fix: adding steward details

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

Author: ulemons

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

@@ -1,5 +1,7 @@
 import { QueryExecutor } from '../queryExecutor'
 
+import { STEWARD_DISPLAY_NAME_METADATA, STEWARD_MENTIONED_JOIN } from './stewardships'
+
 export interface PackageMetrics {
   totalPackages: number
   criticalPackages: number
@@ -512,8 +514,10 @@ export async function listPackagesForApi(
     opts.includeLastActivity === true
       ? `
     LEFT JOIN LATERAL (
-      SELECT sa.activity_type, sa.content, sa.metadata, sa.created_at
+      SELECT sa.activity_type, sa.content, sa.created_at,
+        ${STEWARD_DISPLAY_NAME_METADATA} AS metadata
       FROM stewardship_activity sa
+      ${STEWARD_MENTIONED_JOIN}
       WHERE sa.stewardship_id = s.id
       ORDER BY sa.created_at DESC
       LIMIT 1

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

@@ -351,12 +351,12 @@ export interface ActivityFeedRow {
   total: string
 }
 
-const STEWARD_MENTIONED_JOIN = `
+export const STEWARD_MENTIONED_JOIN = `
   LEFT JOIN stewards st_mentioned
     ON sa.activity_type = 'steward_added'
     AND st_mentioned.user_id = (sa.metadata->>'userId')`
 
-const STEWARD_DISPLAY_NAME_METADATA = `CASE
+export const STEWARD_DISPLAY_NAME_METADATA = `CASE
         WHEN sa.activity_type = 'steward_added' AND st_mentioned.display_name IS NOT NULL
         THEN COALESCE(sa.metadata, '{}'::jsonb) || jsonb_build_object('stewardDisplayName', st_mentioned.display_name)
         ELSE sa.metadata
@@ -607,8 +607,10 @@ export async function listMyPackages(
 
   const displayLaterals = `
     LEFT JOIN LATERAL (
-      SELECT sa.content, sa.activity_type, sa.metadata, sa.created_at
+      SELECT sa.content, sa.activity_type, sa.created_at,
+        ${STEWARD_DISPLAY_NAME_METADATA} AS metadata
       FROM stewardship_activity sa
+      ${STEWARD_MENTIONED_JOIN}
       WHERE sa.stewardship_id = s.id
       ORDER BY sa.created_at DESC
       LIMIT 1