From 546bfbaca12d53b077b9a4c298796fa10feaeffc Mon Sep 17 00:00:00 2001
From: nicktrn <55853254+nicktrn@users.noreply.github.com>
Date: Sat, 5 Oct 2024 14:15:02 +0100
Subject: [PATCH 1/2] disable schedules for deleted orgs

---
 .../app/v3/services/triggerScheduledTask.server.ts    | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/apps/webapp/app/v3/services/triggerScheduledTask.server.ts b/apps/webapp/app/v3/services/triggerScheduledTask.server.ts
index a6acc3d569..3c93be5742 100644
--- a/apps/webapp/app/v3/services/triggerScheduledTask.server.ts
+++ b/apps/webapp/app/v3/services/triggerScheduledTask.server.ts
@@ -40,6 +40,17 @@ export class TriggerScheduledTaskService extends BaseService {
       }
 
       if (!instance.taskSchedule.active) {
+        shouldTrigger = false;
+      } else if (instance.environment.organization.deletedAt) {
+        await this._prisma.taskSchedule.update({
+          where: {
+            id: instance.taskSchedule.id,
+          },
+          data: {
+            active: false,
+          },
+        });
+
         shouldTrigger = false;
       }
 

From 49ab8cac29d497f3f325545f4a00c707e18375f6 Mon Sep 17 00:00:00 2001
From: nicktrn <55853254+nicktrn@users.noreply.github.com>
Date: Sat, 5 Oct 2024 14:15:20 +0100
Subject: [PATCH 2/2] add debug logs

---
 apps/webapp/app/v3/services/triggerScheduledTask.server.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/apps/webapp/app/v3/services/triggerScheduledTask.server.ts b/apps/webapp/app/v3/services/triggerScheduledTask.server.ts
index 3c93be5742..abc61bf33b 100644
--- a/apps/webapp/app/v3/services/triggerScheduledTask.server.ts
+++ b/apps/webapp/app/v3/services/triggerScheduledTask.server.ts
@@ -42,6 +42,12 @@ export class TriggerScheduledTaskService extends BaseService {
       if (!instance.taskSchedule.active) {
         shouldTrigger = false;
       } else if (instance.environment.organization.deletedAt) {
+        logger.debug("Organization is deleted, disabling schedule", {
+          instanceId,
+          scheduleId: instance.taskSchedule.friendlyId,
+          organizationId: instance.environment.organization.id,
+        });
+
         await this._prisma.taskSchedule.update({
           where: {
             id: instance.taskSchedule.id,