The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
fix(server): compare gmail sync cursors numerically (#26402)
Belkouche2bf05f0418be
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-cursor.service.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-cursor.service.tsindex cb74764df7b..5a6eaf10c76 100644--- a/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-cursor.service.ts+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-cursor.service.ts@@ -7,6 +7,7 @@ import { MessageFolderEntity } from 'src/engine/metadata-modules/message-folder/import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';import { MessageChannelEntity } from 'src/engine/metadata-modules/message-channel/entities/message-channel.entity';+import { isSyncCursorNewer } from 'src/modules/messaging/message-import-manager/utils/is-sync-cursor-newer.util';@Injectable()export class MessagingCursorService {@@ -35,11 +36,12 @@ export class MessagingCursorService {throttleFailureCount: 0,throttleRetryAfter: null,syncStageStartedAt: null,- syncCursor:- !messageChannel.syncCursor ||- nextSyncCursor > messageChannel.syncCursor- ? nextSyncCursor- : messageChannel.syncCursor,+ syncCursor: isSyncCursorNewer(+ nextSyncCursor,+ messageChannel.syncCursor,+ )+ ? nextSyncCursor+ : messageChannel.syncCursor,},);} else {diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/utils/__tests__/is-sync-cursor-newer.util.spec.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/utils/__tests__/is-sync-cursor-newer.util.spec.tsnew file mode 100644index 00000000000..e880b998bda--- /dev/null+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/utils/__tests__/is-sync-cursor-newer.util.spec.ts@@ -0,0 +1,23 @@+import { isSyncCursorNewer } from 'src/modules/messaging/message-import-manager/utils/is-sync-cursor-newer.util';++describe('isSyncCursorNewer', () => {+ it('should accept any cursor when there is no current cursor', () => {+ expect(isSyncCursorNewer('12', null)).toBe(true);+ expect(isSyncCursorNewer('12', undefined)).toBe(true);+ expect(isSyncCursorNewer('12', '')).toBe(true);+ });++ it('should compare numeric cursors by value', () => {+ expect(isSyncCursorNewer('1000012', '999999')).toBe(true);+ expect(isSyncCursorNewer('999999', '1000012')).toBe(false);+ expect(isSyncCursorNewer('1000012', '1000012')).toBe(false);+ expect(+ isSyncCursorNewer('18446744073709551616', '18446744073709551615'),+ ).toBe(true);+ });++ it('should fall back to string comparison for non numeric cursors', () => {+ expect(isSyncCursorNewer('b', 'a')).toBe(true);+ expect(isSyncCursorNewer('a', 'b')).toBe(false);+ });+});diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/utils/is-sync-cursor-newer.util.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/utils/is-sync-cursor-newer.util.tsnew file mode 100644index 00000000000..a8743314c7d--- /dev/null+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/utils/is-sync-cursor-newer.util.ts@@ -0,0 +1,15 @@+const isNumericCursor = (cursor: string): boolean => /^\d+$/.test(cursor);++export const isSyncCursorNewer = (+ nextSyncCursor: string,+ currentSyncCursor: string | null | undefined,+): boolean => {+ if (!currentSyncCursor) {+ return true;+ }+ if (isNumericCursor(nextSyncCursor) && isNumericCursor(currentSyncCursor)) {+ return BigInt(nextSyncCursor) > BigInt(currentSyncCursor);+ }++ return nextSyncCursor > currentSyncCursor;+};