fix: prevent foreign key violations during entity merges (#3555)

Author: skwowet

backend/src/database/repositories/memberOrganizationRepository.ts

@@ -47,41 +47,6 @@ class MemberOrganizationRepository {
     return results as IMemberOrganization[]
   }
 
-  static async removeMemberRole(role: IMemberOrganization, options: IRepositoryOptions) {
-    const seq = SequelizeRepository.getSequelize(options)
-    const transaction = SequelizeRepository.getTransaction(options)
-
-    let deleteMemberRole = `DELETE FROM "memberOrganizations"
-                                            WHERE
-                                            "organizationId" = :organizationId and
-                                            "memberId" = :memberId`
-
-    const replacements = {
-      organizationId: role.organizationId,
-      memberId: role.memberId,
-    } as any
-
-    if (role.dateStart === null) {
-      deleteMemberRole += ` and "dateStart" is null `
-    } else {
-      deleteMemberRole += ` and "dateStart" = :dateStart `
-      replacements.dateStart = (role.dateStart as Date).toISOString()
-    }
-
-    if (role.dateEnd === null) {
-      deleteMemberRole += ` and "dateEnd" is null `
-    } else {
-      deleteMemberRole += ` and "dateEnd" = :dateEnd `
-      replacements.dateEnd = (role.dateEnd as Date).toISOString()
-    }
-
-    await seq.query(deleteMemberRole, {
-      replacements,
-      type: QueryTypes.DELETE,
-      transaction,
-    })
-  }
-
   static async findNonIntersectingRoles(
     primaryId: string,
     secondaryId: string,

backend/src/database/repositories/organizationRepository.ts

@@ -24,7 +24,7 @@ import {
   addOrgsToSegments,
   cleanUpOrgIdentities,
   cleanupForOganization,
-  deleteOrgAttributesByOrganizationId,
+  deleteOrganizationAttributes,
   fetchManyOrgIdentities,
   fetchManyOrgSegments,
   fetchOrgIdentities,
@@ -564,7 +564,7 @@ class OrganizationRepository {
 
     await cleanupForOganization(qx, id)
 
-    await deleteOrgAttributesByOrganizationId(qx, id)
+    await deleteOrganizationAttributes(qx, [id])
 
     await record.destroy({
       transaction,

services/apps/entity_merging_worker/src/activities/organizations.ts

@@ -6,7 +6,8 @@ import {
 } from '@crowd/data-access-layer/src/old/apps/entity_merging_worker/orgs'
 import {
   cleanupForOganization,
-  deleteOrgAttributesByOrganizationId,
+  deleteOrganizationAttributes,
+  deleteOrganizationEnrichment,
 } from '@crowd/data-access-layer/src/organizations'
 import { dbStoreQx, pgpQx } from '@crowd/data-access-layer/src/queryExecutor'
 import { SearchSyncApiClient } from '@crowd/opensearch'
@@ -19,7 +20,8 @@ export async function deleteOrganization(organizationId: string): Promise<void>
   await deleteOrganizationSegments(svc.postgres.writer, organizationId)
 
   const qx = dbStoreQx(svc.postgres.writer)
-  await deleteOrgAttributesByOrganizationId(qx, organizationId)
+  await deleteOrganizationEnrichment(qx, organizationId)
+  await deleteOrganizationAttributes(qx, [organizationId])
   await cleanupForOganization(qx, organizationId)
 
   await deleteOrganizationById(svc.postgres.writer, organizationId)

services/apps/merge_suggestions_worker/src/activities/organizationMergeSuggestions.ts

@@ -283,9 +283,6 @@ export async function getOrganizationMergeSuggestions(
     throw e
   }
 
-  svc.log.debug(`Found ${organizationsToMerge.length} similar organizations!`)
-  svc.log.debug({ organizationsToMerge })
-
   for (const organizationToMerge of organizationsToMerge) {
     const secondaryOrgWithLfxMembership = await hasLfxMembership(qx, {
       organizationId: organizationToMerge._source.uuid_organizationId,

services/libs/data-access-layer/src/member_organization_affiliation_overrides/index.ts

@@ -160,18 +160,3 @@ export async function findPrimaryWorkExperiencesOfMember(
   )
   return overrides
 }
-
-export async function deleteAffiliationOverrides(
-  qx: QueryExecutor,
-  memberId: string,
-  memberOrganizationIds: string[],
-): Promise<void> {
-  await qx.result(
-    `
-      DELETE FROM "memberOrganizationAffiliationOverrides"
-      WHERE "memberId" = $(memberId)
-      AND "memberOrganizationId" IN ($(memberOrganizationIds:csv))
-    `,
-    { memberId, memberOrganizationIds },
-  )
-}