Merge branch 'main' into TWNTY-6447

twentyhq · Sep 16, 2024 · dd2ab35 · dd2ab35
2 parents 7d5e1fd + bc99cfe
commit dd2ab35
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 73 deletions.
diff --git a/...atabase/commands/upgrade-version/0-30/0-30-set-custom-object-is-soft-deletable.command.ts b/...atabase/commands/upgrade-version/0-30/0-30-set-custom-object-is-soft-deletable.command.ts
diff --git a/.../twenty-server/src/database/commands/upgrade-version/0-30/0-30-upgrade-version.command.ts b/.../twenty-server/src/database/commands/upgrade-version/0-30/0-30-upgrade-version.command.ts
@@ -5,7 +5,6 @@ import { Repository } from 'typeorm';
 
 import { ActiveWorkspacesCommandRunner } from 'src/database/commands/active-workspaces.command';
 import { MigrateEmailFieldsToEmailsCommand } from 'src/database/commands/upgrade-version/0-30/0-30-migrate-email-fields-to-emails.command';
-import { SetCustomObjectIsSoftDeletableCommand } from 'src/database/commands/upgrade-version/0-30/0-30-set-custom-object-is-soft-deletable.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';
 
@@ -23,7 +22,6 @@ export class UpgradeTo0_30Command extends ActiveWorkspacesCommandRunner {
     protected readonly workspaceRepository: Repository<Workspace>,
     private readonly syncWorkspaceMetadataCommand: SyncWorkspaceMetadataCommand,
     private readonly migrateEmailFieldsToEmails: MigrateEmailFieldsToEmailsCommand,
-    private readonly setCustomObjectIsSoftDeletableCommand: SetCustomObjectIsSoftDeletableCommand,
   ) {
     super(workspaceRepository);
   }
@@ -41,11 +39,6 @@ export class UpgradeTo0_30Command extends ActiveWorkspacesCommandRunner {
       },
       workspaceIds,
     );
-    await this.setCustomObjectIsSoftDeletableCommand.executeActiveWorkspacesCommand(
-      passedParam,
-      options,
-      workspaceIds,
-    );
     await this.migrateEmailFieldsToEmails.executeActiveWorkspacesCommand(
       passedParam,
       options,

diff --git a/...s/twenty-server/src/database/commands/upgrade-version/0-30/0-30-upgrade-version.module.ts b/...s/twenty-server/src/database/commands/upgrade-version/0-30/0-30-upgrade-version.module.ts
@@ -2,7 +2,6 @@ import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 
 import { MigrateEmailFieldsToEmailsCommand } from 'src/database/commands/upgrade-version/0-30/0-30-migrate-email-fields-to-emails.command';
-import { SetCustomObjectIsSoftDeletableCommand } from 'src/database/commands/upgrade-version/0-30/0-30-set-custom-object-is-soft-deletable.command';
 import { UpgradeTo0_30Command } from 'src/database/commands/upgrade-version/0-30/0-30-upgrade-version.command';
 import { TypeORMModule } from 'src/database/typeorm/typeorm.module';
 import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
@@ -28,10 +27,6 @@ import { ViewModule } from 'src/modules/view/view.module';
     TypeORMModule,
     ViewModule,
   ],
-  providers: [
-    UpgradeTo0_30Command,
-    MigrateEmailFieldsToEmailsCommand,
-    SetCustomObjectIsSoftDeletableCommand,
-  ],
+  providers: [UpgradeTo0_30Command, MigrateEmailFieldsToEmailsCommand],
 })
 export class UpgradeTo0_30CommandModule {}