fix: comments

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

Author: ulemons

backend/src/api/public/v1/ossprey/openapi.yaml

@@ -397,14 +397,14 @@ paths:
                     description: Critical packages with status = escalated.
                     example: 8
               example:
-                totalPackages: 617024
+                totalPackages: 1842
                 criticalPackages: 312
-                coveragePercent: 0.1
+                coveragePercent: 33.2
                 coverageTrend: null
-                activeStewards: 3
-                unassignedCritical: 616021
-                needsAttention: 1
-                escalated: 1
+                activeStewards: 42
+                unassignedCritical: 1230
+                needsAttention: 47
+                escalated: 8
         '401':
           description: Missing or invalid bearer token.
           content:
@@ -538,9 +538,9 @@ paths:
             type: string
         - name: ecosystem
           in: query
+          description: Filter by package ecosystem. Not validated server-side — any ecosystem stored in the DB is accepted.
           schema:
             type: string
-            enum: [npm, maven, cargo, pypi]
         - name: lifecycle
           in: query
           schema:

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

@@ -74,14 +74,15 @@ export async function getOsspreyMetrics(qx: QueryExecutor): Promise<OsspreyMetri
   ] = await Promise.all([
     qx.selectOne(`
       SELECT
-        COUNT(*)::text                                                              AS "totalPackages",
-        COUNT(*) FILTER (WHERE p.is_critical = true)::text                         AS "criticalPackages",
-        COUNT(*) FILTER (WHERE p.is_critical = true AND s.status IN ('assessing','active','needs_attention'))::text AS covered,
-        COUNT(*) FILTER (WHERE p.is_critical = true AND s.status = 'needs_attention')::text AS "needsAttention",
-        COUNT(*) FILTER (WHERE p.is_critical = true AND s.status = 'escalated')::text   AS escalated,
-        COUNT(*) FILTER (WHERE p.is_critical = true AND (s.status = 'unassigned' OR s.id IS NULL))::text AS "unassignedCritical"
+        COUNT(*)::text                                                                     AS "totalPackages",
+        COUNT(*) FILTER (WHERE p.has_critical_vulnerability = true)::text                 AS "criticalPackages",
+        COUNT(*) FILTER (WHERE s.status IN ('assessing','active','needs_attention'))::text AS covered,
+        COUNT(*) FILTER (WHERE s.status = 'needs_attention')::text                        AS "needsAttention",
+        COUNT(*) FILTER (WHERE s.status = 'escalated')::text                              AS escalated,
+        COUNT(*) FILTER (WHERE s.status = 'unassigned' OR s.id IS NULL)::text             AS "unassignedCritical"
       FROM packages p
       LEFT JOIN stewardships s ON s.package_id = p.id
+      WHERE p.is_critical = true
     `),
     qx.selectOne(`
       SELECT COUNT(DISTINCT ss.user_id)::text AS count
@@ -92,13 +93,13 @@ export async function getOsspreyMetrics(qx: QueryExecutor): Promise<OsspreyMetri
     `),
   ])
 
-  const critical = parseInt(counts.criticalPackages, 10)
+  const total = parseInt(counts.totalPackages, 10)
   const covered = parseInt(counts.covered, 10)
 
   return {
-    totalPackages: parseInt(counts.totalPackages, 10),
-    criticalPackages: critical,
-    coveragePercent: critical > 0 ? Math.round((covered / critical) * 1000) / 10 : 0,
+    totalPackages: total,
+    criticalPackages: parseInt(counts.criticalPackages, 10),
+    coveragePercent: total > 0 ? Math.round((covered / total) * 1000) / 10 : 0,
     coverageTrend: null, // TODO: requires snapshot mechanism or stewardship_activity timestamp analysis
     activeStewards: parseInt(stewardRow.count, 10),
     unassignedCritical: parseInt(counts.unassignedCritical, 10),
@@ -425,26 +426,8 @@ export async function listPackagesForApi(
   // 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 }
 
-  // Shared LATERAL clauses — included in both the main query and the count fallback
-  // so that WHERE conditions referencing them work in both paths.
-  const stewardsLateral =
-    opts.includeStewards === true
-      ? `
-    LEFT JOIN LATERAL (
-      SELECT COALESCE(
-        json_agg(
-          json_build_object('userId', ss.user_id, 'role', ss.role, 'assignedAt', ss.assigned_at)
-          ORDER BY ss.assigned_at ASC
-        ) FILTER (WHERE ss.id IS NOT NULL),
-        '[]'::json
-      ) AS stewards
-      FROM stewardship_stewards ss
-      WHERE ss.stewardship_id = s.id
-        AND ss.deleted_at IS NULL
-    ) ss_agg ON true`
-      : ''
-
-  const laterals = `
+  // Laterals needed for WHERE filter conditions — included in both the main query and the COUNT fallback.
+  const filterLaterals = `
     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
@@ -465,20 +448,41 @@ export async function listPackagesForApi(
       WHERE pr.package_id = p.id
       ORDER BY pr.confidence DESC
       LIMIT 1
-    ) r_sc ON true
-    ${stewardsLateral}
-    ${
-      opts.includeLastActivity === true
-        ? `
+    ) r_sc ON true`
+
+  // Additional laterals for SELECT output only — not needed in the COUNT fallback.
+  const stewardsLateral =
+    opts.includeStewards === true
+      ? `
+    LEFT JOIN LATERAL (
+      SELECT COALESCE(
+        json_agg(
+          json_build_object('userId', ss.user_id, 'role', ss.role, 'assignedAt', ss.assigned_at)
+          ORDER BY ss.assigned_at ASC
+        ) FILTER (WHERE ss.id IS NOT NULL),
+        '[]'::json
+      ) AS stewards
+      FROM stewardship_stewards ss
+      WHERE ss.stewardship_id = s.id
+        AND ss.deleted_at IS NULL
+    ) ss_agg ON true`
+      : ''
+
+  const lastActLateral =
+    opts.includeLastActivity === true
+      ? `
     LEFT JOIN LATERAL (
       SELECT sa.activity_type, sa.content, sa.created_at
       FROM stewardship_activity sa
       WHERE sa.stewardship_id = s.id
       ORDER BY sa.created_at DESC
       LIMIT 1
     ) last_act ON true`
-        : ''
-    }`
+      : ''
+
+  const laterals = `${filterLaterals}
+    ${stewardsLateral}
+    ${lastActLateral}`
 
   const rows: PackageListRow[] = await qx.select(
     `
@@ -518,10 +522,11 @@ export async function listPackagesForApi(
   } else {
     // 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.
+    // Use filterLaterals (not laterals) — stewards/last_act laterals are SELECT-only and not needed here.
     const countRow: { count: string } = await qx.selectOne(
       `SELECT COUNT(*)::text AS count
        FROM packages p
-       ${laterals}
+       ${filterLaterals}
        ${where}`,
       params,
     )

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

@@ -349,7 +349,7 @@ export async function listStewardshipActivity(
     FROM stewardship_activity sa
     JOIN stewardships s ON s.id = sa.stewardship_id
     JOIN packages p ON p.id = s.package_id
-    ORDER BY sa.created_at DESC
+    ORDER BY sa.created_at DESC, sa.id DESC
     LIMIT $(limit) OFFSET $(offset)
     `,
     { limit: opts.pageSize, offset: (opts.page - 1) * opts.pageSize },