fix: soft-delete undated duplicate member organization rows (#4070)

Author: skwowet

services/apps/cron_service/src/jobs/inferMemberOrganizationStintChanges.job.ts

@@ -10,6 +10,7 @@ import {
   changeMemberOrganizationAffiliationOverrides,
   checkOrganizationAffiliationPolicy,
   createMemberOrganization,
+  deleteUndatedMemberOrganizations,
   fetchMemberOrganizationsBySource,
   updateMemberOrganization,
 } from '@crowd/data-access-layer'
@@ -136,6 +137,10 @@ async function applyStintChanges(qx: QueryExecutor, changes: MemberOrgStintChang
       })
     }
   }
+
+  await deleteUndatedMemberOrganizations(qx, changes[0].memberId, [
+    ...new Set(changes.map((c) => c.organizationId)),
+  ])
 }
 
 export default job

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

@@ -482,6 +482,47 @@ export async function deleteMemberOrganizations(
   })
 }
 
+export async function deleteUndatedMemberOrganizations(
+  qx: QueryExecutor,
+  memberId: string,
+  organizationIds: string[],
+): Promise<void> {
+  if (organizationIds.length === 0) {
+    return
+  }
+
+  const whereClause = `
+    "memberId" = $(memberId)
+    AND "organizationId" IN ($(organizationIds:csv))
+    AND "dateStart" IS NULL
+    AND "dateEnd" IS NULL
+    AND "deletedAt" IS NULL
+  `
+
+  const params = { memberId, organizationIds }
+
+  await qx.tx(async (tx) => {
+    await tx.result(
+      `
+        DELETE FROM "memberOrganizationAffiliationOverrides"
+        WHERE "memberOrganizationId" IN (
+          SELECT "id" FROM "memberOrganizations" WHERE ${whereClause}
+        )
+      `,
+      params,
+    )
+
+    await tx.result(
+      `
+        UPDATE "memberOrganizations"
+        SET "deletedAt" = NOW()
+        WHERE ${whereClause}
+      `,
+      params,
+    )
+  })
+}
+
 export async function cleanSoftDeletedMemberOrganization(
   qx: QueryExecutor,
   memberId: string,