Enforce unique constraints for 0.33 (#8645)

## Context - Fixing folder structure where 0.33 was inside 0.32. - Updating the command so it runs enforce uniqueness on all tables - Updating workspaces entities so the sync metadata adds the index
twentyhq · Nov 21, 2024 · 52df530 · 52df530
1 parent 39373b4
commit 52df530
Show file tree

Hide file tree

Showing 13 changed files with 130 additions and 86 deletions.
diff --git a/packages/twenty-server/src/database/commands/database-command.module.ts b/packages/twenty-server/src/database/commands/database-command.module.ts
@@ -8,7 +8,7 @@ import { DataSeedDemoWorkspaceModule } from 'src/database/commands/data-seed-dem
 import { DataSeedWorkspaceCommand } from 'src/database/commands/data-seed-dev-workspace.command';
 import { ConfirmationQuestion } from 'src/database/commands/questions/confirmation.question';
 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-32/0-33/0-33-upgrade-version.module';
+import { UpgradeTo0_33CommandModule } from 'src/database/commands/upgrade-version/0-33/0-33-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';

diff --git a/.../twenty-server/src/database/commands/upgrade-version/0-32/0-32-upgrade-version.command.ts b/.../twenty-server/src/database/commands/upgrade-version/0-32/0-32-upgrade-version.command.ts
@@ -10,8 +10,6 @@ import { SimplifySearchVectorExpressionCommand } from 'src/database/commands/upg
 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';
 
-import { EnforceUniqueConstraintsCommand } from './0-32-enforce-unique-constraints.command';
-
 interface UpdateTo0_32CommandOptions {
   workspaceId?: string;
 }
@@ -25,7 +23,6 @@ export class UpgradeTo0_32Command extends ActiveWorkspacesCommandRunner {
     @InjectRepository(Workspace, 'core')
     protected readonly workspaceRepository: Repository<Workspace>,
     private readonly syncWorkspaceMetadataCommand: SyncWorkspaceMetadataCommand,
-    private readonly enforceUniqueConstraintsCommand: EnforceUniqueConstraintsCommand,
     private readonly simplifySearchVectorExpressionCommand: SimplifySearchVectorExpressionCommand,
     private readonly copyWebhookOperationIntoOperationsCommand: CopyWebhookOperationIntoOperationsCommand,
     private readonly backfillViewGroupsCommand: BackfillViewGroupsCommand,
@@ -53,12 +50,6 @@ export class UpgradeTo0_32Command extends ActiveWorkspacesCommandRunner {
       workspaceIds,
     );
 
-    await this.enforceUniqueConstraintsCommand.executeActiveWorkspacesCommand(
-      passedParam,
-      options,
-      workspaceIds,
-    );
-
     await this.copyWebhookOperationIntoOperationsCommand.executeActiveWorkspacesCommand(
       passedParam,
       options,

diff --git a/...s/twenty-server/src/database/commands/upgrade-version/0-32/0-32-upgrade-version.module.ts b/...s/twenty-server/src/database/commands/upgrade-version/0-32/0-32-upgrade-version.module.ts
@@ -2,7 +2,6 @@ import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 
 import { CopyWebhookOperationIntoOperationsCommand } from 'src/database/commands/upgrade-version/0-32/0-32-copy-webhook-operation-into-operations-command';
-import { EnforceUniqueConstraintsCommand } from 'src/database/commands/upgrade-version/0-32/0-32-enforce-unique-constraints.command';
 import { SimplifySearchVectorExpressionCommand } from 'src/database/commands/upgrade-version/0-32/0-32-simplify-search-vector-expression';
 import { UpgradeTo0_32Command } from 'src/database/commands/upgrade-version/0-32/0-32-upgrade-version.command';
 import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
@@ -27,7 +26,6 @@ import { BackfillViewGroupsCommand } from './0-32-backfill-view-groups.command';
   ],
   providers: [
     UpgradeTo0_32Command,
-    EnforceUniqueConstraintsCommand,
     BackfillViewGroupsCommand,
     CopyWebhookOperationIntoOperationsCommand,
     SimplifySearchVectorExpressionCommand,

diff --git a/...-32-enforce-unique-constraints.command.ts → ...-33-enforce-unique-constraints.command.ts b/...-32-enforce-unique-constraints.command.ts → ...-33-enforce-unique-constraints.command.ts
@@ -17,10 +17,11 @@ interface EnforceUniqueConstraintsCommandOptions
   company?: boolean;
   viewField?: boolean;
   viewSort?: boolean;
+  verbose?: boolean;
 }
 
 @Command({
-  name: 'upgrade-0.32:enforce-unique-constraints',
+  name: 'upgrade-0.33:enforce-unique-constraints',
   description:
     'Enforce unique constraints on company domainName, person emailsPrimaryEmail, ViewField, and ViewSort',
 })
@@ -41,6 +42,14 @@ export class EnforceUniqueConstraintsCommand extends ActiveWorkspacesCommandRunn
     return true;
   }
 
+  @Option({
+    flags: '--verbose',
+    description: 'Verbose output',
+  })
+  parseVerbose() {
+    return true;
+  }
+
   @Option({
     flags: '--company',
     description: 'Enforce unique constraints on company domainName',
@@ -76,15 +85,7 @@ export class EnforceUniqueConstraintsCommand extends ActiveWorkspacesCommandRunn
       this.logger.log(`Running command for workspace ${workspaceId}`);
 
       try {
-        await this.enforceUniqueConstraintsForWorkspace(
-          workspaceId,
-          options.dryRun ?? false,
-          options,
-        );
-
-        await this.twentyORMGlobalManager.destroyDataSourceForWorkspace(
-          workspaceId,
-        );
+        await this.enforceUniqueConstraintsForWorkspace(workspaceId, options);
       } catch (error) {
         this.logger.log(
           chalk.red(
@@ -104,30 +105,31 @@ export class EnforceUniqueConstraintsCommand extends ActiveWorkspacesCommandRunn
 
   private async enforceUniqueConstraintsForWorkspace(
     workspaceId: string,
-    dryRun: boolean,
     options: EnforceUniqueConstraintsCommandOptions,
   ): Promise<void> {
-    await this.enforceUniquePersonEmail(workspaceId, dryRun);
-
+    if (options.person) {
+      await this.enforceUniquePersonEmail(workspaceId, options);
+    }
     if (options.company) {
-      await this.enforceUniqueCompanyDomainName(workspaceId, dryRun);
+      await this.enforceUniqueCompanyDomainName(workspaceId, options);
     }
     if (options.viewField) {
-      await this.enforceUniqueViewField(workspaceId, dryRun);
+      await this.enforceUniqueViewField(workspaceId, options);
     }
     if (options.viewSort) {
-      await this.enforceUniqueViewSort(workspaceId, dryRun);
+      await this.enforceUniqueViewSort(workspaceId, options);
     }
   }
 
   private async enforceUniqueCompanyDomainName(
     workspaceId: string,
-    dryRun: boolean,
+    options: EnforceUniqueConstraintsCommandOptions,
   ): Promise<void> {
     const companyRepository =
       await this.twentyORMGlobalManager.getRepositoryForWorkspace(
         workspaceId,
         'company',
+        false,
       );
 
     const duplicates = await companyRepository
@@ -156,28 +158,31 @@ export class EnforceUniqueConstraintsCommand extends ActiveWorkspacesCommandRunn
       for (let i = 1; i < companies.length; i++) {
         const newdomainNamePrimaryLinkUrl = `${company_domainNamePrimaryLinkUrl}${i}`;
 
-        if (!dryRun) {
+        if (!options.dryRun) {
           await companyRepository.update(companies[i].id, {
             domainNamePrimaryLinkUrl: newdomainNamePrimaryLinkUrl,
           });
         }
-        this.logger.log(
-          chalk.yellow(
-            `Updated company ${companies[i].id} domainName from ${company_domainNamePrimaryLinkUrl} to ${newdomainNamePrimaryLinkUrl}`,
-          ),
-        );
+        if (options.verbose) {
+          this.logger.log(
+            chalk.yellow(
+              `Updated company ${companies[i].id} domainName from ${company_domainNamePrimaryLinkUrl} to ${newdomainNamePrimaryLinkUrl}`,
+            ),
+          );
+        }
       }
     }
   }
 
   private async enforceUniquePersonEmail(
     workspaceId: string,
-    dryRun: boolean,
+    options: EnforceUniqueConstraintsCommandOptions,
   ): Promise<void> {
     const personRepository =
       await this.twentyORMGlobalManager.getRepositoryForWorkspace(
         workspaceId,
         'person',
+        false,
       );
 
     const duplicates = await personRepository
@@ -208,28 +213,31 @@ export class EnforceUniqueConstraintsCommand extends ActiveWorkspacesCommandRunn
           ? `${person_emailsPrimaryEmail.split('@')[0]}+${i}@${person_emailsPrimaryEmail.split('@')[1]}`
           : `${person_emailsPrimaryEmail}+${i}`;
 
-        if (!dryRun) {
+        if (!options.dryRun) {
           await personRepository.update(persons[i].id, {
             emailsPrimaryEmail: newEmail,
           });
         }
-        this.logger.log(
-          chalk.yellow(
-            `Updated person ${persons[i].id} emailsPrimaryEmail from ${person_emailsPrimaryEmail} to ${newEmail}`,
-          ),
-        );
+        if (options.verbose) {
+          this.logger.log(
+            chalk.yellow(
+              `Updated person ${persons[i].id} emailsPrimaryEmail from ${person_emailsPrimaryEmail} to ${newEmail}`,
+            ),
+          );
+        }
       }
     }
   }
 
   private async enforceUniqueViewField(
     workspaceId: string,
-    dryRun: boolean,
+    options: EnforceUniqueConstraintsCommandOptions,
   ): Promise<void> {
     const viewFieldRepository =
       await this.twentyORMGlobalManager.getRepositoryForWorkspace(
         workspaceId,
         'viewField',
+        false,
       );
 
     const duplicates = await viewFieldRepository
@@ -249,26 +257,29 @@ export class EnforceUniqueConstraintsCommand extends ActiveWorkspacesCommandRunn
       });
 
       for (let i = 1; i < viewFields.length; i++) {
-        if (!dryRun) {
+        if (!options.dryRun) {
           await viewFieldRepository.softDelete(viewFields[i].id);
         }
-        this.logger.log(
-          chalk.yellow(
-            `Soft deleted duplicate ViewField ${viewFields[i].id} for fieldMetadataId ${fieldMetadataId} and viewId ${viewId}`,
-          ),
-        );
+        if (options.verbose) {
+          this.logger.log(
+            chalk.yellow(
+              `Soft deleted duplicate ViewField ${viewFields[i].id} for fieldMetadataId ${fieldMetadataId} and viewId ${viewId}`,
+            ),
+          );
+        }
       }
     }
   }
 
   private async enforceUniqueViewSort(
     workspaceId: string,
-    dryRun: boolean,
+    options: EnforceUniqueConstraintsCommandOptions,
   ): Promise<void> {
     const viewSortRepository =
       await this.twentyORMGlobalManager.getRepositoryForWorkspace(
         workspaceId,
         'viewSort',
+        false,
       );
 
     const duplicates = await viewSortRepository
@@ -288,14 +299,16 @@ export class EnforceUniqueConstraintsCommand extends ActiveWorkspacesCommandRunn
       });
 
       for (let i = 1; i < viewSorts.length; i++) {
-        if (!dryRun) {
+        if (!options.dryRun) {
           await viewSortRepository.softDelete(viewSorts[i].id);
         }
-        this.logger.log(
-          chalk.yellow(
-            `Soft deleted duplicate ViewSort ${viewSorts[i].id} for fieldMetadataId ${fieldMetadataId} and viewId ${viewId}`,
-          ),
-        );
+        if (options.verbose) {
+          this.logger.log(
+            chalk.yellow(
+              `Soft deleted duplicate ViewSort ${viewSorts[i].id} for fieldMetadataId ${fieldMetadataId} and viewId ${viewId}`,
+            ),
+          );
+        }
       }
     }
   }

diff --git a/...ate-rich-text-search-vector-expression.ts → ...ate-rich-text-search-vector-expression.ts b/...ate-rich-text-search-vector-expression.ts → ...ate-rich-text-search-vector-expression.ts
diff --git a/...0-32/0-33/0-33-upgrade-version.command.ts → ...sion/0-33/0-33-upgrade-version.command.ts b/...0-32/0-33/0-33-upgrade-version.command.ts → ...sion/0-33/0-33-upgrade-version.command.ts
@@ -4,8 +4,10 @@ import { Command } from 'nest-commander';
 import { Repository } from 'typeorm';
 
 import { ActiveWorkspacesCommandRunner } from 'src/database/commands/active-workspaces.command';
-import { UpdateRichTextSearchVectorCommand } from 'src/database/commands/upgrade-version/0-32/0-33/0-33-update-rich-text-search-vector-expression';
+import { EnforceUniqueConstraintsCommand } from 'src/database/commands/upgrade-version/0-33/0-33-enforce-unique-constraints.command';
+import { UpdateRichTextSearchVectorCommand } from 'src/database/commands/upgrade-version/0-33/0-33-update-rich-text-search-vector-expression';
 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';
 
 interface UpdateTo0_33CommandOptions {
   workspaceId?: string;
@@ -20,6 +22,8 @@ export class UpgradeTo0_33Command extends ActiveWorkspacesCommandRunner {
     @InjectRepository(Workspace, 'core')
     protected readonly workspaceRepository: Repository<Workspace>,
     private readonly updateRichTextSearchVectorCommand: UpdateRichTextSearchVectorCommand,
+    private readonly enforceUniqueConstraintsCommand: EnforceUniqueConstraintsCommand,
+    private readonly syncWorkspaceMetadataCommand: SyncWorkspaceMetadataCommand,
   ) {
     super(workspaceRepository);
   }
@@ -29,6 +33,25 @@ export class UpgradeTo0_33Command extends ActiveWorkspacesCommandRunner {
     options: UpdateTo0_33CommandOptions,
     workspaceIds: string[],
   ): Promise<void> {
+    await this.enforceUniqueConstraintsCommand.executeActiveWorkspacesCommand(
+      passedParam,
+      {
+        ...options,
+        company: true,
+        person: true,
+        viewField: true,
+        viewSort: true,
+      },
+      workspaceIds,
+    );
+    await this.syncWorkspaceMetadataCommand.executeActiveWorkspacesCommand(
+      passedParam,
+      {
+        ...options,
+        force: true,
+      },
+      workspaceIds,
+    );
     await this.updateRichTextSearchVectorCommand.executeActiveWorkspacesCommand(
       passedParam,
       options,

diff --git a/.../0-32/0-33/0-33-upgrade-version.module.ts → ...rsion/0-33/0-33-upgrade-version.module.ts b/.../0-32/0-33/0-33-upgrade-version.module.ts → ...rsion/0-33/0-33-upgrade-version.module.ts
@@ -1,8 +1,9 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 
-import { UpdateRichTextSearchVectorCommand } from 'src/database/commands/upgrade-version/0-32/0-33/0-33-update-rich-text-search-vector-expression';
-import { UpgradeTo0_33Command } from 'src/database/commands/upgrade-version/0-32/0-33/0-33-upgrade-version.command';
+import { EnforceUniqueConstraintsCommand } from 'src/database/commands/upgrade-version/0-33/0-33-enforce-unique-constraints.command';
+import { UpdateRichTextSearchVectorCommand } from 'src/database/commands/upgrade-version/0-33/0-33-update-rich-text-search-vector-expression';
+import { UpgradeTo0_33Command } from 'src/database/commands/upgrade-version/0-33/0-33-upgrade-version.command';
 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';
@@ -21,6 +22,10 @@ import { WorkspaceSyncMetadataCommandsModule } from 'src/engine/workspace-manage
     SearchModule,
     WorkspaceMigrationRunnerModule,
   ],
-  providers: [UpgradeTo0_33Command, UpdateRichTextSearchVectorCommand],
+  providers: [
+    UpgradeTo0_33Command,
+    UpdateRichTextSearchVectorCommand,
+    EnforceUniqueConstraintsCommand,
+  ],
 })
 export class UpgradeTo0_33CommandModule {}
diff --git a/packages/twenty-server/src/engine/twenty-orm/decorators/workspace-index.decorator.ts b/packages/twenty-server/src/engine/twenty-orm/decorators/workspace-index.decorator.ts
@@ -25,7 +25,9 @@ export function WorkspaceIndex(
     );
 
     metadataArgsStorage.addIndexes({
-      name: `IDX_${generateDeterministicIndexName([
+      name: `IDX_${
+        options?.isUnique ? 'UNIQUE_' : ''
+      }${generateDeterministicIndexName([
         convertClassNameToObjectMetadataName(target.name),
         ...columns,
       ])}`,