fix: improve handling of overlapping email-domain member organizations

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

Author: skwowet

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

@@ -46,7 +46,7 @@ export async function deleteMemberWorkExperience(req: Request, res: Response): P
 
   const memberOrgIdsToDelete = [
     workExperienceId,
-    ...overlappingEmailDomainRows.map((row) => row.id as string),
+    ...overlappingEmailDomainRows.flatMap((row) => (row.id ? [row.id] : [])),
   ]
 
   // Delete hidden grouped rows with the visible row so read responses stay consistent

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

@@ -86,9 +86,11 @@ export async function updateMemberWorkExperience(req: Request, res: Response): P
         await cleanSoftDeletedMemberOrganization(tx, memberId, data.organizationId, update)
         await updateMemberOrganization(tx, memberId, workExperienceId, update)
 
+        const overlapBasis = { ...existing, ...update }
+
         const overlappingEmailDomainRows = getOverlappingEmailDomainMemberOrganizations(
           memberOrgs,
-          existing,
+          overlapBasis,
         )
 
         const groupedUpdate: MemberOrganizationUpdate = {}
@@ -105,8 +107,10 @@ export async function updateMemberWorkExperience(req: Request, res: Response): P
         }
 
         if (overlappingEmailDomainRows.length > 0 && Object.keys(groupedUpdate).length > 0) {
-          for (const overlappingRow of overlappingEmailDomainRows) {
-            await updateMemberOrganization(tx, memberId, overlappingRow.id as string, groupedUpdate)
+          for (const overlappingRow of overlappingEmailDomainRows.filter(
+            (row): row is typeof row & { id: string } => !!row.id,
+          )) {
+            await updateMemberOrganization(tx, memberId, overlappingRow.id, groupedUpdate)
           }
         }
       })

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

@@ -59,7 +59,7 @@ export async function verifyMemberWorkExperience(req: Request, res: Response): P
 
   const memberOrgIdsToDelete = [
     workExperienceId,
-    ...overlappingEmailDomainRows.map((row) => row.id as string),
+    ...overlappingEmailDomainRows.flatMap((row) => (row.id ? [row.id] : [])),
   ]
 
   const verifiedUpdate = { verified, verifiedBy }
@@ -81,13 +81,10 @@ export async function verifyMemberWorkExperience(req: Request, res: Response): P
             verifiedUpdate,
           )
 
-          for (const overlappingRow of overlappingEmailDomainRows) {
-            await updateMemberOrganization(
-              tx,
-              memberId,
-              overlappingRow.id as string,
-              verifiedUpdate,
-            )
+          for (const overlappingRow of overlappingEmailDomainRows.filter(
+            (row): row is typeof row & { id: string } => !!row.id,
+          )) {
+            await updateMemberOrganization(tx, memberId, overlappingRow.id, verifiedUpdate)
           }
         } else {
           // Unverifying removes the grouped work experience from both visible and hidden rows

backend/src/services/member/memberAffiliationsService.ts

@@ -119,7 +119,7 @@ export default class MemberAffiliationsService extends LoggerBase {
 
     const memberOrgIds = [
       data.memberOrganizationId,
-      ...overlappingEmailDomainRows.map((row) => row.id as string),
+      ...overlappingEmailDomainRows.flatMap((row) => (row.id ? [row.id] : [])),
     ]
 
     // Apply the override to hidden grouped rows so the merged work experience has one decision

backend/src/services/member/memberOrganizationsService.ts

@@ -87,6 +87,10 @@ export default class MemberOrganizationsService extends LoggerBase {
       memberOrganizations.map((mo) => mo.id),
     )
 
+    const overridesByMemberOrganizationId = new Map(
+      affiliationOverrides.map((override) => [override.memberOrganizationId, override]),
+    )
+
     // Create mapping by id to speed up the processing
     const orgById: Record<string, IOrganizationSummary> = organizations.reduce(
       (obj: Record<string, IOrganizationSummary>, org) => ({
@@ -100,7 +104,7 @@ export default class MemberOrganizationsService extends LoggerBase {
     const groupedMemberOrganizations = groupMemberOrganizations(memberOrganizations)
 
     const allOrganizations = groupedMemberOrganizations
-      .filter((mo) => orgById[mo.organizationId]) // Only include non-deleted organizations
+      .filter((mo): mo is typeof mo & { id: string } => !!mo.id && !!orgById[mo.organizationId])
       .map((mo) => {
         const overlappingEmailDomainRows = getOverlappingEmailDomainMemberOrganizations(
           memberOrganizations,
@@ -110,10 +114,9 @@ export default class MemberOrganizationsService extends LoggerBase {
         const relatedIds = [mo.id, ...overlappingEmailDomainRows.map((row) => row.id)]
 
         const relatedOverrides = relatedIds.map((memberOrganizationId) =>
-          affiliationOverrides.find(
-            (override) => override.memberOrganizationId === memberOrganizationId,
-          ),
+          overridesByMemberOrganizationId.get(memberOrganizationId),
         )
+
         const resolvedOverrides = relatedOverrides.filter((override) => !!override)
 
         // Merge override flags from rows that are displayed as one work experience
@@ -132,7 +135,7 @@ export default class MemberOrganizationsService extends LoggerBase {
             ...mo,
             affiliationOverride: {
               memberId,
-              memberOrganizationId: mo.id as string,
+              memberOrganizationId: mo.id,
               allowAffiliation,
               isPrimaryWorkExperience,
             },
@@ -289,9 +292,11 @@ export default class MemberOrganizationsService extends LoggerBase {
 
       const memberOrganizations = await fetchMemberOrganizations(qx, memberId)
 
+      const overlapBasis = { ...existing, ...update }
+
       const overlappingEmailDomainRows = getOverlappingEmailDomainMemberOrganizations(
         memberOrganizations,
-        existing,
+        overlapBasis,
       )
 
       const groupedUpdate = lodash.pickBy(
@@ -306,7 +311,11 @@ export default class MemberOrganizationsService extends LoggerBase {
 
       if (overlappingEmailDomainRows.length > 0 && Object.keys(groupedUpdate).length > 0) {
         for (const overlappingRow of overlappingEmailDomainRows) {
-          await updateMemberOrganization(qx, memberId, overlappingRow.id as string, groupedUpdate)
+          if (!overlappingRow.id) {
+            continue
+          }
+
+          await updateMemberOrganization(qx, memberId, overlappingRow.id, groupedUpdate)
         }
       }
 
@@ -353,7 +362,7 @@ export default class MemberOrganizationsService extends LoggerBase {
 
       const memberOrganizationIdsToDelete = [
         id,
-        ...overlappingEmailDomainRows.map((row) => row.id as string),
+        ...overlappingEmailDomainRows.flatMap((row) => (row.id ? [row.id] : [])),
       ]
 
       // Delete hidden grouped rows with the visible row so list responses stay consistent

backend/src/utils/mapper.ts

@@ -39,35 +39,44 @@ export function groupMemberOrganizations<T extends IMemberOrganization>(rows: T[
   const hiddenEmailDomainIds = new Set<string>()
   const displayGroups = new Map<string, { displayRow: T; groupedEmailDomainRows: T[] }>()
 
-  for (const emailDomainRow of emailDomainRows) {
+  for (const emailDomainRow of emailDomainRows.filter(
+    (row): row is T & { id: string } => !!row.id,
+  )) {
     const overlappingNonEmailRows = nonEmailRows.filter((row) =>
       memberOrganizationsOverlap(emailDomainRow, row),
     )
 
     if (overlappingNonEmailRows.length > 0) {
-      const displayRow = [...overlappingNonEmailRows].sort(
-        (a, b) =>
-          getMemberOrganizationSourceRank(a.source) - getMemberOrganizationSourceRank(b.source),
-      )[0]
-
-      hiddenEmailDomainIds.add(emailDomainRow.id as string)
-
-      const existingGroup = displayGroups.get(displayRow.id as string)
-      if (existingGroup) {
-        existingGroup.groupedEmailDomainRows.push(emailDomainRow)
-      } else {
-        displayGroups.set(displayRow.id as string, {
-          displayRow,
-          groupedEmailDomainRows: [emailDomainRow],
-        })
+      const displayRow = [...overlappingNonEmailRows].sort((a, b) => {
+        const rankDiff =
+          getMemberOrganizationSourceRank(a.source) - getMemberOrganizationSourceRank(b.source)
+        if (rankDiff !== 0) {
+          return rankDiff
+        }
+
+        return (a.id ?? '').localeCompare(b.id ?? '')
+      })[0]
+
+      if (displayRow.id) {
+        hiddenEmailDomainIds.add(displayRow.id)
+
+        const existingGroup = displayGroups.get(displayRow.id)
+        if (existingGroup) {
+          existingGroup.groupedEmailDomainRows.push(emailDomainRow)
+        } else {
+          displayGroups.set(displayRow.id, {
+            displayRow,
+            groupedEmailDomainRows: [emailDomainRow],
+          })
+        }
       }
     }
   }
 
   return rows
-    .filter((row) => !hiddenEmailDomainIds.has(row.id as string))
+    .filter((row): row is T & { id: string } => !!row.id && !hiddenEmailDomainIds.has(row.id))
     .map((row) => {
-      const group = displayGroups.get(row.id as string)
+      const group = displayGroups.get(row.id)
       if (!group) {
         return row
       }
@@ -96,9 +105,8 @@ export function groupMemberOrganizations<T extends IMemberOrganization>(rows: T[
       if (normalizedEnds.some((date) => date === null)) {
         dateEnd = null
       } else if (normalizedEnds.length > 0) {
-        dateEnd = normalizedEnds.reduce((max, date) =>
-          (date as string) > max ? (date as string) : max,
-        )
+        const datedEnds = normalizedEnds.filter((date): date is string => date !== null)
+        dateEnd = datedEnds.reduce((max, date) => (date > max ? date : max))
       }
 
       return {

services/libs/common_services/src/services/member-organization.ts

@@ -176,7 +176,9 @@ export function inferMemberOrganizationStintChanges(
   const activeRows = normalizedRows.filter((row) => !row.deletedAt)
 
   // Deleted dated rows suppress recreation for dates the user removed
-  const deletedRows = normalizedRows.filter((row) => row.deletedAt && row.dateStart)
+  const deletedRows = normalizedRows.filter(
+    (row): row is typeof row & { dateStart: string } => !!row.deletedAt && !!row.dateStart,
+  )
 
   const sortedDates = orgDates
     .map((entry) => ({
@@ -201,7 +203,7 @@ export function inferMemberOrganizationStintChanges(
       deletedRows.some(
         (row) =>
           row.organizationId === organizationId &&
-          dateIntersects(row.dateStart as string, row.dateEnd, targetDate, targetDate),
+          dateIntersects(row.dateStart, row.dateEnd, targetDate, targetDate),
       )
     ) {
       continue
@@ -299,17 +301,26 @@ export function inferMemberOrganizationStintChanges(
   }
 
   // 7. Map only modified or new stints back to change objects
-  return stints
-    .filter((s) => s.isDirty && s.dateStart && s.dateEnd)
-    .map((s): MemberOrgStintChange => {
-      const payload = {
-        memberId,
-        organizationId: s.organizationId,
-        dateStart: s.dateStart as string,
-        dateEnd: s.dateEnd as string,
-      }
+  return stints.flatMap((s): MemberOrgStintChange[] => {
+    if (!s.isDirty || !s.dateStart || !s.dateEnd) {
+      return []
+    }
 
-      if (s.isNew) return { type: 'insert', ...payload }
-      return { type: 'update', id: s.id as string, ...payload }
-    })
+    const payload = {
+      memberId,
+      organizationId: s.organizationId,
+      dateStart: s.dateStart,
+      dateEnd: s.dateEnd,
+    }
+
+    if (s.isNew) {
+      return [{ type: 'insert', ...payload }]
+    }
+
+    if (!s.id) {
+      return []
+    }
+
+    return [{ type: 'update', id: s.id, ...payload }]
+  })
 }