fix: dedupe overlapping email-domain member organizations

Group email-domain inferred member organizations into overlapping
non-email-domain rows on read, fan out shared writes to hidden rows,
and suppress stint recreation for soft-deleted dated ranges.

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

Author: skwowet

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

@@ -7,12 +7,13 @@ import { signalMemberUpdate } from '@crowd/common_services'
 import {
   MemberField,
   deleteMemberOrganizations,
-  fetchManyMemberOrgsWithOrgData,
+  fetchMemberOrganizations,
   findMemberById,
   optionsQx,
 } from '@crowd/data-access-layer'
 
 import { noContent } from '@/utils/api'
+import { getOverlappingEmailDomainMemberOrganizations } from '@/utils/mapper'
 import { validateOrThrow } from '@/utils/validation'
 
 const paramsSchema = z.object({
@@ -31,21 +32,31 @@ export async function deleteMemberWorkExperience(req: Request, res: Response): P
     throw new NotFoundError('Member not found')
   }
 
-  const orgsMap = await fetchManyMemberOrgsWithOrgData(qx, [memberId])
-
-  const memberOrg = (orgsMap.get(memberId) ?? []).find((mo) => mo.id === workExperienceId)
+  const memberOrgs = await fetchMemberOrganizations(qx, memberId)
+  const memberOrg = memberOrgs.find((mo) => mo.id === workExperienceId)
 
   if (!memberOrg) {
     throw new NotFoundError('Work experience not found')
   }
 
+  const overlappingEmailDomainRows = getOverlappingEmailDomainMemberOrganizations(
+    memberOrgs,
+    memberOrg,
+  )
+
+  const memberOrgIdsToDelete = [
+    workExperienceId,
+    ...overlappingEmailDomainRows.map((row) => row.id as string),
+  ]
+
+  // Delete hidden grouped rows with the visible row so read responses stay consistent
   await captureApiChange(
     req,
     memberEditOrganizationsAction(memberId, async (captureOldState, captureNewState) => {
       captureOldState(memberOrg)
 
       await qx.tx(async (tx) => {
-        await deleteMemberOrganizations(tx, memberId, [workExperienceId])
+        await deleteMemberOrganizations(tx, memberId, memberOrgIdsToDelete)
       })
 
       // Signal after commit so the workflow sees persisted changes

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

@@ -10,7 +10,7 @@ import {
 } from '@crowd/data-access-layer'
 
 import { ok } from '@/utils/api'
-import { toMemberWorkExperience } from '@/utils/mapper'
+import { groupMemberOrganizations, toMemberWorkExperience } from '@/utils/mapper'
 import { validateOrThrow } from '@/utils/validation'
 
 const paramsSchema = z.object({
@@ -28,7 +28,9 @@ export async function getMemberWorkExperiences(req: Request, res: Response): Pro
   }
 
   const orgsMap = await fetchManyMemberOrgsWithOrgData(qx, [memberId])
-  const workExperiences = (orgsMap.get(memberId) ?? []).map(toMemberWorkExperience)
+  const workExperiences = groupMemberOrganizations(orgsMap.get(memberId) ?? []).map(
+    toMemberWorkExperience,
+  )
 
   ok(res, { memberId, workExperiences })
 }

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

@@ -8,14 +8,19 @@ import {
   MemberField,
   cleanSoftDeletedMemberOrganization,
   fetchManyMemberOrgsWithOrgData,
+  fetchMemberOrganizations,
   findMemberById,
   optionsQx,
   updateMemberOrganization,
 } from '@crowd/data-access-layer'
 import type { MemberOrganizationDateRange, MemberOrganizationUpdate } from '@crowd/types'
 
 import { ok } from '@/utils/api'
-import { toMemberWorkExperience } from '@/utils/mapper'
+import {
+  getOverlappingEmailDomainMemberOrganizations,
+  groupMemberOrganizations,
+  toMemberWorkExperience,
+} from '@/utils/mapper'
 import { validateOrThrow } from '@/utils/validation'
 
 const paramsSchema = z.object({
@@ -45,8 +50,8 @@ export async function updateMemberWorkExperience(req: Request, res: Response): P
     throw new NotFoundError('Member not found')
   }
 
-  const orgsMap = await fetchManyMemberOrgsWithOrgData(qx, [memberId])
-  const existing = (orgsMap.get(memberId) ?? []).find((mo) => mo.id === workExperienceId)
+  const memberOrgs = await fetchMemberOrganizations(qx, memberId)
+  const existing = memberOrgs.find((mo) => mo.id === workExperienceId)
 
   if (!existing) {
     throw new NotFoundError('Work experience not found')
@@ -80,6 +85,30 @@ export async function updateMemberWorkExperience(req: Request, res: Response): P
       await qx.tx(async (tx) => {
         await cleanSoftDeletedMemberOrganization(tx, memberId, data.organizationId, update)
         await updateMemberOrganization(tx, memberId, workExperienceId, update)
+
+        const overlappingEmailDomainRows = getOverlappingEmailDomainMemberOrganizations(
+          memberOrgs,
+          existing,
+        )
+
+        const groupedUpdate: MemberOrganizationUpdate = {}
+
+        // Keep grouped rows aligned for shared display fields; dates stay on the edited row
+        if (data.jobTitle !== undefined) {
+          groupedUpdate.title = data.jobTitle
+        }
+        if (data.verified !== undefined) {
+          groupedUpdate.verified = data.verified
+        }
+        if (data.verifiedBy !== undefined) {
+          groupedUpdate.verifiedBy = data.verifiedBy
+        }
+
+        if (overlappingEmailDomainRows.length > 0 && Object.keys(groupedUpdate).length > 0) {
+          for (const overlappingRow of overlappingEmailDomainRows) {
+            await updateMemberOrganization(tx, memberId, overlappingRow.id as string, groupedUpdate)
+          }
+        }
       })
 
       // Signal after commit so the workflow sees persisted changes
@@ -88,7 +117,10 @@ export async function updateMemberWorkExperience(req: Request, res: Response): P
       })
 
       const orgsMap = await fetchManyMemberOrgsWithOrgData(qx, [memberId])
-      const updatedMo = (orgsMap.get(memberId) ?? []).find((mo) => mo.id === workExperienceId)
+
+      const updatedMo = groupMemberOrganizations(orgsMap.get(memberId) ?? []).find(
+        (mo) => mo.id === workExperienceId,
+      )
 
       if (!updatedMo) {
         throw new NotFoundError('Work experience not found')

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

@@ -8,14 +8,19 @@ import {
   MemberField,
   deleteMemberOrganizations,
   fetchManyMemberOrgsWithOrgData,
+  fetchMemberOrganizations,
   findMemberById,
   optionsQx,
   updateMemberOrganization,
 } from '@crowd/data-access-layer'
-import { IMemberOrganization } from '@crowd/types'
+import { IMemberOrganization, IMemberRoleWithOrganization } from '@crowd/types'
 
 import { ok } from '@/utils/api'
-import { toMemberWorkExperience } from '@/utils/mapper'
+import {
+  getOverlappingEmailDomainMemberOrganizations,
+  groupMemberOrganizations,
+  toMemberWorkExperience,
+} from '@/utils/mapper'
 import { validateOrThrow } from '@/utils/validation'
 
 const paramsSchema = z.object({
@@ -40,13 +45,25 @@ export async function verifyMemberWorkExperience(req: Request, res: Response): P
     throw new NotFoundError('Member not found')
   }
 
-  const orgsMap = await fetchManyMemberOrgsWithOrgData(qx, [memberId])
-  const memberOrg = (orgsMap.get(memberId) ?? []).find((mo) => mo.id === workExperienceId)
+  const memberOrgs = await fetchMemberOrganizations(qx, memberId)
+  const memberOrg = memberOrgs.find((mo) => mo.id === workExperienceId)
 
   if (!memberOrg) {
     throw new NotFoundError('Work experience not found')
   }
 
+  const overlappingEmailDomainRows = getOverlappingEmailDomainMemberOrganizations(
+    memberOrgs,
+    memberOrg,
+  )
+
+  const memberOrgIdsToDelete = [
+    workExperienceId,
+    ...overlappingEmailDomainRows.map((row) => row.id as string),
+  ]
+
+  const verifiedUpdate = { verified, verifiedBy }
+
   let updatedMemberOrg: IMemberOrganization | undefined
 
   await captureApiChange(
@@ -56,12 +73,25 @@ export async function verifyMemberWorkExperience(req: Request, res: Response): P
 
       await qx.tx(async (tx) => {
         if (verified) {
-          updatedMemberOrg = await updateMemberOrganization(tx, memberId, workExperienceId, {
-            verified,
-            verifiedBy,
-          })
+          // Verification status belongs to the grouped work experience, not just the visible row
+          updatedMemberOrg = await updateMemberOrganization(
+            tx,
+            memberId,
+            workExperienceId,
+            verifiedUpdate,
+          )
+
+          for (const overlappingRow of overlappingEmailDomainRows) {
+            await updateMemberOrganization(
+              tx,
+              memberId,
+              overlappingRow.id as string,
+              verifiedUpdate,
+            )
+          }
         } else {
-          await deleteMemberOrganizations(tx, memberId, [workExperienceId], true)
+          // Unverifying removes the grouped work experience from both visible and hidden rows
+          await deleteMemberOrganizations(tx, memberId, memberOrgIdsToDelete, true)
         }
       })
 
@@ -76,5 +106,13 @@ export async function verifyMemberWorkExperience(req: Request, res: Response): P
     }),
   )
 
-  ok(res, toMemberWorkExperience({ ...memberOrg, ...updatedMemberOrg }))
+  const orgsMap = await fetchManyMemberOrgsWithOrgData(qx, [memberId])
+
+  const responseMo: IMemberRoleWithOrganization =
+    groupMemberOrganizations(orgsMap.get(memberId) ?? []).find(
+      (mo) => mo.id === workExperienceId,
+    ) ??
+    ({ ...memberOrg, ...updatedMemberOrg, verified, verifiedBy } as IMemberRoleWithOrganization)
+
+  ok(res, toMemberWorkExperience(responseMo))
 }

backend/src/services/member/memberAffiliationsService.ts

@@ -3,7 +3,13 @@ import { uniq } from 'lodash'
 
 import { Error400, dateIntersects, groupBy } from '@crowd/common'
 import { signalMemberUpdate } from '@crowd/common_services'
+import {
+  changeMemberOrganizationAffiliationOverrides,
+  fetchMemberOrganizations,
+  findMemberAffiliationOverrides,
+} from '@crowd/data-access-layer'
 import { findMaintainerRoles } from '@crowd/data-access-layer/src/maintainers'
+import { deleteMemberSegmentAffiliations } from '@crowd/data-access-layer/src/member_segment_affiliations'
 import { fetchManySegments } from '@crowd/data-access-layer/src/segments'
 import { LoggerBase } from '@crowd/logging'
 import {
@@ -13,8 +19,8 @@ import {
 } from '@crowd/types'
 
 import MemberAffiliationsRepository from '@/database/repositories/member/memberAffiliationsRepository'
-import MemberOrganizationAffiliationOverridesRepository from '@/database/repositories/member/memberOrganizationAffiliationOverridesRepository'
 import SequelizeRepository from '@/database/repositories/sequelizeRepository'
+import { getOverlappingEmailDomainMemberOrganizations } from '@/utils/mapper'
 
 import { IServiceOptions } from '../IServiceOptions'
 
@@ -102,11 +108,42 @@ export default class MemberAffiliationsService extends LoggerBase {
       }
     }
 
-    const override = await MemberOrganizationAffiliationOverridesRepository.changeOverride(
-      data,
-      this.options,
+    const qx = SequelizeRepository.getQueryExecutor(this.options)
+
+    const memberOrgs = await fetchMemberOrganizations(qx, data.memberId)
+    const memberOrg = memberOrgs.find((mo) => mo.id === data.memberOrganizationId)
+
+    const overlappingEmailDomainRows = memberOrg
+      ? getOverlappingEmailDomainMemberOrganizations(memberOrgs, memberOrg)
+      : []
+
+    const memberOrgIds = [
+      data.memberOrganizationId,
+      ...overlappingEmailDomainRows.map((row) => row.id as string),
+    ]
+
+    // Apply the override to hidden grouped rows so the merged work experience has one decision
+    await changeMemberOrganizationAffiliationOverrides(
+      qx,
+      memberOrgIds.map((memberOrganizationId) => ({
+        ...data,
+        memberOrganizationId,
+      })),
     )
 
+    if (data.allowAffiliation === false && memberOrg?.organizationId) {
+      await deleteMemberSegmentAffiliations(qx, {
+        memberId: data.memberId,
+        organizationId: memberOrg.organizationId,
+      })
+    }
+
+    const overrides = await findMemberAffiliationOverrides(qx, data.memberId, [
+      data.memberOrganizationId,
+    ])
+
+    const override = overrides[0]
+
     await signalMemberUpdate(this.options.temporal, data.memberId)
 
     return override