Merge branch 'main' into feat/CM-361-part-1

skwowet · web-flow · commit be80ade7ed47 · 2026-07-01T16:56:30.000+05:30
diff --git a/backend/package.json b/backend/package.json
@@ -19,6 +19,7 @@
     "script:continue-run": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true tsx src/bin/scripts/continue-run.ts",
     "script:trigger-webhook": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true tsx src/bin/scripts/trigger-webhook.ts",
     "script:send-weekly-analytics-email": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true tsx src/bin/scripts/send-weekly-analytics-email.ts",
+    "script:merge-members": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true tsx src/bin/scripts/merge-members.ts",
     "script:merge-organizations": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true tsx src/bin/scripts/merge-organizations.ts",
     "script:refresh-materialized-views": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true tsx src/bin/scripts/refresh-materialized-views.ts",
     "script:unmerge-members": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true tsx src/bin/scripts/unmerge-members.ts",
diff --git a/backend/src/api/public/v1/stewardships/getMyActivity.ts b/backend/src/api/public/v1/stewardships/getMyActivity.ts
@@ -65,7 +65,7 @@ export async function getMyActivityHandler(req: Request, res: Response): Promise
       description: r.content,
       actor: r.actor,
       createdAt: r.createdAt,
-      suggestedAction: SUGGESTED_ACTIONS[r.stewardshipStatus] ?? null,
+      suggestedAction: SUGGESTED_ACTIONS[r.currentStewardshipStatus] ?? null,
     })),
     meta: {
       total,
diff --git a/backend/src/bin/scripts/merge-members.ts b/backend/src/bin/scripts/merge-members.ts
@@ -3,6 +3,7 @@ import commandLineUsage from 'command-line-usage'
 import * as fs from 'fs'
 import path from 'path'
 
+import { generateUUIDv1 } from '@crowd/common'
 import { CommonMemberService } from '@crowd/common_services'
 import { optionsQx } from '@crowd/data-access-layer'
 import { MemberField, findMemberById } from '@crowd/data-access-layer/src/members'
@@ -33,6 +34,13 @@ const options = [
     description:
       'The unique ID of a member that will be merged into the first one. This one will be destroyed. You can provide multiple ids here separated by comma.',
   },
+  {
+    name: 'userId',
+    alias: 'u',
+    typeLabel: '{underline userId}',
+    type: String,
+    description: 'User ID of the user performing the merge.',
+  },
   {
     name: 'help',
     alias: 'h',
@@ -65,6 +73,8 @@ if (parameters.help || !parameters.originalId || !parameters.targetId) {
     const originalId = parameters.originalId
     const targetIds = parameters.targetId.split(',')
 
+    const userId = parameters.userId
+
     const options = await SequelizeRepository.getDefaultIRepositoryOptions()
     const qx = SequelizeRepository.getQueryExecutor(options)
 
@@ -74,6 +84,16 @@ if (parameters.help || !parameters.originalId || !parameters.targetId) {
     ])
 
     options.currentTenant = { id: originalMember.tenantId }
+    options.currentUser = { id: userId }
+
+    const ctx = {
+      ...options,
+      requestId: generateUUIDv1(),
+      userData: {
+        ip: '127.0.0.1',
+        userAgent: 'merge-members-script',
+      },
+    }
 
     for (const targetId of targetIds) {
       const targetMember = await findMemberById(qx, targetId, [
@@ -89,7 +109,7 @@ if (parameters.help || !parameters.originalId || !parameters.targetId) {
         log.info(`Merging ${targetId} into ${originalId}...`)
         const service = new CommonMemberService(optionsQx(options), options.temporal, log)
         try {
-          await service.merge(originalId, targetId)
+          await service.merge(originalId, targetId, ctx)
         } catch (err) {
           log.error(`Error merging members: ${err.message}`)
           process.exit(1)
diff --git a/backend/src/osspckgs/migrations/V1782400000__stewardship-activity-status-at-time.sql b/backend/src/osspckgs/migrations/V1782400000__stewardship-activity-status-at-time.sql
@@ -0,0 +1,4 @@
+-- Store the stewardship status as it was at the moment each activity was logged.
+-- Existing rows get NULL (no history to reconstruct); queries fall back to s.status for them.
+ALTER TABLE stewardship_activity
+  ADD COLUMN IF NOT EXISTS status_at_time TEXT;
diff --git a/services/apps/packages_worker/src/maven/extract.ts b/services/apps/packages_worker/src/maven/extract.ts
@@ -276,9 +276,10 @@ async function resolveWithInheritance(groupId: string, artifactId: string, versi
 
   const missingLicense = licenses.length === 0
   const missingScm = !scmUrl
+  const missingDevelopers = developers.length === 0 || contributors.length === 0
   const parent = extractParent(pom)
 
-  if (parent && (missingLicense || missingScm)) {
+  if (parent && (missingLicense || missingScm || missingDevelopers)) {
     const parentKey = `${parent.groupId}:${parent.artifactId}:${parent.version}`
     if (depth >= MAX_PARENT_DEPTH || visited.has(parentKey)) {
       log.warn(
diff --git a/services/apps/script_executor_worker/src/activities.ts b/services/apps/script_executor_worker/src/activities.ts
@@ -37,6 +37,7 @@ import {
   findMemberById,
   findMemberIdentitiesGroupedByPlatform,
   findMemberMergeActions,
+  findMergeActionUnmergeBackup,
 } from './activities/dissect-member'
 import {
   getBotMembersWithOrgAffiliation,
@@ -66,6 +67,7 @@ export {
   findMembersWithSamePlatformIdentitiesDifferentCapitalization,
   mergeMembers,
   findMemberMergeActions,
+  findMergeActionUnmergeBackup,
   unmergeMembers,
   unmergeMembersPreview,
   waitForTemporalWorkflowExecutionFinish,
diff --git a/services/apps/script_executor_worker/src/activities/dissect-member/index.ts b/services/apps/script_executor_worker/src/activities/dissect-member/index.ts
@@ -30,6 +30,17 @@ export async function findMemberMergeActions(
   return mergeActions
 }
 
+export async function findMergeActionUnmergeBackup(
+  mergeActionId: string,
+): Promise<IMergeAction['unmergeBackup'] | null> {
+  try {
+    const mergeActionRepo = new MergeActionRepository(svc.postgres.reader.connection(), svc.log)
+    return await mergeActionRepo.findMergeActionUnmergeBackup(mergeActionId)
+  } catch (err) {
+    throw new Error(err)
+  }
+}
+
 export async function findMemberIdentitiesGroupedByPlatform(
   memberId: string,
 ): Promise<IFindMemberIdentitiesGroupedByPlatformResult[]> {
diff --git a/services/apps/script_executor_worker/src/workflows/dissectMember.ts b/services/apps/script_executor_worker/src/workflows/dissectMember.ts
@@ -4,7 +4,6 @@ import {
   continueAsNew,
   proxyActivities,
   startChild,
-  workflowInfo,
 } from '@temporalio/workflow'
 
 import { IMemberUnmergeBackup, IUnmergeBackup, MemberIdentityType } from '@crowd/types'
@@ -24,8 +23,6 @@ const common = proxyActivities<typeof commonActivities>({
 })
 
 export async function dissectMember(args: IDissectMemberArgs): Promise<void> {
-  const info = workflowInfo()
-
   // check if memberId exist in db before unmerging
   const member = await activity.findMemberById(args.memberId)
 
@@ -92,17 +89,26 @@ export async function dissectMember(args: IDissectMemberArgs): Promise<void> {
       // 2. wait for temporal async stuff to complete
       // 3. call the same workflow again for the unmerged secondary member
 
+      // Fetch each backup in its own activity — listing 10 backups in one result can exceed
+      // Temporal's 2MB activity payload limit on polluted members.
+      const unmergeBackup = await activity.findMergeActionUnmergeBackup(mergeAction.id)
+
+      if (!unmergeBackup) {
+        console.log(`Merge action ${mergeAction.id} has no unmerge backup, skipping!`)
+        continue
+      }
+
       await common.unmergeMembers(
         mergeAction.primaryId,
-        mergeAction.unmergeBackup as IUnmergeBackup<IMemberUnmergeBackup>,
+        unmergeBackup as IUnmergeBackup<IMemberUnmergeBackup>,
       )
 
       const workflowId = `finishMemberUnmerging/${mergeAction.primaryId}/${mergeAction.secondaryId}`
 
       await common.waitForTemporalWorkflowExecutionFinish(workflowId)
 
       await startChild(dissectMember, {
-        workflowId: `${info.workflowId}/${mergeAction.secondaryId}`,
+        workflowId: `dissectMember/${mergeAction.secondaryId}`,
         cancellationType: ChildWorkflowCancellationType.ABANDON,
         parentClosePolicy: ParentClosePolicy.PARENT_CLOSE_POLICY_ABANDON,
         retry: {
diff --git a/services/libs/data-access-layer/src/old/apps/script_executor_worker/mergeAction.repo.ts b/services/libs/data-access-layer/src/old/apps/script_executor_worker/mergeAction.repo.ts
@@ -19,7 +19,16 @@ class MergeActionRepository {
   ) {
     let rows: IMergeAction[] = []
     let query = `
-        select * from "mergeActions" ma
+        select
+          ma.id,
+          ma.type,
+          ma."primaryId",
+          ma."secondaryId",
+          ma."createdAt",
+          ma."updatedAt",
+          ma.step,
+          ma.state
+        from "mergeActions" ma
         where 
           ma."state" = 'merged' and 
           ma."primaryId" = $(memberId) and 
@@ -62,6 +71,20 @@ class MergeActionRepository {
     return rows
   }
 
+  async findMergeActionUnmergeBackup(mergeActionId: string) {
+    const rows = await this.connection.query(
+      `
+      select ma."unmergeBackup"
+      from "mergeActions" ma
+      where ma.id = $(mergeActionId)
+        and ma."unmergeBackup" is not null
+      `,
+      { mergeActionId },
+    )
+
+    return rows[0]?.unmergeBackup ?? null
+  }
+
   async findMergeActionsWithDeletedSecondaryEntities(
     limit: number,
     offset: number,
diff --git a/services/libs/data-access-layer/src/osspckgs/stewardships.ts b/services/libs/data-access-layer/src/osspckgs/stewardships.ts
@@ -203,9 +203,9 @@ export async function openStewardshipByPurl(
     ),
     _log AS (
       INSERT INTO stewardship_activity
-        (stewardship_id, actor_user_id, actor_type, activity_type, content, actor_username, actor_display_name, actor_avatar_url)
+        (stewardship_id, actor_user_id, actor_type, activity_type, content, actor_username, actor_display_name, actor_avatar_url, status_at_time)
       SELECT upserted.id, $(actorUserId), 'user', 'state_changed', 'Opened for stewardship',
-             $(actorUsername), $(actorDisplayName), $(actorAvatarUrl)
+             $(actorUsername), $(actorDisplayName), $(actorAvatarUrl), 'open'
       FROM upserted
       WHERE NOT EXISTS (SELECT 1 FROM prev WHERE prev.old_status = 'open')
     )
@@ -278,16 +278,17 @@ export async function assignSteward(
 
     await tx.result(
       `INSERT INTO stewardship_activity
-         (stewardship_id, actor_user_id, actor_type, activity_type, content, metadata, actor_username, actor_display_name, actor_avatar_url)
+         (stewardship_id, actor_user_id, actor_type, activity_type, content, metadata, actor_username, actor_display_name, actor_avatar_url, status_at_time)
        VALUES ($(stewardshipId), $(actorUserId), 'user', 'steward_added', $(content), $(metadata)::jsonb,
-               $(actorUsername), $(actorDisplayName), $(actorAvatarUrl))`,
+               $(actorUsername), $(actorDisplayName), $(actorAvatarUrl), $(statusAtTime))`,
       {
         stewardshipId,
         actorUserId: data.assignedBy,
         actorUsername: data.actorUsername ?? null,
         actorDisplayName: data.actorDisplayName ?? null,
         actorAvatarUrl: data.actorAvatarUrl ?? null,
         content: `Assigned steward ${data.userId} as ${data.role}`,
+        statusAtTime: stewardship.status,
         metadata: JSON.stringify({
           userId: data.userId,
           role: data.role,
@@ -316,10 +317,10 @@ export async function assignSteward(
         ),
         _log AS (
           INSERT INTO stewardship_activity
-            (stewardship_id, actor_user_id, actor_type, activity_type, content, metadata, actor_username, actor_display_name, actor_avatar_url)
+            (stewardship_id, actor_user_id, actor_type, activity_type, content, metadata, actor_username, actor_display_name, actor_avatar_url, status_at_time)
           SELECT id, $(actorUserId), 'user', 'state_changed',
                  'Status updated to assessing', $(metadata)::jsonb,
-                 $(actorUsername), $(actorDisplayName), $(actorAvatarUrl)
+                 $(actorUsername), $(actorDisplayName), $(actorAvatarUrl), 'assessing'
           FROM upd
         )
         SELECT * FROM upd
@@ -380,6 +381,7 @@ export interface ActivityFeedRow {
   content: string | null
   metadata: Record<string, unknown> | null
   stewardshipStatus: string
+  currentStewardshipStatus: string
   createdAt: string
   total: string
 }
@@ -406,7 +408,8 @@ export async function listStewardshipActivity(
       sa.activity_type                   AS "activityType",
       sa.content                         AS content,
       ${STEWARD_DISPLAY_NAME_METADATA}   AS metadata,
-      s.status                           AS "stewardshipStatus",
+      COALESCE(sa.status_at_time, s.status) AS "stewardshipStatus",
+      s.status                           AS "currentStewardshipStatus",
       sa.created_at                      AS "createdAt",
       COUNT(*) OVER()::text              AS total
     FROM stewardship_activity sa
@@ -454,6 +457,7 @@ export async function listStewardshipActivity(
       ),
       metadata: row.metadata as Record<string, unknown> | null,
       stewardshipStatus: row.stewardshipStatus as string,
+      currentStewardshipStatus: row.currentStewardshipStatus as string,
       createdAt: toIso(row.createdAt),
     })),
     total,
@@ -797,6 +801,7 @@ export async function listMyActivity(
       sub.content,
       sub.metadata,
       sub."stewardshipStatus",
+      sub."currentStewardshipStatus",
       sub."createdAt",
       COUNT(*) OVER()::text AS total
     FROM (
@@ -814,7 +819,8 @@ export async function listMyActivity(
         sa.activity_type                   AS "activityType",
         sa.content                         AS content,
         ${STEWARD_DISPLAY_NAME_METADATA}   AS metadata,
-        s.status                           AS "stewardshipStatus",
+        COALESCE(sa.status_at_time, s.status) AS "stewardshipStatus",
+        s.status                           AS "currentStewardshipStatus",
         sa.created_at                      AS "createdAt"
       FROM stewardship_activity sa
       JOIN stewardships s ON s.id = sa.stewardship_id
@@ -879,6 +885,7 @@ export async function listMyActivity(
       ),
       metadata: row.metadata as Record<string, unknown> | null,
       stewardshipStatus: row.stewardshipStatus as string,
+      currentStewardshipStatus: row.currentStewardshipStatus as string,
       createdAt: toIso(row.createdAt),
     })),
     total,
@@ -961,9 +968,9 @@ export async function escalateStewardship(
     ),
     _log AS (
       INSERT INTO stewardship_activity
-        (stewardship_id, actor_user_id, actor_type, activity_type, content, metadata, actor_username, actor_display_name, actor_avatar_url)
+        (stewardship_id, actor_user_id, actor_type, activity_type, content, metadata, actor_username, actor_display_name, actor_avatar_url, status_at_time)
       SELECT id, $(actorUserId), 'user', 'escalation',
-             $(content), $(metadata)::jsonb, $(actorUsername), $(actorDisplayName), $(actorAvatarUrl)
+             $(content), $(metadata)::jsonb, $(actorUsername), $(actorDisplayName), $(actorAvatarUrl), 'escalated'
       FROM upd
     )
     SELECT * FROM upd
@@ -1037,9 +1044,9 @@ export async function updateStewardshipStatus(
     ),
     _log AS (
       INSERT INTO stewardship_activity
-        (stewardship_id, actor_user_id, actor_type, activity_type, content, metadata, actor_username, actor_display_name, actor_avatar_url)
+        (stewardship_id, actor_user_id, actor_type, activity_type, content, metadata, actor_username, actor_display_name, actor_avatar_url, status_at_time)
       SELECT id, $(actorUserId), 'user', 'state_changed',
-             $(content), $(metadata)::jsonb, $(actorUsername), $(actorDisplayName), $(actorAvatarUrl)
+             $(content), $(metadata)::jsonb, $(actorUsername), $(actorDisplayName), $(actorAvatarUrl), $(status)
       FROM upd
     )
     SELECT * FROM upd
