Skip to content

The open alternative to Salesforce, designed for AI.

refactor(orm): fold the lean write path into performMutation (#27129)

Félix Malfaitb74f6eaff29c
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.ts
index 533a9689f7a..b0c7b916548 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
@@ -1242,15 +1242,14 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {
this.applyRowLevelPermissionPredicates(selectQueryBuilder, 'update');
- const result = await WorkspaceSelectQueryBuilder.toMutationQueryBuilder(
+ const result = await this.morphAndExecute({
selectQueryBuilder,
- 'update',
- )
- .set(setColumns)
- .returning(updateEventColumnsToReturn)
- .execute();
+ kind: 'update',
+ columnsToReturn: updateEventColumnsToReturn,
+ setColumns,
+ });
- generatedMaps.push(...(result.generatedMaps as ObjectRecord[]));
+ generatedMaps.push(...result.generatedMaps);
if (result.generatedMaps.length === 0) {
continue;
@@ -1272,7 +1271,7 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {
getUpdateEventRecords(rawBeforeForInput, recordsAfterWrite),
setColumns,
),
- result.generatedMaps as ObjectRecord[],
+ result.generatedMaps,
),
);
}
@@ -1659,22 +1658,27 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {
this.applyRowLevelPermissionPredicates(selectQueryBuilder, kind);
}
- if (this.canMutateWithoutBeforeImage({ kind, data })) {
- return this.performMutationWithoutBeforeImage({
- selectQueryBuilder,
- kind,
- columnsToReturn,
- data,
- validateWrittenRecords,
- });
- }
+ // The before-image only feeds events, scoped-write checks and files field diffs
+ const canSkipBeforeImage =
+ this.options.shouldBypassPermissionChecks &&
+ this.options.shouldSkipEventEmission &&
+ !(
+ kind === 'update' &&
+ isDefined(data) &&
+ this.filesFieldSync.isUpdatingFilesField(
+ data,
+ this.options.flatObjectMetadata.id,
+ )
+ );
const eventSelectQueryBuilder =
this.buildEventSnapshotQueryBuilder(selectQueryBuilder);
- const recordsBefore = await eventSelectQueryBuilder.getMany<ObjectRecord>({
- noFormatting: true,
- });
+ const recordsBefore = canSkipBeforeImage
+ ? []
+ : await eventSelectQueryBuilder.getMany<ObjectRecord>({
+ noFormatting: true,
+ });
if (kind === 'update' && recordsBefore.length > QUERY_MAX_RECORDS) {
throw new TwentyOrmException(
@@ -1711,10 +1715,13 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {
}
}
- const setColumns =
- kind === 'update' && isDefined(dataToWrite)
- ? this.buildSetColumns(dataToWrite)
- : undefined;
+ let setColumns: Record<string, unknown> | undefined;
+
+ if (kind === 'update' && isDefined(dataToWrite)) {
+ const { id: _id, ...columns } = this.formatWriteData(dataToWrite);
+
+ setColumns = columns;
+ }
if (kind === 'update' && isDefined(setColumns)) {
await this.validateRLSPredicatesForUpdatedRecords(
@@ -1743,7 +1750,13 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {
const mutationResult = await this.morphAndExecute({
selectQueryBuilder,
kind,
- columnsToReturn: this.getMutationColumnsToReturn(kind, columnsToReturn),
+ columnsToReturn:
+ kind === 'update'
+ ? getUpdateEventColumnsToReturn(
+ columnsToReturn,
+ this.options.tableShape,
+ )
+ : columnsToReturn,
setColumns,
});
@@ -1785,77 +1798,6 @@ 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> {
@@ -1938,22 +1880,17 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {
columnsToReturn: string[];
setColumns?: Record<string, unknown>;
}): Promise<{ generatedMaps: ObjectRecord[] }> {
- if (kind === 'update') {
- return WorkspaceSelectQueryBuilder.toMutationQueryBuilder(
+ const mutationQueryBuilder =
+ WorkspaceSelectQueryBuilder.toMutationQueryBuilder(
selectQueryBuilder,
- 'update',
- )
- .set(setColumns ?? {})
- .returning(columnsToReturn)
- .execute();
+ kind,
+ );
+
+ if (kind === 'update') {
+ mutationQueryBuilder.set(setColumns ?? {});
}
- return WorkspaceSelectQueryBuilder.toMutationQueryBuilder(
- selectQueryBuilder,
- kind,
- )
- .returning(columnsToReturn)
- .execute();
+ return mutationQueryBuilder.returning(columnsToReturn).execute();
}
private buildEventSnapshotQueryBuilder(
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.ts
index b77144d24cf..9abd3a492b8 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,7 +188,7 @@ export class MessageCampaignDeliveryService {
campaignId: string;
messageId: string;
}): Promise<void> {
- const { affected: failedDeliveryCount } = await this.workspaceOrmManager
+ const { generatedMaps: failedDeliveries } = await this.workspaceOrmManager
.getRepository(
CampaignDeliveryWorkspaceEntity,
{ shouldBypassPermissionChecks: true },
@@ -202,7 +202,7 @@ export class MessageCampaignDeliveryService {
},
);
- if (failedDeliveryCount === 1) {
+ if (failedDeliveries.length === 1) {
this.logger.warn(
`Campaign ${campaignId} of workspace ${workspaceId} gave up on message ${messageId} after ${SEND_SLOT_RETRY.attemptLimit} refused send slots`,
);
@@ -478,7 +478,7 @@ export class MessageCampaignDeliveryService {
}): Promise<string | null> {
const claimToken = v4();
- const { affected: claimedDeliveryCount } = await this.workspaceOrmManager
+ const { generatedMaps: claimedDeliveries } = await this.workspaceOrmManager
.getRepository(
CampaignDeliveryWorkspaceEntity,
{ shouldBypassPermissionChecks: true },
@@ -493,7 +493,7 @@ export class MessageCampaignDeliveryService {
},
);
- return claimedDeliveryCount === 1 ? claimToken : null;
+ return claimedDeliveries.length === 1 ? claimToken : null;
}
private async settleClaimedDelivery({
@@ -514,7 +514,7 @@ export class MessageCampaignDeliveryService {
>
>;
}): Promise<number> {
- const { affected: settledDeliveryCount } = await this.workspaceOrmManager
+ const { generatedMaps: settledDeliveries } = await this.workspaceOrmManager
.getRepository(
CampaignDeliveryWorkspaceEntity,
{ shouldBypassPermissionChecks: true },
@@ -525,6 +525,6 @@ export class MessageCampaignDeliveryService {
{ ...update, claimToken: null, claimExpiresAt: null },
);
- return settledDeliveryCount ?? 0;
+ return settledDeliveries.length;
}
}
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.ts
index d287136aa54..e9d1f0d62d7 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 { affected: settledDeliveryCount } =
+ const { generatedMaps: settledDeliveries } =
await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
const campaignDeliveryRepository =
this.workspaceOrmManager.getRepository(
@@ -274,7 +274,7 @@ export class MessageCampaignLifecycleService {
return campaignDeliveryRepository.update(criteria, update);
}, buildSystemAuthContext(workspaceId));
- return settledDeliveryCount ?? 0;
+ return settledDeliveries.length;
}
async finalizeCampaignIfComplete({