Skip to content

The open alternative to Salesforce, designed for AI.

Fix composite field update events (#24641)

Félix Malfaita6eedd8bf2af
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.ts
index e375abc63bc..32d35fc6fd7 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
@@ -38,6 +38,10 @@ import { formatData } from 'src/engine/twenty-orm/utils/format-data.util';
import { formatResult } from 'src/engine/twenty-orm/utils/format-result.util';
import { formatTwentyOrmEventToDatabaseBatchEvent } from 'src/engine/twenty-orm/utils/format-twenty-orm-event-to-database-batch-event.util';
import { getObjectMetadataFromEntityTarget } from 'src/engine/twenty-orm/utils/get-object-metadata-from-entity-target.util';
+import {
+ mergeRecordsWithUpdateValues,
+ mergeRecordWithUpdateValues,
+} from 'src/engine/twenty-orm/utils/merge-records-with-update-values.util';
import { validateRLSPredicatesForRecords } from 'src/engine/twenty-orm/utils/validate-rls-predicates-for-records.util';
import { computeObjectTargetTable } from 'src/engine/utils/compute-object-target-table.util';
@@ -245,15 +249,7 @@ export class WorkspaceUpdateQueryBuilder<
this.applyRowLevelPermissionPredicates();
const valuesSet = this.expressionMap.valuesSet ?? {};
- const updatedRecords: T[] = before.map(
- (record, index) =>
- ({
- ...record,
- ...(Array.isArray(valuesSet)
- ? (valuesSet[index] ?? valuesSet[0] ?? {})
- : valuesSet),
- }) as T,
- );
+ const updatedRecords = mergeRecordsWithUpdateValues(before, valuesSet);
this.validateRLSPredicatesForUpdate({
updatedRecords,
@@ -270,7 +266,7 @@ export class WorkspaceUpdateQueryBuilder<
});
const formattedAfter = formatResult<T[]>(
- after,
+ mergeRecordsWithUpdateValues(after, valuesSet),
objectMetadata,
this.internalContext.flatObjectMetadataMaps,
this.internalContext.flatFieldMetadataMaps,
@@ -443,12 +439,7 @@ export class WorkspaceUpdateQueryBuilder<
const beforeRecord = beforeRecordById.get(input.criteria);
const updatedRecords = beforeRecord
- ? [
- {
- ...beforeRecord,
- ...input.partialEntity,
- } as T,
- ]
+ ? [mergeRecordWithUpdateValues(beforeRecord, input.partialEntity)]
: [];
this.validateRLSPredicatesForUpdate({
@@ -468,8 +459,20 @@ export class WorkspaceUpdateQueryBuilder<
noFormatting: true,
});
+ const updateValuesByRecordId = new Map(
+ this.manyInputs.map(({ criteria, partialEntity }) => [
+ criteria,
+ partialEntity,
+ ]),
+ );
+
const formattedAfter = formatResult<T[]>(
- afterRecords,
+ afterRecords.map((record) =>
+ mergeRecordWithUpdateValues(
+ record,
+ updateValuesByRecordId.get(record.id),
+ ),
+ ),
objectMetadata,
this.internalContext.flatObjectMetadataMaps,
this.internalContext.flatFieldMetadataMaps,
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/merge-records-with-update-values.util.spec.ts b/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/merge-records-with-update-values.util.spec.ts
new file mode 100644
index 00000000000..add0b628e8d
--- /dev/null
+++ b/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/merge-records-with-update-values.util.spec.ts
@@ -0,0 +1,73 @@
+import {
+ mergeRecordsWithUpdateValues,
+ mergeRecordWithUpdateValues,
+} from 'src/engine/twenty-orm/utils/merge-records-with-update-values.util';
+
+describe('mergeRecordsWithUpdateValues', () => {
+ it('merges shared concrete values into every record', () => {
+ expect(
+ mergeRecordsWithUpdateValues(
+ [
+ { id: 'first', name: 'First' },
+ { id: 'second', name: 'Second' },
+ ],
+ { name: 'Updated', optionalValue: undefined },
+ ),
+ ).toEqual([
+ { id: 'first', name: 'Updated', optionalValue: undefined },
+ { id: 'second', name: 'Updated', optionalValue: undefined },
+ ]);
+ });
+
+ it('ignores raw SQL function values', () => {
+ expect(
+ mergeRecordWithUpdateValues(
+ { id: 'first', name: 'First', computedValue: 'Persisted value' },
+ {
+ name: 'Updated',
+ computedValue: () => 'CURRENT_TIMESTAMP',
+ },
+ ),
+ ).toEqual({
+ id: 'first',
+ name: 'Updated',
+ computedValue: 'Persisted value',
+ });
+ });
+
+ it('uses values at the matching record index', () => {
+ expect(
+ mergeRecordsWithUpdateValues(
+ [
+ { id: 'first', name: 'First' },
+ { id: 'second', name: 'Second' },
+ ],
+ [{ name: 'First updated' }, { name: 'Second updated' }],
+ ),
+ ).toEqual([
+ { id: 'first', name: 'First updated' },
+ { id: 'second', name: 'Second updated' },
+ ]);
+ });
+
+ it('falls back to the first values entry when an index is missing', () => {
+ expect(
+ mergeRecordsWithUpdateValues(
+ [
+ { id: 'first', name: 'First' },
+ { id: 'second', name: 'Second' },
+ ],
+ [{ name: 'Updated' }],
+ ),
+ ).toEqual([
+ { id: 'first', name: 'Updated' },
+ { id: 'second', name: 'Updated' },
+ ]);
+ });
+
+ it('returns the original record when values are missing', () => {
+ const record = { id: 'first', name: 'First' };
+
+ expect(mergeRecordWithUpdateValues(record, undefined)).toBe(record);
+ });
+});
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/merge-records-with-update-values.util.ts b/packages/twenty-server/src/engine/twenty-orm/utils/merge-records-with-update-values.util.ts
new file mode 100644
index 00000000000..987a230fd73
--- /dev/null
+++ b/packages/twenty-server/src/engine/twenty-orm/utils/merge-records-with-update-values.util.ts
@@ -0,0 +1,39 @@
+import { type ObjectLiteral } from 'typeorm';
+import { type QueryDeepPartialEntity } from 'typeorm/query-builder/QueryPartialEntity';
+
+type UpdateValues<TRecord extends ObjectLiteral> =
+ | QueryDeepPartialEntity<TRecord>
+ | ObjectLiteral;
+
+const getConcreteUpdateValues = <TRecord extends ObjectLiteral>(
+ values: UpdateValues<TRecord>,
+): Partial<TRecord> =>
+ Object.fromEntries(
+ Object.entries(values).filter(([, value]) => typeof value !== 'function'),
+ ) as Partial<TRecord>;
+
+export const mergeRecordWithUpdateValues = <TRecord extends ObjectLiteral>(
+ record: TRecord,
+ values: UpdateValues<TRecord> | undefined,
+): TRecord => {
+ if (values === undefined) {
+ return record;
+ }
+
+ return { ...record, ...getConcreteUpdateValues(values) };
+};
+
+export const mergeRecordsWithUpdateValues = <TRecord extends ObjectLiteral>(
+ records: TRecord[],
+ values: UpdateValues<TRecord> | UpdateValues<TRecord>[],
+): TRecord[] => {
+ if (!Array.isArray(values)) {
+ const concreteValues = getConcreteUpdateValues(values);
+
+ return records.map((record) => ({ ...record, ...concreteValues }));
+ }
+
+ return records.map((record, index) =>
+ mergeRecordWithUpdateValues(record, values[index] ?? values[0]),
+ );
+};
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.ts
index 46dd64534f2..b74df36abb3 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
@@ -164,6 +164,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 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';
@@ -210,6 +211,7 @@ const CREATED_RECORD_IDS: { objectMetadataSingularName: string; id: string }[] =
id,
})),
{ objectMetadataSingularName: 'company', id: NOTE_COMPANY_ID },
+ { objectMetadataSingularName: 'company', id: COMPOSITE_COMPANY_ID },
{ objectMetadataSingularName: 'company', id: POSITION_COMPANY_ID },
{ objectMetadataSingularName: 'company', id: COMPANY_ID },
];
@@ -301,6 +303,56 @@ describe('timeline activity write path (integration)', () => {
});
});
+ it('should write an updated entry for a composite field change', async () => {
+ await createRecord({
+ objectMetadataSingularName: 'company',
+ data: {
+ id: COMPOSITE_COMPANY_ID,
+ name: 'Composite Field Timeline',
+ },
+ });
+
+ await updateRecord({
+ objectMetadataSingularName: 'company',
+ recordId: COMPOSITE_COMPANY_ID,
+ data: {
+ address: {
+ addressStreet1: '234 Composite Street',
+ addressStreet2: '',
+ addressCity: 'Paris',
+ addressState: '',
+ addressCountry: '',
+ addressPostcode: '',
+ addressLat: null,
+ addressLng: null,
+ },
+ },
+ });
+
+ const timelineActivities = await findTimelineActivities({
+ targetCompanyId: { eq: COMPOSITE_COMPANY_ID },
+ timelineActivityTypeId: {
+ eq: timelineActivityTypeIdForOrThrow('updated'),
+ },
+ });
+
+ expect(timelineActivities).toHaveLength(1);
+ 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()) {
await createRecord({