The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Reorder validation execution to match migration action order (#22200)
martmullb49225df4bff
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/services/workspace-entity-migration-builder.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/services/workspace-entity-migration-builder.service.tsindex 4d1c16da831..d82a344238c 100644--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/services/workspace-entity-migration-builder.service.ts+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/services/workspace-entity-migration-builder.service.ts@@ -183,6 +183,86 @@ export abstract class WorkspaceEntityMigrationBuilderService<`EntityBuilder ${this.metadataName}`,'deletion validation',);+ this.logger.perfTime(+ `EntityBuilder ${this.metadataName}`,+ 'creation validation',+ );++ const remainingFlatEntityMapsToCreate = structuredClone(+ createdFlatEntityMaps,+ );++ const sortedCreateUniversalIdentifiers =+ topologicallySortUniversalFlatEntitiesForSelfReferentialFks({+ metadataName: this.metadataName,+ universalFlatEntityMaps: createdFlatEntityMaps,+ });++ for (const flatEntityToCreateUniversalIdentifier of sortedCreateUniversalIdentifiers) {+ const rawUniversalflatEntityToCreate =+ findFlatEntityByUniversalIdentifierOrThrow({+ universalIdentifier: flatEntityToCreateUniversalIdentifier,+ flatEntityMaps: createdFlatEntityMaps,+ });++ const universalFlatEntityToCreate =+ resetUniversalFlatEntityForeignKeyAggregators({+ metadataName: this.metadataName,+ universalFlatEntity: rawUniversalflatEntityToCreate,+ });++ const universalIdentifierToDelete =+ universalFlatEntityToCreate.universalIdentifier;++ deleteUniversalFlatEntityFromUniversalFlatEntityMapsThroughMutationOrThrow(+ {+ universalIdentifierToDelete,+ universalFlatEntityMapsToMutate: remainingFlatEntityMapsToCreate,+ },+ );++ const validationResult = await this.innerValidateFlatEntityCreation({+ additionalCacheDataMaps,+ flatEntityToValidate: universalFlatEntityToCreate,+ workspaceId,+ optimisticFlatEntityMapsAndRelatedFlatEntityMaps,+ remainingFlatEntityMapsToValidate: remainingFlatEntityMapsToCreate,+ buildOptions,+ });++ if (validationResult.status === 'fail') {+ allValidationResult.push(validationResult);+ continue;+ }++ addUniversalFlatEntityToUniversalFlatEntityAndRelatedEntityMapsThroughMutationOrThrow(+ {+ universalFlatEntity: universalFlatEntityToCreate,+ universalFlatEntityAndRelatedMapsToMutate:+ optimisticFlatEntityMapsAndRelatedFlatEntityMaps,+ metadataName: this.metadataName,+ },+ );++ const formattedNewCreateAction: AllUniversalWorkspaceMigrationAction<+ 'create',+ typeof this.metadataName+ > = {+ ...validationResult.action,+ flatEntity: deleteUniversalFlatEntityForeignKeyAggregators({+ metadataName: this.metadataName,+ universalFlatEntity: validationResult.action+ .flatEntity as MetadataFlatEntity<T>,+ }),+ };++ actionsResult.create.push(formattedNewCreateAction);+ }++ this.logger.perfTimeEnd(+ `EntityBuilder ${this.metadataName}`,+ 'creation validation',+ );this.logger.perfTime(`EntityBuilder ${this.metadataName}`,'update validation',@@ -208,7 +288,6 @@ export abstract class WorkspaceEntityMigrationBuilderService<buildOptions,additionalCacheDataMaps,universalIdentifier: flatEntityToUpdateUniversalIdentifier,- remainingFlatEntityMapsToValidate: createdFlatEntityMaps,});if (validationResult.status === 'fail') {@@ -271,87 +350,6 @@ export abstract class WorkspaceEntityMigrationBuilderService<`EntityBuilder ${this.metadataName}`,'update validation',);-- const remainingFlatEntityMapsToCreate = structuredClone(- createdFlatEntityMaps,- );-- this.logger.perfTime(- `EntityBuilder ${this.metadataName}`,- 'creation validation',- );-- const sortedCreateUniversalIdentifiers =- topologicallySortUniversalFlatEntitiesForSelfReferentialFks({- metadataName: this.metadataName,- universalFlatEntityMaps: createdFlatEntityMaps,- });-- for (const flatEntityToCreateUniversalIdentifier of sortedCreateUniversalIdentifiers) {- const rawUniversalflatEntityToCreate =- findFlatEntityByUniversalIdentifierOrThrow({- universalIdentifier: flatEntityToCreateUniversalIdentifier,- flatEntityMaps: createdFlatEntityMaps,- });-- const universalFlatEntityToCreate =- resetUniversalFlatEntityForeignKeyAggregators({- metadataName: this.metadataName,- universalFlatEntity: rawUniversalflatEntityToCreate,- });-- const universalIdentifierToDelete =- universalFlatEntityToCreate.universalIdentifier;-- deleteUniversalFlatEntityFromUniversalFlatEntityMapsThroughMutationOrThrow(- {- universalIdentifierToDelete,- universalFlatEntityMapsToMutate: remainingFlatEntityMapsToCreate,- },- );-- const validationResult = await this.innerValidateFlatEntityCreation({- additionalCacheDataMaps,- flatEntityToValidate: universalFlatEntityToCreate,- workspaceId,- optimisticFlatEntityMapsAndRelatedFlatEntityMaps,- remainingFlatEntityMapsToValidate: remainingFlatEntityMapsToCreate,- buildOptions,- });-- if (validationResult.status === 'fail') {- allValidationResult.push(validationResult);- continue;- }-- addUniversalFlatEntityToUniversalFlatEntityAndRelatedEntityMapsThroughMutationOrThrow(- {- universalFlatEntity: universalFlatEntityToCreate,- universalFlatEntityAndRelatedMapsToMutate:- optimisticFlatEntityMapsAndRelatedFlatEntityMaps,- metadataName: this.metadataName,- },- );-- const formattedNewCreateAction: AllUniversalWorkspaceMigrationAction<- 'create',- typeof this.metadataName- > = {- ...validationResult.action,- flatEntity: deleteUniversalFlatEntityForeignKeyAggregators({- metadataName: this.metadataName,- universalFlatEntity: validationResult.action- .flatEntity as MetadataFlatEntity<T>,- }),- };-- actionsResult.create.push(formattedNewCreateAction);- }-- this.logger.perfTimeEnd(- `EntityBuilder ${this.metadataName}`,- 'creation validation',- );this.logger.perfTimeEnd(`EntityBuilder ${this.metadataName}`,'entity processing',diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/universal-flat-entity-update-validation-args.type.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/universal-flat-entity-update-validation-args.type.tsindex 005da4ecd07..d1cf1a5560c 100644--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/universal-flat-entity-update-validation-args.type.ts+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/universal-flat-entity-update-validation-args.type.ts@@ -5,7 +5,7 @@ import { type UniversalFlatEntityValidationArgs } from 'src/engine/workspace-manexport type FlatEntityUpdateValidationArgs<T extends AllMetadataName> = Omit<UniversalFlatEntityValidationArgs<T>,- 'flatEntityToValidate'+ 'flatEntityToValidate' | 'remainingFlatEntityMapsToValidate'> & {flatEntityUpdate: UniversalFlatEntityUpdate<T>;universalIdentifier: string;diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-navigation-menu-item-validator.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-navigation-menu-item-validator.service.tsindex 135119e99fe..5972799eae4 100644--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-navigation-menu-item-validator.service.ts+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-navigation-menu-item-validator.service.ts@@ -284,7 +284,6 @@ export class FlatNavigationMenuItemValidatorService {optimisticFlatEntityMapsAndRelatedFlatEntityMaps: {flatNavigationMenuItemMaps: optimisticFlatNavigationMenuItemMaps,},- remainingFlatEntityMapsToValidate,}: FlatEntityUpdateValidationArgs<typeof ALL_METADATA_NAME.navigationMenuItem>): FailedFlatEntityValidation<'navigationMenuItem', 'update'> {@@ -353,21 +352,12 @@ export class FlatNavigationMenuItemValidatorService {const newFolderUniversalIdentifier = folderUniversalIdentifierUpdate;- const combinedFlatNavigationMenuItemMaps: MetadataUniversalFlatEntityMaps<- typeof ALL_METADATA_NAME.navigationMenuItem- > = {- byUniversalIdentifier: {- ...remainingFlatEntityMapsToValidate.byUniversalIdentifier,- ...optimisticFlatNavigationMenuItemMaps.byUniversalIdentifier,- },- };-const circularDependencyErrors = this.getCircularDependencyValidationErrors({navigationMenuItemUniversalIdentifier:fromFlatNavigationMenuItem.universalIdentifier,folderUniversalIdentifier: newFolderUniversalIdentifier,- flatNavigationMenuItemMaps: combinedFlatNavigationMenuItemMaps,+ flatNavigationMenuItemMaps: optimisticFlatNavigationMenuItemMaps,},);@@ -378,7 +368,7 @@ export class FlatNavigationMenuItemValidatorService {const referencedParentNavigationMenuItem =findFlatEntityByUniversalIdentifier({universalIdentifier: newFolderUniversalIdentifier,- flatEntityMaps: combinedFlatNavigationMenuItemMaps,+ flatEntityMaps: optimisticFlatNavigationMenuItemMaps,});if (!isDefined(referencedParentNavigationMenuItem)) {