fix: adding maintainer filter

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

Author: ulemons

backend/src/api/public/v1/packages/batchGetStewardship.ts

@@ -27,6 +27,8 @@ const bodySchema = z.object({
 
 export async function batchGetStewardship(req: Request, res: Response): Promise<void> {
   const { purls: rawPurls } = validateOrThrow(bodySchema, req.body)
+  // Normalize after parsing (not in the schema) so rawPurls keeps the client's
+  // original form — used as the response key so clients can look up their input.
   const normalizedPurls = rawPurls.map(normalizePurl)
 
   const qx = await getPackagesQx()

services/libs/data-access-layer/src/osspckgs/api.ts

@@ -96,10 +96,8 @@ export async function listPackagesForApi(
   }
 
   if (opts.busFactor1Only) {
-    // UNIQUE(package_id, maintainer_id) on package_maintainers covers this lookup
-    conditions.push(
-      `(SELECT COUNT(*) FROM package_maintainers pm WHERE pm.package_id = p.id) = 1`,
-    )
+    // References pm_counts LATERAL join below — computed once, used in both WHERE and SELECT
+    conditions.push(`pm_counts.cnt = 1`)
   }
 
   const where = `WHERE ${conditions.join(' AND ')}`
@@ -111,9 +109,8 @@ export async function listPackagesForApi(
   else sortExpr = 'LOWER(p.name)'
   const sortDir = opts.sortDir === 'desc' ? 'DESC' : 'ASC'
 
-  const filterParams = { ...params }
-  params.limit = opts.pageSize
-  params.offset = (opts.page - 1) * opts.pageSize
+  // Separate paginated params from filter-only params used by the fallback COUNT query
+  const queryParams = { ...params, limit: opts.pageSize, offset: (opts.page - 1) * opts.pageSize }
 
   const rows: PackageListRow[] = await qx.select(
     `
@@ -124,18 +121,21 @@ export async function listPackagesForApi(
       p.impact AS "criticalityScore",
       s.status AS "stewardshipStatus",
       COALESCE(ap_counts.cnt, 0) AS "openVulns",
-      (SELECT COUNT(*)::int FROM package_maintainers pm WHERE pm.package_id = p.id) AS "maintainerCount",
+      pm_counts.cnt AS "maintainerCount",
       COUNT(*) OVER() AS total
     FROM packages p
     LEFT JOIN stewardships s ON s.package_id = p.id
     LEFT JOIN LATERAL (
       SELECT COUNT(*)::int AS cnt FROM advisory_packages WHERE package_id = p.id
     ) ap_counts ON true
+    LEFT JOIN LATERAL (
+      SELECT COUNT(*)::int AS cnt FROM package_maintainers pm WHERE pm.package_id = p.id
+    ) pm_counts ON true
     ${where}
     ORDER BY ${sortExpr} ${sortDir} NULLS LAST, p.purl ${sortDir}
     LIMIT $(limit) OFFSET $(offset)
     `,
-    params,
+    queryParams,
   )
 
   let total: number
@@ -145,8 +145,14 @@ export async function listPackagesForApi(
     // Window function returns no rows when the page is beyond the result set.
     // Fall back to a separate COUNT so the caller always gets the real total.
     const countRow: { count: string } = await qx.selectOne(
-      `SELECT COUNT(*)::text AS count FROM packages p LEFT JOIN stewardships s ON s.package_id = p.id ${where}`,
-      filterParams,
+      `SELECT COUNT(*)::text AS count
+       FROM packages p
+       LEFT JOIN stewardships s ON s.package_id = p.id
+       LEFT JOIN LATERAL (
+         SELECT COUNT(*)::int AS cnt FROM package_maintainers pm WHERE pm.package_id = p.id
+       ) pm_counts ON true
+       ${where}`,
+      params,
     )
     total = parseInt(countRow.count, 10)
   }