fix: refactor v1Router

Signed-off-by: Umberto Sgueglia <usgueglia@contractor.linuxfoundation.org>

Author: ulemons

backend/src/api/public/index.ts

@@ -1,18 +1,12 @@
 import { Router } from 'express'
 
-import { AUTH0_CONFIG } from '../../conf'
-
 import { errorHandler } from './middlewares/errorHandler'
-import { oauth2Middleware } from './middlewares/oauth2Middleware'
-import { staticApiKeyMiddleware } from './middlewares/staticApiKeyMiddleware'
 import { v1Router } from './v1'
-import { devStatsRouter } from './v1/dev-stats'
 
 export function publicRouter(): Router {
   const router = Router()
 
-  router.use('/v1', staticApiKeyMiddleware(), devStatsRouter())
-  router.use('/v1', oauth2Middleware(AUTH0_CONFIG), v1Router())
+  router.use('/v1', v1Router())
   router.use(errorHandler)
 
   return router

backend/src/api/public/v1/dev-stats/getAffiliations.ts

@@ -11,29 +11,42 @@ import {
 import { ok } from '@/utils/api'
 import { validateOrThrow } from '@/utils/validation'
 
-const MAX_HANDLES = 1000
+const MAX_HANDLES = 100
+const DEFAULT_PAGE_SIZE = 50
 
 const bodySchema = z.object({
   githubHandles: z
     .array(z.string().min(1))
     .min(1)
     .max(MAX_HANDLES, `Maximum ${MAX_HANDLES} handles per request`),
+  page: z.number().int().min(1).default(1),
+  pageSize: z.number().int().min(1).max(MAX_HANDLES).default(DEFAULT_PAGE_SIZE),
 })
 
 export async function getAffiliations(req: Request, res: Response): Promise<void> {
-  const { githubHandles } = validateOrThrow(bodySchema, req.body)
+  const { githubHandles, page, pageSize } = validateOrThrow(bodySchema, req.body)
   const qx = optionsQx(req)
 
   const lowercasedHandles = githubHandles.map((h) => h.toLowerCase())
 
+  const offset = (page - 1) * pageSize
+  const pageHandles = lowercasedHandles.slice(offset, offset + pageSize)
+
   // Step 1: find verified members by github handles
-  const memberRows = await findMembersByGithubHandles(qx, lowercasedHandles)
+  const memberRows = await findMembersByGithubHandles(qx, pageHandles)
 
   const foundHandles = new Set(memberRows.map((r) => r.githubHandle.toLowerCase()))
-  const notFound = githubHandles.filter((h) => !foundHandles.has(h.toLowerCase()))
+  const notFound = pageHandles.filter((h) => !foundHandles.has(h))
 
   if (memberRows.length === 0) {
-    ok(res, { total_found: 0, contributors: [], notFound })
+    ok(res, {
+      total: githubHandles.length,
+      page,
+      pageSize,
+      total_found: 0,
+      contributors: [],
+      notFound,
+    })
     return
   }
 
@@ -60,5 +73,12 @@ export async function getAffiliations(req: Request, res: Response): Promise<void
     affiliations: affiliationsByMember.get(member.memberId) ?? [],
   }))
 
-  ok(res, { total_found: contributors.length, contributors, notFound })
+  ok(res, {
+    total: githubHandles.length,
+    page,
+    pageSize,
+    total_found: contributors.length,
+    contributors,
+    notFound,
+  })
 }

backend/src/api/public/v1/dev-stats/index.ts

@@ -14,7 +14,7 @@ export function devStatsRouter(): Router {
 
   router.use(rateLimiter)
 
-  router.post('/affiliations', requireScopes([SCOPES.READ_AFFILIATIONS]), safeWrap(getAffiliations))
+  router.post('/', requireScopes([SCOPES.READ_AFFILIATIONS]), safeWrap(getAffiliations))
 
   return router
 }

backend/src/api/public/v1/index.ts

@@ -1,13 +1,19 @@
 import { Router } from 'express'
 
+import { AUTH0_CONFIG } from '../../../conf'
+
+import { oauth2Middleware } from '../middlewares/oauth2Middleware'
+import { staticApiKeyMiddleware } from '../middlewares/staticApiKeyMiddleware'
+import { devStatsRouter } from './dev-stats'
 import { membersRouter } from './members'
 import { organizationsRouter } from './organizations'
 
 export function v1Router(): Router {
   const router = Router()
 
-  router.use('/members', membersRouter())
-  router.use('/organizations', organizationsRouter())
+  router.use('/members', oauth2Middleware(AUTH0_CONFIG), membersRouter())
+  router.use('/organizations', oauth2Middleware(AUTH0_CONFIG), organizationsRouter())
+  router.use('/affiliations', staticApiKeyMiddleware(), devStatsRouter())
 
   return router
 }

services/libs/data-access-layer/src/affiliations/index.ts

@@ -33,7 +33,6 @@ export async function findWorkExperiencesBulk(
 ): Promise<IWorkRow[]> {
   const rows: IWorkRow[] = await qx.select(
     `
-      /* TODO: re-enable memberCount tiebreaker once performance is acceptable
       WITH relevant_orgs AS (
         SELECT DISTINCT "organizationId"
         FROM "memberOrganizations"
@@ -53,7 +52,6 @@ export async function findWorkExperiencesBulk(
           )
         GROUP BY osa."organizationId"
       )
-      */
       SELECT
         mo.id,
         mo."memberId",
@@ -64,12 +62,12 @@ export async function findWorkExperiencesBulk(
         mo."dateEnd",
         mo."createdAt",
         COALESCE(ovr."isPrimaryWorkExperience", false)      AS "isPrimaryWorkExperience",
-        0                                                   AS "memberCount", -- TODO: restore COALESCE(a.total_count, 0) when re-enabling aggs
+        COALESCE(a.total_count, 0)                          AS "memberCount",
         NULL::text                                          AS "segmentId"
       FROM "memberOrganizations" mo
       JOIN organizations o ON mo."organizationId" = o.id
       LEFT JOIN "memberOrganizationAffiliationOverrides" ovr ON ovr."memberOrganizationId" = mo.id
-      -- LEFT JOIN aggs a ON a."organizationId" = mo."organizationId" -- TODO: restore when re-enabling aggs
+      LEFT JOIN aggs a ON a."organizationId" = mo."organizationId"
       WHERE mo."memberId" IN ($(memberIds:csv))
         AND mo."deletedAt" IS NULL
         AND COALESCE(ovr."allowAffiliation", true) = true