diff --git a/packages/twenty-server/src/modules/calendar/blocklist-manager/jobs/blocklist-item-delete-calendar-events.job.ts b/packages/twenty-server/src/modules/calendar/blocklist-manager/jobs/blocklist-item-delete-calendar-events.job.ts index 0968fe601..6efc2da7c 100644 --- a/packages/twenty-server/src/modules/calendar/blocklist-manager/jobs/blocklist-item-delete-calendar-events.job.ts +++ b/packages/twenty-server/src/modules/calendar/blocklist-manager/jobs/blocklist-item-delete-calendar-events.job.ts @@ -83,12 +83,6 @@ export class BlocklistItemDeleteCalendarEventsJob { continue; } - this.logger.log( - `Deleting calendar events from ${handles.join( - ', ', - )} in workspace ${workspaceId} for workspace member ${workspaceMemberId}`, - ); - const calendarChannels = await calendarChannelRepository.find({ select: { id: true, @@ -145,12 +139,6 @@ export class BlocklistItemDeleteCalendarEventsJob { calendarEventsAssociationsToDelete.map(({ id }) => id), ); } - - this.logger.log( - `Deleted calendar events from handle ${handles.join( - ', ', - )} in workspace ${workspaceId} for workspace member ${workspaceMemberId}`, - ); } await this.calendarEventCleanerService.cleanWorkspaceCalendarEvents( diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-cleaner/jobs/delete-connected-account-associated-calendar-data.job.ts b/packages/twenty-server/src/modules/calendar/calendar-event-cleaner/jobs/delete-connected-account-associated-calendar-data.job.ts index cd8409ea8..24eebef10 100644 --- a/packages/twenty-server/src/modules/calendar/calendar-event-cleaner/jobs/delete-connected-account-associated-calendar-data.job.ts +++ b/packages/twenty-server/src/modules/calendar/calendar-event-cleaner/jobs/delete-connected-account-associated-calendar-data.job.ts @@ -1,5 +1,3 @@ -import { Logger } from '@nestjs/common'; - import { Process } from 'src/engine/core-modules/message-queue/decorators/process.decorator'; import { Processor } from 'src/engine/core-modules/message-queue/decorators/processor.decorator'; import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants'; @@ -12,10 +10,6 @@ export type DeleteConnectedAccountAssociatedCalendarDataJobData = { @Processor(MessageQueue.calendarQueue) export class DeleteConnectedAccountAssociatedCalendarDataJob { - private readonly logger = new Logger( - DeleteConnectedAccountAssociatedCalendarDataJob.name, - ); - constructor( private readonly calendarEventCleanerService: CalendarEventCleanerService, ) {} @@ -24,16 +18,8 @@ export class DeleteConnectedAccountAssociatedCalendarDataJob { async handle( data: DeleteConnectedAccountAssociatedCalendarDataJobData, ): Promise { - this.logger.log( - `Deleting connected account ${data.connectedAccountId} associated calendar data in workspace ${data.workspaceId}`, - ); - await this.calendarEventCleanerService.cleanWorkspaceCalendarEvents( data.workspaceId, ); - - this.logger.log( - `Deleted connected account ${data.connectedAccountId} associated calendar data in workspace ${data.workspaceId}`, - ); } } diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/crons/jobs/calendar-ongoing-stale.cron.job.ts b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/crons/jobs/calendar-ongoing-stale.cron.job.ts index bc434c66e..46b660e1e 100644 --- a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/crons/jobs/calendar-ongoing-stale.cron.job.ts +++ b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/crons/jobs/calendar-ongoing-stale.cron.job.ts @@ -1,7 +1,7 @@ import { InjectRepository } from '@nestjs/typeorm'; -import { Repository } from 'typeorm'; import { WorkspaceActivationStatus } from 'twenty-shared/workspace'; +import { Repository } from 'typeorm'; import { SentryCronMonitor } from 'src/engine/core-modules/cron/sentry-cron-monitor.decorator'; import { ExceptionHandlerService } from 'src/engine/core-modules/exception-handler/exception-handler.service'; diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/jobs/calendar-ongoing-stale.job.ts b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/jobs/calendar-ongoing-stale.job.ts index c81a7d800..c7880459d 100644 --- a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/jobs/calendar-ongoing-stale.job.ts +++ b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/jobs/calendar-ongoing-stale.job.ts @@ -1,4 +1,4 @@ -import { Logger, Scope } from '@nestjs/common'; +import { Scope } from '@nestjs/common'; import { In } from 'typeorm'; @@ -22,16 +22,13 @@ export type CalendarOngoingStaleJobData = { scope: Scope.REQUEST, }) export class CalendarOngoingStaleJob { - private readonly logger = new Logger(CalendarOngoingStaleJob.name); constructor( private readonly twentyORMManager: TwentyORMManager, private readonly calendarChannelSyncStatusService: CalendarChannelSyncStatusService, ) {} @Process(CalendarOngoingStaleJob.name) - async handle(data: CalendarOngoingStaleJobData): Promise { - const { workspaceId } = data; - + async handle(): Promise { const calendarChannelRepository = await this.twentyORMManager.getRepository( 'calendarChannel', @@ -51,9 +48,6 @@ export class CalendarOngoingStaleJob { calendarChannel.syncStageStartedAt && isSyncStale(calendarChannel.syncStageStartedAt) ) { - this.logger.log( - `Sync for calendar channel ${calendarChannel.id} and workspace ${workspaceId} is stale. Setting sync stage to pending`, - ); await this.calendarChannelSyncStatusService.resetSyncStageStartedAt([ calendarChannel.id, ]); diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-participant-manager/jobs/calendar-create-company-and-contact-after-sync.job.ts b/packages/twenty-server/src/modules/calendar/calendar-event-participant-manager/jobs/calendar-create-company-and-contact-after-sync.job.ts index 1aadb2088..169db2965 100644 --- a/packages/twenty-server/src/modules/calendar/calendar-event-participant-manager/jobs/calendar-create-company-and-contact-after-sync.job.ts +++ b/packages/twenty-server/src/modules/calendar/calendar-event-participant-manager/jobs/calendar-create-company-and-contact-after-sync.job.ts @@ -1,15 +1,15 @@ -import { Logger, Scope } from '@nestjs/common'; +import { Scope } from '@nestjs/common'; import { IsNull } from 'typeorm'; import { Process } from 'src/engine/core-modules/message-queue/decorators/process.decorator'; import { Processor } from 'src/engine/core-modules/message-queue/decorators/processor.decorator'; import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants'; +import { FieldActorSource } from 'src/engine/metadata-modules/field-metadata/composite-types/actor.composite-type'; import { TwentyORMManager } from 'src/engine/twenty-orm/twenty-orm.manager'; import { CalendarChannelWorkspaceEntity } from 'src/modules/calendar/common/standard-objects/calendar-channel.workspace-entity'; import { CalendarEventParticipantWorkspaceEntity } from 'src/modules/calendar/common/standard-objects/calendar-event-participant.workspace-entity'; import { CreateCompanyAndContactService } from 'src/modules/contact-creation-manager/services/create-company-and-contact.service'; -import { FieldActorSource } from 'src/engine/metadata-modules/field-metadata/composite-types/actor.composite-type'; export type CalendarCreateCompanyAndContactAfterSyncJobData = { workspaceId: string; @@ -21,9 +21,6 @@ export type CalendarCreateCompanyAndContactAfterSyncJobData = { scope: Scope.REQUEST, }) export class CalendarCreateCompanyAndContactAfterSyncJob { - private readonly logger = new Logger( - CalendarCreateCompanyAndContactAfterSyncJob.name, - ); constructor( private readonly twentyORMManager: TwentyORMManager, private readonly createCompanyAndContactService: CreateCompanyAndContactService, @@ -33,9 +30,6 @@ export class CalendarCreateCompanyAndContactAfterSyncJob { async handle( data: CalendarCreateCompanyAndContactAfterSyncJobData, ): Promise { - this.logger.log( - `create contacts and companies after sync for workspace ${data.workspaceId} and calendarChannel ${data.calendarChannelId}`, - ); const { workspaceId, calendarChannelId } = data; const calendarChannelRepository = @@ -99,9 +93,5 @@ export class CalendarCreateCompanyAndContactAfterSyncJob { workspaceId, FieldActorSource.CALENDAR, ); - - this.logger.log( - `create contacts and companies after sync for workspace ${data.workspaceId} and calendarChannel ${data.calendarChannelId} done`, - ); } } diff --git a/packages/twenty-server/src/modules/messaging/blocklist-manager/jobs/messaging-blocklist-item-delete-messages.job.ts b/packages/twenty-server/src/modules/messaging/blocklist-manager/jobs/messaging-blocklist-item-delete-messages.job.ts index fedeb9a2f..0d0418cbf 100644 --- a/packages/twenty-server/src/modules/messaging/blocklist-manager/jobs/messaging-blocklist-item-delete-messages.job.ts +++ b/packages/twenty-server/src/modules/messaging/blocklist-manager/jobs/messaging-blocklist-item-delete-messages.job.ts @@ -1,4 +1,4 @@ -import { Logger, Scope } from '@nestjs/common'; +import { Scope } from '@nestjs/common'; import { And, Any, ILike, In, Not, Or } from 'typeorm'; @@ -22,8 +22,6 @@ export type BlocklistItemDeleteMessagesJobData = WorkspaceEventBatch< scope: Scope.REQUEST, }) export class BlocklistItemDeleteMessagesJob { - private readonly logger = new Logger(BlocklistItemDeleteMessagesJob.name); - constructor( private readonly threadCleanerService: MessagingMessageCleanerService, private readonly twentyORMManager: TwentyORMManager, @@ -81,12 +79,6 @@ export class BlocklistItemDeleteMessagesJob { continue; } - this.logger.log( - `Deleting messages from ${handles.join( - ', ', - )} in workspace ${workspaceId} for workspace member ${workspaceMemberId}`, - ); - const rolesToDelete: ('from' | 'to')[] = ['from', 'to']; const messageChannels = await messageChannelRepository.find({ @@ -146,12 +138,6 @@ export class BlocklistItemDeleteMessagesJob { messageChannelMessageAssociationsToDelete.map(({ id }) => id), ); } - - this.logger.log( - `Deleted messages from handle ${handles.join( - ', ', - )} in workspace ${workspaceId} for workspace member ${workspaceMemberId}`, - ); } await this.threadCleanerService.cleanWorkspaceThreads(workspaceId); diff --git a/packages/twenty-server/src/modules/messaging/message-cleaner/jobs/messaging-connected-account-deletion-cleanup.job.ts b/packages/twenty-server/src/modules/messaging/message-cleaner/jobs/messaging-connected-account-deletion-cleanup.job.ts index 2523c1804..9b97a9166 100644 --- a/packages/twenty-server/src/modules/messaging/message-cleaner/jobs/messaging-connected-account-deletion-cleanup.job.ts +++ b/packages/twenty-server/src/modules/messaging/message-cleaner/jobs/messaging-connected-account-deletion-cleanup.job.ts @@ -1,9 +1,9 @@ import { Logger, Scope } from '@nestjs/common'; -import { MessagingMessageCleanerService } from 'src/modules/messaging/message-cleaner/services/messaging-message-cleaner.service'; +import { Process } from 'src/engine/core-modules/message-queue/decorators/process.decorator'; import { Processor } from 'src/engine/core-modules/message-queue/decorators/processor.decorator'; import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants'; -import { Process } from 'src/engine/core-modules/message-queue/decorators/process.decorator'; +import { MessagingMessageCleanerService } from 'src/modules/messaging/message-cleaner/services/messaging-message-cleaner.service'; export type MessagingConnectedAccountDeletionCleanupJobData = { workspaceId: string; @@ -27,14 +27,6 @@ export class MessagingConnectedAccountDeletionCleanupJob { async handle( data: MessagingConnectedAccountDeletionCleanupJobData, ): Promise { - this.logger.log( - `Deleting connected account ${data.connectedAccountId} associated messaging data in workspace ${data.workspaceId}`, - ); - await this.messageCleanerService.cleanWorkspaceThreads(data.workspaceId); - - this.logger.log( - `Deleted connected account ${data.connectedAccountId} associated messaging data in workspace ${data.workspaceId}`, - ); } } diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/gmail/services/gmail-get-messages.service.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/gmail/services/gmail-get-messages.service.ts index 37205e7f1..843e147db 100644 --- a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/gmail/services/gmail-get-messages.service.ts +++ b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/gmail/services/gmail-get-messages.service.ts @@ -1,4 +1,4 @@ -import { Injectable, Logger } from '@nestjs/common'; +import { Injectable } from '@nestjs/common'; import { AxiosResponse } from 'axios'; import { gmail_v1 as gmailV1 } from 'googleapis'; @@ -12,8 +12,6 @@ import { MessageWithParticipants } from 'src/modules/messaging/message-import-ma @Injectable() export class GmailGetMessagesService { - private readonly logger = new Logger(GmailGetMessagesService.name); - constructor( private readonly fetchByBatchesService: GmailFetchByBatchService, private readonly gmailHandleErrorService: GmailHandleErrorService, @@ -25,25 +23,13 @@ export class GmailGetMessagesService { ConnectedAccountWorkspaceEntity, 'accessToken' | 'refreshToken' | 'id' | 'handle' | 'handleAliases' >, - workspaceId: string, ): Promise { - let startTime = Date.now(); - const { messageIdsByBatch, batchResponses } = await this.fetchByBatchesService.fetchAllByBatches( messageIds, connectedAccount.accessToken, 'batch_gmail_messages', ); - let endTime = Date.now(); - - this.logger.log( - `Messaging import for workspace ${workspaceId} and account ${connectedAccount.id} fetching ${ - messageIds.length - } messages in ${endTime - startTime}ms`, - ); - - startTime = Date.now(); const messages = batchResponses.flatMap((response, index) => { return this.formatBatchResponseAsMessage( @@ -53,14 +39,6 @@ export class GmailGetMessagesService { ); }); - endTime = Date.now(); - - this.logger.log( - `Messaging import for workspace ${workspaceId} and account ${connectedAccount.id} formatting ${ - messageIds.length - } messages in ${endTime - startTime}ms`, - ); - return messages; } diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/microsoft/services/microsoft-fetch-by-batch.service.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/microsoft/services/microsoft-fetch-by-batch.service.ts index e80361051..79cc8d23a 100644 --- a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/microsoft/services/microsoft-fetch-by-batch.service.ts +++ b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/microsoft/services/microsoft-fetch-by-batch.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@nestjs/common'; +import { Injectable, Logger } from '@nestjs/common'; import { ConnectedAccountWorkspaceEntity } from 'src/modules/connected-account/standard-objects/connected-account.workspace-entity'; import { MicrosoftImportDriverException } from 'src/modules/messaging/message-import-manager/drivers/microsoft/exceptions/microsoft-import-driver.exception'; @@ -8,6 +8,7 @@ import { isMicrosoftClientTemporaryError } from 'src/modules/messaging/message-i @Injectable() export class MicrosoftFetchByBatchService { + private readonly logger = new Logger(MicrosoftFetchByBatchService.name); constructor( private readonly microsoftClientProvider: MicrosoftClientProvider, ) {} @@ -56,8 +57,18 @@ export class MicrosoftFetchByBatchService { typeof error.body === 'string' && isMicrosoftClientTemporaryError(error.body) ) { + // TODO: remove this log once we catch better the error codes + this.logger.error( + `Error temporary (${error.code}) fetching messages for account ${connectedAccount.id.slice(0, 8)}`, + ); + this.logger.log(error); throw new MicrosoftImportDriverException(error.body, error.code, 429); } else { + // TODO: remove this log once we catch better the error codes + this.logger.error( + `Error unknown (${error.code}) fetching messages for account ${connectedAccount.id.slice(0, 8)}`, + ); + this.logger.log(error); throw error; } } diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/microsoft/services/microsoft-get-messages.service.dev.spec.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/microsoft/services/microsoft-get-messages.service.dev.spec.ts index b9e577a0f..77be45a6d 100644 --- a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/microsoft/services/microsoft-get-messages.service.dev.spec.ts +++ b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/microsoft/services/microsoft-get-messages.service.dev.spec.ts @@ -51,7 +51,6 @@ xdescribe('Microsoft dev tests : get messages service', () => { const result = await service.getMessages( mockMessageIds, mockConnectedAccount, - 'workspace-1', ); expect(result).toHaveLength(1); diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/microsoft/services/microsoft-get-messages.service.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/microsoft/services/microsoft-get-messages.service.ts index ef0b31c91..7e598f93c 100644 --- a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/microsoft/services/microsoft-get-messages.service.ts +++ b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/microsoft/services/microsoft-get-messages.service.ts @@ -28,10 +28,7 @@ export class MicrosoftGetMessagesService { async getMessages( messageIds: string[], connectedAccount: ConnectedAccountType, - workspaceId: string, ): Promise { - const startTime = Date.now(); - try { const { batchResponses } = await this.microsoftFetchByBatchService.fetchAllByBatches( @@ -44,14 +41,6 @@ export class MicrosoftGetMessagesService { connectedAccount, ); - const endTime = Date.now(); - - this.logger.log( - `Messaging import for workspace ${workspaceId} and account ${ - connectedAccount.id - } fetched ${messages.length} messages in ${endTime - startTime}ms`, - ); - return messages; } catch (error) { this.microsoftHandleErrorService.handleMicrosoftMessageFetchError(error); diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/microsoft/utils/is-temporary-error.utils.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/microsoft/utils/is-temporary-error.utils.ts index d470a157a..0662ba7d8 100644 --- a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/microsoft/utils/is-temporary-error.utils.ts +++ b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/microsoft/utils/is-temporary-error.utils.ts @@ -1,3 +1,6 @@ export const isMicrosoftClientTemporaryError = (body: string): boolean => { - return body.includes('Unexpected token < in JSON at position'); + return ( + body.includes('Unexpected token < in JSON at position') || + body.includes('ApplicationThrottled 429 error') + ); }; diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/jobs/messaging-clean-cache.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/jobs/messaging-clean-cache.ts index edb32a3fd..028c44e6f 100644 --- a/packages/twenty-server/src/modules/messaging/message-import-manager/jobs/messaging-clean-cache.ts +++ b/packages/twenty-server/src/modules/messaging/message-import-manager/jobs/messaging-clean-cache.ts @@ -1,5 +1,3 @@ -import { Logger } from '@nestjs/common'; - 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'; @@ -14,8 +12,6 @@ export type MessagingCleanCacheJobData = { @Processor(MessageQueue.messagingQueue) export class MessagingCleanCacheJob { - private readonly logger = new Logger(MessagingCleanCacheJob.name); - constructor( @InjectCacheStorage(CacheStorageNamespace.ModuleMessaging) private readonly cacheStorage: CacheStorageService, @@ -23,16 +19,8 @@ export class MessagingCleanCacheJob { @Process(MessagingCleanCacheJob.name) async handle(data: MessagingCleanCacheJobData): Promise { - this.logger.log( - `Deleting message channel ${data.messageChannelId} associated cache in workspace ${data.workspaceId}`, - ); - await this.cacheStorage.del( `messages-to-import:${data.workspaceId}:${data.messageChannelId}`, ); - - this.logger.log( - `Deleted message channel ${data.messageChannelId} associated cache in workspace ${data.workspaceId}`, - ); } } diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/jobs/messaging-message-list-fetch.job.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/jobs/messaging-message-list-fetch.job.ts index 7f16834be..767acfb78 100644 --- a/packages/twenty-server/src/modules/messaging/message-import-manager/jobs/messaging-message-list-fetch.job.ts +++ b/packages/twenty-server/src/modules/messaging/message-import-manager/jobs/messaging-message-list-fetch.job.ts @@ -1,4 +1,4 @@ -import { Logger, Scope } from '@nestjs/common'; +import { Scope } from '@nestjs/common'; import { Process } from 'src/engine/core-modules/message-queue/decorators/process.decorator'; import { Processor } from 'src/engine/core-modules/message-queue/decorators/processor.decorator'; @@ -31,8 +31,6 @@ export type MessagingMessageListFetchJobData = { scope: Scope.REQUEST, }) export class MessagingMessageListFetchJob { - private readonly logger = new Logger(MessagingMessageListFetchJob.name); - constructor( private readonly messagingFullMessageListFetchService: MessagingFullMessageListFetchService, private readonly messagingPartialMessageListFetchService: MessagingPartialMessageListFetchService, @@ -117,10 +115,6 @@ export class MessagingMessageListFetchJob { switch (messageChannel.syncStage) { case MessageChannelSyncStage.PARTIAL_MESSAGE_LIST_FETCH_PENDING: - this.logger.log( - `Fetching partial message list for workspace ${workspaceId} and messageChannelId ${messageChannel.id}`, - ); - await this.messagingMonitoringService.track({ eventName: 'partial_message_list_fetch.started', workspaceId, @@ -144,10 +138,6 @@ export class MessagingMessageListFetchJob { break; case MessageChannelSyncStage.FULL_MESSAGE_LIST_FETCH_PENDING: - this.logger.log( - `Fetching full message list for workspace ${workspaceId} and account ${messageChannel.connectedAccount.id}`, - ); - await this.messagingMonitoringService.track({ eventName: 'full_message_list_fetch.started', workspaceId, diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-get-messages.service.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-get-messages.service.ts index e414ce162..2165b1d22 100644 --- a/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-get-messages.service.ts +++ b/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-get-messages.service.ts @@ -31,20 +31,17 @@ export class MessagingGetMessagesService { | 'handle' | 'handleAliases' >, - workspaceId: string, ): Promise { switch (connectedAccount.provider) { case ConnectedAccountProvider.GOOGLE: return this.gmailGetMessagesService.getMessages( messageIds, connectedAccount, - workspaceId, ); case ConnectedAccountProvider.MICROSOFT: return this.microsoftGetMessagesService.getMessages( messageIds, connectedAccount, - workspaceId, ); default: throw new MessageImportException( diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-messages-import.service.spec.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-messages-import.service.spec.ts index fb1365b37..d64f6ef8e 100644 --- a/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-messages-import.service.spec.ts +++ b/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-messages-import.service.spec.ts @@ -214,7 +214,6 @@ describe('MessagingMessagesImportService', () => { expect(messagingGetMessagesService.getMessages).toHaveBeenCalledWith( ['message-id-1', 'message-id-2'], mockConnectedAccount, - workspaceId, ); expect( saveMessagesService.saveMessagesAndEnqueueContactCreation, 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.ts index e0101082e..d66eba14f 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 @@ -68,10 +68,6 @@ export class MessagingMessagesImportService { messageChannelId: messageChannel.id, }); - this.logger.log( - `Messaging import for workspace ${workspaceId} and account ${connectedAccount.id} starting...`, - ); - await this.messageChannelSyncStatusService.markAsMessagesImportOngoing([ messageChannel.id, ]); @@ -103,6 +99,10 @@ export class MessagingMessagesImportService { message: error.message, }; default: + this.logger.error( + `Error (${error.code}) refreshing access token for account ${connectedAccount.id}`, + ); + this.logger.log(error); throw error; } } @@ -130,7 +130,6 @@ export class MessagingMessagesImportService { const allMessages = await this.messagingGetMessagesService.getMessages( messageIdsToFetch, connectedAccount, - workspaceId, ); const blocklist = await this.blocklistRepository.getByWorkspaceMemberId( @@ -184,6 +183,10 @@ export class MessagingMessagesImportService { workspaceId, ); } catch (error) { + // TODO: remove this log once we catch better the error codes + this.logger.error( + `Error (${error.code}) importing messages for workspace ${workspaceId.slice(0, 8)} and account ${connectedAccount.id.slice(0, 8)}: ${error.message} - ${error.body}`, + ); await this.cacheStorage.setAdd( `messages-to-import:${workspaceId}:${messageChannel.id}`, messageIdsToFetch, diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-partial-message-list-fetch.service.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-partial-message-list-fetch.service.ts index e5291dcd5..21ce030e3 100644 --- a/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-partial-message-list-fetch.service.ts +++ b/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-partial-message-list-fetch.service.ts @@ -1,4 +1,4 @@ -import { Injectable, Logger } from '@nestjs/common'; +import { Injectable } from '@nestjs/common'; import { In } from 'typeorm'; @@ -20,10 +20,6 @@ import { @Injectable() export class MessagingPartialMessageListFetchService { - private readonly logger = new Logger( - MessagingPartialMessageListFetchService.name, - ); - constructor( @InjectCacheStorage(CacheStorageNamespace.ModuleMessaging) private readonly cacheStorage: CacheStorageService, @@ -79,9 +75,6 @@ export class MessagingPartialMessageListFetchService { ); if (isPartialImportFinished) { - this.logger.log( - `Partial message list import done on message channel ${messageChannel.id} in folder ${folderId} for workspace ${workspaceId} and account ${connectedAccount.id}`, - ); continue; } @@ -90,10 +83,6 @@ export class MessagingPartialMessageListFetchService { messageExternalIds, ); - this.logger.log( - `Added ${messageExternalIds.length} messages to import for workspace ${workspaceId} and account ${connectedAccount.id}`, - ); - const messageChannelMessageAssociationRepository = await this.twentyORMManager.getRepository( 'messageChannelMessageAssociation', @@ -110,10 +99,6 @@ export class MessagingPartialMessageListFetchService { ); } - this.logger.log( - `Deleted ${messageExternalIdsToDelete.length} messages for workspace ${workspaceId} and account ${connectedAccount.id}`, - ); - await this.messagingCursorService.updateCursor( messageChannel, nextSyncCursor, @@ -130,10 +115,6 @@ export class MessagingPartialMessageListFetchService { ); if (isPartialImportFinishedForAllFolders) { - this.logger.log( - `Partial message list import done on message channel ${messageChannel.id} entirely for workspace ${workspaceId} and account ${connectedAccount.id}`, - ); - await this.messageChannelSyncStatusService.markAsCompletedAndSchedulePartialMessageListFetch( [messageChannel.id], ); diff --git a/packages/twenty-server/src/modules/messaging/monitoring/crons/jobs/messaging-message-channel-sync-status-monitoring.cron.job.ts b/packages/twenty-server/src/modules/messaging/monitoring/crons/jobs/messaging-message-channel-sync-status-monitoring.cron.job.ts index af06f0e41..c686ef77d 100644 --- a/packages/twenty-server/src/modules/messaging/monitoring/crons/jobs/messaging-message-channel-sync-status-monitoring.cron.job.ts +++ b/packages/twenty-server/src/modules/messaging/monitoring/crons/jobs/messaging-message-channel-sync-status-monitoring.cron.job.ts @@ -38,8 +38,6 @@ export class MessagingMessageChannelSyncStatusMonitoringCronJob { MESSAGING_MESSAGE_CHANNEL_SYNC_STATUS_MONITORING_CRON_PATTERN, ) async handle(): Promise { - this.logger.log('Starting message channel sync status monitoring...'); - await this.messagingMonitoringService.track({ eventName: 'message_channel.monitoring.sync_status.start', message: 'Starting message channel sync status monitoring',