The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Fix legacy composite update event snapshots (#24648)
Félix Malfait98ed14d97262
diff --git a/packages/twenty-server/src/engine/twenty-orm/repository/workspace-update-query-builder.ts b/packages/twenty-server/src/engine/twenty-orm/repository/workspace-update-query-builder.tsindex 43d49d02335..01dacce1831 100644--- a/packages/twenty-server/src/engine/twenty-orm/repository/workspace-update-query-builder.ts+++ b/packages/twenty-server/src/engine/twenty-orm/repository/workspace-update-query-builder.ts@@ -166,9 +166,11 @@ export class WorkspaceUpdateQueryBuilder<const tableName = computeObjectTargetTable(objectMetadata);- const before = await eventSelectQueryBuilder.getMany({- noFormatting: true,- });+ const before = structuredClone(+ await eventSelectQueryBuilder.getMany({+ noFormatting: true,+ }),+ );if (before.length > QUERY_MAX_RECORDS) {throw new TwentyORMException(@@ -196,7 +198,7 @@ export class WorkspaceUpdateQueryBuilder<);const formattedBefore = formatResult<T[]>(- before,+ structuredClone(before),objectMetadata,this.internalContext.flatObjectMetadataMaps,this.internalContext.flatFieldMetadataMaps,@@ -250,7 +252,10 @@ export class WorkspaceUpdateQueryBuilder<this.applyRowLevelPermissionPredicates();const valuesSet = this.expressionMap.valuesSet ?? {};- const updatedRecords = mergeRecordsWithUpdateValues(before, valuesSet);+ const updatedRecords = mergeRecordsWithUpdateValues(+ structuredClone(before),+ valuesSet,+ );this.validateRLSPredicatesForUpdate({updatedRecords,@@ -268,7 +273,7 @@ export class WorkspaceUpdateQueryBuilder<const formattedAfter = formatResult<T[]>(mergeRecordsWithUpdateValues(- getUpdateEventRecords(before, after),+ structuredClone(getUpdateEventRecords(before, after)),valuesSet,),objectMetadata,@@ -351,12 +356,14 @@ export class WorkspaceUpdateQueryBuilder<this.manyInputs.map((input) => input.criteria),);- const beforeRecords = await eventSelectQueryBuilder.getMany({- noFormatting: true,- });+ const beforeRecords = structuredClone(+ await eventSelectQueryBuilder.getMany({+ noFormatting: true,+ }),+ );const formattedBefore = formatResult<T[]>(- beforeRecords,+ structuredClone(beforeRecords),objectMetadata,this.internalContext.flatObjectMetadataMaps,this.internalContext.flatFieldMetadataMaps,@@ -443,7 +450,12 @@ export class WorkspaceUpdateQueryBuilder<const beforeRecord = beforeRecordById.get(input.criteria);const updatedRecords = beforeRecord- ? [mergeRecordWithUpdateValues(beforeRecord, input.partialEntity)]+ ? [+ mergeRecordWithUpdateValues(+ structuredClone(beforeRecord),+ input.partialEntity,+ ),+ ]: [];this.validateRLSPredicatesForUpdate({@@ -473,7 +485,7 @@ export class WorkspaceUpdateQueryBuilder<const formattedAfter = formatResult<T[]>(getUpdateEventRecords(beforeRecords, afterRecords).map((record) =>mergeRecordWithUpdateValues(- record,+ structuredClone(record),updateValuesByRecordId.get(record.id),),),diff --git a/packages/twenty-server/test/integration/graphql/suites/timeline/timeline-activity-write-path.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/timeline/timeline-activity-write-path.integration-spec.tsindex 93afb07b5bb..427e49155d9 100644--- a/packages/twenty-server/test/integration/graphql/suites/timeline/timeline-activity-write-path.integration-spec.ts+++ b/packages/twenty-server/test/integration/graphql/suites/timeline/timeline-activity-write-path.integration-spec.ts@@ -86,10 +86,13 @@ const updateRecord = async ({expect(response.body.errors).toBeUndefined();};-const withOrmV2ReadPath = async (callback: () => Promise<void>) => {+const withOrmV2ReadPathSetting = async (+ enabled: boolean,+ callback: () => Promise<void>,+) => {await updateFeatureFlag({featureFlag: FeatureFlagKey.IS_ORM_V2_READ_PATH_ENABLED,- value: true,+ value: enabled,expectToFail: false,});@@ -186,7 +189,7 @@ const ATTACHMENT_UNIVERSAL_IDENTIFIER =const COMPANY_ID = '20202020-7171-4000-8000-000000000001';const POSITION_COMPANY_ID = '20202020-7171-4000-8000-000000000002';-const COMPOSITE_COMPANY_ID = '20202020-7171-4000-8000-000000000003';+const LEGACY_COMPOSITE_COMPANY_ID = '20202020-7171-4000-8000-000000000003';const NOTE_COMPANY_ID = '20202020-7171-4000-8000-000000000004';const NOTE_ID = '20202020-7171-4000-8000-000000000005';const NOTE_TARGET_ID = '20202020-7171-4000-8000-000000000006';@@ -199,6 +202,7 @@ const ROUTED_CALENDAR_EVENT_ID = '20202020-7171-4000-8000-000000000014';const ROUTED_CALENDAR_EVENT_PARTICIPANT_ID ='20202020-7171-4000-8000-000000000015';const ATTACHMENT_ID = '20202020-7171-4000-8000-000000000016';+const ORM_V2_COMPOSITE_COMPANY_ID = '20202020-7171-4000-8000-000000000017';const BATCH_COMPANY_IDS = ['20202020-7171-4000-8000-000000000008','20202020-7171-4000-8000-000000000009',@@ -233,7 +237,14 @@ const CREATED_RECORD_IDS: { objectMetadataSingularName: string; id: string }[] =id,})),{ objectMetadataSingularName: 'company', id: NOTE_COMPANY_ID },- { objectMetadataSingularName: 'company', id: COMPOSITE_COMPANY_ID },+ {+ objectMetadataSingularName: 'company',+ id: LEGACY_COMPOSITE_COMPANY_ID,+ },+ {+ objectMetadataSingularName: 'company',+ id: ORM_V2_COMPOSITE_COMPANY_ID,+ },{ objectMetadataSingularName: 'company', id: POSITION_COMPANY_ID },{ objectMetadataSingularName: 'company', id: COMPANY_ID },];@@ -325,62 +336,76 @@ describe('timeline activity write path (integration)', () => {});});- it('should write an updated entry for an ORM v2 composite field change', async () => {- await withOrmV2ReadPath(async () => {- await createRecord({- objectMetadataSingularName: 'company',- data: {- id: COMPOSITE_COMPANY_ID,- name: 'Composite Field Timeline',- },- });-- const updateStartedAt = Date.now();-- await updateRecord({- objectMetadataSingularName: 'company',- recordId: COMPOSITE_COMPANY_ID,- data: {- address: {- addressStreet1: '234 Composite Street',- addressStreet2: '',- addressCity: 'Paris',- addressState: '',- addressCountry: '',- addressPostcode: '',- addressLat: null,- addressLng: null,+ it.each([+ {+ companyId: LEGACY_COMPOSITE_COMPANY_ID,+ isOrmV2ReadPathEnabled: false,+ ormName: 'legacy ORM',+ },+ {+ companyId: ORM_V2_COMPOSITE_COMPANY_ID,+ isOrmV2ReadPathEnabled: true,+ ormName: 'ORM v2',+ },+ ])(+ 'should write an updated entry for a $ormName composite field change',+ async ({ companyId, isOrmV2ReadPathEnabled }) => {+ await withOrmV2ReadPathSetting(isOrmV2ReadPathEnabled, async () => {+ await createRecord({+ objectMetadataSingularName: 'company',+ data: {+ id: companyId,+ name: 'Composite Field Timeline',},- },- });+ });- const timelineActivities = await findTimelineActivities({- targetCompanyId: { eq: COMPOSITE_COMPANY_ID },- timelineActivityTypeId: {- eq: timelineActivityTypeIdForOrThrow('updated'),- },- });+ const updateStartedAt = Date.now();- expect(timelineActivities).toHaveLength(1);- expect(- new Date(timelineActivities[0].happensAt).getTime(),- ).toBeGreaterThanOrEqual(updateStartedAt);- expect(timelineActivities[0].properties).toMatchObject({- diff: {- address: {- before: {- addressStreet1: '',- addressCity: '',- },- after: {+ await updateRecord({+ objectMetadataSingularName: 'company',+ recordId: companyId,+ data: {+ address: {addressStreet1: '234 Composite Street',+ addressStreet2: '',addressCity: 'Paris',+ addressState: '',+ addressCountry: '',+ addressPostcode: '',+ addressLat: null,+ addressLng: null,},},- },+ });++ const timelineActivities = await findTimelineActivities({+ targetCompanyId: { eq: companyId },+ timelineActivityTypeId: {+ eq: timelineActivityTypeIdForOrThrow('updated'),+ },+ });++ expect(timelineActivities).toHaveLength(1);+ expect(+ new Date(timelineActivities[0].happensAt).getTime(),+ ).toBeGreaterThanOrEqual(updateStartedAt);+ expect(timelineActivities[0].properties).toMatchObject({+ diff: {+ address: {+ before: {+ addressStreet1: '',+ addressCity: '',+ },+ after: {+ addressStreet1: '234 Composite Street',+ addressCity: 'Paris',+ },+ },+ },+ });});- });- });+ },+ );it('should merge every record of a multi record batch', async () => {for (const [index, id] of BATCH_COMPANY_IDS.entries()) {