fix calendar-event-cleaner

twentyhq · Aug 20, 2024 · c78e768 · c78e768
1 parent cd3a285
commit c78e768
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 30 deletions.
diff --git a/...wenty-server/src/modules/calendar/calendar-event-cleaner/calendar-event-cleaner.module.ts b/...wenty-server/src/modules/calendar/calendar-event-cleaner/calendar-event-cleaner.module.ts
@@ -1,15 +1,15 @@
 import { Module } from '@nestjs/common';
 
-import { TwentyORMModule } from 'src/engine/twenty-orm/twenty-orm.module';
 import { DeleteConnectedAccountAssociatedCalendarDataJob } from 'src/modules/calendar/calendar-event-cleaner/jobs/delete-connected-account-associated-calendar-data.job';
+import { CalendarEventCleanerConnectedAccountListener } from 'src/modules/calendar/calendar-event-cleaner/listeners/calendar-event-cleaner-connected-account.listener';
 import { CalendarEventCleanerService } from 'src/modules/calendar/calendar-event-cleaner/services/calendar-event-cleaner.service';
-import { CalendarEventWorkspaceEntity } from 'src/modules/calendar/common/standard-objects/calendar-event.workspace-entity';
 
 @Module({
-  imports: [TwentyORMModule.forFeature([CalendarEventWorkspaceEntity])],
+  imports: [],
   providers: [
     CalendarEventCleanerService,
     DeleteConnectedAccountAssociatedCalendarDataJob,
+    CalendarEventCleanerConnectedAccountListener,
   ],
   exports: [CalendarEventCleanerService],
 })

diff --git a/...dar/calendar-event-cleaner/listeners/calendar-event-cleaner-connected-account.listener.ts b/...dar/calendar-event-cleaner/listeners/calendar-event-cleaner-connected-account.listener.ts
@@ -0,0 +1,40 @@
+import { Injectable } from '@nestjs/common';
+import { OnEvent } from '@nestjs/event-emitter';
+
+import { ObjectRecordDeleteEvent } from 'src/engine/integrations/event-emitter/types/object-record-delete.event';
+import { InjectMessageQueue } from 'src/engine/integrations/message-queue/decorators/message-queue.decorator';
+import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
+import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
+import { WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/workspace-event.type';
+import {
+  DeleteConnectedAccountAssociatedCalendarDataJob,
+  DeleteConnectedAccountAssociatedCalendarDataJobData,
+} from 'src/modules/calendar/calendar-event-cleaner/jobs/delete-connected-account-associated-calendar-data.job';
+import { ConnectedAccountWorkspaceEntity } from 'src/modules/connected-account/standard-objects/connected-account.workspace-entity';
+
+@Injectable()
+export class CalendarEventCleanerConnectedAccountListener {
+  constructor(
+    @InjectMessageQueue(MessageQueue.calendarQueue)
+    private readonly calendarQueueService: MessageQueueService,
+  ) {}
+
+  @OnEvent('connectedAccount.deleted')
+  async handleDeletedEvent(
+    payload: WorkspaceEventBatch<
+      ObjectRecordDeleteEvent<ConnectedAccountWorkspaceEntity>
+    >,
+  ) {
+    await Promise.all(
+      payload.events.map((eventPayload) =>
+        this.calendarQueueService.add<DeleteConnectedAccountAssociatedCalendarDataJobData>(
+          DeleteConnectedAccountAssociatedCalendarDataJob.name,
+          {
+            workspaceId: payload.workspaceId,
+            connectedAccountId: eventPayload.recordId,
+          },
+        ),
+      ),
+    );
+  }
+}
diff --git a/...ssaging/message-cleaner/listeners/messaging-message-cleaner-connected-account.listener.ts b/...ssaging/message-cleaner/listeners/messaging-message-cleaner-connected-account.listener.ts
@@ -6,10 +6,6 @@ import { InjectMessageQueue } from 'src/engine/integrations/message-queue/decora
 import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
 import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
 import { WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/workspace-event.type';
-import {
-  DeleteConnectedAccountAssociatedCalendarDataJob,
-  DeleteConnectedAccountAssociatedCalendarDataJobData,
-} from 'src/modules/calendar/calendar-event-cleaner/jobs/delete-connected-account-associated-calendar-data.job';
 import { ConnectedAccountWorkspaceEntity } from 'src/modules/connected-account/standard-objects/connected-account.workspace-entity';
 import {
   MessagingConnectedAccountDeletionCleanupJob,
@@ -21,8 +17,6 @@ export class MessagingMessageCleanerConnectedAccountListener {
   constructor(
     @InjectMessageQueue(MessageQueue.messagingQueue)
     private readonly messageQueueService: MessageQueueService,
-    @InjectMessageQueue(MessageQueue.calendarQueue)
-    private readonly calendarQueueService: MessageQueueService,
   ) {}
 
   @OnEvent('connectedAccount.deleted')
@@ -42,17 +36,5 @@ export class MessagingMessageCleanerConnectedAccountListener {
         ),
       ),
     );
-
-    await Promise.all(
-      payload.events.map((eventPayload) =>
-        this.calendarQueueService.add<DeleteConnectedAccountAssociatedCalendarDataJobData>(
-          DeleteConnectedAccountAssociatedCalendarDataJob.name,
-          {
-            workspaceId: payload.workspaceId,
-            connectedAccountId: eventPayload.recordId,
-          },
-        ),
-      ),
-    );
   }
 }
diff --git a/...s/twenty-server/src/modules/messaging/message-cleaner/messaging-message-cleaner.module.ts b/...s/twenty-server/src/modules/messaging/message-cleaner/messaging-message-cleaner.module.ts
@@ -1,19 +1,11 @@
 import { Module } from '@nestjs/common';
 
-import { TwentyORMModule } from 'src/engine/twenty-orm/twenty-orm.module';
-import { MessageThreadWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message-thread.workspace-entity';
-import { MessageWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message.workspace-entity';
 import { MessagingConnectedAccountDeletionCleanupJob } from 'src/modules/messaging/message-cleaner/jobs/messaging-connected-account-deletion-cleanup.job';
 import { MessagingMessageCleanerConnectedAccountListener } from 'src/modules/messaging/message-cleaner/listeners/messaging-message-cleaner-connected-account.listener';
 import { MessagingMessageCleanerService } from 'src/modules/messaging/message-cleaner/services/messaging-message-cleaner.service';
 
 @Module({
-  imports: [
-    TwentyORMModule.forFeature([
-      MessageWorkspaceEntity,
-      MessageThreadWorkspaceEntity,
-    ]),
-  ],
+  imports: [],
   providers: [
     MessagingMessageCleanerService,
     MessagingConnectedAccountDeletionCleanupJob,