The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
fix(server): ORM v2 write-path parity - persist workflow step logs, skip undefined values (#24330)
Thomas Trompetteb5fc6fbd39d4
diff --git a/packages/twenty-server/src/engine/twenty-orm-v2/repository/workspace-repository-v2.ts b/packages/twenty-server/src/engine/twenty-orm-v2/repository/workspace-repository-v2.tsindex 955a91eae2a..142149ca17a 100644--- a/packages/twenty-server/src/engine/twenty-orm-v2/repository/workspace-repository-v2.ts+++ b/packages/twenty-server/src/engine/twenty-orm-v2/repository/workspace-repository-v2.ts@@ -154,6 +154,22 @@ export class WorkspaceRepositoryV2 {);}+ // TypeORM drops undefined properties before it validates or writes anything;+ // strip them here so they neither throw on an unknown field nor bind as NULL+ private formatWriteData(+ data: Partial<ObjectRecord>,+ ): Record<string, unknown> {+ const definedData = Object.fromEntries(+ Object.entries(data).filter(([, value]) => value !== undefined),+ );++ return formatData(+ definedData,+ this.options.flatObjectMetadata,+ this.options.internalContext.flatFieldMetadataMaps,+ );+ }+applyWriteRowLevelPermissions(queryBuilder: WorkspaceSelectQueryBuilderV2,): void {@@ -972,10 +988,8 @@ export class WorkspaceRepositoryV2 {}for (const [index, input] of inputs.entries()) {- const { id: _id, ...setColumns } = formatData(+ const { id: _id, ...setColumns } = this.formatWriteData(dataByInputIndex[index],- this.options.flatObjectMetadata,- this.options.internalContext.flatFieldMetadataMaps,);this.validateWriteIsPermitted({@@ -1039,11 +1053,7 @@ export class WorkspaceRepositoryV2 {formattedRecords: Record<string, unknown>[];} {const formattedRecords = records.map((record) =>- formatData(- record,- this.options.flatObjectMetadata,- this.options.internalContext.flatFieldMetadataMaps,- ),+ this.formatWriteData(record),);const columnNameSet = new Set<string>();@@ -1218,11 +1228,7 @@ export class WorkspaceRepositoryV2 {const setColumns =kind === 'update' && isDefined(dataToWrite)- ? formatData(- dataToWrite,- this.options.flatObjectMetadata,- this.options.internalContext.flatFieldMetadataMaps,- )+ ? this.formatWriteData(dataToWrite): undefined;this.validateWriteIsPermitted({diff --git a/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run/workflow-run-step-log.workspace-service.ts b/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run/workflow-run-step-log.workspace-service.tsindex 65f4820a022..1299e25cfd2 100644--- a/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run/workflow-run-step-log.workspace-service.ts+++ b/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run/workflow-run-step-log.workspace-service.ts@@ -1,10 +1,10 @@import { Injectable, Logger } from '@nestjs/common';+import { InjectDataSource } from '@nestjs/typeorm';import { type WorkflowRunStepLog } from 'twenty-shared/workflow';+import { DataSource } from 'typeorm';-import { GlobalWorkspaceOrmManager } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-orm.manager';-import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';-import { type WorkflowRunWorkspaceEntity } from 'src/modules/workflow/common/standard-objects/workflow-run.workspace-entity';+import { getWorkspaceSchemaName } from 'src/engine/workspace-datasource/utils/get-workspace-schema-name.util';const MAX_STEP_LOG_BYTES = 256_000;@@ -21,8 +21,10 @@ export class WorkflowRunStepLogWorkspaceService {private readonly logger = new Logger(WorkflowRunStepLogWorkspaceService.name);constructor(- private readonly globalWorkspaceOrmManager: GlobalWorkspaceOrmManager,+ @InjectDataSource()+ private readonly coreDataSource: DataSource,) {}+async setStepLog({workflowRunId,workspaceId,@@ -49,29 +51,11 @@ export class WorkflowRunStepLogWorkspaceService {sizeBytes,};- const authContext = buildSystemAuthContext(workspaceId);-- await this.globalWorkspaceOrmManager.executeInWorkspaceContext(async () => {- const workflowRunRepository =- await this.globalWorkspaceOrmManager.getRepository<WorkflowRunWorkspaceEntity>(- workspaceId,- 'workflowRun',- { shouldBypassPermissionChecks: true },- );+ const schemaName = getWorkspaceSchemaName(workspaceId);- await workflowRunRepository- .createQueryBuilder()- .update()- .set({- stepLogs: () =>- `jsonb_set(COALESCE("stepLogs", '{}'::jsonb), ARRAY[:stepId]::text[], :stepLog::jsonb, true)`,- })- .where('id = :workflowRunId', { workflowRunId })- .setParameters({- stepId,- stepLog: JSON.stringify(stepLogWithSize),- })- .execute();- }, authContext);+ await this.coreDataSource.query(+ `UPDATE ${schemaName}."workflowRun" SET "stepLogs" = jsonb_set(COALESCE("stepLogs", '{}'::jsonb), ARRAY[$1]::text[], $2::jsonb, true) WHERE "id" = $3`,+ [stepId, JSON.stringify(stepLogWithSize), workflowRunId],+ );}}