The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
fix(event-logs): don't skip rows that share a millisecond when paginating (#26537)
martmullca2a382d8b0a
diff --git a/packages/twenty-server/src/engine/core-modules/event-logs/event-logs.service.spec.ts b/packages/twenty-server/src/engine/core-modules/event-logs/event-logs.service.spec.tsnew file mode 100644index 00000000000..40e1a746c3b--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/event-logs/event-logs.service.spec.ts@@ -0,0 +1,112 @@+import { EventLogTable } from 'twenty-shared/types';+import { type Repository } from 'typeorm';++import { type ClickHouseService } from 'src/database/clickhouse/clickhouse.service';+import { type BillingService } from 'src/engine/core-modules/billing/services/billing.service';+import { type EnterprisePlanService } from 'src/engine/core-modules/enterprise/services/enterprise-plan.service';+import { EventLogsService } from 'src/engine/core-modules/event-logs/event-logs.service';+import { type UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';++const makeDeletedRecordRow = (recordId: string, timestamp: string) => ({+ event: 'Object Record Deleted',+ timestamp,+ workspaceId: 'workspace-id',+ recordId,+ objectMetadataId: 'company-object-metadata-id',+ properties: {},+});++const pageRowsEndingOnSharedTimestamp = [+ makeDeletedRecordRow('company-1', '2026-09-24 11:42:31.100'),+ makeDeletedRecordRow('company-2', '2026-09-24 11:42:31.096'),+ makeDeletedRecordRow('company-3', '2026-09-24 11:42:31.096'),+];++describe('EventLogsService', () => {+ let service: EventLogsService;+ let select: jest.Mock;++ beforeEach(() => {+ select = jest.fn();++ service = new EventLogsService(+ { getMainClient: () => ({}), select } as unknown as ClickHouseService,+ { hasEntitlement: async () => true } as unknown as BillingService,+ { isValid: () => true } as unknown as EnterprisePlanService,+ {} as Repository<UserWorkspaceEntity>,+ );+ });++ it('returns every record sharing the timestamp of the last record of the page', async () => {+ select+ .mockResolvedValueOnce(pageRowsEndingOnSharedTimestamp)+ .mockResolvedValueOnce([{ totalCount: 5 }])+ .mockResolvedValueOnce([+ makeDeletedRecordRow('company-2', '2026-09-24 11:42:31.096'),+ makeDeletedRecordRow('company-3', '2026-09-24 11:42:31.096'),+ makeDeletedRecordRow('company-4', '2026-09-24 11:42:31.096'),+ ]);++ const result = await service.queryEventLogs('workspace-id', {+ table: EventLogTable.OBJECT_EVENT,+ first: 2,+ });++ expect(result.records.map((record) => record.recordId)).toEqual([+ 'company-1',+ 'company-2',+ 'company-3',+ 'company-4',+ ]);+ expect(result.pageInfo.hasNextPage).toBe(true);+ expect(select).toHaveBeenCalledTimes(3);+ expect(select).toHaveBeenLastCalledWith(+ expect.stringMatching(+ /"timestamp" = \{lastRecordTimestamp:DateTime64\(3\)\}\s+LIMIT \{maxLimit:Int32\}/,+ ),+ expect.objectContaining({+ workspaceId: 'workspace-id',+ lastRecordTimestamp: '2026-09-24 11:42:31.096',+ maxLimit: 10000,+ }),+ );+ });++ it('keeps the page as fetched when the lookup at its last timestamp fails', async () => {+ select+ .mockResolvedValueOnce(pageRowsEndingOnSharedTimestamp)+ .mockResolvedValueOnce([{ totalCount: 5 }])+ .mockResolvedValueOnce([]);++ const result = await service.queryEventLogs('workspace-id', {+ table: EventLogTable.OBJECT_EVENT,+ first: 2,+ });++ expect(result.records.map((record) => record.recordId)).toEqual([+ 'company-1',+ 'company-2',+ ]);+ });++ it('keeps the page at the requested size when the next record is older', async () => {+ select+ .mockResolvedValueOnce([+ makeDeletedRecordRow('company-1', '2026-09-24 11:42:31.100'),+ makeDeletedRecordRow('company-2', '2026-09-24 11:42:31.096'),+ makeDeletedRecordRow('company-3', '2026-09-24 11:42:31.090'),+ ])+ .mockResolvedValueOnce([{ totalCount: 3 }]);++ const result = await service.queryEventLogs('workspace-id', {+ table: EventLogTable.OBJECT_EVENT,+ first: 2,+ });++ expect(result.records.map((record) => record.recordId)).toEqual([+ 'company-1',+ 'company-2',+ ]);+ expect(select).toHaveBeenCalledTimes(2);+ });+});diff --git a/packages/twenty-server/src/engine/core-modules/event-logs/event-logs.service.ts b/packages/twenty-server/src/engine/core-modules/event-logs/event-logs.service.tsindex 7f47a239d02..467ab4eddcf 100644--- a/packages/twenty-server/src/engine/core-modules/event-logs/event-logs.service.ts+++ b/packages/twenty-server/src/engine/core-modules/event-logs/event-logs.service.ts@@ -93,6 +93,13 @@ export class EventLogsService {LIMIT {limit:Int32}`;+ const recordsAtLastTimestampQuery = `+ SELECT *+ FROM ${tableName}+ WHERE ${filterWhereClause} AND "timestamp" = {lastRecordTimestamp:DateTime64(3)}+ LIMIT {maxLimit:Int32}+ `;+params.limit = limit + 1;const [records, countResult] = await Promise.all([@@ -102,12 +109,37 @@ export class EventLogsService {const totalCount = countResult[0]?.totalCount ?? 0;const hasNextPage = records.length > limit;+ const lastRecordTimestamp = records[limit - 1]?.timestamp;+ const hasMoreRecordsAtLastTimestamp =+ hasNextPage && records[limit].timestamp === lastRecordTimestamp;++ let pageRecords = records.slice(0, limit);++ if (hasMoreRecordsAtLastTimestamp) {+ params.lastRecordTimestamp = lastRecordTimestamp;+ params.maxLimit = MAX_LIMIT;- if (hasNextPage) {- records.pop();+ const recordsAtLastTimestamp = await this.clickHouseService.select<+ Record<string, unknown>+ >(recordsAtLastTimestampQuery, params);+ const pageRecordsAtLastTimestamp = pageRecords.filter(+ (record) => record.timestamp === lastRecordTimestamp,+ );++ if (recordsAtLastTimestamp.length >= pageRecordsAtLastTimestamp.length) {+ pageRecords = [+ ...pageRecords.filter(+ (record) => record.timestamp !== lastRecordTimestamp,+ ),+ ...recordsAtLastTimestamp,+ ];+ }}- const normalizedRecords = normalizeEventLogRecords(records, input.table);+ const normalizedRecords = normalizeEventLogRecords(+ pageRecords,+ input.table,+ );const lastRecord = normalizedRecords[normalizedRecords.length - 1];const endCursor =hasNextPage && lastRecord