fix: remove dangling affiliation overrides on memberOrganization deletion (#3631)

Author: skwowet

services/apps/members_enrichment_worker/src/activities/enrichment.ts

@@ -411,7 +411,7 @@ export async function updateMemberUsingSquashedPayload(
       if (results.toDelete.length > 0) {
         for (const org of results.toDelete) {
           updated = true
-          await deleteMemberOrgById(tx.transaction(), memberId, org.id)
+          await deleteMemberOrgById(tx.transaction(), org.id)
         }
       }
 

services/libs/data-access-layer/src/members/organizations.ts

@@ -133,23 +133,43 @@ export async function createOrUpdateMemberOrganizations(
   dateEnd: string | null | undefined,
 ): Promise<void> {
   if (dateStart) {
+    const whereClause = `
+      "memberId" = $(memberId)
+      AND "title" = $(title)
+      AND "organizationId" = $(organizationId)
+      AND "dateStart" IS NULL
+      AND "dateEnd" IS NULL
+    `
+
     // clean up organizations without dates if we're getting ones with dates
     await qx.result(
       `
           UPDATE "memberOrganizations"
           SET "deletedAt" = NOW()
-          WHERE "memberId" = $(memberId)
-          AND "title" = $(title)
-          AND "organizationId" = $(organizationId)
-          AND "dateStart" IS NULL
-          AND "dateEnd" IS NULL
+          WHERE ${whereClause}
         `,
       {
         memberId,
         title,
         organizationId,
       },
     )
+
+    // always clean up affiliation overrides for any organization we soft-delete
+    // to prevent stale override data pointing to soft-deleted organizations
+    await qx.result(
+      `
+        DELETE FROM "memberOrganizationAffiliationOverrides"
+        WHERE "memberOrganizationId" IN (
+          SELECT id FROM "memberOrganizations" WHERE ${whereClause}
+        )
+      `,
+      {
+        memberId,
+        title,
+        organizationId,
+      },
+    )
   } else {
     const rows = await qx.select(
       `

services/libs/data-access-layer/src/old/apps/members_enrichment_worker/index.ts

@@ -433,47 +433,7 @@ export async function insertOrgIdentity(
   )
 }
 
-export async function deleteMemberOrg(db: DbConnOrTx, memberId: string, organizationId: string) {
-  await db.tx(async (tx) => {
-    await tx.none(
-      `
-      DELETE FROM "memberOrganizationAffiliationOverrides"
-      WHERE "memberOrganizationId" IN (
-        SELECT id FROM "memberOrganizations"
-        WHERE "memberId" = $(memberId)
-        AND "organizationId" = $(organizationId)
-        AND "dateStart" IS NULL
-        AND "dateEnd" IS NULL
-      )
-    `,
-      {
-        memberId,
-        organizationId,
-      },
-    )
-
-    await tx.none(
-      `
-      UPDATE "memberOrganizations"
-      SET "deletedAt" = NOW()
-      WHERE "memberId" = $(memberId)
-      AND "organizationId" = $(organizationId)
-      AND "dateStart" IS NULL
-      AND "dateEnd" IS NULL
-    `,
-      {
-        memberId,
-        organizationId,
-      },
-    )
-  })
-}
-
-export async function deleteMemberOrgById(
-  tx: DbTransaction,
-  memberId: string,
-  id: string,
-): Promise<void> {
+export async function deleteMemberOrgById(tx: DbTransaction, id: string): Promise<void> {
   // Execute directly on the provided transaction to avoid creating nested savepoints
   await tx.none(
     `
@@ -487,9 +447,9 @@ export async function deleteMemberOrgById(
     `
       UPDATE "memberOrganizations"
       SET "deletedAt" = NOW()
-      WHERE "memberId" = $(memberId) and id = $(id);
+      WHERE id = $(id);
     `,
-    { memberId, id },
+    { id },
   )
 }
 
@@ -506,7 +466,7 @@ export async function findMemberOrgs(db: DbStore, memberId: string, orgId: strin
 }
 
 export async function updateMemberOrg(
-  tx: DbConnOrTx,
+  tx: DbTransaction,
   memberId: string,
   original: IMemberOrganizationData,
   toUpdate: Record<string, unknown>,
@@ -554,10 +514,7 @@ export async function updateMemberOrg(
 
   if (existing) {
     // we should just delete the row
-    await tx.none(
-      `update "memberOrganizations" set "deletedAt" = now() where "memberId" = $(memberId) and id = $(id)`,
-      { id: original.id, memberId },
-    )
+    await deleteMemberOrgById(tx, original.id)
   } else {
     const sets = keys.map((k) => `"${k}" = $(${k})`)
     await tx.none(