The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
feat(messaging): import recent messages as soon as an account connects (#23983)
neo77393bc99e875b3
diff --git a/packages/twenty-server/src/engine/core-modules/auth/auth.module.ts b/packages/twenty-server/src/engine/core-modules/auth/auth.module.tsindex ce77e06f3bd..d9c2782f8d2 100644--- a/packages/twenty-server/src/engine/core-modules/auth/auth.module.ts+++ b/packages/twenty-server/src/engine/core-modules/auth/auth.module.ts@@ -74,6 +74,7 @@ import { CalendarChannelSyncStatusService } from 'src/modules/calendar/common/seimport { ConnectedAccountModule } from 'src/modules/connected-account/connected-account.module';import { EmailAliasManagerModule } from 'src/modules/connected-account/email-alias-manager/email-alias-manager.module';import { MessagingCommonModule } from 'src/modules/messaging/common/messaging-common.module';+import { OnboardingRecentMessagesImportModule } from 'src/modules/onboarding-recent-messages-import/onboarding-recent-messages-import.module';import { MessagingFolderSyncManagerModule } from 'src/modules/messaging/message-folder-manager/messaging-folder-sync-manager.module';import { AuthResolver } from './auth.resolver';@@ -107,6 +108,7 @@ import { JwtAuthStrategy } from './strategies/jwt.auth.strategy';OnboardingModule,ConnectedAccountModule,MessagingCommonModule,+ OnboardingRecentMessagesImportModule,MessagingFolderSyncManagerModule,WorkspaceSSOModule,FeatureFlagModule,diff --git a/packages/twenty-server/src/engine/core-modules/auth/services/google-apis.service.spec.ts b/packages/twenty-server/src/engine/core-modules/auth/services/google-apis.service.spec.tsindex afa772f6eca..dea1323fde9 100644--- a/packages/twenty-server/src/engine/core-modules/auth/services/google-apis.service.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/auth/services/google-apis.service.spec.ts@@ -31,6 +31,7 @@ import { EmailAliasManagerService } from 'src/modules/connected-account/email-alimport { AccountsToReconnectService } from 'src/modules/connected-account/services/accounts-to-reconnect.service';import { MessageChannelSyncStatusService } from 'src/modules/messaging/common/services/message-channel-sync-status.service';import { SyncMessageFoldersService } from 'src/modules/messaging/message-folder-manager/services/sync-message-folders.service';+import { OnboardingRecentMessagesImportService } from 'src/modules/onboarding-recent-messages-import/services/onboarding-recent-messages-import.service';jest.mock('uuid', () => ({...jest.requireActual('uuid'),@@ -209,6 +210,12 @@ describe('GoogleAPIsService', () => {refreshHandleAliases: jest.fn().mockResolvedValue([]),},},+ {+ provide: OnboardingRecentMessagesImportService,+ useValue: {+ importRecentMessages: jest.fn().mockResolvedValue(undefined),+ },+ },{provide: getRepositoryToken(ConnectedAccountEntity),useValue: mockConnectedAccountRepository,diff --git a/packages/twenty-server/src/engine/core-modules/auth/services/google-apis.service.ts b/packages/twenty-server/src/engine/core-modules/auth/services/google-apis.service.tsindex ed6c61326a6..7d7d9f8410e 100644--- a/packages/twenty-server/src/engine/core-modules/auth/services/google-apis.service.ts+++ b/packages/twenty-server/src/engine/core-modules/auth/services/google-apis.service.ts@@ -47,6 +47,7 @@ import {MessagingMessageListFetchJob,type MessagingMessageListFetchJobData,} from 'src/modules/messaging/message-import-manager/jobs/messaging-message-list-fetch.job';+import { OnboardingRecentMessagesImportService } from 'src/modules/onboarding-recent-messages-import/services/onboarding-recent-messages-import.service';import { isDefined } from 'twenty-shared/utils';@Injectable()@@ -67,6 +68,7 @@ export class GoogleAPIsService {private readonly updateConnectedAccountOnReconnectService: UpdateConnectedAccountOnReconnectService,private readonly googleAPIScopesService: GoogleAPIScopesService,private readonly googleApisServiceAvailabilityService: GoogleApisServiceAvailabilityService,+ private readonly onboardingRecentMessagesImportService: OnboardingRecentMessagesImportService,private readonly syncMessageFoldersService: SyncMessageFoldersService,private readonly emailAliasManagerService: EmailAliasManagerService,@InjectRepository(ConnectedAccountEntity)@@ -344,6 +346,12 @@ export class GoogleAPIsService {MessagingMessageListFetchJob.name,{ workspaceId, messageChannelId: messageChannel.id },);+ this.onboardingRecentMessagesImportService+ .importRecentMessages({+ messageChannelId: messageChannel.id,+ workspaceId,+ })+ .catch(() => undefined);}}}diff --git a/packages/twenty-server/src/engine/core-modules/auth/services/microsoft-apis.service.spec.ts b/packages/twenty-server/src/engine/core-modules/auth/services/microsoft-apis.service.spec.tsindex 7015692d020..12fd0dfbcb9 100644--- a/packages/twenty-server/src/engine/core-modules/auth/services/microsoft-apis.service.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/auth/services/microsoft-apis.service.spec.ts@@ -28,6 +28,7 @@ import { EmailAliasManagerService } from 'src/modules/connected-account/email-alimport { AccountsToReconnectService } from 'src/modules/connected-account/services/accounts-to-reconnect.service';import { MessageChannelSyncStatusService } from 'src/modules/messaging/common/services/message-channel-sync-status.service';import { SyncMessageFoldersService } from 'src/modules/messaging/message-folder-manager/services/sync-message-folders.service';+import { OnboardingRecentMessagesImportService } from 'src/modules/onboarding-recent-messages-import/services/onboarding-recent-messages-import.service';jest.mock('uuid', () => ({...jest.requireActual('uuid'),@@ -199,6 +200,12 @@ describe('MicrosoftAPIsService', () => {refreshHandleAliases: jest.fn().mockResolvedValue([]),},},+ {+ provide: OnboardingRecentMessagesImportService,+ useValue: {+ importRecentMessages: jest.fn().mockResolvedValue(undefined),+ },+ },],}).compile();diff --git a/packages/twenty-server/src/engine/core-modules/auth/services/microsoft-apis.service.ts b/packages/twenty-server/src/engine/core-modules/auth/services/microsoft-apis.service.tsindex 75c7f8bef7b..12356abedc3 100644--- a/packages/twenty-server/src/engine/core-modules/auth/services/microsoft-apis.service.ts+++ b/packages/twenty-server/src/engine/core-modules/auth/services/microsoft-apis.service.ts@@ -45,6 +45,7 @@ import {MessagingMessageListFetchJob,type MessagingMessageListFetchJobData,} from 'src/modules/messaging/message-import-manager/jobs/messaging-message-list-fetch.job';+import { OnboardingRecentMessagesImportService } from 'src/modules/onboarding-recent-messages-import/services/onboarding-recent-messages-import.service';import { isDefined } from 'twenty-shared/utils';@Injectable()@@ -65,6 +66,7 @@ export class MicrosoftAPIsService {private readonly twentyConfigService: TwentyConfigService,private readonly syncMessageFoldersService: SyncMessageFoldersService,private readonly emailAliasManagerService: EmailAliasManagerService,+ private readonly onboardingRecentMessagesImportService: OnboardingRecentMessagesImportService,@InjectRepository(ConnectedAccountEntity)private readonly connectedAccountRepository: Repository<ConnectedAccountEntity>,@InjectRepository(UserWorkspaceEntity)@@ -307,6 +309,12 @@ export class MicrosoftAPIsService {messageChannelId: messageChannel.id,},);+ this.onboardingRecentMessagesImportService+ .importRecentMessages({+ messageChannelId: messageChannel.id,+ workspaceId,+ })+ .catch(() => undefined);}}}diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/messaging-import-manager.module.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/messaging-import-manager.module.tsindex 693806ffb8e..3d42f5cc48c 100644--- a/packages/twenty-server/src/modules/messaging/message-import-manager/messaging-import-manager.module.ts+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/messaging-import-manager.module.ts@@ -126,6 +126,7 @@ import { MessagingMonitoringModule } from 'src/modules/messaging/monitoring/messMessagingProcessGroupEmailActionsService,InboundEmailImportService,MessagingSaveMessagesAndEnqueueContactCreationService,+ MessagingMessagesImportService,],})export class MessagingImportManagerModule {}diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-messages-import.service.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-messages-import.service.tsindex 7312fdd023d..104f90423f2 100644--- a/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-messages-import.service.ts+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-messages-import.service.ts@@ -63,12 +63,13 @@ export class MessagingMessagesImportService {messageChannel: MessageChannelEntity,connectedAccount: ConnectedAccountEntity,workspaceId: string,+ batchSize?: number,) {let messageIdsToFetch: string[] = [];- const messagesGetBatchSize = this.twentyConfigService.get(- 'MESSAGING_MESSAGES_GET_BATCH_SIZE',- );+ const messagesGetBatchSize =+ batchSize ??+ this.twentyConfigService.get('MESSAGING_MESSAGES_GET_BATCH_SIZE');const authContext = buildSystemAuthContext(workspaceId);diff --git a/packages/twenty-server/src/modules/onboarding-recent-messages-import/constants/recent-messages-import-cache-ttl-ms.constant.ts b/packages/twenty-server/src/modules/onboarding-recent-messages-import/constants/recent-messages-import-cache-ttl-ms.constant.tsnew file mode 100644index 00000000000..eba2478e6b6--- /dev/null+++ b/packages/twenty-server/src/modules/onboarding-recent-messages-import/constants/recent-messages-import-cache-ttl-ms.constant.ts@@ -0,0 +1 @@+export const RECENT_MESSAGES_IMPORT_CACHE_TTL_MS = 7 * 24 * 60 * 60 * 1000;diff --git a/packages/twenty-server/src/modules/onboarding-recent-messages-import/constants/recent-messages-max-count.constant.ts b/packages/twenty-server/src/modules/onboarding-recent-messages-import/constants/recent-messages-max-count.constant.tsnew file mode 100644index 00000000000..f98261f3449--- /dev/null+++ b/packages/twenty-server/src/modules/onboarding-recent-messages-import/constants/recent-messages-max-count.constant.ts@@ -0,0 +1 @@+export const RECENT_MESSAGES_MAX_COUNT = 100;diff --git a/packages/twenty-server/src/modules/onboarding-recent-messages-import/onboarding-recent-messages-import.module.ts b/packages/twenty-server/src/modules/onboarding-recent-messages-import/onboarding-recent-messages-import.module.tsnew file mode 100644index 00000000000..2ec28194e4a--- /dev/null+++ b/packages/twenty-server/src/modules/onboarding-recent-messages-import/onboarding-recent-messages-import.module.ts@@ -0,0 +1,32 @@+import { Module } from '@nestjs/common';+import { TypeOrmModule } from '@nestjs/typeorm';++import { MessageChannelEntity } from 'src/engine/metadata-modules/message-channel/entities/message-channel.entity';+import { OAuth2ClientManagerModule } from 'src/modules/connected-account/oauth2-client-manager/oauth2-client-manager.module';+import { MessagingCommonModule } from 'src/modules/messaging/common/messaging-common.module';+import { MessagingIMAPDriverModule } from 'src/modules/messaging/message-import-manager/drivers/imap/messaging-imap-driver.module';+import { MessagingImportManagerModule } from 'src/modules/messaging/message-import-manager/messaging-import-manager.module';+import { GmailRecentMessagesService } from 'src/modules/onboarding-recent-messages-import/services/gmail-recent-messages.service';+import { ImapRecentMessagesService } from 'src/modules/onboarding-recent-messages-import/services/imap-recent-messages.service';+import { MicrosoftRecentMessagesService } from 'src/modules/onboarding-recent-messages-import/services/microsoft-recent-messages.service';+import { OnboardingRecentMessagesImportService } from 'src/modules/onboarding-recent-messages-import/services/onboarding-recent-messages-import.service';+import { RecentMessagesService } from 'src/modules/onboarding-recent-messages-import/services/recent-messages.service';++@Module({+ imports: [+ TypeOrmModule.forFeature([MessageChannelEntity]),+ OAuth2ClientManagerModule,+ MessagingIMAPDriverModule,+ MessagingCommonModule,+ MessagingImportManagerModule,+ ],+ providers: [+ GmailRecentMessagesService,+ MicrosoftRecentMessagesService,+ ImapRecentMessagesService,+ RecentMessagesService,+ OnboardingRecentMessagesImportService,+ ],+ exports: [OnboardingRecentMessagesImportService],+})+export class OnboardingRecentMessagesImportModule {}diff --git a/packages/twenty-server/src/modules/onboarding-recent-messages-import/services/gmail-recent-messages.service.ts b/packages/twenty-server/src/modules/onboarding-recent-messages-import/services/gmail-recent-messages.service.tsnew file mode 100644index 00000000000..19913a2fe6c--- /dev/null+++ b/packages/twenty-server/src/modules/onboarding-recent-messages-import/services/gmail-recent-messages.service.ts@@ -0,0 +1,38 @@+import { Injectable } from '@nestjs/common';++import { google } from 'googleapis';+import { isDefined } from 'twenty-shared/utils';++import { GoogleOAuth2ClientProvider } from 'src/modules/connected-account/oauth2-client-manager/drivers/google/google-oauth2-client.provider';++const GMAIL_SENT_SEARCH_FILTER = 'in:sent';++@Injectable()+export class GmailRecentMessagesService {+ constructor(+ private readonly googleOAuth2ClientProvider: GoogleOAuth2ClientProvider,+ ) {}++ async getExternalIds({+ connectedAccountId,+ maxCount,+ }: {+ connectedAccountId: string;+ maxCount: number;+ }): Promise<string[]> {+ const oAuth2Client =+ await this.googleOAuth2ClientProvider.getClient(connectedAccountId);++ const gmailClient = google.gmail({ version: 'v1', auth: oAuth2Client });++ const messageList = await gmailClient.users.messages.list({+ userId: 'me',+ maxResults: maxCount,+ q: GMAIL_SENT_SEARCH_FILTER,+ });++ return (messageList.data.messages ?? [])+ .map((message) => message.id)+ .filter(isDefined);+ }+}diff --git a/packages/twenty-server/src/modules/onboarding-recent-messages-import/services/imap-recent-messages.service.ts b/packages/twenty-server/src/modules/onboarding-recent-messages-import/services/imap-recent-messages.service.tsnew file mode 100644index 00000000000..39ddab1ba38--- /dev/null+++ b/packages/twenty-server/src/modules/onboarding-recent-messages-import/services/imap-recent-messages.service.ts@@ -0,0 +1,91 @@+import { Injectable } from '@nestjs/common';++import { type ImapFlow } from 'imapflow';+import { isDefined } from 'twenty-shared/utils';++import { type MessageFolder } from 'src/modules/messaging/message-folder-manager/interfaces/message-folder-driver.interface';+import { ImapClientProvider } from 'src/modules/messaging/message-import-manager/drivers/imap/providers/imap-client.provider';+import { getImapFolderPath } from 'src/modules/messaging/message-import-manager/drivers/imap/utils/get-imap-folder-path.util';++@Injectable()+export class ImapRecentMessagesService {+ constructor(private readonly imapClientProvider: ImapClientProvider) {}++ async getExternalIds({+ connectedAccountId,+ messageFolders,+ maxCount,+ }: {+ connectedAccountId: string;+ messageFolders: MessageFolder[];+ maxCount: number;+ }): Promise<string[]> {+ const sentFolders = messageFolders.filter(+ (messageFolder) => messageFolder.isSentFolder,+ );++ if (sentFolders.length === 0) {+ return [];+ }++ const imapClient =+ await this.imapClientProvider.getClient(connectedAccountId);++ try {+ const messageExternalIds: string[] = [];++ for (const messageFolder of sentFolders) {+ messageExternalIds.push(+ ...(await this.getFolderExternalIds({+ imapClient,+ messageFolder,+ maxCount,+ })),+ );+ }++ return messageExternalIds;+ } finally {+ await this.imapClientProvider.closeClient(imapClient);+ }+ }++ private async getFolderExternalIds({+ imapClient,+ messageFolder,+ maxCount,+ }: {+ imapClient: ImapFlow;+ messageFolder: MessageFolder;+ maxCount: number;+ }): Promise<string[]> {+ const folderPath = getImapFolderPath(messageFolder.externalId);++ if (!isDefined(folderPath)) {+ return [];+ }++ const mailboxLock = await imapClient.getMailboxLock(folderPath);++ try {+ const mailbox = imapClient.mailbox;++ if (!mailbox || typeof mailbox === 'boolean' || mailbox.exists === 0) {+ return [];+ }++ const firstSequenceNumber = Math.max(1, mailbox.exists - maxCount + 1);+ const messageExternalIds: string[] = [];++ for await (const message of imapClient.fetch(`${firstSequenceNumber}:*`, {+ uid: true,+ })) {+ messageExternalIds.push(`${folderPath}:${message.uid}`);+ }++ return messageExternalIds.reverse();+ } finally {+ mailboxLock.release();+ }+ }+}diff --git a/packages/twenty-server/src/modules/onboarding-recent-messages-import/services/microsoft-recent-messages.service.ts b/packages/twenty-server/src/modules/onboarding-recent-messages-import/services/microsoft-recent-messages.service.tsnew file mode 100644index 00000000000..92ebd2a9d1c--- /dev/null+++ b/packages/twenty-server/src/modules/onboarding-recent-messages-import/services/microsoft-recent-messages.service.ts@@ -0,0 +1,36 @@+import { Injectable } from '@nestjs/common';++import { isDefined } from 'twenty-shared/utils';++import { MicrosoftOAuth2ClientProvider } from 'src/modules/connected-account/oauth2-client-manager/drivers/microsoft/microsoft-oauth2-client.provider';++const GRAPH_SENT_MAIL_FOLDER_ID = 'sentitems';++@Injectable()+export class MicrosoftRecentMessagesService {+ constructor(+ private readonly microsoftOAuth2ClientProvider: MicrosoftOAuth2ClientProvider,+ ) {}++ async getExternalIds({+ connectedAccountId,+ maxCount,+ }: {+ connectedAccountId: string;+ maxCount: number;+ }): Promise<string[]> {+ const microsoftClient =+ await this.microsoftOAuth2ClientProvider.getClient(connectedAccountId);++ const response: { value?: { id?: string }[] } = await microsoftClient+ .api(+ `/me/mailFolders/${GRAPH_SENT_MAIL_FOLDER_ID}/messages?$select=id&$orderby=sentDateTime desc&$top=${maxCount}`,+ )+ .header('Prefer', 'IdType="ImmutableId"')+ .get();++ return (response?.value ?? [])+ .map((message) => message.id)+ .filter(isDefined);+ }+}diff --git a/packages/twenty-server/src/modules/onboarding-recent-messages-import/services/onboarding-recent-messages-import.service.ts b/packages/twenty-server/src/modules/onboarding-recent-messages-import/services/onboarding-recent-messages-import.service.tsnew file mode 100644index 00000000000..ae38c74d907--- /dev/null+++ b/packages/twenty-server/src/modules/onboarding-recent-messages-import/services/onboarding-recent-messages-import.service.ts@@ -0,0 +1,112 @@+import { Injectable, Logger } from '@nestjs/common';+import { InjectRepository } from '@nestjs/typeorm';++import { MessageChannelSyncStage } from 'twenty-shared/types';+import { isDefined } from 'twenty-shared/utils';+import { Repository } from 'typeorm';++import { InjectCacheStorage } from 'src/engine/core-modules/cache-storage/decorators/cache-storage.decorator';+import { CacheStorageService } from 'src/engine/core-modules/cache-storage/services/cache-storage.service';+import { CacheStorageNamespace } from 'src/engine/core-modules/cache-storage/types/cache-storage-namespace.enum';+import { MessageChannelEntity } from 'src/engine/metadata-modules/message-channel/entities/message-channel.entity';+import { GlobalWorkspaceOrmManager } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-orm.manager';+import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';+import { MessageChannelSyncStatusService } from 'src/modules/messaging/common/services/message-channel-sync-status.service';+import { MessagingMessagesImportService } from 'src/modules/messaging/message-import-manager/services/messaging-messages-import.service';+import { RECENT_MESSAGES_IMPORT_CACHE_TTL_MS } from 'src/modules/onboarding-recent-messages-import/constants/recent-messages-import-cache-ttl-ms.constant';+import { RecentMessagesService } from 'src/modules/onboarding-recent-messages-import/services/recent-messages.service';++@Injectable()+export class OnboardingRecentMessagesImportService {+ private readonly logger = new Logger(+ OnboardingRecentMessagesImportService.name,+ );++ constructor(+ @InjectCacheStorage(CacheStorageNamespace.ModuleMessaging)+ private readonly cacheStorage: CacheStorageService,+ @InjectRepository(MessageChannelEntity)+ private readonly messageChannelRepository: Repository<MessageChannelEntity>,+ private readonly globalWorkspaceOrmManager: GlobalWorkspaceOrmManager,+ private readonly messageChannelSyncStatusService: MessageChannelSyncStatusService,+ private readonly messagingMessagesImportService: MessagingMessagesImportService,+ private readonly recentMessagesService: RecentMessagesService,+ ) {}++ async importRecentMessages({+ messageChannelId,+ workspaceId,+ }: {+ messageChannelId: string;+ workspaceId: string;+ }): Promise<void> {+ const authContext = buildSystemAuthContext(workspaceId);++ try {+ await this.globalWorkspaceOrmManager.executeInWorkspaceContext(+ async () => {+ const messageChannel = await this.messageChannelRepository.findOne({+ where: { id: messageChannelId, workspaceId },+ relations: { connectedAccount: true, messageFolders: true },+ });++ if (!isDefined(messageChannel) || !messageChannel.isSyncEnabled) {+ return;+ }++ const hasAlreadyCompletedASync = isDefined(messageChannel.syncedAt);++ if (hasAlreadyCompletedASync) {+ return;+ }++ const messageExternalIds =+ await this.recentMessagesService.getExternalIds({+ connectedAccount: messageChannel.connectedAccount,+ messageFolders: messageChannel.messageFolders ?? [],+ });++ if (messageExternalIds.length === 0) {+ return;+ }++ await this.cacheStorage.setAdd(+ `messages-to-import:${workspaceId}:${messageChannel.id}`,+ messageExternalIds,+ RECENT_MESSAGES_IMPORT_CACHE_TTL_MS,+ );++ await this.messageChannelSyncStatusService.markAsMessagesImportScheduled(+ [messageChannel.id],+ workspaceId,+ );++ await this.messagingMessagesImportService.processMessageBatchImport(+ {+ ...messageChannel,+ syncStage: MessageChannelSyncStage.MESSAGES_IMPORT_SCHEDULED,+ },+ messageChannel.connectedAccount,+ workspaceId,+ messageExternalIds.length,+ );++ await this.messageChannelSyncStatusService.markAsMessagesListFetchPending(+ [messageChannel.id],+ workspaceId,+ );++ this.logger.log(+ `WorkspaceId: ${workspaceId}, MessageChannelId: ${messageChannel.id} - Imported ${messageExternalIds.length} recent messages`,+ );+ },+ authContext,+ { lite: true },+ );+ } catch (error) {+ this.logger.warn(+ `WorkspaceId: ${workspaceId}, MessageChannelId: ${messageChannelId} - Could not import recent messages: ${error.message}`,+ );+ }+ }+}diff --git a/packages/twenty-server/src/modules/onboarding-recent-messages-import/services/recent-messages.service.ts b/packages/twenty-server/src/modules/onboarding-recent-messages-import/services/recent-messages.service.tsnew file mode 100644index 00000000000..a404af65efa--- /dev/null+++ b/packages/twenty-server/src/modules/onboarding-recent-messages-import/services/recent-messages.service.ts@@ -0,0 +1,72 @@+import { Injectable } from '@nestjs/common';++import { ConnectedAccountProvider } from 'twenty-shared/types';++import { type ConnectedAccountEntity } from 'src/engine/metadata-modules/connected-account/entities/connected-account.entity';+import {+ MessageImportDriverException,+ MessageImportDriverExceptionCode,+} from 'src/modules/messaging/message-import-manager/drivers/exceptions/message-import-driver.exception';+import { type MessageFolder } from 'src/modules/messaging/message-folder-manager/interfaces/message-folder-driver.interface';+import { RECENT_MESSAGES_MAX_COUNT } from 'src/modules/onboarding-recent-messages-import/constants/recent-messages-max-count.constant';+import { GmailRecentMessagesService } from 'src/modules/onboarding-recent-messages-import/services/gmail-recent-messages.service';+import { ImapRecentMessagesService } from 'src/modules/onboarding-recent-messages-import/services/imap-recent-messages.service';+import { MicrosoftRecentMessagesService } from 'src/modules/onboarding-recent-messages-import/services/microsoft-recent-messages.service';++@Injectable()+export class RecentMessagesService {+ constructor(+ private readonly gmailRecentMessagesService: GmailRecentMessagesService,+ private readonly microsoftRecentMessagesService: MicrosoftRecentMessagesService,+ private readonly imapRecentMessagesService: ImapRecentMessagesService,+ ) {}++ async getExternalIds({+ connectedAccount,+ messageFolders,+ }: {+ connectedAccount: Pick<ConnectedAccountEntity, 'provider' | 'id'>;+ messageFolders: MessageFolder[];+ }): Promise<string[]> {+ const externalIds = await this.getExternalIdsByProvider({+ connectedAccount,+ messageFolders,+ });++ return [...new Set(externalIds)];+ }++ private async getExternalIdsByProvider({+ connectedAccount,+ messageFolders,+ }: {+ connectedAccount: Pick<ConnectedAccountEntity, 'provider' | 'id'>;+ messageFolders: MessageFolder[];+ }): Promise<string[]> {+ const maxCount = RECENT_MESSAGES_MAX_COUNT;++ switch (connectedAccount.provider) {+ case ConnectedAccountProvider.GOOGLE:+ return this.gmailRecentMessagesService.getExternalIds({+ connectedAccountId: connectedAccount.id,+ maxCount,+ });+ case ConnectedAccountProvider.MICROSOFT:+ return this.microsoftRecentMessagesService.getExternalIds({+ connectedAccountId: connectedAccount.id,+ maxCount,+ });+ case ConnectedAccountProvider.IMAP_SMTP_CALDAV:+ return this.imapRecentMessagesService.getExternalIds({+ connectedAccountId: connectedAccount.id,+ messageFolders,+ maxCount,+ });+ default:+ throw new MessageImportDriverException(+ `Provider ${connectedAccount.provider} is not supported`,+ MessageImportDriverExceptionCode.PROVIDER_NOT_SUPPORTED,+ );+ }+ }+}diff --git a/packages/twenty-server/test/integration/google/messaging/onboarding-recent-messages-import.integration-spec.ts b/packages/twenty-server/test/integration/google/messaging/onboarding-recent-messages-import.integration-spec.tsnew file mode 100644index 00000000000..62ee51e357b--- /dev/null+++ b/packages/twenty-server/test/integration/google/messaging/onboarding-recent-messages-import.integration-spec.ts@@ -0,0 +1,74 @@+import {+ ConnectedAccountProvider,+ MessageChannelSyncStage,+} from 'twenty-shared/types';++import { getGmailMessageSubject } from 'test/integration/google/mocks/gmail-message-subject.util';+import { gmailMessage } from 'test/integration/google/mocks/gmail-message.util';+import { setupGoogleMock } from 'test/integration/google/mocks/setup-google-mock.util';+import { connectMessagingAccount } from 'test/integration/utils/connect-messaging-account.util';+import { expectEventually } from 'test/integration/utils/expect-eventually.util';+import { findImportedMessageSubjects } from 'test/integration/utils/find-imported-records.util';+import { queryMessageChannels } from 'test/integration/utils/query-messaging.util';+import { runMessageChannelSync } from 'test/integration/utils/run-message-channel-sync.util';++const HANDLE = '[email protected]';++const findChannel = async (channelId: string) => {+ const channels = await queryMessageChannels();++ return channels.find((channel) => channel.id === channelId);+};++describe('Gmail onboarding recent messages import (integration)', () => {+ const sentMessages = [+ gmailMessage({ labelIds: ['SENT'] }),+ gmailMessage({ labelIds: ['SENT'] }),+ ];+ const expectedSubjects = sentMessages.map(getGmailMessageSubject).sort();++ setupGoogleMock({ handle: HANDLE, inbox: sentMessages });++ let channel: Awaited<ReturnType<typeof connectMessagingAccount>>;++ beforeAll(async () => {+ channel = await connectMessagingAccount({+ provider: ConnectedAccountProvider.GOOGLE,+ handle: HANDLE,+ });+ }, 60000);++ afterAll(async () => {+ await channel?.cleanup().catch(() => undefined);+ });++ it('imports the recent sent messages during connect, before any sync job runs', async () => {+ await expectEventually(+ async () => {+ expect(await findImportedMessageSubjects(expectedSubjects)).toEqual(+ expectedSubjects,+ );+ },+ { timeoutMs: 30_000 },+ );+ }, 60000);++ it('leaves the channel awaiting the full message list fetch', async () => {+ await expectEventually(+ async () => {+ expect((await findChannel(channel.channelId))?.syncStage).toEqual(+ MessageChannelSyncStage.MESSAGE_LIST_FETCH_PENDING,+ );+ },+ { timeoutMs: 30_000 },+ );+ }, 60000);++ it('lets the full sync complete afterwards without duplicating the imported messages', async () => {+ await runMessageChannelSync(channel.channelId);++ expect(await findImportedMessageSubjects(expectedSubjects)).toEqual(+ expectedSubjects,+ );+ }, 60000);+});