From dc371ef6e783ab7d4f3acf0cb8342237d2d708bf Mon Sep 17 00:00:00 2001 From: neo773 <62795688+neo773@users.noreply.github.com> Date: Thu, 25 Jun 2026 14:36:38 +0530 Subject: [PATCH] rename sync-completion methods to avoid confusion with stage setters (#22138) `markAsCompletedAndMarkAsCalendarEventListFetchPending` was just `markAsCalendarEventListFetchPending` with a prefix, so dropping the prefix silently turned a sync-completion into a plain stage reset Renamed to markAsCalendarEventSyncCompleted / markAsMessageSyncCompleted so they no longer share a tail with the stage setters. Mirrors the existing markAsFailed naming. No behavior change. Sanity check: replayed the original #22015 diff through two isolated review agents, identical prompt, only the names differing. With the old names the reviewer explicitly cleared the branch as safe; with the new names it flagged the missing completion as high severity. The rename makes the mistake visible. Review in cubic --- .../services/calendar-events-import.service.ts | 4 ++-- .../services/calendar-fetch-events.service.ts | 2 +- .../common/services/calendar-channel-sync-status.service.ts | 2 +- .../common/services/message-channel-sync-status.service.ts | 2 +- .../__tests__/messaging-messages-import.service.spec.ts | 4 +--- .../services/messaging-message-list-fetch.service.ts | 2 +- .../services/messaging-messages-import.service.ts | 4 ++-- 7 files changed, 9 insertions(+), 11 deletions(-) diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/services/calendar-events-import.service.ts b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/services/calendar-events-import.service.ts index 6eb0a48162..a67dbff139 100644 --- a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/services/calendar-events-import.service.ts +++ b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/services/calendar-events-import.service.ts @@ -72,7 +72,7 @@ export class CalendarEventsImportService { ); if (!eventIdsToFetch || eventIdsToFetch.length === 0) { - await this.calendarChannelSyncStatusService.markAsCompletedAndMarkAsCalendarEventListFetchPending( + await this.calendarChannelSyncStatusService.markAsCalendarEventSyncCompleted( [calendarChannel.id], workspaceId, ); @@ -170,7 +170,7 @@ export class CalendarEventsImportService { ); if (eventIdsToFetch.length < CALENDAR_EVENT_IMPORT_BATCH_SIZE) { - await this.calendarChannelSyncStatusService.markAsCompletedAndMarkAsCalendarEventListFetchPending( + await this.calendarChannelSyncStatusService.markAsCalendarEventSyncCompleted( [calendarChannel.id], workspaceId, ); diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/services/calendar-fetch-events.service.ts b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/services/calendar-fetch-events.service.ts index 23cb8b5d38..cbbb4a4623 100644 --- a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/services/calendar-fetch-events.service.ts +++ b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/services/calendar-fetch-events.service.ts @@ -87,7 +87,7 @@ export class CalendarFetchEventsService { workspaceId, ); } else { - await this.calendarChannelSyncStatusService.markAsCompletedAndMarkAsCalendarEventListFetchPending( + await this.calendarChannelSyncStatusService.markAsCalendarEventSyncCompleted( [calendarChannel.id], workspaceId, ); diff --git a/packages/twenty-server/src/modules/calendar/common/services/calendar-channel-sync-status.service.ts b/packages/twenty-server/src/modules/calendar/common/services/calendar-channel-sync-status.service.ts index 730164b0dd..6748f2df59 100644 --- a/packages/twenty-server/src/modules/calendar/common/services/calendar-channel-sync-status.service.ts +++ b/packages/twenty-server/src/modules/calendar/common/services/calendar-channel-sync-status.service.ts @@ -206,7 +206,7 @@ export class CalendarChannelSyncStatusService { ); } - public async markAsCompletedAndMarkAsCalendarEventListFetchPending( + public async markAsCalendarEventSyncCompleted( calendarChannelIds: string[], workspaceId: string, ) { diff --git a/packages/twenty-server/src/modules/messaging/common/services/message-channel-sync-status.service.ts b/packages/twenty-server/src/modules/messaging/common/services/message-channel-sync-status.service.ts index 8df3f9c0f6..753950110b 100644 --- a/packages/twenty-server/src/modules/messaging/common/services/message-channel-sync-status.service.ts +++ b/packages/twenty-server/src/modules/messaging/common/services/message-channel-sync-status.service.ts @@ -217,7 +217,7 @@ export class MessageChannelSyncStatusService { ); } - public async markAsCompletedAndMarkAsMessagesListFetchPending( + public async markAsMessageSyncCompleted( messageChannelIds: string[], workspaceId: string, ) { diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/services/__tests__/messaging-messages-import.service.spec.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/services/__tests__/messaging-messages-import.service.spec.ts index d56efe6819..a3884c88b5 100644 --- a/packages/twenty-server/src/modules/messaging/message-import-manager/services/__tests__/messaging-messages-import.service.spec.ts +++ b/packages/twenty-server/src/modules/messaging/message-import-manager/services/__tests__/messaging-messages-import.service.spec.ts @@ -78,9 +78,7 @@ describe('MessagingMessagesImportService', () => { provide: MessageChannelSyncStatusService, useValue: { markAsMessagesImportOngoing: jest.fn().mockResolvedValue(undefined), - markAsCompletedAndMarkAsMessagesListFetchPending: jest - .fn() - .mockResolvedValue(undefined), + markAsMessageSyncCompleted: jest.fn().mockResolvedValue(undefined), markAsMessagesImportPending: jest.fn().mockResolvedValue(undefined), }, }, diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-message-list-fetch.service.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-message-list-fetch.service.ts index 48d1ab64bb..f3ac6c4e85 100644 --- a/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-message-list-fetch.service.ts +++ b/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-message-list-fetch.service.ts @@ -251,7 +251,7 @@ export class MessagingMessageListFetchService { ); if (totalMessagesToImportCount === 0) { - await this.messageChannelSyncStatusService.markAsCompletedAndMarkAsMessagesListFetchPending( + await this.messageChannelSyncStatusService.markAsMessageSyncCompleted( [freshMessageChannel.id], workspaceId, ); 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 6ca701aee1..7312fdd023 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 @@ -108,7 +108,7 @@ export class MessagingMessagesImportService { ); if (!messageIdsToFetch?.length) { - await this.messageChannelSyncStatusService.markAsCompletedAndMarkAsMessagesListFetchPending( + await this.messageChannelSyncStatusService.markAsMessageSyncCompleted( [messageChannel.id], workspaceId, ); @@ -214,7 +214,7 @@ export class MessagingMessagesImportService { } if (messageIdsToFetch.length < messagesGetBatchSize) { - await this.messageChannelSyncStatusService.markAsCompletedAndMarkAsMessagesListFetchPending( + await this.messageChannelSyncStatusService.markAsMessageSyncCompleted( [messageChannel.id], workspaceId, );