From 834e4e1f969f6fcef2abcd65b6d6c3fa8153ddc2 Mon Sep 17 00:00:00 2001
From: jNullj <15849761+jNullj@users.noreply.github.com>
Date: Sun, 16 Mar 2025 22:27:43 +0200
Subject: [PATCH] Update [SourceForge] commit count badge to support repository
 parameter (#10954)

* [sourceforge] update commit count service to support repo param

follow-up to #10935
sourceforge commit count also requires the new repo param for some projects.

* [sourceforge] add redirector for legacy commit count URLs

* fix missing openapi path
---
 ...urceforge-commit-count-redirect.service.js | 15 ++++++++++
 ...ourceforge-commit-count-redirect.tester.js |  6 ++++
 .../sourceforge-commit-count.service.js       | 30 ++++++++++++-------
 .../sourceforge-commit-count.tester.js        | 14 +++++++--
 4 files changed, 51 insertions(+), 14 deletions(-)
 create mode 100644 services/sourceforge/sourceforge-commit-count-redirect.service.js
 create mode 100644 services/sourceforge/sourceforge-commit-count-redirect.tester.js

diff --git a/services/sourceforge/sourceforge-commit-count-redirect.service.js b/services/sourceforge/sourceforge-commit-count-redirect.service.js
new file mode 100644
index 0000000000..1efcd416bd
--- /dev/null
+++ b/services/sourceforge/sourceforge-commit-count-redirect.service.js
@@ -0,0 +1,15 @@
+import { redirector } from '../index.js'
+
+export default redirector({
+  // SourceForge commit count service used to only have project name as a parameter
+  // and the repository name was always `git`.
+  // The service was later updated to have the repository name as a parameter.
+  // This redirector is used to keep the old URLs working.
+  category: 'activity',
+  route: {
+    base: 'sourceforge/commit-count',
+    pattern: ':project',
+  },
+  transformPath: ({ project }) => `/sourceforge/commit-count/${project}/git`,
+  dateAdded: new Date('2025-03-15'),
+})
diff --git a/services/sourceforge/sourceforge-commit-count-redirect.tester.js b/services/sourceforge/sourceforge-commit-count-redirect.tester.js
new file mode 100644
index 0000000000..3e09678b72
--- /dev/null
+++ b/services/sourceforge/sourceforge-commit-count-redirect.tester.js
@@ -0,0 +1,6 @@
+import { createServiceTester } from '../tester.js'
+export const t = await createServiceTester()
+
+t.create('commit count (redirect)')
+  .get('/guitarix.json')
+  .expectRedirect('/sourceforge/commit-count/guitarix/git.json')
diff --git a/services/sourceforge/sourceforge-commit-count.service.js b/services/sourceforge/sourceforge-commit-count.service.js
index b10727c1ef..0a8d2bf916 100644
--- a/services/sourceforge/sourceforge-commit-count.service.js
+++ b/services/sourceforge/sourceforge-commit-count.service.js
@@ -11,17 +11,25 @@ export default class SourceforgeCommitCount extends BaseJsonService {
 
   static route = {
     base: 'sourceforge/commit-count',
-    pattern: ':project',
+    pattern: ':project/:repo',
   }
 
   static openApi = {
-    '/sourceforge/commit-count/{project}': {
+    '/sourceforge/commit-count/{project}/{repo}': {
       get: {
         summary: 'SourceForge Commit Count',
-        parameters: pathParams({
-          name: 'project',
-          example: 'guitarix',
-        }),
+        parameters: pathParams(
+          {
+            name: 'project',
+            example: 'guitarix',
+          },
+          {
+            name: 'repo',
+            example: 'git',
+            description:
+              'The repository name, usually `git` but might be different.',
+          },
+        ),
       },
     },
   }
@@ -35,18 +43,18 @@ export default class SourceforgeCommitCount extends BaseJsonService {
     }
   }
 
-  async fetch({ project }) {
+  async fetch({ project, repo }) {
     return this._requestJson({
-      url: `https://sourceforge.net/rest/p/${project}/git`,
+      url: `https://sourceforge.net/rest/p/${project}/${repo}`,
       schema,
       httpErrors: {
-        404: 'project not found',
+        404: 'project or repo not found',
       },
     })
   }
 
-  async handle({ project }) {
-    const body = await this.fetch({ project })
+  async handle({ project, repo }) {
+    const body = await this.fetch({ project, repo })
     return this.constructor.render({
       commitCount: body.commit_count,
     })
diff --git a/services/sourceforge/sourceforge-commit-count.tester.js b/services/sourceforge/sourceforge-commit-count.tester.js
index f7a7e3f990..24ad6e7db0 100644
--- a/services/sourceforge/sourceforge-commit-count.tester.js
+++ b/services/sourceforge/sourceforge-commit-count.tester.js
@@ -3,9 +3,17 @@ import { createServiceTester } from '../tester.js'
 export const t = await createServiceTester()
 
 t.create('commit count')
-  .get('/guitarix.json')
+  .get('/guitarix/git.json')
+  .expectBadge({ label: 'commit count', message: isMetric })
+
+t.create('commit count (non default repo)')
+  .get('/opencamera/code.json')
   .expectBadge({ label: 'commit count', message: isMetric })
 
 t.create('commit count (project not found)')
-  .get('/that-doesnt-exist.json')
-  .expectBadge({ label: 'commit count', message: 'project not found' })
+  .get('/that-doesnt-exist/git.json')
+  .expectBadge({ label: 'commit count', message: 'project or repo not found' })
+
+t.create('commit count (repo not found)')
+  .get('/guitarix/invalid-repo.json')
+  .expectBadge({ label: 'commit count', message: 'project or repo not found' })