fix required optionalUrl, remove default, assume semver from firstpage

badges · Dec 18, 2023 · dc113e0 · dc113e0
1 parent 441f2ba
commit dc113e0
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 86 deletions.
diff --git a/services/gitea/gitea-base.js b/services/gitea/gitea-base.js
@@ -16,75 +16,4 @@ export default class GiteaBase extends BaseJsonService {
       }),
     )
   }
-
-  async fetchPage({ page, requestParams, schema }) {
-    const {
-      options: { searchParams: existingQuery, ...restOptions } = {},
-      ...rest
-    } = requestParams
-
-    requestParams = {
-      options: {
-        searchParams: {
-          ...existingQuery,
-          ...{ page },
-        },
-        ...restOptions,
-      },
-      ...rest,
-    }
-
-    const { res, buffer } = await this._request(
-      this.authHelper.withBearerAuthHeader({
-        ...requestParams,
-      }),
-    )
-
-    const json = this._parseJson(buffer)
-    const data = this.constructor._validate(json, schema)
-
-    return { res, data }
-  }
-
-  async fetchPaginatedArrayData({
-    url,
-    options,
-    schema,
-    httpErrors,
-    firstPageOnly = false,
-  }) {
-    const requestLimit = 100
-    const requestParams = {
-      url,
-      options: {
-        headers: { Accept: 'application/json' },
-        searchParams: { limit: requestLimit },
-        ...options,
-      },
-      httpErrors,
-    }
-
-    const {
-      res: { headers },
-      data,
-    } = await this.fetchPage({ page: 1, requestParams, schema })
-    const numberOfItems = headers['x-total-count']
-
-    let numberOfPages = 1
-    if (numberOfItems > 0) {
-      numberOfPages = Math.ceil(numberOfItems / requestLimit)
-    }
-
-    if (numberOfPages === 1 || firstPageOnly) {
-      return data
-    }
-
-    const pageData = await Promise.all(
-      [...Array(numberOfPages - 1).keys()].map((_, i) =>
-        this.fetchPage({ page: ++i + 1, requestParams, schema }),
-      ),
-    )
-
-    return [...data].concat(...pageData.map(p => p.data))
-  }
 }
diff --git a/services/gitea/gitea-helper.js b/services/gitea/gitea-helper.js
@@ -1,6 +1,5 @@
 const documentation = `
-Note that only internet-accessible Gitea compatible instances are supported, for example
-[https://codeberg.org](https://codeberg.org).
+Note that the gitea_url parameter is required because there is canonical hosted gitea service provided by Gitea.
 `
 
 function httpErrorsFor() {

diff --git a/services/gitea/gitea-languages-count.service.js b/services/gitea/gitea-languages-count.service.js
@@ -12,7 +12,7 @@ The keys could be anything and {} is a valid response (e.g: for an empty repo)
 const schema = Joi.object().pattern(/./, nonNegativeInteger)
 
 const queryParamSchema = Joi.object({
-  gitea_url: optionalUrl,
+  gitea_url: optionalUrl.required(),
 }).required()
 
 export default class GiteaLanguageCount extends GiteaBase {
@@ -58,18 +58,15 @@ export default class GiteaLanguageCount extends GiteaBase {
   }
 
   async fetch({ user, repo, baseUrl }) {
-    // https://codeberg.org/api/swagger#/repository/repoGetLanguages
+    // https://try.gitea.io/api/swagger#/repository/repoGetLanguages
     return super.fetch({
       schema,
       url: `${baseUrl}/api/v1/repos/${user}/${repo}/languages`,
       httpErrors: httpErrorsFor('user or repo not found'),
     })
   }
 
-  async handle(
-    { user, repo },
-    { gitea_url: baseUrl = 'https://codeberg.org' },
-  ) {
+  async handle({ user, repo }, { gitea_url: baseUrl }) {
     const data = await this.fetch({
       user,
       repo,

diff --git a/services/gitea/gitea-release.service.js b/services/gitea/gitea-release.service.js
@@ -18,7 +18,7 @@ const displayNameEnum = ['tag', 'release']
 const dateOrderByEnum = ['created_at', 'published_at']
 
 const queryParamSchema = Joi.object({
-  gitea_url: optionalUrl,
+  gitea_url: optionalUrl.required(),
   include_prereleases: Joi.equal(''),
   sort: Joi.string()
     .valid(...sortEnum)
@@ -86,13 +86,12 @@ export default class GiteaRelease extends GiteaBase {
 
   static defaultBadgeData = { label: 'release' }
 
-  async fetch({ user, repo, baseUrl, isSemver }) {
-    // https://codeberg.org/api/swagger#/repository/repoGetRelease
-    return this.fetchPaginatedArrayData({
+  async fetch({ user, repo, baseUrl }) {
+    // https://try.gitea.io/api/swagger#/repository/repoGetRelease
+    return super.fetch({
       schema,
       url: `${baseUrl}/api/v1/repos/${user}/${repo}/releases`,
       httpErrors: httpErrorsFor(),
-      firstPageOnly: !isSemver,
     })
   }
 
@@ -123,7 +122,7 @@ export default class GiteaRelease extends GiteaBase {
   async handle(
     { user, repo },
     {
-      gitea_url: baseUrl = 'https://codeberg.org',
+      gitea_url: baseUrl,
       include_prereleases: pre,
       sort,
       display_name: displayName,

diff --git a/services/gitea/gitea-release.tester.js b/services/gitea/gitea-release.tester.js
@@ -30,7 +30,7 @@ t.create('Release (latest by semver pre-release)')
   .expectBadge({ label: 'release', message: 'v5.0.0-rc1', color: 'orange' })
 
 t.create('Release (project not found)')
-  .get('/CanisHelix/does-not-exist.json')
+  .get('/CanisHelix/does-not-exist.json?gitea_url=https://codeberg.org')
   .expectBadge({ label: 'release', message: 'user or repo not found' })
 
 t.create('Release (no tags)')