From 07b2b18a4e2bd44c0b78a72303228c823b0cc33f Mon Sep 17 00:00:00 2001
From: Faruk AYDIN <omerfaruk26@gmail.com>
Date: Fri, 12 May 2023 13:25:30 +0200
Subject: [PATCH] fix: Run remove cancelled subscriptions only in the cloud

---
 .../src/helpers/create-bull-board-handler.ts  | 38 +++++++++++--------
 packages/backend/src/worker.ts                |  9 ++++-
 2 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/packages/backend/src/helpers/create-bull-board-handler.ts b/packages/backend/src/helpers/create-bull-board-handler.ts
index 6bab1db9..6b16467d 100644
--- a/packages/backend/src/helpers/create-bull-board-handler.ts
+++ b/packages/backend/src/helpers/create-bull-board-handler.ts
@@ -11,24 +11,32 @@ import appConfig from '../config/app';
 
 const serverAdapter = new ExpressAdapter();
 
+const queues = [
+  new BullMQAdapter(flowQueue),
+  new BullMQAdapter(triggerQueue),
+  new BullMQAdapter(actionQueue),
+  new BullMQAdapter(emailQueue),
+  new BullMQAdapter(deleteUserQueue),
+];
+
+if (appConfig.isCloud) {
+  queues.push(new BullMQAdapter(removeCancelledSubscriptionsQueue));
+}
+
+const shouldEnableBullDashboard = () => {
+  return (
+    appConfig.enableBullMQDashboard &&
+    appConfig.bullMQDashboardUsername &&
+    appConfig.bullMQDashboardPassword
+  );
+};
+
 const createBullBoardHandler = async (serverAdapter: ExpressAdapter) => {
-  if (
-    !appConfig.enableBullMQDashboard ||
-    !appConfig.bullMQDashboardUsername ||
-    !appConfig.bullMQDashboardPassword
-  )
-    return;
+  if (!shouldEnableBullDashboard) return;
 
   createBullBoard({
-    queues: [
-      new BullMQAdapter(flowQueue),
-      new BullMQAdapter(triggerQueue),
-      new BullMQAdapter(actionQueue),
-      new BullMQAdapter(emailQueue),
-      new BullMQAdapter(deleteUserQueue),
-      new BullMQAdapter(removeCancelledSubscriptionsQueue),
-    ],
-    serverAdapter: serverAdapter,
+    queues,
+    serverAdapter,
   });
 };
 
diff --git a/packages/backend/src/worker.ts b/packages/backend/src/worker.ts
index ae63d224..4de664e5 100644
--- a/packages/backend/src/worker.ts
+++ b/packages/backend/src/worker.ts
@@ -1,4 +1,5 @@
 import * as Sentry from './helpers/sentry.ee';
+import appConfig from './config/app';
 
 Sentry.init();
 
@@ -9,8 +10,12 @@ import './workers/trigger';
 import './workers/action';
 import './workers/email';
 import './workers/delete-user.ee';
-import './workers/remove-cancelled-subscriptions.ee';
-import './queues/remove-cancelled-subscriptions.ee';
+
+if (appConfig.isCloud) {
+  import('./workers/remove-cancelled-subscriptions.ee');
+  import('./queues/remove-cancelled-subscriptions.ee');
+}
+
 import telemetry from './helpers/telemetry';
 
 telemetry.setServiceType('worker');