Skip to content

The open alternative to Salesforce, designed for AI.

fix(server): make workflow-core + person-avatar upgrade commands v2-safe (#24724)

Charles Bochetbdc96186ce7b
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-20/2-20-workspace-command-1783526282685-backfill-workflow-version-to-core.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-20/2-20-workspace-command-1783526282685-backfill-workflow-version-to-core.command.ts
index 512e0915a81..05fb955751b 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-20/2-20-workspace-command-1783526282685-backfill-workflow-version-to-core.command.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-20/2-20-workspace-command-1783526282685-backfill-workflow-version-to-core.command.ts
@@ -1,5 +1,5 @@
import { Command } from 'nest-commander';
-import { EntityMetadataNotFoundError } from 'typeorm/error/EntityMetadataNotFoundError';
+import { isWorkspaceObjectNotFoundError } from 'src/database/commands/upgrade-version-command/utils/is-workspace-object-not-found-error.util';
import { ProvisionedWorkspaceCommandRunner } from 'src/database/commands/command-runners/provisioned-workspace.command-runner';
import { WorkspaceIteratorService } from 'src/database/commands/command-runners/workspace-iterator.service';
@@ -47,7 +47,7 @@ export class BackfillWorkflowVersionToCoreCommand extends ProvisionedWorkspaceCo
buildSystemAuthContext(workspaceId),
);
} catch (error) {
- if (error instanceof EntityMetadataNotFoundError) {
+ if (isWorkspaceObjectNotFoundError(error)) {
this.logger.log(
`workflowVersion object does not exist for workspace ${workspaceId}, skipping`,
);
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-22/2-22-workspace-command-1783960128000-migrate-person-avatar-url-to-avatar-file.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-22/2-22-workspace-command-1783960128000-migrate-person-avatar-url-to-avatar-file.command.ts
index 6ba12cd5a44..1d76e13a9c5 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-22/2-22-workspace-command-1783960128000-migrate-person-avatar-url-to-avatar-file.command.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-22/2-22-workspace-command-1783960128000-migrate-person-avatar-url-to-avatar-file.command.ts
@@ -14,6 +14,7 @@ import { RegisteredWorkspaceCommand } from 'src/engine/core-modules/upgrade/deco
import { findFlatEntityByUniversalIdentifier } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-universal-identifier.util';
import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
+import { GlobalWorkspaceOrmManager } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-orm.manager';
import { type WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace.repository';
import { fetchImageWithTypeFromUrl } from 'src/utils/image';
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
@@ -34,6 +35,7 @@ export class MigratePersonAvatarUrlToAvatarFileCommand extends ProvisionedWorksp
private readonly workspaceCacheService: WorkspaceCacheService,
private readonly filesFieldService: FilesFieldService,
private readonly secureHttpClientService: SecureHttpClientService,
+ private readonly globalWorkspaceOrmManager: GlobalWorkspaceOrmManager,
) {
super(workspaceIteratorService);
}
@@ -88,10 +90,12 @@ export class MigratePersonAvatarUrlToAvatarFileCommand extends ProvisionedWorksp
return;
}
- const personRepository = dataSource.getRepository<PersonWorkspaceEntity>(
- 'person',
- { shouldBypassPermissionChecks: true },
- );
+ const personRepository =
+ await this.globalWorkspaceOrmManager.getRepository<PersonWorkspaceEntity>(
+ workspaceId,
+ 'person',
+ { shouldBypassPermissionChecks: true },
+ );
let candidateCount = 0;
let migratedCount = 0;
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-22/2-22-workspace-command-1784193207000-backfill-workflow-version-core-links.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-22/2-22-workspace-command-1784193207000-backfill-workflow-version-core-links.command.ts
index 8f497f17982..adacf317c18 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-22/2-22-workspace-command-1784193207000-backfill-workflow-version-core-links.command.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-22/2-22-workspace-command-1784193207000-backfill-workflow-version-core-links.command.ts
@@ -1,6 +1,6 @@
import { Command } from 'nest-commander';
import { isDefined } from 'twenty-shared/utils';
-import { EntityMetadataNotFoundError } from 'typeorm/error/EntityMetadataNotFoundError';
+import { isWorkspaceObjectNotFoundError } from 'src/database/commands/upgrade-version-command/utils/is-workspace-object-not-found-error.util';
import { v4 as uuidv4 } from 'uuid';
import { ProvisionedWorkspaceCommandRunner } from 'src/database/commands/command-runners/provisioned-workspace.command-runner';
@@ -54,7 +54,7 @@ export class BackfillWorkflowVersionCoreLinksCommand extends ProvisionedWorkspac
workspaceWorkflowVersions = await workflowVersionRepository.find();
} catch (error) {
- if (error instanceof EntityMetadataNotFoundError) {
+ if (isWorkspaceObjectNotFoundError(error)) {
this.logger.log(
`workflowVersion object does not exist for workspace ${workspaceId}, skipping`,
);
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-23/2-23-workspace-command-1784286707000-backfill-workflow-core-links.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-23/2-23-workspace-command-1784286707000-backfill-workflow-core-links.command.ts
index 95bd1f56ed0..81263c46e23 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-23/2-23-workspace-command-1784286707000-backfill-workflow-core-links.command.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-23/2-23-workspace-command-1784286707000-backfill-workflow-core-links.command.ts
@@ -1,6 +1,6 @@
import { Command } from 'nest-commander';
import { isDefined } from 'twenty-shared/utils';
-import { EntityMetadataNotFoundError } from 'typeorm/error/EntityMetadataNotFoundError';
+import { isWorkspaceObjectNotFoundError } from 'src/database/commands/upgrade-version-command/utils/is-workspace-object-not-found-error.util';
import { v4 as uuidv4 } from 'uuid';
import { ProvisionedWorkspaceCommandRunner } from 'src/database/commands/command-runners/provisioned-workspace.command-runner';
@@ -51,7 +51,7 @@ export class BackfillWorkflowCoreLinksCommand extends ProvisionedWorkspaceComman
workspaceWorkflows = await workflowRepository.find();
} catch (error) {
- if (error instanceof EntityMetadataNotFoundError) {
+ if (isWorkspaceObjectNotFoundError(error)) {
this.logger.log(
`workflow object does not exist for workspace ${workspaceId}, skipping`,
);
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-28/2-28-workspace-command-1785600000000-repair-orphan-core-workflow-versions.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-28/2-28-workspace-command-1785600000000-repair-orphan-core-workflow-versions.command.ts
index f8ce17dfa87..40324240359 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-28/2-28-workspace-command-1785600000000-repair-orphan-core-workflow-versions.command.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-28/2-28-workspace-command-1785600000000-repair-orphan-core-workflow-versions.command.ts
@@ -1,6 +1,6 @@
import { Command } from 'nest-commander';
import { isDefined } from 'twenty-shared/utils';
-import { EntityMetadataNotFoundError } from 'typeorm/error/EntityMetadataNotFoundError';
+import { isWorkspaceObjectNotFoundError } from 'src/database/commands/upgrade-version-command/utils/is-workspace-object-not-found-error.util';
import { ProvisionedWorkspaceCommandRunner } from 'src/database/commands/command-runners/provisioned-workspace.command-runner';
import { WorkspaceIteratorService } from 'src/database/commands/command-runners/workspace-iterator.service';
@@ -50,7 +50,7 @@ export class RepairOrphanCoreWorkflowVersionsCommand extends ProvisionedWorkspac
})
.count();
} catch (error) {
- if (error instanceof EntityMetadataNotFoundError) {
+ if (isWorkspaceObjectNotFoundError(error)) {
return;
}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/utils/is-workspace-object-not-found-error.util.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/utils/is-workspace-object-not-found-error.util.ts
new file mode 100644
index 00000000000..37dffc4d76a
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/utils/is-workspace-object-not-found-error.util.ts
@@ -0,0 +1,15 @@
+import { EntityMetadataNotFoundError } from 'typeorm/error/EntityMetadataNotFoundError';
+
+import {
+ TwentyOrmV2Exception,
+ TwentyOrmV2ExceptionCode,
+} from 'src/engine/twenty-orm-v2/exceptions/twenty-orm-v2.exception';
+
+// A workspace object can be absent when upgrading from a version that predates it.
+// The v1 GlobalWorkspaceDataSource throws EntityMetadataNotFoundError, while the v2
+// datasource throws TwentyOrmV2Exception(UNKNOWN_OBJECT). Backfill commands must treat
+// both as "object not provisioned yet" and skip rather than fail the upgrade.
+export const isWorkspaceObjectNotFoundError = (error: unknown): boolean =>
+ error instanceof EntityMetadataNotFoundError ||
+ (error instanceof TwentyOrmV2Exception &&
+ error.code === TwentyOrmV2ExceptionCode.UNKNOWN_OBJECT);