Make search sync asynchronous when merging orgs (#2053)

CrowdDotDev · Jan 10, 2024 · b965648 · b965648
1 parent 76c5832
commit b965648
Showing 1 changed file with 17 additions and 17 deletions.
diff --git a/backend/src/services/organizationService.ts b/backend/src/services/organizationService.ts
@@ -160,6 +160,23 @@ export default class OrganizationService extends LoggerBase {
         this.options,
       )
 
+      const searchSyncService = new SearchSyncService(this.options, SyncMode.ASYNCHRONOUS)
+
+      await searchSyncService.triggerOrganizationSync(this.options.currentTenant.id, originalId)
+      await searchSyncService.triggerRemoveOrganization(this.options.currentTenant.id, toMergeId)
+
+      // sync organization members
+      await searchSyncService.triggerOrganizationMembersSync(
+        this.options.currentTenant.id,
+        originalId,
+      )
+
+      // sync organization activities
+      await searchSyncService.triggerOrganizationActivitiesSync(
+        this.options.currentTenant.id,
+        originalId,
+      )
+
       await this.options.temporal.workflow.start('finishOrganizationMerging', {
         taskQueue: 'entity-merging',
         workflowId: `finishOrganizationMerging/${originalId}/${toMergeId}`,
@@ -178,23 +195,6 @@ export default class OrganizationService extends LoggerBase {
         },
       })
 
-      const searchSyncService = new SearchSyncService(this.options)
-
-      await searchSyncService.triggerOrganizationSync(this.options.currentTenant.id, originalId)
-      await searchSyncService.triggerRemoveOrganization(this.options.currentTenant.id, toMergeId)
-
-      // sync organization members
-      await searchSyncService.triggerOrganizationMembersSync(
-        this.options.currentTenant.id,
-        originalId,
-      )
-
-      // sync organization activities
-      await searchSyncService.triggerOrganizationActivitiesSync(
-        this.options.currentTenant.id,
-        originalId,
-      )
-
       this.options.log.info({ originalId, toMergeId }, 'Organizations merged!')
       return {
         status: 200,