Skip to content

The open alternative to Salesforce, designed for AI.

fix(workflow): unblock 2.42 workflow execution backfill on legacy workspaces (#26435)

Thomas Trompette098ecae507a7
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-42/2-42-workspace-command-1789719131001-backfill-workflow-execution-core-ids.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-42/2-42-workspace-command-1789719131001-backfill-workflow-execution-core-ids.command.ts
index c668f571a97..9028d8ad359 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-42/2-42-workspace-command-1789719131001-backfill-workflow-execution-core-ids.command.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-42/2-42-workspace-command-1789719131001-backfill-workflow-execution-core-ids.command.ts
@@ -51,7 +51,39 @@ export class BackfillWorkflowExecutionCoreIdsCommand extends ProvisionedWorkspac
await queryRunner.startTransaction();
- const invalidMappings = await queryRunner.query(
+ const [, createdCoreVersionCount] = await queryRunner.query(
+ `WITH "createdCoreVersions" AS (
+ INSERT INTO core."workflowVersion"
+ (id, "workspaceId", "universalIdentifier", "applicationId", triggers, steps, status, "workflowId", "coreWorkflowId", "workspaceWorkflowVersionId")
+ SELECT gen_random_uuid(), $1, gen_random_uuid(), workspace."workspaceCustomApplicationId",
+ CASE WHEN wv.trigger IS NULL THEN NULL ELSE jsonb_build_array(wv.trigger) END,
+ wv.steps, wv.status::text::core."workflowVersion_status_enum", wv."workflowId", cw.id, wv.id
+ FROM "${schema}"."workflowVersion" wv
+ JOIN core."workspace" workspace ON workspace.id = $1
+ JOIN "${schema}"."workflow" w ON w.id = wv."workflowId"
+ JOIN core."workflow" cw
+ ON cw.id = w."coreWorkflowId" AND cw."workspaceId" = $1 AND cw."workspaceWorkflowId" = wv."workflowId"
+ WHERE wv."deletedAt" IS NULL AND wv."coreWorkflowVersionId" IS NULL
+ AND NOT EXISTS (
+ SELECT 1 FROM core."workflowVersion" existing
+ WHERE existing."workspaceId" = $1 AND existing."workspaceWorkflowVersionId" = wv.id
+ )
+ RETURNING id, "workspaceWorkflowVersionId"
+ )
+ UPDATE "${schema}"."workflowVersion" wv
+ SET "coreWorkflowVersionId" = "createdCoreVersions".id
+ FROM "createdCoreVersions"
+ WHERE wv.id = "createdCoreVersions"."workspaceWorkflowVersionId"`,
+ [workspaceId],
+ );
+
+ if (createdCoreVersionCount > 0) {
+ this.logger.log(
+ `${options.dryRun ? '[DRY RUN] Would create' : 'Created'} ${createdCoreVersionCount} missing core workflow version(s) in workspace ${workspaceId}`,
+ );
+ }
+
+ const invalidMappings: { id: string }[] = await queryRunner.query(
`SELECT wv.id FROM "${schema}"."workflowVersion" wv
LEFT JOIN core."workflowVersion" cv ON cv.id = wv."coreWorkflowVersionId"
LEFT JOIN core."workflow" cw ON cw.id = cv."coreWorkflowId"
@@ -61,35 +93,52 @@ export class BackfillWorkflowExecutionCoreIdsCommand extends ProvisionedWorkspac
cw.id IS NULL OR cw."workspaceId" <> $1 OR
cw."workspaceWorkflowId" IS DISTINCT FROM wv."workflowId" OR
cv."workspaceWorkflowVersionId" IS DISTINCT FROM wv.id
- ) LIMIT 1`,
- [workspaceId],
- );
- const duplicates = await queryRunner.query(
- `SELECT wv."coreWorkflowVersionId" FROM "${schema}"."workflowVersion" wv
- JOIN core."workflowVersion" cv ON cv.id = wv."coreWorkflowVersionId" AND cv."workspaceId" = $1
- GROUP BY wv."coreWorkflowVersionId" HAVING count(*) > 1 LIMIT 1`,
+ ) LIMIT 10`,
[workspaceId],
);
+ const duplicates: { coreWorkflowVersionId: string }[] =
+ await queryRunner.query(
+ `SELECT wv."coreWorkflowVersionId" FROM "${schema}"."workflowVersion" wv
+ JOIN core."workflowVersion" cv ON cv.id = wv."coreWorkflowVersionId" AND cv."workspaceId" = $1
+ GROUP BY wv."coreWorkflowVersionId" HAVING count(*) > 1 LIMIT 10`,
+ [workspaceId],
+ );
if (invalidMappings.length > 0 || duplicates.length > 0) {
- throw new Error(`Missing or conflicting workflow version mapping in workspace ${workspaceId}`);
+ throw new Error(
+ `Missing or conflicting workflow version mapping in workspace ${workspaceId}: ${[
+ ...invalidMappings.map(({ id }) => `workspace version ${id}`),
+ ...duplicates.map(
+ ({ coreWorkflowVersionId }) =>
+ `shared core version ${coreWorkflowVersionId}`,
+ ),
+ ].join(', ')}`,
+ );
}
- const conflictingRuns = await queryRunner.query(
+ const conflictingRuns: { id: string }[] = await queryRunner.query(
`SELECT r.id FROM "${schema}"."workflowRun" r
LEFT JOIN core."workflowVersion" cv
ON cv."workspaceId" = $1 AND cv."workspaceWorkflowVersionId" = r."workflowVersionId"
LEFT JOIN core."workflow" cw
ON cw."workspaceId" = $1 AND cw."workspaceWorkflowId" = r."workflowId"
- WHERE (r."coreWorkflowVersionId" IS NOT NULL AND cv.id IS NOT NULL AND r."coreWorkflowVersionId" <> cv.id)
- OR (r."coreWorkflowId" IS NOT NULL AND cw.id IS NOT NULL AND r."coreWorkflowId" <> cw.id)
+ LEFT JOIN core."workflowVersion" "storedVersion"
+ ON "storedVersion".id = r."coreWorkflowVersionId"
+ LEFT JOIN core."workflow" "storedWorkflow"
+ ON "storedWorkflow".id = r."coreWorkflowId"
+ WHERE ("storedVersion".id IS NOT NULL AND cv.id IS NOT NULL AND "storedVersion".id <> cv.id)
+ OR ("storedWorkflow".id IS NOT NULL AND cw.id IS NOT NULL AND "storedWorkflow".id <> cw.id)
OR (cv.id IS NOT NULL AND cw.id IS NOT NULL AND cv."coreWorkflowId" <> cw.id)
- LIMIT 1`,
+ LIMIT 10`,
[workspaceId],
);
if (conflictingRuns.length > 0) {
- throw new Error(`Conflicting workflow run core ids in workspace ${workspaceId}`);
+ throw new Error(
+ `Conflicting workflow run core ids in workspace ${workspaceId}: ${conflictingRuns
+ .map(({ id }) => id)
+ .join(', ')}`,
+ );
}
await queryRunner.query(
@@ -97,7 +146,10 @@ export class BackfillWorkflowExecutionCoreIdsCommand extends ProvisionedWorkspac
SET "coreWorkflowVersionId" = cv.id
FROM core."workflowVersion" cv
WHERE cv."workspaceId" = $1 AND cv."workspaceWorkflowVersionId" = r."workflowVersionId"
- AND r."coreWorkflowVersionId" IS NULL`,
+ AND NOT EXISTS (
+ SELECT 1 FROM core."workflowVersion" "storedVersion"
+ WHERE "storedVersion".id = r."coreWorkflowVersionId"
+ )`,
[workspaceId],
);
await queryRunner.query(
@@ -105,7 +157,10 @@ export class BackfillWorkflowExecutionCoreIdsCommand extends ProvisionedWorkspac
SET "coreWorkflowId" = cv."coreWorkflowId"
FROM core."workflowVersion" cv
WHERE cv."workspaceId" = $1 AND cv.id = r."coreWorkflowVersionId"
- AND r."coreWorkflowId" IS NULL`,
+ AND NOT EXISTS (
+ SELECT 1 FROM core."workflow" "storedWorkflow"
+ WHERE "storedWorkflow".id = r."coreWorkflowId"
+ )`,
[workspaceId],
);
await queryRunner.query(
@@ -113,37 +168,49 @@ export class BackfillWorkflowExecutionCoreIdsCommand extends ProvisionedWorkspac
SET "coreWorkflowId" = cw.id
FROM core."workflow" cw
WHERE cw."workspaceId" = $1 AND cw."workspaceWorkflowId" = r."workflowId"
- AND r."coreWorkflowId" IS NULL`,
+ AND NOT EXISTS (
+ SELECT 1 FROM core."workflow" "storedWorkflow"
+ WHERE "storedWorkflow".id = r."coreWorkflowId"
+ )`,
[workspaceId],
);
- const unmappedPendingRuns = await queryRunner.query(
+ const unmappedPendingRuns: { id: string }[] = await queryRunner.query(
`SELECT r.id FROM "${schema}"."workflowRun" r
LEFT JOIN core."workflowVersion" cv ON cv.id = r."coreWorkflowVersionId" AND cv."workspaceId" = $1
LEFT JOIN core."workflow" cw ON cw.id = r."coreWorkflowId" AND cw."workspaceId" = $1
WHERE r."deletedAt" IS NULL AND r.status IN ('NOT_STARTED', 'ENQUEUED', 'RUNNING')
AND (cv.id IS NULL OR cw.id IS NULL OR cv."coreWorkflowId" <> cw.id)
- LIMIT 1`,
+ LIMIT 10`,
[workspaceId],
);
if (unmappedPendingRuns.length > 0) {
- throw new Error(`Pending workflow runs have no valid core mapping in workspace ${workspaceId}`);
+ throw new Error(
+ `Pending workflow runs have no valid core mapping in workspace ${workspaceId}: ${unmappedPendingRuns
+ .map(({ id }) => id)
+ .join(', ')}`,
+ );
}
- const conflictingPublishedVersions = await queryRunner.query(
- `SELECT cw.id FROM core."workflow" cw
- LEFT JOIN core."workflowVersion" cv ON cv."workspaceId" = cw."workspaceId"
- AND cv."workspaceWorkflowVersionId" = cw."lastPublishedVersionId"
- WHERE cw."workspaceId" = $1 AND cw."lastPublishedVersionId" IS NOT NULL
- AND (cv.id IS NULL OR cv."coreWorkflowId" <> cw.id OR
- (cw."lastPublishedCoreWorkflowVersionId" IS NOT NULL AND cw."lastPublishedCoreWorkflowVersionId" <> cv.id))
- LIMIT 1`,
- [workspaceId],
- );
+ const conflictingPublishedVersions: { id: string }[] =
+ await queryRunner.query(
+ `SELECT cw.id FROM core."workflow" cw
+ LEFT JOIN core."workflowVersion" cv ON cv."workspaceId" = cw."workspaceId"
+ AND cv."workspaceWorkflowVersionId" = cw."lastPublishedVersionId"
+ WHERE cw."workspaceId" = $1 AND cw."lastPublishedVersionId" IS NOT NULL
+ AND (cv.id IS NULL OR cv."coreWorkflowId" <> cw.id OR
+ (cw."lastPublishedCoreWorkflowVersionId" IS NOT NULL AND cw."lastPublishedCoreWorkflowVersionId" <> cv.id))
+ LIMIT 10`,
+ [workspaceId],
+ );
if (conflictingPublishedVersions.length > 0) {
- throw new Error(`Invalid published core version mapping in workspace ${workspaceId}`);
+ throw new Error(
+ `Invalid published core version mapping in workspace ${workspaceId}: ${conflictingPublishedVersions
+ .map(({ id }) => id)
+ .join(', ')}`,
+ );
}
await queryRunner.query(
@@ -161,6 +228,8 @@ export class BackfillWorkflowExecutionCoreIdsCommand extends ProvisionedWorkspac
} else {
await queryRunner.commitTransaction();
await this.workspaceCacheService.invalidateAndRecompute(workspaceId, [
+ 'flatWorkflowMaps',
+ 'flatWorkflowVersionMaps',
'workflowAutomatedTriggerMaps',
]);
this.logger.log(`Workflow execution mappings backfilled in workspace ${workspaceId}`);
diff --git a/packages/twenty-server/test/integration/graphql/suites/workflow/core-workflow-execution.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/workflow/core-workflow-execution.integration-spec.ts
index a8bfded827e..65be6da6beb 100644
--- a/packages/twenty-server/test/integration/graphql/suites/workflow/core-workflow-execution.integration-spec.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/workflow/core-workflow-execution.integration-spec.ts
@@ -1583,6 +1583,75 @@ describe('core workflow execution and queue compatibility (e2e)', () => {
}
});
+ it('re-derives run core ids whose core rows no longer exist', async () => {
+ const fixture = await createFixture();
+ const id = randomUUID();
+ try {
+ await global.testDataSource.query(
+ `INSERT INTO "${schema}"."workflowRun" (id, name, "workflowId", "workflowVersionId", "coreWorkflowId", "coreWorkflowVersionId", status, position, state) VALUES ($1, 'B-Async stale', $2, $3, $4, $5, 'COMPLETED', 0, '{}')`,
+ [
+ id,
+ fixture.workflowId,
+ fixture.workflowVersionId,
+ randomUUID(),
+ randomUUID(),
+ ],
+ );
+ await backfill();
+ expect(await getRun(id)).toMatchObject({
+ coreWorkflowId: fixture.coreWorkflowId,
+ coreWorkflowVersionId: fixture.coreWorkflowVersionId,
+ });
+ } finally {
+ await global.testDataSource.query(
+ `DELETE FROM "${schema}"."workflowRun" WHERE id = $1`,
+ [id],
+ );
+ }
+ });
+
+ it('creates the missing core version of a live unlinked workspace version', async () => {
+ const fixture = await createFixture();
+ await global.testDataSource.query(
+ 'DELETE FROM core."workflowVersion" WHERE id = $1',
+ [fixture.coreWorkflowVersionId],
+ );
+ await global.testDataSource.query(
+ `UPDATE "${schema}"."workflowVersion" SET "coreWorkflowVersionId" = NULL WHERE id = $1`,
+ [fixture.workflowVersionId],
+ );
+ await global.testDataSource.query(
+ 'UPDATE core.workflow SET "lastPublishedCoreWorkflowVersionId" = NULL WHERE id = $1',
+ [fixture.coreWorkflowId],
+ );
+
+ await backfill();
+
+ const [workspaceVersion] = await global.testDataSource.query(
+ `SELECT "coreWorkflowVersionId" FROM "${schema}"."workflowVersion" WHERE id = $1`,
+ [fixture.workflowVersionId],
+ );
+ const [coreVersion] = await global.testDataSource.query(
+ 'SELECT "coreWorkflowId", "workspaceWorkflowVersionId", status, triggers, steps FROM core."workflowVersion" WHERE id = $1',
+ [workspaceVersion.coreWorkflowVersionId],
+ );
+ const [coreWorkflow] = await global.testDataSource.query(
+ 'SELECT "lastPublishedCoreWorkflowVersionId" FROM core.workflow WHERE id = $1',
+ [fixture.coreWorkflowId],
+ );
+
+ expect(coreVersion).toEqual({
+ coreWorkflowId: fixture.coreWorkflowId,
+ workspaceWorkflowVersionId: fixture.workflowVersionId,
+ status: 'ACTIVE',
+ triggers: [fixture.trigger],
+ steps: fixture.steps,
+ });
+ expect(coreWorkflow.lastPublishedCoreWorkflowVersionId).toBe(
+ workspaceVersion.coreWorkflowVersionId,
+ );
+ });
+
it('rejects an unmapped pending run without partially updating its ids', async () => {
const id = randomUUID();
try {