From 546fba7d05aac468ec5dc7eaf0bb1b9c7cfae9a1 Mon Sep 17 00:00:00 2001 From: neo773 <62795688+neo773@users.noreply.github.com> Date: Thu, 6 Nov 2025 20:44:21 +0530 Subject: [PATCH] `[MESSAGING]` Calendar check `syncStatus` in jobs (#15658) --- .../calendar-relaunch-failed-calendar-channels.cron.job.ts | 7 +++++-- .../jobs/calendar-relaunch-failed-calendar-channel.job.ts | 3 ++- .../messaging-relaunch-failed-message-channels.cron.job.ts | 7 +++++-- .../jobs/messaging-relaunch-failed-message-channel.job.ts | 3 ++- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/crons/jobs/calendar-relaunch-failed-calendar-channels.cron.job.ts b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/crons/jobs/calendar-relaunch-failed-calendar-channels.cron.job.ts index 05658cb491..e5baed1d24 100644 --- a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/crons/jobs/calendar-relaunch-failed-calendar-channels.cron.job.ts +++ b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/crons/jobs/calendar-relaunch-failed-calendar-channels.cron.job.ts @@ -16,7 +16,10 @@ import { CalendarRelaunchFailedCalendarChannelJob, type CalendarRelaunchFailedCalendarChannelJobData, } from 'src/modules/calendar/calendar-event-import-manager/jobs/calendar-relaunch-failed-calendar-channel.job'; -import { CalendarChannelSyncStage } from 'src/modules/calendar/common/standard-objects/calendar-channel.workspace-entity'; +import { + CalendarChannelSyncStage, + CalendarChannelSyncStatus, +} from 'src/modules/calendar/common/standard-objects/calendar-channel.workspace-entity'; export const CALENDAR_RELAUNCH_FAILED_CALENDAR_CHANNELS_CRON_PATTERN = '*/30 * * * *'; @@ -50,7 +53,7 @@ export class CalendarRelaunchFailedCalendarChannelsCronJob { const schemaName = getWorkspaceSchemaName(activeWorkspace.id); const failedCalendarChannels = await this.coreDataSource.query( - `SELECT * FROM ${schemaName}."calendarChannel" WHERE "syncStage" = '${CalendarChannelSyncStage.FAILED}'`, + `SELECT * FROM ${schemaName}."calendarChannel" WHERE "syncStage" = '${CalendarChannelSyncStage.FAILED}' AND "syncStatus" = '${CalendarChannelSyncStatus.FAILED_UNKNOWN}'`, ); for (const calendarChannel of failedCalendarChannels) { diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/jobs/calendar-relaunch-failed-calendar-channel.job.ts b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/jobs/calendar-relaunch-failed-calendar-channel.job.ts index 619d6dfd12..3c396243f3 100644 --- a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/jobs/calendar-relaunch-failed-calendar-channel.job.ts +++ b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/jobs/calendar-relaunch-failed-calendar-channel.job.ts @@ -48,7 +48,8 @@ export class CalendarRelaunchFailedCalendarChannelJob { if ( !calendarChannel || - calendarChannel.syncStage !== CalendarChannelSyncStage.FAILED + calendarChannel.syncStage !== CalendarChannelSyncStage.FAILED || + calendarChannel.syncStatus !== CalendarChannelSyncStatus.FAILED_UNKNOWN ) { return; } diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/crons/jobs/messaging-relaunch-failed-message-channels.cron.job.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/crons/jobs/messaging-relaunch-failed-message-channels.cron.job.ts index 037c159442..8513f100e7 100644 --- a/packages/twenty-server/src/modules/messaging/message-import-manager/crons/jobs/messaging-relaunch-failed-message-channels.cron.job.ts +++ b/packages/twenty-server/src/modules/messaging/message-import-manager/crons/jobs/messaging-relaunch-failed-message-channels.cron.job.ts @@ -12,7 +12,10 @@ import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queu import { MessageQueueService } from 'src/engine/core-modules/message-queue/services/message-queue.service'; import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity'; import { getWorkspaceSchemaName } from 'src/engine/workspace-datasource/utils/get-workspace-schema-name.util'; -import { MessageChannelSyncStage } from 'src/modules/messaging/common/standard-objects/message-channel.workspace-entity'; +import { + MessageChannelSyncStage, + MessageChannelSyncStatus, +} from 'src/modules/messaging/common/standard-objects/message-channel.workspace-entity'; import { MessagingRelaunchFailedMessageChannelJob, type MessagingRelaunchFailedMessageChannelJobData, @@ -50,7 +53,7 @@ export class MessagingRelaunchFailedMessageChannelsCronJob { const schemaName = getWorkspaceSchemaName(activeWorkspace.id); const failedMessageChannels = await this.coreDataSource.query( - `SELECT * FROM ${schemaName}."messageChannel" WHERE "syncStage" = '${MessageChannelSyncStage.FAILED}'`, + `SELECT * FROM ${schemaName}."messageChannel" WHERE "syncStage" = '${MessageChannelSyncStage.FAILED}' AND "syncStatus" = '${MessageChannelSyncStatus.FAILED_UNKNOWN}'`, ); for (const messageChannel of failedMessageChannels) { diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/jobs/messaging-relaunch-failed-message-channel.job.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/jobs/messaging-relaunch-failed-message-channel.job.ts index 6326eb6486..f2b52c42b5 100644 --- a/packages/twenty-server/src/modules/messaging/message-import-manager/jobs/messaging-relaunch-failed-message-channel.job.ts +++ b/packages/twenty-server/src/modules/messaging/message-import-manager/jobs/messaging-relaunch-failed-message-channel.job.ts @@ -48,7 +48,8 @@ export class MessagingRelaunchFailedMessageChannelJob { if ( !messageChannel || - messageChannel.syncStage !== MessageChannelSyncStage.FAILED + messageChannel.syncStage !== MessageChannelSyncStage.FAILED || + messageChannel.syncStatus !== MessageChannelSyncStatus.FAILED_UNKNOWN ) { return; }