fix: small issues and test

Author: magrinj

packages/twenty-server/package.json

@@ -26,6 +26,7 @@
     "jsdom": "~22.1.0",
     "jwt-decode": "^4.0.0",
     "lodash.differencewith": "^4.5.0",
+    "lodash.omitby": "^4.6.0",
     "lodash.uniq": "^4.5.0",
     "lodash.uniqby": "^4.7.0",
     "passport": "^0.7.0",
@@ -40,6 +41,7 @@
     "@types/lodash.isequal": "^4.5.8",
     "@types/lodash.isobject": "^3.0.7",
     "@types/lodash.omit": "^4.5.9",
+    "@types/lodash.omitby": "^4.6.9",
     "@types/lodash.snakecase": "^4.1.7",
     "@types/lodash.uniq": "^4.5.9",
     "@types/lodash.uniqby": "^4.7.9",

packages/twenty-server/src/engine/integrations/message-queue/drivers/bullmq.driver.ts

@@ -1,5 +1,6 @@
 import { OnModuleDestroy } from '@nestjs/common';
 
+import omitBy from 'lodash.omitby';
 import { JobsOptions, Queue, QueueOptions, Worker } from 'bullmq';
 
 import {
@@ -52,10 +53,13 @@ export class BullMQDriver implements MessageQueueDriver, OnModuleDestroy {
         // TODO: Correctly support for job.id
         await handler({ data: job.data, id: job.id ?? '', name: job.name });
       },
-      {
-        ...this.options,
-        concurrency: options?.concurrency,
-      },
+      omitBy(
+        {
+          ...this.options,
+          concurrency: options?.concurrency,
+        },
+        (value) => value === undefined,
+      ),
     );
 
     this.workerMap[queueName] = worker;

packages/twenty-server/src/engine/integrations/message-queue/message-queue.explorer.ts

@@ -42,8 +42,6 @@ export class MessageQueueExplorer implements OnModuleInit {
         ),
       );
 
-    console.log('PROCESSORS', processors);
-
     for (const wrapper of processors) {
       const { instance, metatype } = wrapper;
       const methodNames = this.metadataScanner.getAllMethodNames(instance);

packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/commands/clean-inactive-workspaces.command.ts

@@ -15,7 +15,7 @@ export type CleanInactiveWorkspacesCommandOptions = {
 })
 export class CleanInactiveWorkspacesCommand extends CommandRunner {
   constructor(
-    @InjectMessageQueue(MessageQueue.taskAssignedQueue)
+    @InjectMessageQueue(MessageQueue.cronQueue)
     private readonly messageQueueService: MessageQueueService,
   ) {
     super();

packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/crons/clean-inactive-workspace.job.ts

@@ -29,8 +29,6 @@ type WorkspaceToDeleteData = {
   daysSinceInactive: number;
 };
 
-// TODO: Special case with two queues, is it working ?
-@Processor(MessageQueue.taskAssignedQueue)
 @Processor(MessageQueue.cronQueue)
 export class CleanInactiveWorkspaceJob {
   private readonly logger = new Logger(CleanInactiveWorkspaceJob.name);

packages/twenty-server/src/modules/calendar/services/google-calendar-sync/google-calendar-sync.service.ts

@@ -62,7 +62,7 @@ export class GoogleCalendarSyncService {
     private readonly workspaceDataSourceService: WorkspaceDataSourceService,
     private readonly calendarEventCleanerService: CalendarEventCleanerService,
     private readonly calendarEventParticipantsService: CalendarEventParticipantService,
-    @InjectMessageQueue(MessageQueue.emailQueue)
+    @InjectMessageQueue(MessageQueue.messagingQueue)
     private readonly messageQueueService: MessageQueueService,
   ) {}
 

packages/twenty-server/src/modules/connected-account/auto-companies-and-contacts-creation/jobs/create-company-and-contact.job.ts

@@ -12,9 +12,7 @@ export type CreateCompanyAndContactJobData = {
   }[];
 };
 
-// TODO: Was used on two queues previously, is it working ?
 @Processor(MessageQueue.messagingQueue)
-@Processor(MessageQueue.emailQueue)
 export class CreateCompanyAndContactJob {
   constructor(
     private readonly createCompanyAndContactService: CreateCompanyAndContactService,

yarn.lock

@@ -17074,6 +17074,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/lodash.omitby@npm:^4.6.9":
+  version: 4.6.9
+  resolution: "@types/lodash.omitby@npm:4.6.9"
+  dependencies:
+    "@types/lodash": "npm:*"
+  checksum: e8850219326634c5b531e3398d24701000328e4366504d9315c1660c2fe2a0d4fc9aa2983b8c652ee7239921cd16103b37b1e44efdf25658de2a36f64b76888a
+  languageName: node
+  linkType: hard
+
 "@types/lodash.pick@npm:^4.3.7":
   version: 4.4.9
   resolution: "@types/lodash.pick@npm:4.4.9"
@@ -34348,6 +34357,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"lodash.omitby@npm:^4.6.0":
+  version: 4.6.0
+  resolution: "lodash.omitby@npm:4.6.0"
+  checksum: 4608b1d8c4063b63349a3462852465fbe74781d737fbb26a0a7f00b0e65f6ccbc13fa490a38f9380103d93fc398e3873983038efadfafc67ccafbb25d9bc7bf4
+  languageName: node
+  linkType: hard
+
 "lodash.once@npm:^4.0.0":
   version: 4.1.1
   resolution: "lodash.once@npm:4.1.1"
@@ -46738,6 +46754,7 @@ __metadata:
     "@types/lodash.isequal": "npm:^4.5.8"
     "@types/lodash.isobject": "npm:^3.0.7"
     "@types/lodash.omit": "npm:^4.5.9"
+    "@types/lodash.omitby": "npm:^4.6.9"
     "@types/lodash.snakecase": "npm:^4.1.7"
     "@types/lodash.uniq": "npm:^4.5.9"
     "@types/lodash.uniqby": "npm:^4.7.9"
@@ -46750,6 +46767,7 @@ __metadata:
     jsdom: "npm:~22.1.0"
     jwt-decode: "npm:^4.0.0"
     lodash.differencewith: "npm:^4.5.0"
+    lodash.omitby: "npm:^4.6.0"
     lodash.uniq: "npm:^4.5.0"
     lodash.uniqby: "npm:^4.7.0"
     passport: "npm:^0.7.0"