diff --git a/packages/twenty-server/src/database/commands/command-runners/__tests__/upgrade.command-runner.spec.ts b/packages/twenty-server/src/database/commands/command-runners/__tests__/upgrade.command-runner.spec.ts index ddba437f2..82f7854a9 100644 --- a/packages/twenty-server/src/database/commands/command-runners/__tests__/upgrade.command-runner.spec.ts +++ b/packages/twenty-server/src/database/commands/command-runners/__tests__/upgrade.command-runner.spec.ts @@ -2,8 +2,8 @@ import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; import { SemVer } from 'semver'; -import { Repository } from 'typeorm'; import { EachTestingContext } from 'twenty-shared/testing'; +import { Repository } from 'typeorm'; import { UpgradeCommandRunner } from 'src/database/commands/command-runners/upgrade.command-runner'; import { EnvironmentVariables } from 'src/engine/core-modules/environment/environment-variables'; @@ -14,7 +14,6 @@ import { SyncWorkspaceMetadataCommand } from 'src/engine/workspace-manager/works class TestUpgradeCommandRunnerV1 extends UpgradeCommandRunner { fromWorkspaceVersion = new SemVer('1.0.0'); - VALIDATE_WORKSPACE_VERSION_FEATURE_FLAG = true as const; public override async runBeforeSyncMetadata(): Promise { return; @@ -27,7 +26,6 @@ class TestUpgradeCommandRunnerV1 extends UpgradeCommandRunner { class InvalidVersionUpgradeCommandRunner extends UpgradeCommandRunner { fromWorkspaceVersion = new SemVer('invalid'); - VALIDATE_WORKSPACE_VERSION_FEATURE_FLAG = true as const; protected async runBeforeSyncMetadata(): Promise { return; @@ -40,7 +38,6 @@ class InvalidVersionUpgradeCommandRunner extends UpgradeCommandRunner { class TestUpgradeCommandRunnerV2 extends UpgradeCommandRunner { fromWorkspaceVersion = new SemVer('2.0.0'); - VALIDATE_WORKSPACE_VERSION_FEATURE_FLAG = true as const; protected async runBeforeSyncMetadata(): Promise { return; diff --git a/packages/twenty-server/src/database/commands/command-runners/upgrade.command-runner.ts b/packages/twenty-server/src/database/commands/command-runners/upgrade.command-runner.ts index ddd8a62f5..e322284b3 100644 --- a/packages/twenty-server/src/database/commands/command-runners/upgrade.command-runner.ts +++ b/packages/twenty-server/src/database/commands/command-runners/upgrade.command-runner.ts @@ -2,8 +2,8 @@ import { InjectRepository } from '@nestjs/typeorm'; import chalk from 'chalk'; import { SemVer } from 'semver'; -import { Repository } from 'typeorm'; import { isDefined } from 'twenty-shared/utils'; +import { Repository } from 'typeorm'; import { ActiveOrSuspendedWorkspacesMigrationCommandRunner, @@ -109,15 +109,6 @@ export abstract class UpgradeCommandRunner extends ActiveOrSuspendedWorkspacesMi private async retrieveWorkspaceVersionAndCompareToWorkspaceFromVersion( workspaceId: string, ): Promise { - // TODO remove after first release has been done using workspace_version - if (!isDefined(this.VALIDATE_WORKSPACE_VERSION_FEATURE_FLAG)) { - this.logger.warn( - 'VALIDATE_WORKSPACE_VERSION_FEATURE_FLAG set to true ignoring workspace versions validation step', - ); - - return 'equal'; - } - const workspace = await this.workspaceRepository.findOneByOrFail({ id: workspaceId, }); diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/upgrade.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/upgrade.command.ts index d6d1edaba..a72232820 100644 --- a/packages/twenty-server/src/database/commands/upgrade-version-command/upgrade.command.ts +++ b/packages/twenty-server/src/database/commands/upgrade-version-command/upgrade.command.ts @@ -31,7 +31,7 @@ type VersionCommands = { description: 'Upgrade workspaces to the latest version', }) export class UpgradeCommand extends UpgradeCommandRunner { - fromWorkspaceVersion = new SemVer('0.43.0'); + fromWorkspaceVersion = new SemVer('0.44.0'); private commands: VersionCommands; constructor( @@ -74,19 +74,19 @@ export class UpgradeCommand extends UpgradeCommandRunner { this.addTasksAssignedToMeViewCommand, ], }; - const commands_044: VersionCommands = { + const _commands_044: VersionCommands = { beforeSyncMetadata: [ this.initializePermissionsCommand, this.updateViewAggregateOperationsCommand, ], afterSyncMetadata: [], }; - const _commands_050: VersionCommands = { + const commands_050: VersionCommands = { beforeSyncMetadata: [this.migrateRelationsToFieldMetadataCommand], afterSyncMetadata: [], }; - this.commands = commands_044; + this.commands = commands_050; } override async runBeforeSyncMetadata(args: RunOnWorkspaceArgs) {