fix: soft delete member segment affiliations for blocked orgs (#4170)

Signed-off-by: Yeganathan S <63534555+skwowet@users.noreply.github.com>

Author: skwowet

backend/src/api/public/v1/members/project-affiliations/patchProjectAffiliation.ts

@@ -6,7 +6,6 @@ import { NotFoundError } from '@crowd/common'
 import { signalMemberUpdate } from '@crowd/common_services'
 import {
   MemberField,
-  deleteAllMemberSegmentAffiliationsForProject,
   fetchMemberProjectSegments,
   fetchMemberSegmentAffiliationsForProject,
   findMaintainerRoles,
@@ -15,6 +14,7 @@ import {
   optionsQx,
 } from '@crowd/data-access-layer'
 import type { ISegmentAffiliationWithOrg } from '@crowd/data-access-layer'
+import { deleteMemberSegmentAffiliations } from '@crowd/data-access-layer/src/member_segment_affiliations'
 
 import { ok } from '@/utils/api'
 import { validateOrThrow } from '@/utils/validation'
@@ -80,7 +80,7 @@ export async function patchProjectAffiliation(req: Request, res: Response): Prom
       const orgIdsToRecalculate = [...new Set([...oldOrgIds, ...newOrgIds])]
 
       await qx.tx(async (tx) => {
-        await deleteAllMemberSegmentAffiliationsForProject(tx, memberId, projectId)
+        await deleteMemberSegmentAffiliations(tx, { memberId, segmentId: projectId })
 
         if (affiliations.length > 0) {
           await insertMemberSegmentAffiliations(

backend/src/api/public/v1/members/work-experiences/createMemberWorkExperience.ts

@@ -19,6 +19,7 @@ import {
   findMemberById,
   optionsQx,
 } from '@crowd/data-access-layer'
+import { deleteMemberSegmentAffiliations } from '@crowd/data-access-layer/src/member_segment_affiliations'
 import type {
   IMemberOrganization,
   IMemberRoleWithOrganization,
@@ -104,6 +105,10 @@ export async function createMemberWorkExperience(req: Request, res: Response): P
               allowAffiliation: false,
             },
           ])
+          await deleteMemberSegmentAffiliations(tx, {
+            memberId,
+            organizationId: data.organizationId,
+          })
         }
       })
 

backend/src/bin/scripts/backfill-email-domain-member-organization-dates.ts

@@ -12,6 +12,7 @@ import {
   updateMemberOrganization,
 } from '@crowd/data-access-layer'
 import { getDbConnection } from '@crowd/data-access-layer/src/database'
+import { deleteMemberSegmentAffiliations } from '@crowd/data-access-layer/src/member_segment_affiliations'
 import { chunkArray } from '@crowd/data-access-layer/src/old/apps/merge_suggestions_worker/utils'
 import { getServiceLogger } from '@crowd/logging'
 import { getRedisClient } from '@crowd/redis'
@@ -129,6 +130,10 @@ setImmediate(async () => {
                             allowAffiliation: false,
                           },
                         ])
+                        await deleteMemberSegmentAffiliations(tx, {
+                          memberId,
+                          organizationId: change.organizationId,
+                        })
                       }
                     } else if (change.type === 'update') {
                       await updateMemberOrganization(tx, memberId, change.id, {

backend/src/database/migrations/V1780460201__add-deleted-at-to-member-segment-affiliations.sql

@@ -0,0 +1,2 @@
+alter table "memberSegmentAffiliations"
+    add column if not exists "deletedAt" timestamp with time zone default null;

backend/src/database/repositories/member/memberAffiliationsRepository.ts

@@ -1,6 +1,6 @@
 import { OrganizationField, queryOrgs } from '@crowd/data-access-layer'
 import {
-  deleteMemberAffiliations,
+  deleteMemberSegmentAffiliations,
   fetchMemberAffiliations,
   insertMemberAffiliations,
 } from '@crowd/data-access-layer/src/member_segment_affiliations'
@@ -86,7 +86,7 @@ class MemberAffiliationsRepository {
       const qx = SequelizeRepository.getQueryExecutor(txOptions)
 
       // Delete all member affiliations
-      await deleteMemberAffiliations(qx, memberId)
+      await deleteMemberSegmentAffiliations(qx, { memberId })
 
       if (data?.length > 0) {
         //  Insert multiple member affiliations

backend/src/database/repositories/member/memberOrganizationAffiliationOverridesRepository.ts

@@ -1,8 +1,10 @@
 import {
   changeMemberOrganizationAffiliationOverrides,
+  fetchMemberOrganizationById,
   findMemberAffiliationOverrides,
   findPrimaryWorkExperiencesOfMember,
 } from '@crowd/data-access-layer'
+import { deleteMemberSegmentAffiliations } from '@crowd/data-access-layer/src/member_segment_affiliations'
 import {
   IChangeAffiliationOverrideData,
   IMemberOrganizationAffiliationOverride,
@@ -16,6 +18,20 @@ class MemberOrganizationAffiliationOverridesRepository {
     const qx = SequelizeRepository.getQueryExecutor(options)
 
     await changeMemberOrganizationAffiliationOverrides(qx, [data])
+
+    const { allowAffiliation, memberId, memberOrganizationId } = data
+
+    if (allowAffiliation === false && memberId && memberOrganizationId) {
+      const memberOrganization = await fetchMemberOrganizationById(qx, memberOrganizationId)
+
+      if (memberOrganization?.organizationId) {
+        await deleteMemberSegmentAffiliations(qx, {
+          memberId,
+          organizationId: memberOrganization.organizationId,
+        })
+      }
+    }
+
     const overrides = await findMemberAffiliationOverrides(qx, data.memberId, [
       data.memberOrganizationId,
     ])

backend/src/database/repositories/memberRepository.ts

@@ -1,7 +1,12 @@
 import lodash, { chunk, uniq } from 'lodash'
 import Sequelize, { QueryTypes } from 'sequelize'
 
-import { captureApiChange, memberCreateAction, memberEditProfileAction } from '@crowd/audit-logs'
+import {
+  captureApiChange,
+  memberCreateAction,
+  memberEditAffiliationsAction,
+  memberEditProfileAction,
+} from '@crowd/audit-logs'
 import {
   DEFAULT_TENANT_ID,
   Error400,
@@ -25,6 +30,11 @@ import {
 import { findManyLfxMemberships } from '@crowd/data-access-layer/src/lfx_memberships'
 import { findMaintainerRoles } from '@crowd/data-access-layer/src/maintainers'
 import { addMemberNoMerge, removeMemberToMerge } from '@crowd/data-access-layer/src/member_merge'
+import {
+  deleteMemberSegmentAffiliations,
+  findMemberAffiliations,
+  insertMemberAffiliations,
+} from '@crowd/data-access-layer/src/member_segment_affiliations'
 import {
   MemberField,
   fetchManyMemberIdentities,
@@ -67,7 +77,6 @@ import { AttributeData } from '../attributes/attribute'
 
 import { IRepositoryOptions } from './IRepositoryOptions'
 import MemberAttributeSettingsRepository from './memberAttributeSettingsRepository'
-import MemberSegmentAffiliationRepository from './memberSegmentAffiliationRepository'
 import SegmentRepository from './segmentRepository'
 import SequelizeRepository from './sequelizeRepository'
 import TenantRepository from './tenantRepository'
@@ -1128,8 +1137,31 @@ class MemberRepository {
     data: MemberSegmentAffiliation[],
     options: IRepositoryOptions,
   ): Promise<void> {
-    const affiliationRepository = new MemberSegmentAffiliationRepository(options)
-    await affiliationRepository.setForMember(memberId, data)
+    const qx = optionsQx(options)
+    await captureApiChange(
+      options,
+      memberEditAffiliationsAction(memberId, async (captureOldState, captureNewState) => {
+        const oldOnes = await findMemberAffiliations(qx, memberId)
+        captureOldState(
+          oldOnes.map((item) => ({
+            segmentId: item.segmentId,
+            organizationId: item.organizationId,
+            dateStart: item.dateStart,
+            dateEnd: item.dateEnd,
+          })),
+        )
+
+        captureNewState(data)
+
+        await deleteMemberSegmentAffiliations(qx, { memberId })
+
+        if (data.length === 0) {
+          return
+        }
+
+        await insertMemberAffiliations(qx, memberId, data)
+      }),
+    )
   }
 
   static async getAffiliations(
@@ -1155,6 +1187,7 @@ class MemberRepository {
       left join organizations o on o.id = msa."organizationId"
       join segments s on s.id = msa."segmentId"
       where msa."memberId" = :memberId
+        and msa."deletedAt" is null
     `
 
     const data = await seq.query(query, {

backend/src/database/repositories/memberSegmentAffiliationRepository.ts

@@ -17,6 +17,7 @@ import {
   queryOrgs,
   updateMemberOrganization,
 } from '@crowd/data-access-layer'
+import { deleteMemberSegmentAffiliations } from '@crowd/data-access-layer/src/member_segment_affiliations'
 import { LoggerBase } from '@crowd/logging'
 import {
   IMemberOrganization,
@@ -186,6 +187,7 @@ export default class MemberOrganizationsService extends LoggerBase {
             allowAffiliation: false,
           },
         ])
+        await deleteMemberSegmentAffiliations(qx, { memberId, organizationId: data.organizationId })
       }
 
       // Fetch updated list

backend/src/services/member/memberOrganizationsService.ts

@@ -16,6 +16,7 @@ import {
 } from '@crowd/data-access-layer'
 import { hasLfxMembership } from '@crowd/data-access-layer/src/lfx_memberships'
 import { applyOrganizationAffiliationPolicyToMembers } from '@crowd/data-access-layer/src/member-organization-affiliation'
+import { deleteMemberSegmentAffiliations } from '@crowd/data-access-layer/src/member_segment_affiliations'
 import {
   addMergeAction,
   queryMergeActions,
@@ -1074,6 +1075,9 @@ export default class OrganizationService extends LoggerBase {
         data.isAffiliationBlocked !== existingOrg.isAffiliationBlocked
       ) {
         await applyOrganizationAffiliationPolicyToMembers(qx, record.id, !data.isAffiliationBlocked)
+        if (data.isAffiliationBlocked) {
+          await deleteMemberSegmentAffiliations(qx, { organizationId: record.id })
+        }
         recalculateAffiliations = true
       }