From bc99cfec98a3dea16afa08dd4c976e5cf019b8ba Mon Sep 17 00:00:00 2001 From: Weiko Date: Mon, 16 Sep 2024 13:53:27 +0200 Subject: [PATCH] 0-30-set-custom-object-is-soft-deletable.command (#7045) This command was supposed to set all custom objects as softDeletable. After some discussion we realised this bool was not used as intended so we are removing it all together until we find a better usage (remote objects for example). This PR removes the command which won't be needed anymore --- ...custom-object-is-soft-deletable.command.ts | 60 ------------------- .../0-30/0-30-upgrade-version.command.ts | 7 --- .../0-30/0-30-upgrade-version.module.ts | 7 +-- 3 files changed, 1 insertion(+), 73 deletions(-) delete mode 100644 packages/twenty-server/src/database/commands/upgrade-version/0-30/0-30-set-custom-object-is-soft-deletable.command.ts diff --git a/packages/twenty-server/src/database/commands/upgrade-version/0-30/0-30-set-custom-object-is-soft-deletable.command.ts b/packages/twenty-server/src/database/commands/upgrade-version/0-30/0-30-set-custom-object-is-soft-deletable.command.ts deleted file mode 100644 index eca303963..000000000 --- a/packages/twenty-server/src/database/commands/upgrade-version/0-30/0-30-set-custom-object-is-soft-deletable.command.ts +++ /dev/null @@ -1,60 +0,0 @@ -import { InjectRepository } from '@nestjs/typeorm'; - -import { Command } from 'nest-commander'; -import { In, Repository } from 'typeorm'; - -import { - ActiveWorkspacesCommandOptions, - ActiveWorkspacesCommandRunner, -} from 'src/database/commands/active-workspaces.command'; -import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity'; -import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity'; - -type SetCustomObjectIsSoftDeletableCommandOptions = - ActiveWorkspacesCommandOptions; - -@Command({ - name: 'upgrade-0.30:set-custom-object-is-soft-deletable', - description: 'Set custom object is soft deletable', -}) -export class SetCustomObjectIsSoftDeletableCommand extends ActiveWorkspacesCommandRunner { - constructor( - @InjectRepository(Workspace, 'core') - protected readonly workspaceRepository: Repository, - @InjectRepository(ObjectMetadataEntity, 'metadata') - private readonly objectMetadataRepository: Repository, - ) { - super(workspaceRepository); - } - - async executeActiveWorkspacesCommand( - _passedParam: string[], - options: SetCustomObjectIsSoftDeletableCommandOptions, - workspaceIds: string[], - ): Promise { - const updateCriteria = { - workspaceId: In(workspaceIds), - isCustom: true, - isSoftDeletable: false, - }; - - if (options.dryRun) { - const objectsToUpdate = await this.objectMetadataRepository.find({ - select: ['id'], - where: updateCriteria, - }); - - this.logger.log( - `Dry run: ${objectsToUpdate.length} objects would be updated`, - ); - - return; - } - - const result = await this.objectMetadataRepository.update(updateCriteria, { - isSoftDeletable: true, - }); - - this.logger.log(`Updated ${result.affected} objects`); - } -} diff --git a/packages/twenty-server/src/database/commands/upgrade-version/0-30/0-30-upgrade-version.command.ts b/packages/twenty-server/src/database/commands/upgrade-version/0-30/0-30-upgrade-version.command.ts index 7d9597955..7d3520cda 100644 --- a/packages/twenty-server/src/database/commands/upgrade-version/0-30/0-30-upgrade-version.command.ts +++ b/packages/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, 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/packages/twenty-server/src/database/commands/upgrade-version/0-30/0-30-upgrade-version.module.ts b/packages/twenty-server/src/database/commands/upgrade-version/0-30/0-30-upgrade-version.module.ts index 3e266cebe..b15bdf940 100644 --- a/packages/twenty-server/src/database/commands/upgrade-version/0-30/0-30-upgrade-version.module.ts +++ b/packages/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 {}