Merge branch 'main' into bugfix/CM-2073

Author: skwowet

pnpm-lock.yaml

@@ -20,9 +20,8 @@
     "@crowd/opensearch": "workspace:*",
     "@crowd/redis": "workspace:*",
     "@crowd/types": "workspace:*",
-    "@crowd/common": "workspace:*",
-    "@crowd/opensearch": "workspace:*",
     "@temporalio/workflow": "~1.11.1",
+    "@temporalio/client": "~1.11.1",
     "axios": "^1.6.8",
     "moment": "~2.29.4",
     "tsx": "^4.7.1",

services/apps/script_executor_worker/package.json

@@ -1,6 +1,8 @@
 import { Config } from '@crowd/archetype-standard'
 import { Options, ServiceWorker } from '@crowd/archetype-worker'
 
+import { schedulePopulateActivityRelations } from './schedules/schedulePopulateActivityRelations'
+
 const config: Config = {
   envvars: ['CROWD_API_SERVICE_URL', 'CROWD_API_SERVICE_USER_TOKEN'],
   producer: {
@@ -33,5 +35,8 @@ export const svc = new ServiceWorker(config, options)
 
 setImmediate(async () => {
   await svc.init()
+
+  await schedulePopulateActivityRelations()
+
   await svc.start()
 })

services/apps/script_executor_worker/src/main.ts

@@ -0,0 +1,42 @@
+import { ScheduleAlreadyRunning, ScheduleOverlapPolicy } from '@temporalio/client'
+
+import { svc } from '../main'
+import { populateActivityRelations } from '../workflows'
+
+export const schedulePopulateActivityRelations = async () => {
+  try {
+    await svc.temporal.schedule.create({
+      scheduleId: 'populateActivityRelations',
+      spec: {
+        cronExpressions: ['30 0 * * *'],
+      },
+      policies: {
+        overlap: ScheduleOverlapPolicy.BUFFER_ONE,
+        catchupWindow: '1 minute',
+      },
+      action: {
+        type: 'startWorkflow',
+        workflowType: populateActivityRelations,
+        taskQueue: 'script-executor',
+        retry: {
+          initialInterval: '15 seconds',
+          backoffCoefficient: 2,
+          maximumAttempts: 3,
+        },
+        args: [
+          {
+            batchSizePerRun: 10000,
+            deleteIndexedEntities: false,
+          },
+        ],
+      },
+    })
+  } catch (err) {
+    if (err instanceof ScheduleAlreadyRunning) {
+      svc.log.info('Schedule already registered in Temporal.')
+      svc.log.info('Configuration may have changed since. Please make sure they are in sync.')
+    } else {
+      throw new Error(err)
+    }
+  }
+}

services/apps/script_executor_worker/src/schedules/schedulePopulateActivityRelations.ts

@@ -1632,7 +1632,7 @@ export async function createOrUpdateRelations(
             now(), 
             now()
         )
-    ON CONFLICT ("activityId", "memberId") 
+    ON CONFLICT ("activityId") 
     DO UPDATE 
     SET 
         "updatedAt" = EXCLUDED."updatedAt",