From 03f89791b6262a596bcc6c1412a0074e3583b3c3 Mon Sep 17 00:00:00 2001 From: Weiko Date: Fri, 20 Dec 2024 18:18:56 +0100 Subject: [PATCH] Add upgrade 0.35 command module (#9175) Moving commands from 0.40 to 0.35 since they should be ready for 0.35. --- .../database/commands/database-command.module.ts | 4 ++-- ...-phone-calling-code-create-column.command.ts} | 5 +---- ...5-phone-calling-code-migrate-data.command.ts} | 2 +- .../0-35-record-position-backfill.command.ts} | 2 +- .../0-35-upgrade-version.command.ts} | 14 +++++++------- .../0-35-upgrade-version.module.ts} | 16 ++++++++-------- ...0-35-view-group-no-value-backfill.command.ts} | 2 +- 7 files changed, 21 insertions(+), 24 deletions(-) rename packages/twenty-server/src/database/commands/upgrade-version/{0-40/0-40-phone-calling-code-create-column.command.ts => 0-35/0-35-phone-calling-code-create-column.command.ts} (95%) rename packages/twenty-server/src/database/commands/upgrade-version/{0-40/0-40-phone-calling-code-migrate-data.command.ts => 0-35/0-35-phone-calling-code-migrate-data.command.ts} (99%) rename packages/twenty-server/src/database/commands/upgrade-version/{0-40/0-40-record-position-backfill.command.ts => 0-35/0-35-record-position-backfill.command.ts} (96%) rename packages/twenty-server/src/database/commands/upgrade-version/{0-40/0-40-upgrade-version.command.ts => 0-35/0-35-upgrade-version.command.ts} (86%) rename packages/twenty-server/src/database/commands/upgrade-version/{0-40/0-40-upgrade-version.module.ts => 0-35/0-35-upgrade-version.module.ts} (84%) rename packages/twenty-server/src/database/commands/upgrade-version/{0-40/0-40-view-group-no-value-backfill.command.ts => 0-35/0-35-view-group-no-value-backfill.command.ts} (98%) diff --git a/packages/twenty-server/src/database/commands/database-command.module.ts b/packages/twenty-server/src/database/commands/database-command.module.ts index 1ab5b849f46b..e25e01cdb03c 100644 --- a/packages/twenty-server/src/database/commands/database-command.module.ts +++ b/packages/twenty-server/src/database/commands/database-command.module.ts @@ -10,7 +10,7 @@ import { ConfirmationQuestion } from 'src/database/commands/questions/confirmati import { UpgradeTo0_32CommandModule } from 'src/database/commands/upgrade-version/0-32/0-32-upgrade-version.module'; import { UpgradeTo0_33CommandModule } from 'src/database/commands/upgrade-version/0-33/0-33-upgrade-version.module'; import { UpgradeTo0_34CommandModule } from 'src/database/commands/upgrade-version/0-34/0-34-upgrade-version.module'; -import { UpgradeTo0_40CommandModule } from 'src/database/commands/upgrade-version/0-40/0-40-upgrade-version.module'; +import { UpgradeTo0_35CommandModule } from 'src/database/commands/upgrade-version/0-35/0-35-upgrade-version.module'; import { TypeORMModule } from 'src/database/typeorm/typeorm.module'; import { BillingSubscription } from 'src/engine/core-modules/billing/entities/billing-subscription.entity'; import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity'; @@ -52,7 +52,7 @@ import { WorkspaceSyncMetadataModule } from 'src/engine/workspace-manager/worksp UpgradeTo0_32CommandModule, UpgradeTo0_33CommandModule, UpgradeTo0_34CommandModule, - UpgradeTo0_40CommandModule, + UpgradeTo0_35CommandModule, FeatureFlagModule, ], providers: [ diff --git a/packages/twenty-server/src/database/commands/upgrade-version/0-40/0-40-phone-calling-code-create-column.command.ts b/packages/twenty-server/src/database/commands/upgrade-version/0-35/0-35-phone-calling-code-create-column.command.ts similarity index 95% rename from packages/twenty-server/src/database/commands/upgrade-version/0-40/0-40-phone-calling-code-create-column.command.ts rename to packages/twenty-server/src/database/commands/upgrade-version/0-35/0-35-phone-calling-code-create-column.command.ts index 4a26e8ec36a4..21fe77a6de86 100644 --- a/packages/twenty-server/src/database/commands/upgrade-version/0-40/0-40-phone-calling-code-create-column.command.ts +++ b/packages/twenty-server/src/database/commands/upgrade-version/0-35/0-35-phone-calling-code-create-column.command.ts @@ -15,7 +15,6 @@ import { FieldMetadataEntity, FieldMetadataType, } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity'; -import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity'; import { WorkspaceMetadataVersionService } from 'src/engine/metadata-modules/workspace-metadata-version/services/workspace-metadata-version.service'; import { generateMigrationName } from 'src/engine/metadata-modules/workspace-migration/utils/generate-migration-name.util'; import { @@ -30,7 +29,7 @@ import { WorkspaceMigrationRunnerService } from 'src/engine/workspace-manager/wo import { isDefined } from 'src/utils/is-defined'; @Command({ - name: 'upgrade-0.40:phone-calling-code-create-column', + name: 'upgrade-0.35:phone-calling-code-create-column', description: 'Create the callingCode column', }) export class PhoneCallingCodeCreateColumnCommand extends ActiveWorkspacesCommandRunner { @@ -39,8 +38,6 @@ export class PhoneCallingCodeCreateColumnCommand extends ActiveWorkspacesCommand protected readonly workspaceRepository: Repository, @InjectRepository(FieldMetadataEntity, 'metadata') private readonly fieldMetadataRepository: Repository, - @InjectRepository(ObjectMetadataEntity, 'metadata') - private readonly objectMetadataRepository: Repository, private readonly workspaceMigrationService: WorkspaceMigrationService, private readonly workspaceMigrationFactory: WorkspaceMigrationFactory, private readonly workspaceMigrationRunnerService: WorkspaceMigrationRunnerService, diff --git a/packages/twenty-server/src/database/commands/upgrade-version/0-40/0-40-phone-calling-code-migrate-data.command.ts b/packages/twenty-server/src/database/commands/upgrade-version/0-35/0-35-phone-calling-code-migrate-data.command.ts similarity index 99% rename from packages/twenty-server/src/database/commands/upgrade-version/0-40/0-40-phone-calling-code-migrate-data.command.ts rename to packages/twenty-server/src/database/commands/upgrade-version/0-35/0-35-phone-calling-code-migrate-data.command.ts index 6359bb1a00e6..67bf658918d0 100644 --- a/packages/twenty-server/src/database/commands/upgrade-version/0-40/0-40-phone-calling-code-migrate-data.command.ts +++ b/packages/twenty-server/src/database/commands/upgrade-version/0-35/0-35-phone-calling-code-migrate-data.command.ts @@ -54,7 +54,7 @@ const isCallingCode = (callingCode: string): boolean => { }; @Command({ - name: 'upgrade-0.40:phone-calling-code-migrate-data', + name: 'upgrade-0.35:phone-calling-code-migrate-data', description: 'Add calling code and change country code with default one', }) export class PhoneCallingCodeMigrateDataCommand extends ActiveWorkspacesCommandRunner { diff --git a/packages/twenty-server/src/database/commands/upgrade-version/0-40/0-40-record-position-backfill.command.ts b/packages/twenty-server/src/database/commands/upgrade-version/0-35/0-35-record-position-backfill.command.ts similarity index 96% rename from packages/twenty-server/src/database/commands/upgrade-version/0-40/0-40-record-position-backfill.command.ts rename to packages/twenty-server/src/database/commands/upgrade-version/0-35/0-35-record-position-backfill.command.ts index f0804e873077..7a342b920eb4 100644 --- a/packages/twenty-server/src/database/commands/upgrade-version/0-40/0-40-record-position-backfill.command.ts +++ b/packages/twenty-server/src/database/commands/upgrade-version/0-35/0-35-record-position-backfill.command.ts @@ -9,7 +9,7 @@ import { RecordPositionBackfillService } from 'src/engine/api/graphql/workspace- import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity'; @Command({ - name: 'upgrade-0.40:record-position-backfill', + name: 'upgrade-0.35:record-position-backfill', description: 'Backfill record position', }) export class RecordPositionBackfillCommand extends ActiveWorkspacesCommandRunner { diff --git a/packages/twenty-server/src/database/commands/upgrade-version/0-40/0-40-upgrade-version.command.ts b/packages/twenty-server/src/database/commands/upgrade-version/0-35/0-35-upgrade-version.command.ts similarity index 86% rename from packages/twenty-server/src/database/commands/upgrade-version/0-40/0-40-upgrade-version.command.ts rename to packages/twenty-server/src/database/commands/upgrade-version/0-35/0-35-upgrade-version.command.ts index e60b537bb398..7f0d7cdb08ba 100644 --- a/packages/twenty-server/src/database/commands/upgrade-version/0-40/0-40-upgrade-version.command.ts +++ b/packages/twenty-server/src/database/commands/upgrade-version/0-35/0-35-upgrade-version.command.ts @@ -5,18 +5,18 @@ import { Repository } from 'typeorm'; import { ActiveWorkspacesCommandRunner } from 'src/database/commands/active-workspaces.command'; import { BaseCommandOptions } from 'src/database/commands/base.command'; -import { PhoneCallingCodeCreateColumnCommand } from 'src/database/commands/upgrade-version/0-40/0-40-phone-calling-code-create-column.command'; -import { PhoneCallingCodeMigrateDataCommand } from 'src/database/commands/upgrade-version/0-40/0-40-phone-calling-code-migrate-data.command'; -import { RecordPositionBackfillCommand } from 'src/database/commands/upgrade-version/0-40/0-40-record-position-backfill.command'; -import { ViewGroupNoValueBackfillCommand } from 'src/database/commands/upgrade-version/0-40/0-40-view-group-no-value-backfill.command'; +import { PhoneCallingCodeCreateColumnCommand } from 'src/database/commands/upgrade-version/0-35/0-35-phone-calling-code-create-column.command'; +import { PhoneCallingCodeMigrateDataCommand } from 'src/database/commands/upgrade-version/0-35/0-35-phone-calling-code-migrate-data.command'; +import { RecordPositionBackfillCommand } from 'src/database/commands/upgrade-version/0-35/0-35-record-position-backfill.command'; +import { ViewGroupNoValueBackfillCommand } from 'src/database/commands/upgrade-version/0-35/0-35-view-group-no-value-backfill.command'; import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity'; import { SyncWorkspaceMetadataCommand } from 'src/engine/workspace-manager/workspace-sync-metadata/commands/sync-workspace-metadata.command'; @Command({ - name: 'upgrade-0.40', - description: 'Upgrade to 0.40', + name: 'upgrade-0.35', + description: 'Upgrade to 0.35', }) -export class UpgradeTo0_40Command extends ActiveWorkspacesCommandRunner { +export class UpgradeTo0_35Command extends ActiveWorkspacesCommandRunner { constructor( @InjectRepository(Workspace, 'core') protected readonly workspaceRepository: Repository, diff --git a/packages/twenty-server/src/database/commands/upgrade-version/0-40/0-40-upgrade-version.module.ts b/packages/twenty-server/src/database/commands/upgrade-version/0-35/0-35-upgrade-version.module.ts similarity index 84% rename from packages/twenty-server/src/database/commands/upgrade-version/0-40/0-40-upgrade-version.module.ts rename to packages/twenty-server/src/database/commands/upgrade-version/0-35/0-35-upgrade-version.module.ts index b19780ed8a17..aba95d1bb4d2 100644 --- a/packages/twenty-server/src/database/commands/upgrade-version/0-40/0-40-upgrade-version.module.ts +++ b/packages/twenty-server/src/database/commands/upgrade-version/0-35/0-35-upgrade-version.module.ts @@ -1,11 +1,11 @@ import { Module } from '@nestjs/common'; import { TypeOrmModule } from '@nestjs/typeorm'; -import { PhoneCallingCodeCreateColumnCommand } from 'src/database/commands/upgrade-version/0-40/0-40-phone-calling-code-create-column.command'; -import { PhoneCallingCodeMigrateDataCommand } from 'src/database/commands/upgrade-version/0-40/0-40-phone-calling-code-migrate-data.command'; -import { RecordPositionBackfillCommand } from 'src/database/commands/upgrade-version/0-40/0-40-record-position-backfill.command'; -import { UpgradeTo0_40Command } from 'src/database/commands/upgrade-version/0-40/0-40-upgrade-version.command'; -import { ViewGroupNoValueBackfillCommand } from 'src/database/commands/upgrade-version/0-40/0-40-view-group-no-value-backfill.command'; +import { PhoneCallingCodeCreateColumnCommand } from 'src/database/commands/upgrade-version/0-35/0-35-phone-calling-code-create-column.command'; +import { PhoneCallingCodeMigrateDataCommand } from 'src/database/commands/upgrade-version/0-35/0-35-phone-calling-code-migrate-data.command'; +import { RecordPositionBackfillCommand } from 'src/database/commands/upgrade-version/0-35/0-35-record-position-backfill.command'; +import { UpgradeTo0_35Command } from 'src/database/commands/upgrade-version/0-35/0-35-upgrade-version.command'; +import { ViewGroupNoValueBackfillCommand } from 'src/database/commands/upgrade-version/0-35/0-35-view-group-no-value-backfill.command'; import { RecordPositionBackfillModule } from 'src/engine/api/graphql/workspace-query-runner/services/record-position-backfill-module'; import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity'; import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity'; @@ -35,12 +35,12 @@ import { WorkspaceSyncMetadataCommandsModule } from 'src/engine/workspace-manage FieldMetadataModule, ], providers: [ - UpgradeTo0_40Command, - PhoneCallingCodeMigrateDataCommand, + UpgradeTo0_35Command, PhoneCallingCodeCreateColumnCommand, + PhoneCallingCodeMigrateDataCommand, WorkspaceMigrationFactory, RecordPositionBackfillCommand, ViewGroupNoValueBackfillCommand, ], }) -export class UpgradeTo0_40CommandModule {} +export class UpgradeTo0_35CommandModule {} diff --git a/packages/twenty-server/src/database/commands/upgrade-version/0-40/0-40-view-group-no-value-backfill.command.ts b/packages/twenty-server/src/database/commands/upgrade-version/0-35/0-35-view-group-no-value-backfill.command.ts similarity index 98% rename from packages/twenty-server/src/database/commands/upgrade-version/0-40/0-40-view-group-no-value-backfill.command.ts rename to packages/twenty-server/src/database/commands/upgrade-version/0-35/0-35-view-group-no-value-backfill.command.ts index 63662563dd67..fabdf1154b7c 100644 --- a/packages/twenty-server/src/database/commands/upgrade-version/0-40/0-40-view-group-no-value-backfill.command.ts +++ b/packages/twenty-server/src/database/commands/upgrade-version/0-35/0-35-view-group-no-value-backfill.command.ts @@ -13,7 +13,7 @@ import { ViewGroupWorkspaceEntity } from 'src/modules/view/standard-objects/view import { ViewWorkspaceEntity } from 'src/modules/view/standard-objects/view.workspace-entity'; @Command({ - name: 'migrate-0.40:backfill-view-group-no-value', + name: 'migrate-0.35:backfill-view-group-no-value', description: 'Backfill view group no value', }) export class ViewGroupNoValueBackfillCommand extends ActiveWorkspacesCommandRunner {