Skip to content

The open alternative to Salesforce, designed for AI.

feat(workflow): add workspaceWorkflowId to core workflows (#25723)

Thomas Trompetteb7e40acd3cb6
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-41/2-41-instance-command-fast-1789350000001-add-workspace-workflow-id-to-workflow.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-41/2-41-instance-command-fast-1789350000001-add-workspace-workflow-id-to-workflow.ts
new file mode 100644
index 00000000000..4afa6dd4733
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-41/2-41-instance-command-fast-1789350000001-add-workspace-workflow-id-to-workflow.ts
@@ -0,0 +1,19 @@
+import { type QueryRunner } from 'typeorm';
+
+import { RegisteredInstanceCommand } from 'src/engine/core-modules/upgrade/decorators/registered-instance-command.decorator';
+import { type FastInstanceCommand } from 'src/engine/core-modules/upgrade/interfaces/fast-instance-command.interface';
+
+@RegisteredInstanceCommand('2.41.0', 1789350000001)
+export class AddWorkspaceWorkflowIdToWorkflowFastInstanceCommand implements FastInstanceCommand {
+ public async up(queryRunner: QueryRunner): Promise<void> {
+ await queryRunner.query(
+ `ALTER TABLE "core"."workflow" ADD COLUMN IF NOT EXISTS "workspaceWorkflowId" uuid`,
+ );
+ }
+
+ public async down(queryRunner: QueryRunner): Promise<void> {
+ await queryRunner.query(
+ `ALTER TABLE "core"."workflow" DROP COLUMN "workspaceWorkflowId"`,
+ );
+ }
+}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-41/2-41-upgrade-version-command.module.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-41/2-41-upgrade-version-command.module.ts
index f9613cb648d..aea7ce7a7e9 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-41/2-41-upgrade-version-command.module.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-41/2-41-upgrade-version-command.module.ts
@@ -3,6 +3,7 @@ import { TypeOrmModule } from '@nestjs/typeorm';
import { WorkspaceIteratorModule } from 'src/database/commands/command-runners/workspace-iterator.module';
import { CorrectStandardFieldAcronymCasingCommand } from 'src/database/commands/upgrade-version-command/2-41/2-41-workspace-command-1789331219041-correct-standard-field-acronym-casing.command';
+import { BackfillWorkspaceWorkflowIdOnWorkflowsCommand } from 'src/database/commands/upgrade-version-command/2-41/2-41-workspace-command-1789350000002-backfill-workspace-workflow-id-on-workflows.command';
import { ApplicationModule } from 'src/engine/core-modules/application/application.module';
import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
import { WorkspaceMigrationRunnerModule } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/workspace-migration-runner.module';
@@ -14,6 +15,9 @@ import { WorkspaceMigrationRunnerModule } from 'src/engine/workspace-manager/wor
WorkspaceIteratorModule,
WorkspaceMigrationRunnerModule,
],
- providers: [CorrectStandardFieldAcronymCasingCommand],
+ providers: [
+ CorrectStandardFieldAcronymCasingCommand,
+ BackfillWorkspaceWorkflowIdOnWorkflowsCommand,
+ ],
})
export class V2_41_UpgradeVersionCommandModule {}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-41/2-41-workspace-command-1789350000002-backfill-workspace-workflow-id-on-workflows.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-41/2-41-workspace-command-1789350000002-backfill-workspace-workflow-id-on-workflows.command.ts
new file mode 100644
index 00000000000..86d89b43238
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-41/2-41-workspace-command-1789350000002-backfill-workspace-workflow-id-on-workflows.command.ts
@@ -0,0 +1,110 @@
+import { Command } from 'nest-commander';
+import { isDefined } from 'twenty-shared/utils';
+import { type QueryRunner } from 'typeorm';
+
+import { ProvisionedWorkspaceCommandRunner } from 'src/database/commands/command-runners/provisioned-workspace.command-runner';
+import { WorkspaceIteratorService } from 'src/database/commands/command-runners/workspace-iterator.service';
+import { type RunOnWorkspaceArgs } from 'src/database/commands/command-runners/workspace.command-runner';
+import { RegisteredWorkspaceCommand } from 'src/engine/core-modules/upgrade/decorators/registered-workspace-command.decorator';
+import { getWorkspaceSchemaName } from 'src/engine/workspace-datasource/utils/get-workspace-schema-name.util';
+
+@RegisteredWorkspaceCommand('2.41.0', 1789350000002)
+@Command({
+ name: 'upgrade:2-41:backfill-workspace-workflow-id-on-workflows',
+ description:
+ 'Backfill workspaceWorkflowId on core workflow rows from the workspace workflow mapping',
+})
+export class BackfillWorkspaceWorkflowIdOnWorkflowsCommand extends ProvisionedWorkspaceCommandRunner {
+ constructor(
+ protected readonly workspaceIteratorService: WorkspaceIteratorService,
+ ) {
+ super(workspaceIteratorService);
+ }
+
+ override async runOnWorkspace({
+ workspaceId,
+ options,
+ dataSource,
+ }: RunOnWorkspaceArgs): Promise<void> {
+ if (!isDefined(dataSource)) {
+ this.logger.warn(
+ `No data source for workspace ${workspaceId}, skipping backfill`,
+ );
+
+ return;
+ }
+
+ const schema = getWorkspaceSchemaName(workspaceId);
+
+ const lowestWorkspaceWorkflowIdSubquery = `
+ SELECT w.id
+ FROM "${schema}"."workflow" w
+ WHERE w."coreWorkflowId" = cw.id
+ AND w."deletedAt" IS NULL
+ ORDER BY w.id
+ LIMIT 1`;
+
+ const queryRunner = dataSource.createQueryRunner();
+
+ await queryRunner.connect();
+
+ try {
+ if (!(await this.hasCoreWorkflowIdColumn(queryRunner, schema))) {
+ return;
+ }
+
+ const [counts] = await queryRunner.query(
+ `SELECT count(*)::int AS total
+ FROM core."workflow" cw
+ WHERE cw."workspaceId" = $1
+ AND cw."workspaceWorkflowId" IS NULL
+ AND EXISTS (${lowestWorkspaceWorkflowIdSubquery})`,
+ [workspaceId],
+ );
+
+ if (counts.total === 0) {
+ return;
+ }
+
+ if (options.dryRun) {
+ this.logger.log(
+ `[DRY RUN] Would backfill workspaceWorkflowId on ${counts.total} core workflow row(s) for workspace ${workspaceId}`,
+ );
+
+ return;
+ }
+
+ await queryRunner.query(
+ `UPDATE core."workflow" cw
+ SET "workspaceWorkflowId" = (${lowestWorkspaceWorkflowIdSubquery})
+ WHERE cw."workspaceId" = $1
+ AND cw."workspaceWorkflowId" IS NULL
+ AND EXISTS (${lowestWorkspaceWorkflowIdSubquery})`,
+ [workspaceId],
+ );
+
+ this.logger.log(
+ `Backfilled workspaceWorkflowId on ${counts.total} core workflow row(s) for workspace ${workspaceId}`,
+ );
+ } finally {
+ await queryRunner.release();
+ }
+ }
+
+ private async hasCoreWorkflowIdColumn(
+ queryRunner: QueryRunner,
+ schema: string,
+ ): Promise<boolean> {
+ const rows = await queryRunner.query(
+ `SELECT 1
+ FROM information_schema.columns
+ WHERE table_schema = $1
+ AND table_name = 'workflow'
+ AND column_name = 'coreWorkflowId'
+ LIMIT 1`,
+ [schema],
+ );
+
+ return rows.length > 0;
+ }
+}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-41/__tests__/2-41-workspace-command-1789350000002-backfill-workspace-workflow-id-on-workflows.command.spec.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-41/__tests__/2-41-workspace-command-1789350000002-backfill-workspace-workflow-id-on-workflows.command.spec.ts
new file mode 100644
index 00000000000..4a73b387b42
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-41/__tests__/2-41-workspace-command-1789350000002-backfill-workspace-workflow-id-on-workflows.command.spec.ts
@@ -0,0 +1,125 @@
+import { type DataSource } from 'typeorm';
+
+import { type WorkspaceIteratorService } from 'src/database/commands/command-runners/workspace-iterator.service';
+import { BackfillWorkspaceWorkflowIdOnWorkflowsCommand } from 'src/database/commands/upgrade-version-command/2-41/2-41-workspace-command-1789350000002-backfill-workspace-workflow-id-on-workflows.command';
+
+const WORKSPACE_ID = '20202020-0000-0000-0000-000000000001';
+
+const isUpdate = (sql: unknown) =>
+ typeof sql === 'string' && sql.trimStart().startsWith('UPDATE');
+
+const setup = ({
+ total = 0,
+ hasCoreWorkflowIdColumn = true,
+}: {
+ total?: number;
+ hasCoreWorkflowIdColumn?: boolean;
+} = {}) => {
+ const query = jest.fn(async (...args: unknown[]) => {
+ const sql = args[0] as string;
+
+ if (sql.includes('information_schema.columns')) {
+ return hasCoreWorkflowIdColumn ? [{ '?column?': 1 }] : [];
+ }
+ if (sql.includes('count(*)')) {
+ return [{ total }];
+ }
+
+ return [];
+ });
+
+ const queryRunner = {
+ connect: jest.fn(),
+ release: jest.fn(),
+ query,
+ };
+
+ const dataSource = {
+ createQueryRunner: () => queryRunner,
+ } as unknown as DataSource;
+
+ const command = new BackfillWorkspaceWorkflowIdOnWorkflowsCommand(
+ {} as WorkspaceIteratorService,
+ );
+
+ const run = (dryRun = false) =>
+ command.runOnWorkspace({
+ workspaceId: WORKSPACE_ID,
+ dataSource,
+ options: { dryRun },
+ index: 0,
+ total: 1,
+ });
+
+ return { run, query, queryRunner };
+};
+
+describe('BackfillWorkspaceWorkflowIdOnWorkflowsCommand', () => {
+ beforeEach(() => jest.clearAllMocks());
+
+ it('backfills the workspaces that have rows left to fill', async () => {
+ const { run, query, queryRunner } = setup({ total: 3 });
+
+ await run();
+
+ const updateCalls = query.mock.calls.filter((call) => isUpdate(call[0]));
+
+ expect(updateCalls).toHaveLength(1);
+ expect(updateCalls[0][1]).toEqual([WORKSPACE_ID]);
+ expect(queryRunner.connect).toHaveBeenCalledTimes(1);
+ expect(queryRunner.release).toHaveBeenCalledTimes(1);
+ });
+
+ it('skips a workspace whose workflow table has no coreWorkflowId column', async () => {
+ const { run, query, queryRunner } = setup({
+ total: 3,
+ hasCoreWorkflowIdColumn: false,
+ });
+
+ await run();
+
+ expect(query.mock.calls.some((call) => isUpdate(call[0]))).toBe(false);
+ expect(
+ query.mock.calls.some((call) => String(call[0]).includes('count(*)')),
+ ).toBe(false);
+ expect(query).toHaveBeenCalledTimes(1);
+ expect(queryRunner.release).toHaveBeenCalledTimes(1);
+ });
+
+ it('does not update on a dry run', async () => {
+ const { run, query } = setup({ total: 3 });
+
+ await run(true);
+
+ expect(query.mock.calls.some((call) => isUpdate(call[0]))).toBe(false);
+ });
+
+ it('is a no-op when every row is already backfilled', async () => {
+ const { run, query } = setup({ total: 0 });
+
+ await run();
+
+ expect(query.mock.calls.some((call) => isUpdate(call[0]))).toBe(false);
+ });
+
+ it('releases the query runner when the update throws', async () => {
+ const { run, queryRunner, query } = setup({ total: 3 });
+
+ query.mockImplementation(async (...args: unknown[]) => {
+ const sql = args[0] as string;
+
+ if (sql.includes('information_schema.columns')) {
+ return [{ '?column?': 1 }];
+ }
+ if (sql.includes('count(*)')) {
+ return [{ total: 3 }];
+ }
+
+ throw new Error('update failed');
+ });
+
+ await expect(run()).rejects.toThrow('update failed');
+
+ expect(queryRunner.release).toHaveBeenCalledTimes(1);
+ });
+});
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-41/add-workspace-workflow-id-to-workflow-upgrade-command-name.constant.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-41/add-workspace-workflow-id-to-workflow-upgrade-command-name.constant.ts
new file mode 100644
index 00000000000..b0ede8eebad
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-41/add-workspace-workflow-id-to-workflow-upgrade-command-name.constant.ts
@@ -0,0 +1,2 @@
+export const ADD_WORKSPACE_WORKFLOW_ID_TO_WORKFLOW_UPGRADE_COMMAND_NAME =
+ '2.41.0_AddWorkspaceWorkflowIdToWorkflowFastInstanceCommand_1789350000001';
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/instance-commands.constant.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/instance-commands.constant.ts
index 8c3ea347d04..a9d5f9ca215 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/instance-commands.constant.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/instance-commands.constant.ts
@@ -188,6 +188,7 @@ import { AddAiModelTiersToWorkspaceFastInstanceCommand } from 'src/database/comm
import { MigrateWorkspaceModelsToTiersSlowInstanceCommand } from 'src/database/commands/upgrade-version-command/2-40/2-40-instance-command-slow-1789000000001-migrate-workspace-models-to-tiers';
import { AddIsSystemToSkillFastInstanceCommand } from 'src/database/commands/upgrade-version-command/2-40/2-40-instance-command-fast-1789129759228-add-is-system-to-skill';
import { MigrateCanvasTabsToVerticalListSlowInstanceCommand } from 'src/database/commands/upgrade-version-command/2-40/2-40-instance-command-slow-1789139070588-migrate-canvas-tabs-to-vertical-list';
+import { AddWorkspaceWorkflowIdToWorkflowFastInstanceCommand } from 'src/database/commands/upgrade-version-command/2-41/2-41-instance-command-fast-1789350000001-add-workspace-workflow-id-to-workflow';
export const INSTANCE_COMMANDS = [
AddViewFieldGroupIdIndexOnViewFieldFastInstanceCommand,
@@ -378,4 +379,5 @@ export const INSTANCE_COMMANDS = [
MigrateWorkspaceModelsToTiersSlowInstanceCommand,
AddIsSystemToSkillFastInstanceCommand,
MigrateCanvasTabsToVerticalListSlowInstanceCommand,
+ AddWorkspaceWorkflowIdToWorkflowFastInstanceCommand,
];
diff --git a/packages/twenty-server/src/engine/core-modules/workflow/entities/workflow.entity.ts b/packages/twenty-server/src/engine/core-modules/workflow/entities/workflow.entity.ts
index 879ee4a2da9..e93b160789a 100644
--- a/packages/twenty-server/src/engine/core-modules/workflow/entities/workflow.entity.ts
+++ b/packages/twenty-server/src/engine/core-modules/workflow/entities/workflow.entity.ts
@@ -8,6 +8,7 @@ import {
} from 'typeorm';
import { CREATE_WORKFLOW_CORE_TABLE_UPGRADE_COMMAND_NAME } from 'src/database/commands/upgrade-version-command/2-20/create-workflow-core-table-upgrade-command-name.constant';
+import { ADD_WORKSPACE_WORKFLOW_ID_TO_WORKFLOW_UPGRADE_COMMAND_NAME } from 'src/database/commands/upgrade-version-command/2-41/add-workspace-workflow-id-to-workflow-upgrade-command-name.constant';
import { WasIntroducedInUpgrade } from 'src/engine/core-modules/upgrade/decorators/was-introduced-in-upgrade.decorator';
import { SyncableEntity } from 'src/engine/workspace-manager/types/syncable-entity.interface';
@@ -27,6 +28,13 @@ export class WorkflowEntity extends SyncableEntity {
@Column({ type: 'uuid', nullable: true })
lastPublishedVersionId: string | null;
+ @WasIntroducedInUpgrade({
+ upgradeCommandName:
+ ADD_WORKSPACE_WORKFLOW_ID_TO_WORKFLOW_UPGRADE_COMMAND_NAME,
+ })
+ @Column({ type: 'uuid', nullable: true })
+ workspaceWorkflowId: string | null;
+
@CreateDateColumn({ type: 'timestamptz' })
createdAt: Date;
diff --git a/packages/twenty-server/src/engine/core-modules/workflow/services/core-workflow-mutation.workspace-service.ts b/packages/twenty-server/src/engine/core-modules/workflow/services/core-workflow-mutation.workspace-service.ts
index cb1141cbda7..aa6438bb983 100644
--- a/packages/twenty-server/src/engine/core-modules/workflow/services/core-workflow-mutation.workspace-service.ts
+++ b/packages/twenty-server/src/engine/core-modules/workflow/services/core-workflow-mutation.workspace-service.ts
@@ -65,6 +65,8 @@ export class CoreWorkflowMutationWorkspaceService {
});
}, authContext);
+ const workspaceWorkflowId = uuidv4();
+
const coreWorkflow = await this.coreWorkflowRepository.insertAndReturnOne(
workspaceId,
{
@@ -72,48 +74,41 @@ export class CoreWorkflowMutationWorkspaceService {
name: name ?? null,
universalIdentifier: uuidv4(),
applicationId,
+ workspaceWorkflowId,
},
);
- let workspaceWorkflowId: string | undefined;
-
try {
- workspaceWorkflowId =
- await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
- const workflowRepository =
- this.workspaceOrmManager.getRepository<WorkflowWorkspaceEntity>(
- 'workflow',
- { shouldBypassPermissionChecks: true },
- );
-
- const position = await this.recordPositionService.buildRecordPosition(
- {
- value: 'first',
- objectMetadata: {
- isCustom: false,
- nameSingular: 'workflow',
- },
- workspaceId,
- },
+ await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
+ const workflowRepository =
+ this.workspaceOrmManager.getRepository<WorkflowWorkspaceEntity>(
+ 'workflow',
+ { shouldBypassPermissionChecks: true },
);
- const insertWorkflowResult = await workflowRepository.insert({
- name: name ?? null,
- position,
- coreWorkflowId: coreWorkflow.id,
- createdBy: buildCreatedByFromFullNameMetadata({
- fullNameMetadata: {
- firstName: workspaceMember.name.firstName,
- lastName: workspaceMember.name.lastName,
- },
- workspaceMemberId: workspaceMember.id,
- }),
- });
+ const position = await this.recordPositionService.buildRecordPosition({
+ value: 'first',
+ objectMetadata: {
+ isCustom: false,
+ nameSingular: 'workflow',
+ },
+ workspaceId,
+ });
- return (
- insertWorkflowResult.generatedMaps[0] as WorkflowWorkspaceEntity
- ).id;
- }, authContext);
+ await workflowRepository.insert({
+ id: workspaceWorkflowId,
+ name: name ?? null,
+ position,
+ coreWorkflowId: coreWorkflow.id,
+ createdBy: buildCreatedByFromFullNameMetadata({
+ fullNameMetadata: {
+ firstName: workspaceMember.name.firstName,
+ lastName: workspaceMember.name.lastName,
+ },
+ workspaceMemberId: workspaceMember.id,
+ }),
+ });
+ }, authContext);
await this.workflowVersionCoreSyncService.createInitialDraftVersionForWorkflow(
workspaceId,
diff --git a/packages/twenty-server/src/engine/core-modules/workflow/services/workflow-core-sync.service.ts b/packages/twenty-server/src/engine/core-modules/workflow/services/workflow-core-sync.service.ts
index 177bd6b7782..04de54bc6ec 100644
--- a/packages/twenty-server/src/engine/core-modules/workflow/services/workflow-core-sync.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/workflow/services/workflow-core-sync.service.ts
@@ -43,10 +43,11 @@ export class WorkflowCoreSyncService {
const applicationId = await this.getCustomApplicationIdOrThrow(workspaceId);
- const linkedCoreWorkflowIds = await this.resolveOwnedCoreWorkflowIds(
- workspaceId,
- liveWorkflows,
- );
+ const workspaceWorkflowIdByOwnedCoreWorkflowId =
+ await this.resolveWorkspaceWorkflowIdByOwnedCoreWorkflowId(
+ workspaceId,
+ liveWorkflows,
+ );
const coreWorkflowIdByWorkspaceRecordId = new Map<string, string>();
@@ -55,7 +56,7 @@ export class WorkflowCoreSyncService {
const linkedCoreWorkflowId =
isNonEmptyString(candidateCoreWorkflowId) &&
- linkedCoreWorkflowIds.has(candidateCoreWorkflowId)
+ workspaceWorkflowIdByOwnedCoreWorkflowId.has(candidateCoreWorkflowId)
? candidateCoreWorkflowId
: null;
@@ -65,9 +66,16 @@ export class WorkflowCoreSyncService {
coreWorkflowIdByWorkspaceRecordId.set(workflow.id, coreWorkflowId);
}
+ const storedWorkspaceWorkflowId = isDefined(linkedCoreWorkflowId)
+ ? workspaceWorkflowIdByOwnedCoreWorkflowId.get(linkedCoreWorkflowId)
+ : null;
+
return {
id: coreWorkflowId,
name: workflow.name ?? null,
+ workspaceWorkflowId: isNonEmptyString(storedWorkspaceWorkflowId)
+ ? storedWorkspaceWorkflowId
+ : workflow.id,
lastPublishedVersionId: isNonEmptyString(
workflow.lastPublishedVersionId,
)
@@ -88,24 +96,26 @@ export class WorkflowCoreSyncService {
// coreWorkflowId is a writable column on the workspace record, so a caller
// can point it at a core row owned by another workspace.
- private async resolveOwnedCoreWorkflowIds(
+ private async resolveWorkspaceWorkflowIdByOwnedCoreWorkflowId(
workspaceId: string,
workflows: WorkflowWorkspaceEntity[],
- ): Promise<Set<string>> {
+ ): Promise<Map<string, string | null>> {
const candidateIds = workflows
.map((workflow) => workflow.coreWorkflowId)
.filter(isNonEmptyString);
if (candidateIds.length === 0) {
- return new Set();
+ return new Map();
}
const ownedRows = await this.coreWorkflowRepository.find(workspaceId, {
where: { id: In(candidateIds) },
- select: { id: true },
+ select: { id: true, workspaceWorkflowId: true },
});
- return new Set(ownedRows.map((row) => row.id));
+ return new Map(
+ ownedRows.map((row) => [row.id, row.workspaceWorkflowId ?? null]),
+ );
}
async deleteFromCore(
diff --git a/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/utils/prefill-workflows.util.ts b/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/utils/prefill-workflows.util.ts
index 7483a4bc711..f66768b7dfa 100644
--- a/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/utils/prefill-workflows.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/utils/prefill-workflows.util.ts
@@ -5,6 +5,7 @@ import { type EntityManager } from 'typeorm';
import { v5 } from 'uuid';
import { DatabaseEventAction } from 'src/engine/api/graphql/graphql-query-runner/enums/database-event-action';
+import { WorkflowEntity } from 'src/engine/core-modules/workflow/entities/workflow.entity';
import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
@@ -232,14 +233,7 @@ export const prefillWorkflows = async (
await entityManager
.createQueryBuilder()
.insert()
- .into('core.workflow', [
- 'id',
- 'workspaceId',
- 'universalIdentifier',
- 'applicationId',
- 'name',
- 'lastPublishedVersionId',
- ])
+ .into(WorkflowEntity)
.orIgnore()
.values([
{
@@ -249,6 +243,7 @@ export const prefillWorkflows = async (
applicationId,
name: 'Quick Lead',
lastPublishedVersionId: quickLeadWorkflowVersionId,
+ workspaceWorkflowId: quickLeadWorkflowId,
},
{
id: coreCreateCompanyWorkflowId,
@@ -257,6 +252,7 @@ export const prefillWorkflows = async (
applicationId,
name: 'Create company when adding a new person',
lastPublishedVersionId: createCompanyWorkflowVersionId,
+ workspaceWorkflowId: createCompanyWorkflowId,
},
])
.execute();
diff --git a/packages/twenty-server/test/integration/graphql/suites/workflow/core-workflow-mutations.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/workflow/core-workflow-mutations.integration-spec.ts
index fcd60c4bcc8..83d04477160 100644
--- a/packages/twenty-server/test/integration/graphql/suites/workflow/core-workflow-mutations.integration-spec.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/workflow/core-workflow-mutations.integration-spec.ts
@@ -98,6 +98,15 @@ describe('coreWorkflow mutations (e2e)', () => {
expect(listedCoreWorkflow?.statuses).toEqual(['DRAFT']);
expect(listedCoreWorkflow?.workspaceWorkflowId).toBe(workspaceWorkflowId);
+ const storedCoreWorkflowRows = await global.testDataSource.query(
+ `SELECT "workspaceWorkflowId" FROM core."workflow" WHERE "id" = $1`,
+ [coreWorkflowId],
+ );
+
+ expect(storedCoreWorkflowRows[0]?.workspaceWorkflowId).toBe(
+ workspaceWorkflowId,
+ );
+
const workspaceWorkflowResponse = await graphql(
`
query GetWorkflow($id: UUID!) {
diff --git a/packages/twenty-server/test/integration/graphql/suites/workflow/workflow-core-mirror.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/workflow/workflow-core-mirror.integration-spec.ts
index 919f90f4c72..2defc9b7a07 100644
--- a/packages/twenty-server/test/integration/graphql/suites/workflow/workflow-core-mirror.integration-spec.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/workflow/workflow-core-mirror.integration-spec.ts
@@ -20,6 +20,18 @@ describe('workflow core mirror (e2e)', () => {
let workflowId: string;
let alreadyDestroyed = false;
+ const fetchWorkspaceWorkflowIdOnCoreRowNamed = async (
+ name: string,
+ ): Promise<string | null | undefined> => {
+ const rows = await global.testDataSource.query(
+ `SELECT "workspaceWorkflowId" FROM core."workflow"
+ WHERE "workspaceId" = $1 AND "name" = $2`,
+ [SEED_APPLE_WORKSPACE_ID, name],
+ );
+
+ return rows[0]?.workspaceWorkflowId;
+ };
+
const countCoreWorkflowsNamed = async (name: string): Promise<number> => {
const rows = await global.testDataSource.query(
`SELECT "id" FROM core."workflow"
@@ -80,6 +92,9 @@ describe('workflow core mirror (e2e)', () => {
workflowId = createResponse.body.data.createWorkflow.id;
expect(await waitForCoreWorkflowsNamed(INITIAL_NAME, 1)).toBe(1);
+ expect(await fetchWorkspaceWorkflowIdOnCoreRowNamed(INITIAL_NAME)).toBe(
+ workflowId,
+ );
const renameResponse = await graphql(
`