fix: prevent duplicate merge suggestion workflow runs (CM-1217) (#4173)

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

Author: skwowet

services/apps/merge_suggestions_worker/src/schedules/memberMergeSuggestions.ts

@@ -1,35 +1,30 @@
 import { ScheduleAlreadyRunning, ScheduleOverlapPolicy } from '@temporalio/client'
 
-import { IS_DEV_ENV, IS_TEST_ENV } from '@crowd/common'
+import { DEFAULT_TENANT_ID } from '@crowd/common'
 
 import { svc } from '../main'
-import { spawnMemberMergeSuggestionsForAllTenants } from '../workflows/spawnMemberMergeSuggestionsForAllTenants'
+import { generateMemberMergeSuggestions } from '../workflows/generateMemberMergeSuggestions'
 
 export const scheduleGenerateMemberMergeSuggestions = async () => {
   try {
     await svc.temporal.schedule.create({
       scheduleId: 'member-merge-suggestions',
-      spec:
-        IS_DEV_ENV || IS_TEST_ENV
-          ? {
-              cronExpressions: ['*/2 * * * *'],
-            }
-          : {
-              intervals: [
-                {
-                  every: '2 hours',
-                },
-              ],
-            },
+      spec: {
+        cronExpressions: ['0 */2 * * *'],
+      },
       policies: {
         overlap: ScheduleOverlapPolicy.BUFFER_ONE,
         catchupWindow: '1 minute',
       },
       action: {
         type: 'startWorkflow',
-        workflowType: spawnMemberMergeSuggestionsForAllTenants,
+        workflowType: generateMemberMergeSuggestions,
         taskQueue: 'merge-suggestions',
-        workflowExecutionTimeout: '5 minutes',
+        args: [
+          {
+            tenantId: DEFAULT_TENANT_ID,
+          },
+        ],
       },
     })
   } catch (err) {

services/apps/merge_suggestions_worker/src/schedules/organizationMergeSuggestions.ts

@@ -1,35 +1,30 @@
 import { ScheduleAlreadyRunning, ScheduleOverlapPolicy } from '@temporalio/client'
 
-import { IS_DEV_ENV, IS_TEST_ENV } from '@crowd/common'
+import { DEFAULT_TENANT_ID } from '@crowd/common'
 
 import { svc } from '../main'
-import { spawnOrganizationMergeSuggestionsForAllTenants } from '../workflows/spawnOrganizationMergeSuggestionsForAllTenants'
+import { generateOrganizationMergeSuggestions } from '../workflows/generateOrganizationMergeSuggestions'
 
 export const scheduleGenerateOrganizationMergeSuggestions = async () => {
   try {
     await svc.temporal.schedule.create({
       scheduleId: 'organization-merge-suggestions',
-      spec:
-        IS_DEV_ENV || IS_TEST_ENV
-          ? {
-              cronExpressions: ['*/2 * * * *'],
-            }
-          : {
-              intervals: [
-                {
-                  every: '2 hours',
-                },
-              ],
-            },
+      spec: {
+        cronExpressions: ['0 */2 * * *'],
+      },
       policies: {
         overlap: ScheduleOverlapPolicy.BUFFER_ONE,
         catchupWindow: '1 minute',
       },
       action: {
         type: 'startWorkflow',
-        workflowType: spawnOrganizationMergeSuggestionsForAllTenants,
+        workflowType: generateOrganizationMergeSuggestions,
         taskQueue: 'merge-suggestions',
-        workflowExecutionTimeout: '5 minutes',
+        args: [
+          {
+            tenantId: DEFAULT_TENANT_ID,
+          },
+        ],
       },
     })
   } catch (err) {

services/apps/merge_suggestions_worker/src/workflows.ts

@@ -2,15 +2,11 @@ import { generateMemberMergeSuggestions } from './workflows/generateMemberMergeS
 import { generateOrganizationMergeSuggestions } from './workflows/generateOrganizationMergeSuggestions'
 import { mergeMembersWithLLM } from './workflows/mergeMembersWithLLM'
 import { mergeOrganizationsWithLLM } from './workflows/mergeOrganizationsWithLLM'
-import { spawnMemberMergeSuggestionsForAllTenants } from './workflows/spawnMemberMergeSuggestionsForAllTenants'
-import { spawnOrganizationMergeSuggestionsForAllTenants } from './workflows/spawnOrganizationMergeSuggestionsForAllTenants'
 import { testMergingEntitiesWithLLM } from './workflows/testMergingEntitiesWithLLM'
 
 export {
   generateMemberMergeSuggestions,
-  spawnMemberMergeSuggestionsForAllTenants,
   generateOrganizationMergeSuggestions,
-  spawnOrganizationMergeSuggestionsForAllTenants,
   testMergingEntitiesWithLLM,
   mergeOrganizationsWithLLM,
   mergeMembersWithLLM,