From 7c4ddb9448975b7096ec34572fca868d2d0e9f7a Mon Sep 17 00:00:00 2001
From: Guillim <guillim@users.noreply.github.com>
Date: Fri, 13 Jun 2025 10:02:26 +0200
Subject: [PATCH] for better error, especially from  sentry cron monitor
 (#12574)

After release 55, we found out that CRON job monitor was red for
CronTriggerCronJob

While only 1 workspace was not in the appropriate state, meaning the
whole command was probably failing for only 1 workspace failing.

We suggest here to catch errors per worksspace and simply push to sentry
the error of the errored workspace relative to workflow trigger.
---
 .../crons/jobs/cron-trigger.cron.job.ts       | 64 +++++++++++--------
 1 file changed, 37 insertions(+), 27 deletions(-)

diff --git a/packages/twenty-server/src/modules/workflow/workflow-trigger/automated-trigger/crons/jobs/cron-trigger.cron.job.ts b/packages/twenty-server/src/modules/workflow/workflow-trigger/automated-trigger/crons/jobs/cron-trigger.cron.job.ts
index 8cf1727a2..300d082a7 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-trigger/automated-trigger/crons/jobs/cron-trigger.cron.job.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-trigger/automated-trigger/crons/jobs/cron-trigger.cron.job.ts
@@ -5,6 +5,7 @@ import { WorkspaceActivationStatus } from 'twenty-shared/workspace';
 import { Repository } from 'typeorm';
 
 import { SentryCronMonitor } from 'src/engine/core-modules/cron/sentry-cron-monitor.decorator';
+import { ExceptionHandlerService } from 'src/engine/core-modules/exception-handler/exception-handler.service';
 import { InjectMessageQueue } from 'src/engine/core-modules/message-queue/decorators/message-queue.decorator';
 import { Process } from 'src/engine/core-modules/message-queue/decorators/process.decorator';
 import { Processor } from 'src/engine/core-modules/message-queue/decorators/processor.decorator';
@@ -33,6 +34,7 @@ export class CronTriggerCronJob {
     @InjectMessageQueue(MessageQueue.workflowQueue)
     private readonly messageQueueService: MessageQueueService,
     private readonly twentyORMGlobalManager: TwentyORMGlobalManager,
+    private readonly exceptionHandlerService: ExceptionHandlerService,
   ) {}
 
   @Process(CronTriggerCronJob.name)
@@ -47,38 +49,46 @@ export class CronTriggerCronJob {
     const now = new Date();
 
     for (const activeWorkspace of activeWorkspaces) {
-      const workflowAutomatedTriggerRepository =
-        await this.twentyORMGlobalManager.getRepositoryForWorkspace<WorkflowAutomatedTriggerWorkspaceEntity>(
-          activeWorkspace.id,
-          'workflowAutomatedTrigger',
-        );
+      try {
+        const workflowAutomatedTriggerRepository =
+          await this.twentyORMGlobalManager.getRepositoryForWorkspace<WorkflowAutomatedTriggerWorkspaceEntity>(
+            activeWorkspace.id,
+            'workflowAutomatedTrigger',
+          );
 
-      const workflowAutomatedCronTriggers =
-        await workflowAutomatedTriggerRepository.find({
-          where: { type: AutomatedTriggerType.CRON },
-        });
+        const workflowAutomatedCronTriggers =
+          await workflowAutomatedTriggerRepository.find({
+            where: { type: AutomatedTriggerType.CRON },
+          });
 
-      for (const workflowAutomatedCronTrigger of workflowAutomatedCronTriggers) {
-        const settings =
-          workflowAutomatedCronTrigger.settings as CronTriggerSettings;
+        for (const workflowAutomatedCronTrigger of workflowAutomatedCronTriggers) {
+          const settings =
+            workflowAutomatedCronTrigger.settings as CronTriggerSettings;
 
-        if (!isDefined(settings.pattern)) {
-          continue;
+          if (!isDefined(settings.pattern)) {
+            continue;
+          }
+
+          if (!shouldRunNow(settings.pattern, now)) {
+            continue;
+          }
+
+          await this.messageQueueService.add<WorkflowTriggerJobData>(
+            WorkflowTriggerJob.name,
+            {
+              workspaceId: activeWorkspace.id,
+              workflowId: workflowAutomatedCronTrigger.workflowId,
+              payload: {},
+            },
+            { retryLimit: 3 },
+          );
         }
-
-        if (!shouldRunNow(settings.pattern, now)) {
-          continue;
-        }
-
-        await this.messageQueueService.add<WorkflowTriggerJobData>(
-          WorkflowTriggerJob.name,
-          {
-            workspaceId: activeWorkspace.id,
-            workflowId: workflowAutomatedCronTrigger.workflowId,
-            payload: {},
+      } catch (error) {
+        this.exceptionHandlerService.captureExceptions([error], {
+          workspace: {
+            id: activeWorkspace.id,
           },
-          { retryLimit: 3 },
-        );
+        });
       }
     }
   }