Twenty standard and workspace custom applications 2/3

packages/twenty-front/src/generated-metadata/graphql.ts

@@ -4827,7 +4827,7 @@ export type Workspace = {
   viewGroups?: Maybe<Array<CoreViewGroup>>;
   viewSorts?: Maybe<Array<CoreViewSort>>;
   views?: Maybe<Array<CoreView>>;
-  workspaceCustomApplicationId?: Maybe<Scalars['String']>;
+  workspaceCustomApplicationId: Scalars['String'];
   workspaceMembersCount?: Maybe<Scalars['Float']>;
   workspaceUrls: WorkspaceUrls;
 };

packages/twenty-front/src/generated/graphql.ts

@@ -4575,7 +4575,7 @@ export type Workspace = {
   viewGroups?: Maybe<Array<CoreViewGroup>>;
   viewSorts?: Maybe<Array<CoreViewSort>>;
   views?: Maybe<Array<CoreView>>;
-  workspaceCustomApplicationId?: Maybe<Scalars['String']>;
+  workspaceCustomApplicationId: Scalars['String'];
   workspaceMembersCount?: Maybe<Scalars['Float']>;
   workspaceUrls: WorkspaceUrls;
 };

packages/twenty-front/src/testing/mock-data/users.ts

@@ -156,6 +156,7 @@ export const mockCurrentWorkspace: Workspace = {
   workspaceMembersCount: 1,
   databaseSchema: '',
   databaseUrl: '',
+  workspaceCustomApplicationId: '',
   isTwoFactorAuthenticationEnforced: false,
   __typename: 'Workspace',
 };

packages/twenty-server/src/database/commands/command-runners/upgrade.command-runner.ts

@@ -84,6 +84,15 @@ export abstract class UpgradeCommandRunner extends ActiveOrSuspendedWorkspacesMi
       this.logger.log('Database migrations completed successfully');
     } catch (error) {
       this.logger.error('Error running database migrations:', error);
+      this.logger.log(
+        this.currentAppVersion.major + '.' + this.currentAppVersion.minor,
+      );
+      if (
+        this.currentAppVersion.major === 1 &&
+        this.currentAppVersion.minor === 12
+      ) {
+        return;
+      }
       throw error;
     }
   }

packages/twenty-server/src/database/commands/upgrade-version-command/1-10/1-10-upgrade-version-command.module.ts

@@ -10,7 +10,6 @@ import { MigrateAttachmentAuthorToCreatedByCommand } from 'src/database/commands
 import { MigrateAttachmentTypeToFileCategoryCommand } from 'src/database/commands/upgrade-version-command/1-10/1-10-migrate-attachment-type-to-file-category.command';
 import { MigrateChannelPartialFullSyncStagesCommand } from 'src/database/commands/upgrade-version-command/1-10/1-10-migrate-channel-partial-full-sync-stages.command';
 import { RegenerateSearchVectorsCommand } from 'src/database/commands/upgrade-version-command/1-10/1-10-regenerate-search-vectors.command';
-import { SeedDashboardViewCommand } from 'src/database/commands/upgrade-version-command/1-10/1-10-seed-dashboard-view.command';
 import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
 import { DataSourceEntity } from 'src/engine/metadata-modules/data-source/data-source.entity';
 import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
@@ -43,7 +42,6 @@ import { WorkspaceCacheStorageModule } from 'src/engine/workspace-cache-storage/
     AddWorkflowRunStopStatusesCommand,
     CleanOrphanedKanbanAggregateOperationFieldMetadataIdCommand,
     MakeSureDashboardNamingAvailableCommand,
-    SeedDashboardViewCommand,
     CreateViewKanbanFieldMetadataIdForeignKeyMigrationCommand,
     FlushCacheCommand,
   ],
@@ -55,7 +53,6 @@ import { WorkspaceCacheStorageModule } from 'src/engine/workspace-cache-storage/
     CleanOrphanedKanbanAggregateOperationFieldMetadataIdCommand,
     MigrateChannelPartialFullSyncStagesCommand,
     MakeSureDashboardNamingAvailableCommand,
-    SeedDashboardViewCommand,
     CreateViewKanbanFieldMetadataIdForeignKeyMigrationCommand,
     FlushCacheCommand,
   ],

packages/twenty-server/src/database/commands/upgrade-version-command/1-11/1-11-create-twenty-standard-application.command.ts

@@ -9,9 +9,9 @@ import {
 } from 'src/database/commands/command-runners/active-or-suspended-workspaces-migration.command-runner';
 import { ApplicationEntity } from 'src/engine/core-modules/application/application.entity';
 import { ApplicationService } from 'src/engine/core-modules/application/application.service';
+import { TWENTY_STANDARD_APPLICATION } from 'src/engine/core-modules/application/constants/twenty-standard-applications';
 import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
 import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
-import { TWENTY_STANDARD_APPLICATION } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/twenty-standard-applications';
 
 @Command({
   name: 'upgrade:1-11:create-twenty-standard-application',
@@ -64,14 +64,10 @@ export class CreateTwentyStandardApplicationCommand extends ActiveOrSuspendedWor
       return;
     }
 
-    try {
-      await this.applicationService.createTwentyStandardApplication({
-        workspaceId,
-      });
+    await this.applicationService.createTwentyStandardApplication({
+      workspaceId,
+    });
 
-      this.logger.log(`Successfully seeded twenty standard`);
-    } catch (e) {
-      this.logger.error(`Failed to seed twenty standard`, e);
-    }
+    this.logger.log(`Successfully seeded twenty standard`);
   }
 }

packages/twenty-server/src/database/commands/upgrade-version-command/1-11/1-11-upgrade-version-command.module.ts

@@ -4,6 +4,10 @@ import { TypeOrmModule } from '@nestjs/typeorm';
 import { CleanOrphanedRoleTargetsCommand } from 'src/database/commands/upgrade-version-command/1-11/1-11-clean-orphaned-role-targets.command';
 import { CleanOrphanedUserWorkspacesCommand } from 'src/database/commands/upgrade-version-command/1-11/1-11-clean-orphaned-user-workspaces.command';
 import { CreateTwentyStandardApplicationCommand } from 'src/database/commands/upgrade-version-command/1-11/1-11-create-twenty-standard-application.command';
+import { AssociateCustomEntitiesToWorkspaceCustomApplicationCommand } from 'src/database/commands/upgrade-version-command/1-12/1-12-associate-custom-entities-to-workspace-custom-application.command';
+import { AssociateStandardEntitiesToTwentyStandardApplicationCommand } from 'src/database/commands/upgrade-version-command/1-12/1-12-associate-standard-entities-to-twenty-standard-application.command';
+import { CreateWorkspaceCustomApplicationCommand } from 'src/database/commands/upgrade-version-command/1-12/1-12-create-workspace-custom-application.command';
+import { MakeSyncableEntitiesUniversalIdentifierAndApplicationIdNonNullableMigration } from 'src/database/commands/upgrade-version-command/1-12/1-12-make-syncable-entities-universal-identifier-and-application-id-non-nullable-migration.command';
 import { ApplicationEntity } from 'src/engine/core-modules/application/application.entity';
 import { ApplicationModule } from 'src/engine/core-modules/application/application.module';
 import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
@@ -34,11 +38,19 @@ import { WorkspaceSchemaManagerModule } from 'src/engine/twenty-orm/workspace-sc
     CleanOrphanedUserWorkspacesCommand,
     CleanOrphanedRoleTargetsCommand,
     CreateTwentyStandardApplicationCommand,
+    AssociateStandardEntitiesToTwentyStandardApplicationCommand,
+    AssociateCustomEntitiesToWorkspaceCustomApplicationCommand,
+    CreateWorkspaceCustomApplicationCommand,
+    MakeSyncableEntitiesUniversalIdentifierAndApplicationIdNonNullableMigration,
   ],
   exports: [
     CleanOrphanedUserWorkspacesCommand,
     CleanOrphanedRoleTargetsCommand,
     CreateTwentyStandardApplicationCommand,
+    AssociateStandardEntitiesToTwentyStandardApplicationCommand,
+    AssociateCustomEntitiesToWorkspaceCustomApplicationCommand,
+    CreateWorkspaceCustomApplicationCommand,
+    MakeSyncableEntitiesUniversalIdentifierAndApplicationIdNonNullableMigration,
   ],
 })
 export class V1_11_UpgradeVersionCommandModule {}

packages/twenty-server/src/database/commands/upgrade-version-command/1-12/1-12-associate-custom-entities-to-workspace-custom-application.command.ts

@@ -0,0 +1,122 @@
+import { InjectDataSource, InjectRepository } from '@nestjs/typeorm';
+
+import { Command } from 'nest-commander';
+import {
+  ALL_METADATA_NAME,
+  AllMetadataName,
+  NOT_V2_YET_METADATA_NAME,
+  NotV2YetAllMetadataName,
+} from 'twenty-shared/metadata';
+import { isDefined } from 'twenty-shared/utils';
+import { DataSource, IsNull, Repository } from 'typeorm';
+import { v4 } from 'uuid';
+
+import {
+  ActiveOrSuspendedWorkspacesMigrationCommandRunner,
+  type RunOnWorkspaceArgs,
+} from 'src/database/commands/command-runners/active-or-suspended-workspaces-migration.command-runner';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
+import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
+import { ALL_METADATA_ENTITY_BY_METADATA_NAME } from 'src/engine/metadata-modules/flat-entity/constant/all-metadata-entity-by-metadata-name.constant';
+import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
+
+const ALL_METADATA_NAME_TO_MIGRATE = [
+  ...Object.keys(ALL_METADATA_NAME),
+  ...Object.keys(NOT_V2_YET_METADATA_NAME),
+] as (AllMetadataName | NotV2YetAllMetadataName)[];
+
+@Command({
+  name: 'upgrade:1-12:associate-custom-entities-to-workspace-custom-application',
+  description:
+    'Will scan all workspace custom entities and associate it to the workspace-custom app and set a universal identifier',
+})
+export class AssociateCustomEntitiesToWorkspaceCustomApplicationCommand extends ActiveOrSuspendedWorkspacesMigrationCommandRunner {
+  constructor(
+    @InjectRepository(WorkspaceEntity)
+    protected readonly workspaceRepository: Repository<WorkspaceEntity>,
+    protected readonly twentyORMGlobalManager: TwentyORMGlobalManager,
+    private readonly applicationService: ApplicationService,
+    @InjectDataSource()
+    private readonly coreDataSource: DataSource,
+  ) {
+    super(workspaceRepository, twentyORMGlobalManager);
+  }
+
+  override async runOnWorkspace({
+    workspaceId,
+    options,
+  }: RunOnWorkspaceArgs): Promise<void> {
+    const workspace = await this.workspaceRepository.findOne({
+      where: {
+        id: workspaceId,
+      },
+    });
+
+    if (!isDefined(workspace)) {
+      throw new Error(`Could not find workspace ${workspaceId}`);
+    }
+
+    this.logger.log(
+      `associate-custom-entities-to-custom-workspace-application start ${workspaceId}`,
+    );
+
+    const workspaceCustomApplication = await this.applicationService.findById(
+      workspace.workspaceCustomApplicationId,
+    );
+
+    if (!isDefined(workspaceCustomApplication)) {
+      throw new Error(
+        `Could not find workspace-custom application workspaceId=${workspaceId} applicationId=${workspace.workspaceCustomApplicationId}`,
+      );
+    }
+
+    const queryRunner = this.coreDataSource.createQueryRunner();
+
+    await queryRunner.connect();
+    await queryRunner.startTransaction();
+
+    try {
+      for (const metadataName of ALL_METADATA_NAME_TO_MIGRATE) {
+        const currentMetadataEntity =
+          ALL_METADATA_ENTITY_BY_METADATA_NAME[metadataName];
+
+        const metadataEntityRepository = queryRunner.manager.getRepository(
+          currentMetadataEntity,
+        );
+
+        this.logger.log(`retrieving ${metadataName} entities`);
+
+        const customEntities = await metadataEntityRepository.find({
+          select: {
+            id: true,
+            universalIdentifier: true,
+            applicationId: true,
+          },
+          where: {
+            workspaceId,
+            applicationId: IsNull(),
+          },
+          withDeleted: true,
+        });
+
+        for (const entity of customEntities) {
+          this.logger.log(`Processing entity id=${entity.id}`);
+
+          await metadataEntityRepository.update(entity.id, {
+            universalIdentifier: entity.universalIdentifier ?? v4(),
+            applicationId: workspaceCustomApplication.id,
+          });
+        }
+      }
+
+      if (!options.dryRun) {
+        await queryRunner.commitTransaction();
+      }
+    } catch (error) {
+      await queryRunner.rollbackTransaction();
+      throw error;
+    } finally {
+      await queryRunner.release();
+    }
+  }
+}