From 579c2ebcea67f17711bae46497b441a9a9a4cfb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Bosi?=
 <71827178+bosiraphael@users.noreply.github.com>
Date: Thu, 22 Aug 2024 17:51:08 +0200
Subject: [PATCH] 6687 change messaging import cron job to run every minute
 (#6704)

Closes #6687
---
 .../messaging-messages-import.cron.command.ts |  4 ++-
 .../messaging-messages-import.cron.job.ts     | 28 ++++++++-----------
 ...-users-messages-get-batch-size.constant.ts |  2 +-
 3 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/crons/commands/messaging-messages-import.cron.command.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/crons/commands/messaging-messages-import.cron.command.ts
index 206f2d47815b..11ef7211d76a 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/crons/commands/messaging-messages-import.cron.command.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/crons/commands/messaging-messages-import.cron.command.ts
@@ -5,6 +5,8 @@ import { MessageQueue } from 'src/engine/integrations/message-queue/message-queu
 import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
 import { MessagingMessagesImportCronJob } from 'src/modules/messaging/message-import-manager/crons/jobs/messaging-messages-import.cron.job';
 
+const MESSAGING_MESSAGES_IMPORT_CRON_PATTERN = '*/1 * * * *';
+
 @Command({
   name: 'cron:messaging:messages-import',
   description: 'Starts a cron job to fetch all messages from cache',
@@ -23,7 +25,7 @@ export class MessagingMessagesImportCronCommand extends CommandRunner {
       undefined,
       {
         repeat: {
-          every: 30000,
+          pattern: MESSAGING_MESSAGES_IMPORT_CRON_PATTERN,
         },
       },
     );
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/crons/jobs/messaging-messages-import.cron.job.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/crons/jobs/messaging-messages-import.cron.job.ts
index daef69dfa03d..a90c09f89d08 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/crons/jobs/messaging-messages-import.cron.job.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/crons/jobs/messaging-messages-import.cron.job.ts
@@ -1,4 +1,3 @@
-import { Logger } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 
 import { Repository } from 'typeorm';
@@ -24,8 +23,6 @@ import {
 
 @Processor(MessageQueue.cronQueue)
 export class MessagingMessagesImportCronJob {
-  private readonly logger = new Logger(MessagingMessagesImportCronJob.name);
-
   constructor(
     @InjectRepository(Workspace, 'core')
     private readonly workspaceRepository: Repository<Workspace>,
@@ -51,23 +48,20 @@ export class MessagingMessagesImportCronJob {
         );
 
       const messageChannels = await messageChannelRepository.find({
-        select: ['id', 'isSyncEnabled', 'syncStage'],
+        where: {
+          isSyncEnabled: true,
+          syncStage: MessageChannelSyncStage.MESSAGES_IMPORT_PENDING,
+        },
       });
 
       for (const messageChannel of messageChannels) {
-        if (
-          messageChannel.isSyncEnabled &&
-          messageChannel.syncStage ===
-            MessageChannelSyncStage.MESSAGES_IMPORT_PENDING
-        ) {
-          await this.messageQueueService.add<MessagingMessagesImportJobData>(
-            MessagingMessagesImportJob.name,
-            {
-              workspaceId: activeWorkspace.id,
-              messageChannelId: messageChannel.id,
-            },
-          );
-        }
+        await this.messageQueueService.add<MessagingMessagesImportJobData>(
+          MessagingMessagesImportJob.name,
+          {
+            workspaceId: activeWorkspace.id,
+            messageChannelId: messageChannel.id,
+          },
+        );
       }
     }
 
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/gmail/constants/messaging-gmail-users-messages-get-batch-size.constant.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/gmail/constants/messaging-gmail-users-messages-get-batch-size.constant.ts
index fdf015b35a78..dc89d1a32bcb 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/gmail/constants/messaging-gmail-users-messages-get-batch-size.constant.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/gmail/constants/messaging-gmail-users-messages-get-batch-size.constant.ts
@@ -1 +1 @@
-export const MESSAGING_GMAIL_USERS_MESSAGES_GET_BATCH_SIZE = 100;
+export const MESSAGING_GMAIL_USERS_MESSAGES_GET_BATCH_SIZE = 200;