The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
refactor(orm): remove query builder mutations in favor of repository writes (#27104)
Félix Malfaitff6f0d912114
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/repositories/agent-history-repository.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/repositories/agent-history-repository.tsindex de4aa1d83f2..d36820bf0d0 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/repositories/agent-history-repository.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/repositories/agent-history-repository.ts@@ -177,37 +177,25 @@ export class AgentHistoryRepository<TRecord extends { id: string }> {values: QueryDeepPartialEntity<TRecord>,) {return this.run(workspaceId, async (repository) => {- const result = await repository- .createQueryBuilder()- .withDeleted()- .where(where)- .update()- .set(values)- .returning(['id'])- .execute();+ const result = await repository.update(where, values);+ const generatedMaps = result.generatedMaps.map(+ ({ id }): Pick<TRecord, 'id'> => ({ id }),+ );return {- affected: result.generatedMaps.length,- generatedMaps: result.generatedMaps.map(- ({ id }): Pick<TRecord, 'id'> => ({ id }),- ),- raw: result.generatedMaps,+ affected: generatedMaps.length,+ generatedMaps,+ raw: generatedMaps,};});}delete(workspaceId: string, where: FindOptionsWhere<TRecord>) {return this.run(workspaceId, async (repository) => {- const result = await repository- .createQueryBuilder()- .withDeleted()- .where(where)- .delete()- .returning(['id'])- .execute();+ const result = await repository.delete(where);return {- affected: result.generatedMaps.length,- generatedMaps: result.generatedMaps,- raw: result.generatedMaps,+ affected: result.raw.length,+ generatedMaps: result.raw,+ raw: result.raw,};});}diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/agent-history-transaction.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/agent-history-transaction.service.tsindex 373bbdcd119..14999f1f6e3 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/agent-history-transaction.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/agent-history-transaction.service.ts@@ -43,14 +43,10 @@ export class AgentHistoryTransactionService {);},update: async (name, where, values) => {- const result = await getRepository(name)- .createQueryBuilder()- .withDeleted()- .where(where)- .update()- .set(values)- .returning(['id'])- .execute();+ const result = await getRepository(name).update(+ where,+ values,+ );return result.generatedMaps.length;},diff --git a/packages/twenty-server/src/engine/twenty-orm/field-operations/files-field-sync/files-field-sync.ts b/packages/twenty-server/src/engine/twenty-orm/field-operations/files-field-sync/files-field-sync.tsindex e3171c78b3d..2eb887aad3e 100644--- a/packages/twenty-server/src/engine/twenty-orm/field-operations/files-field-sync/files-field-sync.ts+++ b/packages/twenty-server/src/engine/twenty-orm/field-operations/files-field-sync/files-field-sync.ts@@ -119,6 +119,16 @@ export class FilesFieldSync {: null;}+ isUpdatingFilesField(+ updatePayload: Record<string, unknown>,+ objectMetadataId: string,+ ): boolean {+ return this.isPayloadTouchingFilesFields(+ updatePayload,+ this.getFilesFields(objectMetadataId),+ );+ }+computeFilesFieldDiffBeforeUpdateOne<Entity extends ObjectLiteral>(updatePayload: QueryDeepPartialEntity<Entity>,target: EntityTarget<Entity>,@@ -131,15 +141,12 @@ export class FilesFieldSync {const filesFields = this.getFilesFields(objectMetadata.id);- if (filesFields.length === 0) {- return null;- }-- const isModifyingFilesField = filesFields.some((filesField) =>- isDefined(updatePayload[filesField.name as keyof typeof updatePayload]),- );-- if (!isModifyingFilesField) {+ if (+ !this.isPayloadTouchingFilesFields(+ updatePayload as Record<string, unknown>,+ filesFields,+ )+ ) {return null;}@@ -635,6 +642,15 @@ export class FilesFieldSync {});}+ private isPayloadTouchingFilesFields(+ updatePayload: Record<string, unknown>,+ filesFields: OrmFlatFieldMetadata[],+ ): boolean {+ return filesFields.some((filesField) =>+ isDefined(updatePayload[filesField.name]),+ );+ }+private getFilesFields(objectMetadataId: string): OrmFlatFieldMetadata[] {const objectMetadata = findFlatEntityByIdInFlatEntityMaps({flatEntityId: objectMetadataId,diff --git a/packages/twenty-server/src/engine/twenty-orm/query-builder/__tests__/workspace-mutation-query-builder.spec.ts b/packages/twenty-server/src/engine/twenty-orm/query-builder/__tests__/workspace-mutation-query-builder.spec.tsindex caf64777622..eacc4d64737 100644--- a/packages/twenty-server/src/engine/twenty-orm/query-builder/__tests__/workspace-mutation-query-builder.spec.ts+++ b/packages/twenty-server/src/engine/twenty-orm/query-builder/__tests__/workspace-mutation-query-builder.spec.ts@@ -96,12 +96,13 @@ describe('WorkspaceMutationQueryBuilder', () => {it('should build a soft delete that stamps deletedAt and updatedAt on live rows only', () => {const { selectQueryBuilder } = buildBuilders();- const mutationQueryBuilder = selectQueryBuilder- .where('"person"."id" IN (:...ids)', {- ids: ['id-1', 'id-2'],- })- .softDelete()- .returning(['id', 'nameFirstName']);+ const mutationQueryBuilder =+ WorkspaceSelectQueryBuilder.toMutationQueryBuilder(+ selectQueryBuilder.where('"person"."id" IN (:...ids)', {+ ids: ['id-1', 'id-2'],+ }),+ 'soft-delete',+ ).returning(['id', 'nameFirstName']);expect(mutationQueryBuilder.getQuery()).toBe(`UPDATE "${SCHEMA_NAME}"."person" AS "person" ` +@@ -114,12 +115,15 @@ describe('WorkspaceMutationQueryBuilder', () => {it('should let a soft delete reach rows already in the trash only after withDeleted', () => {const { selectQueryBuilder } = buildBuilders();- const mutationQueryBuilder = selectQueryBuilder- .where('"person"."id" IN (:...ids)', {- ids: ['id-1', 'id-2'],- })- .withDeleted()- .softDelete();+ const mutationQueryBuilder =+ WorkspaceSelectQueryBuilder.toMutationQueryBuilder(+ selectQueryBuilder+ .where('"person"."id" IN (:...ids)', {+ ids: ['id-1', 'id-2'],+ })+ .withDeleted(),+ 'soft-delete',+ );expect(mutationQueryBuilder.getQuery()).toBe(`UPDATE "${SCHEMA_NAME}"."person" AS "person" ` +@@ -131,10 +135,13 @@ describe('WorkspaceMutationQueryBuilder', () => {it('should build a restore that clears deletedAt and stamps updatedAt', () => {const { selectQueryBuilder } = buildBuilders();- const mutationQueryBuilder = selectQueryBuilder- .where('"person"."id" IN (:...ids)', { ids: ['id-1'] })- .restore()- .returning(['id']);+ const mutationQueryBuilder =+ WorkspaceSelectQueryBuilder.toMutationQueryBuilder(+ selectQueryBuilder.where('"person"."id" IN (:...ids)', {+ ids: ['id-1'],+ }),+ 'restore',+ ).returning(['id']);expect(mutationQueryBuilder.getQuery()).toBe(`UPDATE "${SCHEMA_NAME}"."person" AS "person" ` +@@ -147,10 +154,13 @@ describe('WorkspaceMutationQueryBuilder', () => {it('should build a hard delete with no SET clause', () => {const { selectQueryBuilder } = buildBuilders();- const mutationQueryBuilder = selectQueryBuilder- .where('"person"."id" IN (:...ids)', { ids: ['id-1'] })- .delete()- .returning(['id']);+ const mutationQueryBuilder =+ WorkspaceSelectQueryBuilder.toMutationQueryBuilder(+ selectQueryBuilder.where('"person"."id" IN (:...ids)', {+ ids: ['id-1'],+ }),+ 'delete',+ ).returning(['id']);expect(mutationQueryBuilder.getQuery()).toBe(`DELETE FROM "${SCHEMA_NAME}"."person" AS "person" ` +@@ -162,9 +172,10 @@ describe('WorkspaceMutationQueryBuilder', () => {it('should build an update that binds set values and appends updatedAt maintenance', () => {const { selectQueryBuilder } = buildBuilders();- const [sql, values] = selectQueryBuilder- .where('"person"."id" IN (:...ids)', { ids: ['id-1'] })- .update()+ const [sql, values] = WorkspaceSelectQueryBuilder.toMutationQueryBuilder(+ selectQueryBuilder.where('"person"."id" IN (:...ids)', { ids: ['id-1'] }),+ 'update',+ ).set({ jobTitle: 'Tech Lead' }).returning(['id', 'jobTitle']).getQueryAndParameters();@@ -181,9 +192,10 @@ describe('WorkspaceMutationQueryBuilder', () => {it('should not append updatedAt maintenance when the caller sets updatedAt itself', () => {const { selectQueryBuilder } = buildBuilders();- const [sql, values] = selectQueryBuilder- .where('"person"."id" = :id', { id: 'id-1' })- .update()+ const [sql, values] = WorkspaceSelectQueryBuilder.toMutationQueryBuilder(+ selectQueryBuilder.where('"person"."id" = :id', { id: 'id-1' }),+ 'update',+ ).set({ jobTitle: 'Tech Lead', updatedAt: null }).returning(['id']).getQueryAndParameters();@@ -202,9 +214,12 @@ describe('WorkspaceMutationQueryBuilder', () => {rows: [{ person_id: 'id-1' }, { person_id: 'id-2' }],});- const result = await selectQueryBuilder- .where('"person"."id" IN (:...ids)', { ids: ['id-1', 'id-2'] })- .softDelete()+ const result = await WorkspaceSelectQueryBuilder.toMutationQueryBuilder(+ selectQueryBuilder.where('"person"."id" IN (:...ids)', {+ ids: ['id-1', 'id-2'],+ }),+ 'soft-delete',+ ).returning(['id']).execute();@@ -216,9 +231,12 @@ describe('WorkspaceMutationQueryBuilder', () => {it('should not overwrite a where parameter that collides with a set parameter name', () => {const { selectQueryBuilder } = buildBuilders();- const [, values] = selectQueryBuilder- .where('"person"."id" = :ormSet_0', { ormSet_0: 'id-1' })- .update()+ const [, values] = WorkspaceSelectQueryBuilder.toMutationQueryBuilder(+ selectQueryBuilder.where('"person"."id" = :ormSet_0', {+ ormSet_0: 'id-1',+ }),+ 'update',+ ).set({ jobTitle: 'Tech Lead' }).returning(['id']).getQueryAndParameters();@@ -248,9 +266,10 @@ describe('WorkspaceMutationQueryBuilder', () => {});expect(() =>- selectQueryBuilder- .where('"person"."id" = :id', { id: 'id-1' })- .softDelete()+ WorkspaceSelectQueryBuilder.toMutationQueryBuilder(+ selectQueryBuilder.where('"person"."id" = :id', { id: 'id-1' }),+ 'soft-delete',+ ).returning(['id']).getQuery(),).toThrow(TwentyOrmException);@@ -260,9 +279,10 @@ describe('WorkspaceMutationQueryBuilder', () => {const { selectQueryBuilder } = buildBuilders();expect(() =>- selectQueryBuilder- .where('"person"."id" = :id', { id: 'id-1' })- .update()+ WorkspaceSelectQueryBuilder.toMutationQueryBuilder(+ selectQueryBuilder.where('"person"."id" = :id', { id: 'id-1' }),+ 'update',+ ).set({ missingColumn: 'x' }).returning(['id']).getQuery(),@@ -273,9 +293,10 @@ describe('WorkspaceMutationQueryBuilder', () => {const { selectQueryBuilder } = buildBuilders();expect(- selectQueryBuilder- .where('"person"."id" = :id', { id: 'id-1' })- .update()+ WorkspaceSelectQueryBuilder.toMutationQueryBuilder(+ selectQueryBuilder.where('"person"."id" = :id', { id: 'id-1' }),+ 'update',+ ).returning(['id']).getQuery(),).toBe(@@ -306,9 +327,10 @@ describe('WorkspaceMutationQueryBuilder', () => {});expect(() =>- selectQueryBuilder- .where('"person"."id" = :id', { id: 'id-1' })- .update()+ WorkspaceSelectQueryBuilder.toMutationQueryBuilder(+ selectQueryBuilder.where('"person"."id" = :id', { id: 'id-1' }),+ 'update',+ ).returning(['id']).getQuery(),).toThrow(TwentyOrmException);@@ -319,6 +341,11 @@ describe('WorkspaceMutationQueryBuilder', () => {selectQueryBuilder.leftJoin('person.company', 'company');- expect(() => selectQueryBuilder.softDelete()).toThrow(TwentyOrmException);+ expect(() =>+ WorkspaceSelectQueryBuilder.toMutationQueryBuilder(+ selectQueryBuilder,+ 'soft-delete',+ ),+ ).toThrow(TwentyOrmException);});});diff --git a/packages/twenty-server/src/engine/twenty-orm/query-builder/__tests__/workspace-select-query-builder-relation-where.spec.ts b/packages/twenty-server/src/engine/twenty-orm/query-builder/__tests__/workspace-select-query-builder-relation-where.spec.tsindex 9f678252840..a1f6d4fc1db 100644--- a/packages/twenty-server/src/engine/twenty-orm/query-builder/__tests__/workspace-select-query-builder-relation-where.spec.ts+++ b/packages/twenty-server/src/engine/twenty-orm/query-builder/__tests__/workspace-select-query-builder-relation-where.spec.ts@@ -5,6 +5,7 @@ import { RelationType } from 'src/engine/metadata-modules/field-metadata/interfaimport { TwentyOrmException } from 'src/engine/twenty-orm/exceptions/twenty-orm.exception';import { applyFindOptionsToQueryBuilder } from 'src/engine/twenty-orm/query-builder/utils/apply-find-options.util';import { buildQueryBuilder } from 'src/engine/twenty-orm/query-builder/__tests__/workspace-select-query-builder-test-shapes.util';+import { WorkspaceSelectQueryBuilder } from 'src/engine/twenty-orm/query-builder/workspace-select-query-builder';describe('WorkspaceSelectQueryBuilder relation-keyed where', () => {it('should filter a to-many relation with a correlated EXISTS instead of a join', () => {@@ -240,6 +241,11 @@ describe('WorkspaceSelectQueryBuilder relation-keyed where', () => {queryBuilder.where({ people: { name: Equal('Twenty') } });- expect(() => queryBuilder.delete()).toThrow(TwentyOrmException);+ expect(() =>+ WorkspaceSelectQueryBuilder.toMutationQueryBuilder(+ queryBuilder,+ 'delete',+ ),+ ).toThrow(TwentyOrmException);});});diff --git a/packages/twenty-server/src/engine/twenty-orm/query-builder/__tests__/workspace-select-query-builder-row-access.spec.ts b/packages/twenty-server/src/engine/twenty-orm/query-builder/__tests__/workspace-select-query-builder-row-access.spec.tsindex 6e218b2a637..5abcab7aa97 100644--- a/packages/twenty-server/src/engine/twenty-orm/query-builder/__tests__/workspace-select-query-builder-row-access.spec.ts+++ b/packages/twenty-server/src/engine/twenty-orm/query-builder/__tests__/workspace-select-query-builder-row-access.spec.ts@@ -2,6 +2,7 @@ import {applyRowAccessCondition,buildQueryBuilder,} from 'src/engine/twenty-orm/query-builder/__tests__/workspace-select-query-builder-test-shapes.util';+import { WorkspaceSelectQueryBuilder } from 'src/engine/twenty-orm/query-builder/workspace-select-query-builder';const GUARDED_OR_CHAIN ='(("person"."id" = :a) OR ("person"."id" = :b)) AND ("person"."companyId" = :rowAccessCompanyId)';@@ -59,11 +60,14 @@ describe('WorkspaceSelectQueryBuilder row access conditions', () => {it('should guard a mutation built from the select builder', () => {const { queryBuilder } = buildRowAccessQueryBuilder();- const mutationQueryBuilder = queryBuilder- .where('"person"."id" = :a', { a: 1 })- .orWhere('"person"."id" = :b', { b: 2 })- .applyRowLevelPermissions()- .delete();+ const mutationQueryBuilder =+ WorkspaceSelectQueryBuilder.toMutationQueryBuilder(+ queryBuilder+ .where('"person"."id" = :a', { a: 1 })+ .orWhere('"person"."id" = :b', { b: 2 })+ .applyRowLevelPermissions(),+ 'delete',+ );expect(mutationQueryBuilder.getQuery()).toBe(`DELETE FROM "workspace_1wgvd1injqtife6y4rvfbu3h5"."person" AS "person" WHERE ${GUARDED_OR_CHAIN}`,@@ -110,11 +114,14 @@ describe('WorkspaceSelectQueryBuilder row access conditions', () => {it('should keep the row access condition on a mutation built after where() replaces the WHERE', () => {const { queryBuilder } = buildRowAccessQueryBuilder();- const mutationQueryBuilder = queryBuilder- .applyRowLevelPermissions()- .where('"person"."id" = :a', { a: 1 })- .orWhere('"person"."id" = :b', { b: 2 })- .delete();+ const mutationQueryBuilder =+ WorkspaceSelectQueryBuilder.toMutationQueryBuilder(+ queryBuilder+ .applyRowLevelPermissions()+ .where('"person"."id" = :a', { a: 1 })+ .orWhere('"person"."id" = :b', { b: 2 }),+ 'delete',+ );expect(mutationQueryBuilder.getQuery()).toBe(`DELETE FROM "workspace_1wgvd1injqtife6y4rvfbu3h5"."person" AS "person" WHERE ${GUARDED_OR_CHAIN}`,diff --git a/packages/twenty-server/src/engine/twenty-orm/query-builder/workspace-select-query-builder.ts b/packages/twenty-server/src/engine/twenty-orm/query-builder/workspace-select-query-builder.tsindex f92b15b3019..ab5f630a482 100644--- a/packages/twenty-server/src/engine/twenty-orm/query-builder/workspace-select-query-builder.ts+++ b/packages/twenty-server/src/engine/twenty-orm/query-builder/workspace-select-query-builder.ts@@ -770,26 +770,12 @@ export class WorkspaceSelectQueryBuilder implements WhereExpressionLike {return this.getReferencedColumnNamesByAlias()[this.alias] ?? [];}- update(): WorkspaceMutationQueryBuilder {- return this.toMutationQueryBuilder('update');- }-- delete(): WorkspaceMutationQueryBuilder {- return this.toMutationQueryBuilder('delete');- }-- softDelete(): WorkspaceMutationQueryBuilder {- return this.toMutationQueryBuilder('soft-delete');- }-- restore(): WorkspaceMutationQueryBuilder {- return this.toMutationQueryBuilder('restore');- }-- private toMutationQueryBuilder(+ // Not an instance method, so builders from createQueryBuilder expose no write that skips the repository checks+ static toMutationQueryBuilder(+ selectQueryBuilder: WorkspaceSelectQueryBuilder,kind: MutationKind,): WorkspaceMutationQueryBuilder {- if (this.joinClauses.length > 0) {+ if (selectQueryBuilder.joinClauses.length > 0) {throw new TwentyOrmException(`A mutation cannot carry a relation join; rewrite the filter as an "id IN (subquery)" predicate first`,TwentyOrmExceptionCode.UNSUPPORTED_OPERATION,@@ -797,7 +783,7 @@ export class WorkspaceSelectQueryBuilder implements WhereExpressionLike {}// Row-level permission predicates are injected on the select path only, so an EXISTS here would be unfiltered- if (this.existsFilterClauses.length > 0) {+ if (selectQueryBuilder.existsFilterClauses.length > 0) {throw new TwentyOrmException(`A mutation cannot carry a relation filter; rewrite the filter as an "id IN (subquery)" predicate first`,TwentyOrmExceptionCode.UNSUPPORTED_OPERATION,@@ -805,17 +791,17 @@ export class WorkspaceSelectQueryBuilder implements WhereExpressionLike {}return new WorkspaceMutationQueryBuilder({- alias: this.alias,+ alias: selectQueryBuilder.alias,kind,context: {- tableShape: this.tableShape,- executor: this.context.executor,- formatResult: this.context.formatResult,+ tableShape: selectQueryBuilder.tableShape,+ executor: selectQueryBuilder.context.executor,+ formatResult: selectQueryBuilder.context.formatResult,},- whereClauses: this.whereClauses,- rowAccessConditions: this.rowAccessConditions,- includeDeleted: this.includeDeleted,- parameters: this.parameters,+ whereClauses: selectQueryBuilder.whereClauses,+ rowAccessConditions: selectQueryBuilder.rowAccessConditions,+ includeDeleted: selectQueryBuilder.includeDeleted,+ parameters: selectQueryBuilder.parameters,});}diff --git a/packages/twenty-server/src/engine/twenty-orm/repository/__tests__/workspace-repository.spec.ts b/packages/twenty-server/src/engine/twenty-orm/repository/__tests__/workspace-repository.spec.tsnew file mode 100644index 00000000000..09a708459fb--- /dev/null+++ b/packages/twenty-server/src/engine/twenty-orm/repository/__tests__/workspace-repository.spec.ts@@ -0,0 +1,234 @@+import { FieldMetadataType } from 'twenty-shared/types';++import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';+import { getFlatFieldMetadataMock } from 'src/engine/metadata-modules/flat-field-metadata/__mocks__/get-flat-field-metadata.mock';+import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';+import { getFlatObjectMetadataMock } from 'src/engine/metadata-modules/flat-object-metadata/__mocks__/get-flat-object-metadata.mock';+import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';+import { type CompiledStatement } from 'src/engine/twenty-orm/sql/utils/compile-named-parameters.util';+import { WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace-repository';+import { type WorkspaceTableShape } from 'src/engine/twenty-orm/table-shape/types/workspace-table-shape.type';++type WorkspaceRepositoryOptions = ConstructorParameters<+ typeof WorkspaceRepository+>[0];++const OBJECT_METADATA_ID = 'delivery-object-id';++const buildField = (name: string, type: FieldMetadataType) =>+ getFlatFieldMetadataMock({+ id: `field-${name}`,+ universalIdentifier: `field-${name}`,+ objectMetadataId: OBJECT_METADATA_ID,+ name,+ type,+ });++const FIELDS = [+ buildField('id', FieldMetadataType.UUID),+ buildField('state', FieldMetadataType.TEXT),+ buildField('attachments', FieldMetadataType.FILES),+ buildField('updatedAt', FieldMetadataType.DATE_TIME),+ buildField('deletedAt', FieldMetadataType.DATE_TIME),+];++const flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata> = {+ byUniversalIdentifier: Object.fromEntries(+ FIELDS.map((field) => [field.universalIdentifier, field]),+ ),+ universalIdentifierById: Object.fromEntries(+ FIELDS.map((field) => [field.id, field.universalIdentifier]),+ ),+ universalIdentifiersByApplicationId: {},+};++const flatObjectMetadata = getFlatObjectMetadataMock({+ id: OBJECT_METADATA_ID,+ universalIdentifier: OBJECT_METADATA_ID,+ nameSingular: 'delivery',+ namePlural: 'deliveries',+ isSystem: true,+ fieldIds: FIELDS.map((field) => field.id),+});++const flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata> = {+ byUniversalIdentifier: { [OBJECT_METADATA_ID]: flatObjectMetadata },+ universalIdentifierById: { [OBJECT_METADATA_ID]: OBJECT_METADATA_ID },+ universalIdentifiersByApplicationId: {},+};++const tableShape: WorkspaceTableShape = {+ objectMetadataId: OBJECT_METADATA_ID,+ nameSingular: 'delivery',+ schemaName: 'workspace_1wgvd1injqtife6y4rvfbu3h5',+ tableName: 'delivery',+ columnShapeByColumnName: Object.fromEntries(+ FIELDS.map((field) => [+ field.name,+ {+ columnName: field.name,+ fieldMetadataId: field.id,+ fieldName: field.name,+ fieldMetadataType: field.type,+ },+ ]),+ ),+ columnNames: FIELDS.map((field) => field.name),+ relationShapeByFieldName: {},+ hasDeletedAtColumn: true,+};++const EMPTY_FLAT_ENTITY_MAPS = {+ byUniversalIdentifier: {},+ universalIdentifierById: {},+ universalIdentifiersByApplicationId: {},+};+const API_KEY_ID = 'api-key-id';+const ROLE_ID = 'role-id';++const buildRepository = ({+ shouldBypassPermissionChecks = true,+ shouldSkipEventEmission,+}: {+ shouldBypassPermissionChecks?: boolean;+ shouldSkipEventEmission: boolean;+}) => {+ const executedStatements: CompiledStatement[] = [];++ const repository = new WorkspaceRepository({+ tableShape,+ flatObjectMetadata,+ internalContext: {+ workspaceId: 'workspace-id',+ featureFlagsMap: {},+ flatObjectMetadataMaps,+ flatFieldMetadataMaps,+ objectIdByNameSingular: { delivery: OBJECT_METADATA_ID },+ eventEmitterService: { emitDatabaseBatchEvent: jest.fn() },+ coreDataSource: { getRepository: () => ({}) },+ userWorkspaceRoleMap: {},+ apiKeyRoleMap: { [API_KEY_ID]: ROLE_ID },+ roleIdsWithAllRecordsAccess: [ROLE_ID],+ flatRowLevelPermissionPredicateMaps: EMPTY_FLAT_ENTITY_MAPS,+ flatRowLevelPermissionPredicateGroupMaps: EMPTY_FLAT_ENTITY_MAPS,+ },+ authContext: { type: 'apiKey', apiKey: { id: API_KEY_ID } },+ executor: {+ execute: async (statement: CompiledStatement) => {+ executedStatements.push(statement);++ return [];+ },+ },+ objectRecordsPermissions: {+ [OBJECT_METADATA_ID]: {+ canReadObjectRecords: true,+ canUpdateObjectRecords: true,+ canSoftDeleteObjectRecords: true,+ canDestroyObjectRecords: true,+ restrictedFields: {},+ },+ },+ shouldBypassPermissionChecks,+ shouldSkipEventEmission,+ tableShapeByObjectMetadataId: () => tableShape,+ } as unknown as WorkspaceRepositoryOptions);++ const getExecutedStatementKinds = () =>+ executedStatements.map((statement) => statement.text.split(' ')[0]);++ return { repository, getExecutedStatementKinds };+};++describe('WorkspaceRepository mutations', () => {+ describe('on a repository that bypasses permission checks and skips events', () => {+ it('should update without reading a before-image', async () => {+ const { repository, getExecutedStatementKinds } = buildRepository({+ shouldSkipEventEmission: true,+ });++ await repository.update({ id: 'delivery-id' }, { state: 'SENT' });++ expect(getExecutedStatementKinds()).toEqual(['UPDATE']);+ });++ it.each([+ ['delete', 'DELETE'],+ ['softDelete', 'UPDATE'],+ ['restore', 'UPDATE'],+ ] as const)(+ 'should %s without reading a before-image',+ async (method, statementKind) => {+ const { repository, getExecutedStatementKinds } = buildRepository({+ shouldSkipEventEmission: true,+ });++ await repository[method]({ id: 'delivery-id' });++ expect(getExecutedStatementKinds()).toEqual([statementKind]);+ },+ );++ it('should still read the before-image when an update touches a files field', async () => {+ const { repository, getExecutedStatementKinds } = buildRepository({+ shouldSkipEventEmission: true,+ });++ await expect(+ repository.update({ id: 'delivery-id' }, { attachments: [] }),+ ).rejects.toThrow('Cannot update multiple records with files field');++ expect(getExecutedStatementKinds()).toEqual(['SELECT']);+ });+ });++ describe('on a repository that emits events', () => {+ it('should read the before- and after-image around an update', async () => {+ const { repository, getExecutedStatementKinds } = buildRepository({+ shouldSkipEventEmission: false,+ });++ await repository.update({ id: 'delivery-id' }, { state: 'SENT' });++ expect(getExecutedStatementKinds()).toEqual([+ 'SELECT',+ 'UPDATE',+ 'SELECT',+ ]);+ });++ it('should read the before-image before a delete', async () => {+ const { repository, getExecutedStatementKinds } = buildRepository({+ shouldSkipEventEmission: false,+ });++ await repository.delete({ id: 'delivery-id' });++ expect(getExecutedStatementKinds()).toEqual(['SELECT', 'DELETE']);+ });+ });++ describe('on a permission-scoped repository that skips events', () => {+ it('should read the before-image before an update', async () => {+ const { repository, getExecutedStatementKinds } = buildRepository({+ shouldBypassPermissionChecks: false,+ shouldSkipEventEmission: true,+ });++ await repository.update({ id: 'delivery-id' }, { state: 'SENT' });++ expect(getExecutedStatementKinds()).toEqual(['SELECT', 'UPDATE']);+ });++ it('should read the before-image before a delete', async () => {+ const { repository, getExecutedStatementKinds } = buildRepository({+ shouldBypassPermissionChecks: false,+ shouldSkipEventEmission: true,+ });++ await repository.delete({ id: 'delivery-id' });++ expect(getExecutedStatementKinds()).toEqual(['SELECT', 'DELETE']);+ });+ });+});diff --git a/packages/twenty-server/src/engine/twenty-orm/repository/workspace-repository.ts b/packages/twenty-server/src/engine/twenty-orm/repository/workspace-repository.tsindex e64487cf756..4916550a325 100644--- a/packages/twenty-server/src/engine/twenty-orm/repository/workspace-repository.ts+++ b/packages/twenty-server/src/engine/twenty-orm/repository/workspace-repository.ts@@ -659,6 +659,7 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {async update(criteria: MutationCriteria,partialEntity: Partial<ObjectRecord>,+ options?: { columnsToReturn?: string[] },): Promise<UpdateResult> {const records = await this.runMutation({selectQueryBuilder: applyMutationCriteriaToQueryBuilder(@@ -667,7 +668,7 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {),rowLevelPermissionsApplied: false,kind: 'update',- columnsToReturn: ['id'],+ columnsToReturn: options?.columnsToReturn ?? ['id'],data: partialEntity,});@@ -1241,8 +1242,10 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {this.applyRowLevelPermissionPredicates(selectQueryBuilder, 'update');- const result = await selectQueryBuilder- .update()+ const result = await WorkspaceSelectQueryBuilder.toMutationQueryBuilder(+ selectQueryBuilder,+ 'update',+ ).set(setColumns).returning(updateEventColumnsToReturn).execute();@@ -1656,6 +1659,16 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {this.applyRowLevelPermissionPredicates(selectQueryBuilder, kind);}+ if (this.canMutateWithoutBeforeImage({ kind, data })) {+ return this.performMutationWithoutBeforeImage({+ selectQueryBuilder,+ kind,+ columnsToReturn,+ data,+ validateWrittenRecords,+ });+ }+const eventSelectQueryBuilder =this.buildEventSnapshotQueryBuilder(selectQueryBuilder);@@ -1698,13 +1711,10 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {}}- let setColumns: Record<string, unknown> | undefined;-- if (kind === 'update' && isDefined(dataToWrite)) {- const { id: _id, ...columns } = this.formatWriteData(dataToWrite);-- setColumns = columns;- }+ const setColumns =+ kind === 'update' && isDefined(dataToWrite)+ ? this.buildSetColumns(dataToWrite)+ : undefined;if (kind === 'update' && isDefined(setColumns)) {await this.validateRLSPredicatesForUpdatedRecords(@@ -1733,13 +1743,7 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {const mutationResult = await this.morphAndExecute({selectQueryBuilder,kind,- columnsToReturn:- kind === 'update'- ? getUpdateEventColumnsToReturn(- columnsToReturn,- this.options.tableShape,- )- : columnsToReturn,+ columnsToReturn: this.getMutationColumnsToReturn(kind, columnsToReturn),setColumns,});@@ -1781,6 +1785,77 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {return mutationResult.generatedMaps;}+ // The before-image only feeds events, scoped-write checks and files field diffs+ private canMutateWithoutBeforeImage({+ kind,+ data,+ }: {+ kind: MutationKind;+ data?: Partial<ObjectRecord>;+ }): boolean {+ return (+ this.options.shouldBypassPermissionChecks &&+ this.options.shouldSkipEventEmission &&+ !(+ kind === 'update' &&+ isDefined(data) &&+ this.filesFieldSync.isUpdatingFilesField(+ data,+ this.options.flatObjectMetadata.id,+ )+ )+ );+ }++ private async performMutationWithoutBeforeImage({+ selectQueryBuilder,+ kind,+ columnsToReturn,+ data,+ validateWrittenRecords,+ }: {+ selectQueryBuilder: WorkspaceSelectQueryBuilder;+ kind: MutationKind;+ columnsToReturn: string[];+ data?: Partial<ObjectRecord>;+ validateWrittenRecords?: ValidateWrittenRecords;+ }): Promise<ObjectRecord[]> {+ const mutationResult = await this.morphAndExecute({+ selectQueryBuilder,+ kind,+ columnsToReturn: this.getMutationColumnsToReturn(kind, columnsToReturn),+ setColumns:+ kind === 'update' && isDefined(data)+ ? this.buildSetColumns(data)+ : undefined,+ });++ if (kind === 'delete') {+ await this.releaseRecordStock(mutationResult.generatedMaps.length);+ }++ await validateWrittenRecords?.(mutationResult.generatedMaps);++ return mutationResult.generatedMaps;+ }++ private buildSetColumns(+ data: Partial<ObjectRecord>,+ ): Record<string, unknown> {+ const { id: _id, ...setColumns } = this.formatWriteData(data);++ return setColumns;+ }++ private getMutationColumnsToReturn(+ kind: MutationKind,+ columnsToReturn: string[],+ ): string[] {+ return kind === 'update'+ ? getUpdateEventColumnsToReturn(columnsToReturn, this.options.tableShape)+ : columnsToReturn;+ }+private async fetchInheritedReadabilityChildRecords(records: ObjectRecord[],): Promise<Map<string, InheritedReadabilityChildRecords> | undefined> {@@ -1864,21 +1939,21 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {setColumns?: Record<string, unknown>;}): Promise<{ generatedMaps: ObjectRecord[] }> {if (kind === 'update') {- return selectQueryBuilder- .update()+ return WorkspaceSelectQueryBuilder.toMutationQueryBuilder(+ selectQueryBuilder,+ 'update',+ ).set(setColumns ?? {}).returning(columnsToReturn).execute();}- const mutationQueryBuilder =- kind === 'soft-delete'- ? selectQueryBuilder.softDelete()- : kind === 'restore'- ? selectQueryBuilder.restore()- : selectQueryBuilder.delete();-- return mutationQueryBuilder.returning(columnsToReturn).execute();+ return WorkspaceSelectQueryBuilder.toMutationQueryBuilder(+ selectQueryBuilder,+ kind,+ )+ .returning(columnsToReturn)+ .execute();}private buildEventSnapshotQueryBuilder(diff --git a/packages/twenty-server/src/engine/twenty-orm/sql/utils/__tests__/sql-injection-invariants.spec.ts b/packages/twenty-server/src/engine/twenty-orm/sql/utils/__tests__/sql-injection-invariants.spec.tsindex 1d9c026272c..68e1f4fdea9 100644--- a/packages/twenty-server/src/engine/twenty-orm/sql/utils/__tests__/sql-injection-invariants.spec.ts+++ b/packages/twenty-server/src/engine/twenty-orm/sql/utils/__tests__/sql-injection-invariants.spec.ts@@ -108,12 +108,14 @@ describe('ORM v2 SQL injection invariants', () => {(hostileValue) => {const queryBuilder = buildQueryBuilder(['id', 'name', 'deletedAt']);- const [text, values] = queryBuilder- .where('"person"."id" = :id', { id: 'id-1' })- .update()- .set({ name: hostileValue })- .returning(['id'])- .getQueryAndParameters();+ const [text, values] =+ WorkspaceSelectQueryBuilder.toMutationQueryBuilder(+ queryBuilder.where('"person"."id" = :id', { id: 'id-1' }),+ 'update',+ )+ .set({ name: hostileValue })+ .returning(['id'])+ .getQueryAndParameters();expect(text).not.toContain(hostileValue);expect(text).toContain('$1');@@ -125,9 +127,10 @@ describe('ORM v2 SQL injection invariants', () => {const queryBuilder = buildQueryBuilder(['id', 'name', 'deletedAt']);expect(() =>- queryBuilder- .where('"person"."id" = :id', { id: 'id-1' })- .update()+ WorkspaceSelectQueryBuilder.toMutationQueryBuilder(+ queryBuilder.where('"person"."id" = :id', { id: 'id-1' }),+ 'update',+ ).set({ "name\" = ''); DROP TABLE person; --": 'x' }).returning(['id']).getQuery(),diff --git a/packages/twenty-server/src/modules/emailing/services/message-campaign-batch-delivery.service.ts b/packages/twenty-server/src/modules/emailing/services/message-campaign-batch-delivery.service.tsindex be304337156..c6edd550f76 100644--- a/packages/twenty-server/src/modules/emailing/services/message-campaign-batch-delivery.service.ts+++ b/packages/twenty-server/src/modules/emailing/services/message-campaign-batch-delivery.service.ts@@ -590,19 +590,14 @@ export class MessageCampaignBatchDeliveryService {{ shouldBypassPermissionChecks: true },{ shouldSkipEventEmission: true },)- .createQueryBuilder()- .where({- id: In(deliveryIds),- state: In(CLAIMABLE_CAMPAIGN_DELIVERY_STATES),- })- .update()- .set({- state: CAMPAIGN_DELIVERY_STATE.SENDING,- claimToken,- claimExpiresAt: new Date(Date.now() + CAMPAIGN_DELIVERY_CLAIM_TTL_MS),- })- .returning(['id'])- .execute();+ .update(+ { id: In(deliveryIds), state: In(CLAIMABLE_CAMPAIGN_DELIVERY_STATES) },+ {+ state: CAMPAIGN_DELIVERY_STATE.SENDING,+ claimToken,+ claimExpiresAt: new Date(Date.now() + CAMPAIGN_DELIVERY_CLAIM_TTL_MS),+ },+ );return claimedDeliveries.map((delivery) => delivery.id);}@@ -630,20 +625,19 @@ export class MessageCampaignBatchDeliveryService {{ shouldBypassPermissionChecks: true },{ shouldSkipEventEmission: true },)- .createQueryBuilder()- .where({- id: In(recipients.map((recipient) => recipient.messageId)),- claimToken,- })- .update()- .set({- state,- skipReason,- failureReason,- claimToken: null,- claimExpiresAt: null,- })- .execute();+ .update(+ {+ id: In(recipients.map((recipient) => recipient.messageId)),+ claimToken,+ },+ {+ state,+ skipReason,+ failureReason,+ claimToken: null,+ claimExpiresAt: null,+ },+ );}private async settleClaimedBatch({@@ -687,15 +681,14 @@ export class MessageCampaignBatchDeliveryService {{ shouldBypassPermissionChecks: true },{ shouldSkipEventEmission: true },)- .createQueryBuilder()- .where({ claimToken })- .update()- .set({- state: CAMPAIGN_DELIVERY_STATE.QUEUED,- claimToken: null,- claimExpiresAt: null,- })- .execute();+ .update(+ { claimToken },+ {+ state: CAMPAIGN_DELIVERY_STATE.QUEUED,+ claimToken: null,+ claimExpiresAt: null,+ },+ );}// Settling threw after the provider had already taken the batch, so the rowsdiff --git a/packages/twenty-server/src/modules/emailing/services/message-campaign-delivery-feedback.service.ts b/packages/twenty-server/src/modules/emailing/services/message-campaign-delivery-feedback.service.tsindex 7e6be85c04a..9c3605b9aae 100644--- a/packages/twenty-server/src/modules/emailing/services/message-campaign-delivery-feedback.service.ts+++ b/packages/twenty-server/src/modules/emailing/services/message-campaign-delivery-feedback.service.ts@@ -45,13 +45,9 @@ export class MessageCampaignDeliveryFeedbackService {{ shouldBypassPermissionChecks: true },{ shouldSkipEventEmission: true },);- return campaignDeliveryRepository- .createQueryBuilder()- .where({ providerMessageId })- .update()- .set(update)- .returning(['campaignId'])- .execute();+ return campaignDeliveryRepository.update({ providerMessageId }, update, {+ columnsToReturn: ['campaignId'],+ });}, buildSystemAuthContext(workspaceId));if (!isDefined(updatedDelivery)) {diff --git a/packages/twenty-server/src/modules/emailing/services/message-campaign-delivery.service.ts b/packages/twenty-server/src/modules/emailing/services/message-campaign-delivery.service.tsindex 7d1b5c4afd2..b77144d24cf 100644--- a/packages/twenty-server/src/modules/emailing/services/message-campaign-delivery.service.ts+++ b/packages/twenty-server/src/modules/emailing/services/message-campaign-delivery.service.ts@@ -188,26 +188,21 @@ export class MessageCampaignDeliveryService {campaignId: string;messageId: string;}): Promise<void> {- const { generatedMaps: failedDeliveries } = await this.workspaceOrmManager+ const { affected: failedDeliveryCount } = await this.workspaceOrmManager.getRepository(CampaignDeliveryWorkspaceEntity,{ shouldBypassPermissionChecks: true },{ shouldSkipEventEmission: true },)- .createQueryBuilder()- .where({- id: messageId,- state: In(CLAIMABLE_CAMPAIGN_DELIVERY_STATES),- })- .update()- .set({- state: CAMPAIGN_DELIVERY_STATE.FAILED,- failureReason: CAMPAIGN_FAILURE_REASON.RATE_LIMITED,- })- .returning(['id'])- .execute();+ .update(+ { id: messageId, state: In(CLAIMABLE_CAMPAIGN_DELIVERY_STATES) },+ {+ state: CAMPAIGN_DELIVERY_STATE.FAILED,+ failureReason: CAMPAIGN_FAILURE_REASON.RATE_LIMITED,+ },+ );- if (failedDeliveries.length === 1) {+ if (failedDeliveryCount === 1) {this.logger.warn(`Campaign ${campaignId} of workspace ${workspaceId} gave up on message ${messageId} after ${SEND_SLOT_RETRY.attemptLimit} refused send slots`,);@@ -483,27 +478,22 @@ export class MessageCampaignDeliveryService {}): Promise<string | null> {const claimToken = v4();- const { generatedMaps: claimedDeliveries } = await this.workspaceOrmManager+ const { affected: claimedDeliveryCount } = await this.workspaceOrmManager.getRepository(CampaignDeliveryWorkspaceEntity,{ shouldBypassPermissionChecks: true },{ shouldSkipEventEmission: true },)- .createQueryBuilder()- .where({- id: messageId,- state: In(CLAIMABLE_CAMPAIGN_DELIVERY_STATES),- })- .update()- .set({- state: CAMPAIGN_DELIVERY_STATE.SENDING,- claimToken,- claimExpiresAt: new Date(Date.now() + CAMPAIGN_DELIVERY_CLAIM_TTL_MS),- })- .returning(['id'])- .execute();+ .update(+ { id: messageId, state: In(CLAIMABLE_CAMPAIGN_DELIVERY_STATES) },+ {+ state: CAMPAIGN_DELIVERY_STATE.SENDING,+ claimToken,+ claimExpiresAt: new Date(Date.now() + CAMPAIGN_DELIVERY_CLAIM_TTL_MS),+ },+ );- return claimedDeliveries.length === 1 ? claimToken : null;+ return claimedDeliveryCount === 1 ? claimToken : null;}private async settleClaimedDelivery({@@ -524,19 +514,17 @@ export class MessageCampaignDeliveryService {>>;}): Promise<number> {- const { generatedMaps: settledDeliveries } = await this.workspaceOrmManager+ const { affected: settledDeliveryCount } = await this.workspaceOrmManager.getRepository(CampaignDeliveryWorkspaceEntity,{ shouldBypassPermissionChecks: true },{ shouldSkipEventEmission: true },)- .createQueryBuilder()- .where({ id: messageId, claimToken })- .update()- .set({ ...update, claimToken: null, claimExpiresAt: null })- .returning(['id'])- .execute();-- return settledDeliveries.length;+ .update(+ { id: messageId, claimToken },+ { ...update, claimToken: null, claimExpiresAt: null },+ );++ return settledDeliveryCount ?? 0;}}diff --git a/packages/twenty-server/src/modules/emailing/services/message-campaign-lifecycle.service.ts b/packages/twenty-server/src/modules/emailing/services/message-campaign-lifecycle.service.tsindex f99a42c9767..d287136aa54 100644--- a/packages/twenty-server/src/modules/emailing/services/message-campaign-lifecycle.service.ts+++ b/packages/twenty-server/src/modules/emailing/services/message-campaign-lifecycle.service.ts@@ -263,7 +263,7 @@ export class MessageCampaignLifecycleService {>>;}): Promise<number> {- const { generatedMaps: settledDeliveries } =+ const { affected: settledDeliveryCount } =await this.workspaceOrmManager.executeInWorkspaceContext(async () => {const campaignDeliveryRepository =this.workspaceOrmManager.getRepository(@@ -271,16 +271,10 @@ export class MessageCampaignLifecycleService {{ shouldBypassPermissionChecks: true },{ shouldSkipEventEmission: true },);- return campaignDeliveryRepository- .createQueryBuilder()- .where(criteria)- .update()- .set(update)- .returning(['id'])- .execute();+ return campaignDeliveryRepository.update(criteria, update);}, buildSystemAuthContext(workspaceId));- return settledDeliveries.length;+ return settledDeliveryCount ?? 0;}async finalizeCampaignIfComplete({diff --git a/packages/twenty-server/src/modules/emailing/services/message-suppression.service.ts b/packages/twenty-server/src/modules/emailing/services/message-suppression.service.tsindex a95ee0416a9..dd552dd7c14 100644--- a/packages/twenty-server/src/modules/emailing/services/message-suppression.service.ts+++ b/packages/twenty-server/src/modules/emailing/services/message-suppression.service.ts@@ -280,12 +280,11 @@ export class MessageSuppressionService {}if (this.shouldEscalate(existing.reason, reason)) {- await suppressionRepository- .createQueryBuilder()- .where({ id: existing.id })- .update()- .set({ reason, source, providerEventId })- .execute();+ await suppressionRepository.update(existing.id, {+ reason,+ source,+ providerEventId,+ });}return true;