fix: recalculate affiliations on update member orgs (IN-1083)

backend/src/services/memberService.ts

@@ -20,6 +20,7 @@ import {
   insertMemberSegmentAggregates,
   queryMembersAdvanced,
 } from '@crowd/data-access-layer/src/members'
+import { fetchMemberOrganizations } from '@crowd/data-access-layer/src/members/organizations'
 import { QueryExecutor, optionsQx } from '@crowd/data-access-layer/src/queryExecutor'
 import { fetchManySegments } from '@crowd/data-access-layer/src/segments'
 import { LoggerBase } from '@crowd/logging'
@@ -276,6 +277,8 @@ export default class MemberService extends LoggerBase {
       data.displayName = data.username[data.platform].username
     }
 
+    let existingOrgIds: string[] = []
+
     const transaction = await SequelizeRepository.createTransaction(this.options)
 
     try {
@@ -436,6 +439,13 @@ export default class MemberService extends LoggerBase {
       let record
       if (existing) {
         const { id } = existing
+
+        if (data.organizations) {
+          existingOrgIds = (await fetchMemberOrganizations(optionsQx(this.options), id)).map(
+            (o) => o.organizationId,
+          )
+        }
+
         delete existing.id
         const toUpdate = CommonMemberService.membersMerge(existing, data)
 
@@ -505,6 +515,21 @@ export default class MemberService extends LoggerBase {
 
       await SequelizeRepository.commitTransaction(transaction)
 
+      if (data.organizations) {
+        const commonMemberService = new CommonMemberService(
+          optionsQx(this.options),
+          this.options.temporal,
+          this.options.log,
+        )
+        const newOrgIds = data.organizations.map((o) => o.id)
+        const allAffectedOrgIds = [...new Set([...existingOrgIds, ...newOrgIds])]
+        await commonMemberService.startAffiliationRecalculation(
+          record.id,
+          allAffectedOrgIds,
+          syncToOpensearch,
+        )
+      }
+
       if (syncToOpensearch) {
         await searchSyncService.triggerMemberSync(record.id)
       }
@@ -800,6 +825,10 @@ export default class MemberService extends LoggerBase {
   ) {
     let transaction
     try {
+      const existingOrgIds = data.organizations
+        ? (await fetchMemberOrganizations(optionsQx(this.options), id)).map((o) => o.organizationId)
+        : []
+
       const repoOptions = await SequelizeRepository.createTransactionalRepositoryOptions(
         this.options,
       )
@@ -824,9 +853,11 @@ export default class MemberService extends LoggerBase {
         this.options.temporal,
         this.options.log,
       )
+      const newOrgIds = (data.organizations || []).map((o) => o.id)
+      const allAffectedOrgIds = [...new Set([...existingOrgIds, ...newOrgIds])]
       await commonMemberService.startAffiliationRecalculation(
         id,
-        (data.organizations || []).map((o) => o.id),
+        allAffectedOrgIds,
         syncToOpensearch,
       )
 

services/apps/data_sink_worker/src/service/member.service.ts

@@ -481,6 +481,17 @@ export default class MemberService extends LoggerBase {
                 this.log,
                 'memberService -> create -> addToMember',
               )
+
+              const commonMemberService = new CommonMemberService(
+                dbStoreQx(this.store),
+                this.temporal,
+                this.log,
+              )
+              await commonMemberService.startAffiliationRecalculation(
+                id,
+                orgsToAdd.map((o) => o.id),
+                false,
+              )
             }
           }
 
@@ -717,6 +728,17 @@ export default class MemberService extends LoggerBase {
                 this.log,
                 'memberService -> update -> addToMember',
               )
+
+              const commonMemberService = new CommonMemberService(
+                dbStoreQx(this.store),
+                this.temporal,
+                this.log,
+              )
+              await commonMemberService.startAffiliationRecalculation(
+                id,
+                orgsToAdd.map((o) => o.id),
+                false,
+              )
             }
           }
         } catch (err) {

services/libs/common_services/src/services/common.member.service.ts

@@ -84,6 +84,10 @@ export class CommonMemberService extends LoggerBase {
       return moment(v).toISOString()
     }
 
+    const normalizedOrgs = organizations.map((item) =>
+      typeof item === 'string' ? { id: item } : item,
+    )
+
     await captureApiChange(
       options,
       memberEditOrganizationsAction(memberId, async (captureOldState, captureNewState) => {
@@ -95,7 +99,7 @@ export class CommonMemberService extends LoggerBase {
         if (replace) {
           const toDelete = originalOrgs.filter(
             (originalOrg: any) =>
-              !organizations.find(
+              !normalizedOrgs.find(
                 (newOrg) =>
                   originalOrg.organizationId === newOrg.id &&
                   (originalOrg.title === (newOrg.title || null) ||
@@ -111,17 +115,15 @@ export class CommonMemberService extends LoggerBase {
           }
         }
 
-        for (const item of organizations) {
-          const org = typeof item === 'string' ? { id: item } : item
-
+        for (const org of normalizedOrgs) {
           // we don't need to touch exactly same existing work experiences
           if (
             !originalOrgs.some(
               (w) =>
-                w.organizationId === item.id &&
-                w.title === (item.title || null) &&
-                w.dateStart === (item.startDate || null) &&
-                w.dateEnd === (item.endDate || null),
+                w.organizationId === org.id &&
+                w.title === (org.title || null) &&
+                w.dateStart === (org.startDate || null) &&
+                w.dateEnd === (org.endDate || null),
             )
           ) {
             const newOrg = {
@@ -241,6 +243,10 @@ export class CommonMemberService extends LoggerBase {
     organizationIds: string[],
     syncToOpensearch = false,
   ): Promise<void> {
+    this.log.info(
+      { memberId, organizationIds, syncToOpensearch },
+      'Starting affiliation recalculation workflow',
+    )
     await this.temporal.workflow.start('memberUpdate', {
       taskQueue: 'profiles',
       workflowId: `${TemporalWorkflowId.MEMBER_UPDATE}/${DEFAULT_TENANT_ID}/${memberId}`,