diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/0-50/0-50-upgrade-version-command.module.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/0-50/0-50-upgrade-version-command.module.ts index c498b310b..b491900ab 100644 --- a/packages/twenty-server/src/database/commands/upgrade-version-command/0-50/0-50-upgrade-version-command.module.ts +++ b/packages/twenty-server/src/database/commands/upgrade-version-command/0-50/0-50-upgrade-version-command.module.ts @@ -1,7 +1,6 @@ import { Module } from '@nestjs/common'; import { TypeOrmModule } from '@nestjs/typeorm'; -import { MigrateRelationsToFieldMetadataCommand } from 'src/database/commands/upgrade-version-command/0-50/0-50-migrate-relations-to-field-metadata.command'; import { UserWorkspace } from 'src/engine/core-modules/user-workspace/user-workspace.entity'; import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity'; import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity'; @@ -27,7 +26,7 @@ import { WorkspaceMigrationRunnerModule } from 'src/engine/workspace-manager/wor WorkspaceMigrationRunnerModule, WorkspaceMetadataVersionModule, ], - providers: [MigrateRelationsToFieldMetadataCommand], - exports: [MigrateRelationsToFieldMetadataCommand], + providers: [], + exports: [], }) export class V0_50_UpgradeVersionCommandModule {} diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/0-50/0-50-migrate-relations-to-field-metadata.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/0-51/0-51-migrate-relations-to-field-metadata.command.ts similarity index 98% rename from packages/twenty-server/src/database/commands/upgrade-version-command/0-50/0-50-migrate-relations-to-field-metadata.command.ts rename to packages/twenty-server/src/database/commands/upgrade-version-command/0-51/0-51-migrate-relations-to-field-metadata.command.ts index 37dd85d04..57499daad 100644 --- a/packages/twenty-server/src/database/commands/upgrade-version-command/0-50/0-50-migrate-relations-to-field-metadata.command.ts +++ b/packages/twenty-server/src/database/commands/upgrade-version-command/0-51/0-51-migrate-relations-to-field-metadata.command.ts @@ -2,8 +2,8 @@ import { InjectRepository } from '@nestjs/typeorm'; import chalk from 'chalk'; import { Command } from 'nest-commander'; -import { In, Repository } from 'typeorm'; import { FieldMetadataType } from 'twenty-shared/types'; +import { In, Repository } from 'typeorm'; import { RelationType } from 'src/engine/metadata-modules/field-metadata/interfaces/relation-type.interface'; @@ -21,7 +21,7 @@ import { import { isFieldMetadataOfType } from 'src/engine/utils/is-field-metadata-of-type.util'; @Command({ - name: 'upgrade:0-50:migrate-relations-to-field-metadata', + name: 'upgrade:0-51:migrate-relations-to-field-metadata', description: 'Migrate relations to field metadata', }) export class MigrateRelationsToFieldMetadataCommand extends ActiveOrSuspendedWorkspacesMigrationCommandRunner { diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/0-51/0-51-upgrade-version-command.module.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/0-51/0-51-upgrade-version-command.module.ts new file mode 100644 index 000000000..9992e9345 --- /dev/null +++ b/packages/twenty-server/src/database/commands/upgrade-version-command/0-51/0-51-upgrade-version-command.module.ts @@ -0,0 +1,32 @@ +import { Module } from '@nestjs/common'; +import { TypeOrmModule } from '@nestjs/typeorm'; + +import { UserWorkspace } from 'src/engine/core-modules/user-workspace/user-workspace.entity'; +import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity'; +import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity'; +import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity'; +import { RoleModule } from 'src/engine/metadata-modules/role/role.module'; +import { UserRoleModule } from 'src/engine/metadata-modules/user-role/user-role.module'; +import { WorkspaceMetadataVersionModule } from 'src/engine/metadata-modules/workspace-metadata-version/workspace-metadata-version.module'; +import { WorkspaceMigrationModule } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.module'; +import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/workspace-datasource.module'; +import { WorkspaceMigrationRunnerModule } from 'src/engine/workspace-manager/workspace-migration-runner/workspace-migration-runner.module'; + +@Module({ + imports: [ + TypeOrmModule.forFeature([Workspace, UserWorkspace], 'core'), + TypeOrmModule.forFeature( + [FieldMetadataEntity, ObjectMetadataEntity], + 'metadata', + ), + WorkspaceDataSourceModule, + RoleModule, + UserRoleModule, + WorkspaceMigrationModule, + WorkspaceMigrationRunnerModule, + WorkspaceMetadataVersionModule, + ], + providers: [], + exports: [], +}) +export class V0_51_UpgradeVersionCommandModule {} 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 a72232820..3c96f331d 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 @@ -16,7 +16,6 @@ import { MigrateSearchVectorOnNoteAndTaskEntitiesCommand } from 'src/database/co import { UpdateDefaultViewRecordOpeningOnWorkflowObjectsCommand } from 'src/database/commands/upgrade-version-command/0-43/0-43-update-default-view-record-opening-on-workflow-objects.command'; import { InitializePermissionsCommand } from 'src/database/commands/upgrade-version-command/0-44/0-44-initialize-permissions.command'; import { UpdateViewAggregateOperationsCommand } from 'src/database/commands/upgrade-version-command/0-44/0-44-update-view-aggregate-operations.command'; -import { MigrateRelationsToFieldMetadataCommand } from 'src/database/commands/upgrade-version-command/0-50/0-50-migrate-relations-to-field-metadata.command'; import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service'; import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity'; import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager'; @@ -51,9 +50,6 @@ export class UpgradeCommand extends UpgradeCommandRunner { // 0.44 Commands protected readonly initializePermissionsCommand: InitializePermissionsCommand, protected readonly updateViewAggregateOperationsCommand: UpdateViewAggregateOperationsCommand, - - // 0.50 Commands - protected readonly migrateRelationsToFieldMetadataCommand: MigrateRelationsToFieldMetadataCommand, ) { super( workspaceRepository, @@ -82,7 +78,7 @@ export class UpgradeCommand extends UpgradeCommandRunner { afterSyncMetadata: [], }; const commands_050: VersionCommands = { - beforeSyncMetadata: [this.migrateRelationsToFieldMetadataCommand], + beforeSyncMetadata: [], afterSyncMetadata: [], };