Skip to content

The open alternative to Salesforce, designed for AI.

fix(server): build the install-time SDK layer from the migration's own flat maps (#25608)

Paul Rastoin2c03b2910df5
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-graphql-schema-sdl/workspace-graphql-schema-sdl.service.ts b/packages/twenty-server/src/engine/api/graphql/workspace-graphql-schema-sdl/workspace-graphql-schema-sdl.service.ts
index 94997778354..3eff6678ce4 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-graphql-schema-sdl/workspace-graphql-schema-sdl.service.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-graphql-schema-sdl/workspace-graphql-schema-sdl.service.ts
@@ -5,6 +5,8 @@ import { printSchema } from 'graphql';
import { isDefined } from 'twenty-shared/utils';
import { ScalarsExplorerService } from 'src/engine/api/graphql/services/scalars-explorer.service';
+import { SCHEMA_SDL_CACHE_DEPENDENCIES } from 'src/engine/api/graphql/workspace-graphql-schema-sdl/constants/schema-sdl-cache-dependencies.constant';
+import { type ObjectFieldIndexFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/object-field-index-flat-entity-maps.type';
import { WorkspaceGraphQLSchemaGenerator } from 'src/engine/api/graphql/workspace-schema-builder/workspace-graphql-schema.factory';
import { FlatWorkspace } from 'src/engine/core-modules/workspace/types/flat-workspace.type';
import {
@@ -17,7 +19,6 @@ import { getSubFlatEntityMapsByApplicationIdsOrThrow } from 'src/engine/metadata
import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
import { type FlatIndexMetadata } from 'src/engine/metadata-modules/flat-index-metadata/types/flat-index-metadata.type';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
-import { SCHEMA_SDL_CACHE_DEPENDENCIES } from 'src/engine/api/graphql/workspace-graphql-schema-sdl/constants/schema-sdl-cache-dependencies.constant';
import { WorkspaceCacheStorageService } from 'src/engine/workspace-cache-storage/workspace-cache-storage.service';
import { combineCacheHashes } from 'src/engine/workspace-cache/utils/combine-cache-hashes.util';
import { TWENTY_STANDARD_APPLICATION } from 'src/engine/workspace-manager/twenty-standard-application/constants/twenty-standard-applications';
@@ -42,27 +43,36 @@ export class WorkspaceGraphqlSchemaSDLService {
async getOrComputeSchemaSDL(
workspace: FlatWorkspace,
applicationId?: string,
+ flatEntityMapsOverride?: ObjectFieldIndexFlatEntityMaps,
): Promise<WorkspaceGraphqlSchemaSDLResult | null> {
if (!isNonEmptyString(workspace.databaseSchema)) {
return null;
}
- const {
- data: {
- flatObjectMetadataMaps: allFlatObjectMetadataMaps,
- flatFieldMetadataMaps: allFlatFieldMetadataMaps,
- flatIndexMaps: allFlatIndexMaps,
- flatApplicationMaps,
- },
- hashes,
- } =
+ const shouldUseStoredSdl = !isDefined(flatEntityMapsOverride);
+
+ const { data, hashes } =
await this.workspaceManyOrAllFlatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMapsWithHashes(
{
workspaceId: workspace.id,
- flatMapsKeys: [...SCHEMA_SDL_CACHE_DEPENDENCIES],
+ flatMapsKeys: shouldUseStoredSdl
+ ? [...SCHEMA_SDL_CACHE_DEPENDENCIES]
+ : isDefined(flatEntityMapsOverride?.flatIndexMaps)
+ ? ['flatApplicationMaps']
+ : ['flatApplicationMaps', 'flatIndexMaps'],
},
);
+ const { flatApplicationMaps } = data;
+ const allFlatObjectMetadataMaps =
+ flatEntityMapsOverride?.flatObjectMetadataMaps ??
+ data.flatObjectMetadataMaps;
+ const allFlatFieldMetadataMaps =
+ flatEntityMapsOverride?.flatFieldMetadataMaps ??
+ data.flatFieldMetadataMaps;
+ const allFlatIndexMaps =
+ flatEntityMapsOverride?.flatIndexMaps ?? data.flatIndexMaps;
+
if (!isDefined(allFlatObjectMetadataMaps)) {
throw new FlatEntityMapsException(
'Object metadata collection not found',
@@ -114,22 +124,24 @@ export class WorkspaceGraphqlSchemaSDLService {
}
}
- const metadataCacheHash = combineCacheHashes(
- hashes,
- SCHEMA_SDL_CACHE_DEPENDENCIES,
- );
-
- let sdl = await this.workspaceCacheStorageService.getGraphQLTypeDefs(
- workspace.id,
- metadataCacheHash,
- applicationId,
- );
- let usedScalarNames =
- await this.workspaceCacheStorageService.getGraphQLUsedScalarNames(
- workspace.id,
- metadataCacheHash,
- applicationId,
- );
+ const metadataCacheHash = shouldUseStoredSdl
+ ? combineCacheHashes(hashes, SCHEMA_SDL_CACHE_DEPENDENCIES)
+ : undefined;
+
+ let sdl = isDefined(metadataCacheHash)
+ ? await this.workspaceCacheStorageService.getGraphQLTypeDefs(
+ workspace.id,
+ metadataCacheHash,
+ applicationId,
+ )
+ : undefined;
+ let usedScalarNames = isDefined(metadataCacheHash)
+ ? await this.workspaceCacheStorageService.getGraphQLUsedScalarNames(
+ workspace.id,
+ metadataCacheHash,
+ applicationId,
+ )
+ : undefined;
if (!sdl || !usedScalarNames) {
const autoGeneratedSchema =
@@ -143,18 +155,20 @@ export class WorkspaceGraphqlSchemaSDLService {
this.scalarsExplorerService.getUsedScalarNames(autoGeneratedSchema);
sdl = printSchema(autoGeneratedSchema);
- await this.workspaceCacheStorageService.setGraphQLTypeDefs(
- workspace.id,
- metadataCacheHash,
- sdl,
- applicationId,
- );
- await this.workspaceCacheStorageService.setGraphQLUsedScalarNames(
- workspace.id,
- metadataCacheHash,
- usedScalarNames,
- applicationId,
- );
+ if (isDefined(metadataCacheHash)) {
+ await this.workspaceCacheStorageService.setGraphQLTypeDefs(
+ workspace.id,
+ metadataCacheHash,
+ sdl,
+ applicationId,
+ );
+ await this.workspaceCacheStorageService.setGraphQLUsedScalarNames(
+ workspace.id,
+ metadataCacheHash,
+ usedScalarNames,
+ applicationId,
+ );
+ }
}
return {
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema.factory.ts
index 2934e220ef8..bb8d6664bcd 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-schema.factory.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema.factory.ts
@@ -6,6 +6,7 @@ import { gql } from 'graphql-tag';
import { isDefined } from 'twenty-shared/utils';
import { ScalarsExplorerService } from 'src/engine/api/graphql/services/scalars-explorer.service';
+import { type ObjectFieldIndexFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/object-field-index-flat-entity-maps.type';
import { WorkspaceGraphqlSchemaSDLService } from 'src/engine/api/graphql/workspace-graphql-schema-sdl/workspace-graphql-schema-sdl.service';
import { workspaceResolverBuilderMethodNames } from 'src/engine/api/graphql/workspace-resolver-builder/factories/factories';
import { WorkspaceResolverFactory } from 'src/engine/api/graphql/workspace-resolver-builder/workspace-resolver.factory';
@@ -23,11 +24,13 @@ export class WorkspaceSchemaFactory {
async createGraphQLSchema(
workspace: FlatWorkspace,
applicationId?: string,
+ flatEntityMapsOverride?: ObjectFieldIndexFlatEntityMaps,
): Promise<GraphQLSchema> {
const schemaSDLResult =
await this.workspaceGraphqlSchemaSDLService.getOrComputeSchemaSDL(
workspace,
applicationId,
+ flatEntityMapsOverride,
);
if (!isDefined(schemaSDLResult)) {
diff --git a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda/services/lambda-executor-manager.service.ts b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda/services/lambda-executor-manager.service.ts
index d88cffad511..067240f7aff 100644
--- a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda/services/lambda-executor-manager.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda/services/lambda-executor-manager.service.ts
@@ -16,6 +16,7 @@ import { Logger } from '@nestjs/common';
import { isNonEmptyString } from '@sniptt/guards';
import { isDefined } from 'twenty-shared/utils';
+import { type ObjectFieldIndexFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/object-field-index-flat-entity-maps.type';
import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';
import { type CacheLockService } from 'src/engine/core-modules/cache-lock/cache-lock.service';
import {
@@ -50,6 +51,7 @@ type ExecutorBuildContext = {
flatLogicFunction: FlatLogicFunction;
flatApplication: FlatApplication;
applicationUniversalIdentifier: string;
+ flatEntityMapsOverride?: ObjectFieldIndexFlatEntityMaps;
};
export class LambdaExecutorManagerService {
@@ -306,6 +308,7 @@ export class LambdaExecutorManagerService {
flatLogicFunction,
flatApplication,
applicationUniversalIdentifier,
+ flatEntityMapsOverride,
lambdaExecutor,
}: ExecutorBuildContext & {
lambdaExecutor: GetFunctionCommandOutput | undefined;
@@ -342,6 +345,7 @@ export class LambdaExecutorManagerService {
sdkLayerArn = await this.layerManager.ensureSdkLayer({
flatApplication,
applicationUniversalIdentifier,
+ flatEntityMapsOverride,
});
} catch (error) {
this.logger.error(
diff --git a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda/services/lambda-layer-manager.service.ts b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda/services/lambda-layer-manager.service.ts
index 0d6685c232b..301717189d4 100644
--- a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda/services/lambda-layer-manager.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda/services/lambda-layer-manager.service.ts
@@ -11,6 +11,7 @@ import {
import { Logger } from '@nestjs/common';
import { isDefined } from 'twenty-shared/utils';
+import { type ObjectFieldIndexFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/object-field-index-flat-entity-maps.type';
import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';
import { SDK_LAYER_PREFIX_IN_ZIP } from 'src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda/constants/lambda-driver.constant';
import { type LambdaAwsClientService } from 'src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda/services/lambda-aws-client.service';
@@ -31,6 +32,7 @@ import {
type LayerAppContext = {
flatApplication: FlatApplication;
applicationUniversalIdentifier: string;
+ flatEntityMapsOverride?: ObjectFieldIndexFlatEntityMaps;
};
export class LambdaLayerManagerService {
@@ -73,7 +75,11 @@ export class LambdaLayerManagerService {
}
async ensureSdkLayer(context: LayerAppContext): Promise<string> {
- const { flatApplication, applicationUniversalIdentifier } = context;
+ const {
+ flatApplication,
+ applicationUniversalIdentifier,
+ flatEntityMapsOverride,
+ } = context;
const layerName = getLambdaSdkLayerName({
workspaceId: flatApplication.workspaceId,
applicationUniversalIdentifier,
@@ -94,6 +100,7 @@ export class LambdaLayerManagerService {
workspaceId: flatApplication.workspaceId,
applicationId: flatApplication.id,
applicationUniversalIdentifier,
+ flatEntityMapsOverride,
});
const zipBuffer = await reprefixLambdaZipEntries({
diff --git a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-drivers/interfaces/logic-function-driver.interface.ts b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-drivers/interfaces/logic-function-driver.interface.ts
index a4da7c3e760..994c67b9188 100644
--- a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-drivers/interfaces/logic-function-driver.interface.ts
+++ b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-drivers/interfaces/logic-function-driver.interface.ts
@@ -1,5 +1,6 @@
import { type LogicFunctionExecutionContext } from 'twenty-shared/logic-function';
+import { type ObjectFieldIndexFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/object-field-index-flat-entity-maps.type';
import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';
import { type LogicFunctionExecutionStatus } from 'src/engine/metadata-modules/logic-function/dtos/logic-function-execution-result.dto';
import { type LogicFunctionExecutionMode } from 'src/engine/metadata-modules/logic-function/logic-function.entity';
@@ -35,6 +36,7 @@ export type LogicFunctionInstallPrebuiltBundleParams = {
flatLogicFunction: FlatLogicFunction;
flatApplication: FlatApplication;
applicationUniversalIdentifier: string;
+ flatEntityMapsOverride?: ObjectFieldIndexFlatEntityMaps;
};
export type LogicFunctionTranspileParams = {
diff --git a/packages/twenty-server/src/engine/core-modules/sdk-client/sdk-client-archive.service.ts b/packages/twenty-server/src/engine/core-modules/sdk-client/sdk-client-archive.service.ts
index fb5149c97ed..37b33f7f7b5 100644
--- a/packages/twenty-server/src/engine/core-modules/sdk-client/sdk-client-archive.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/sdk-client/sdk-client-archive.service.ts
@@ -6,6 +6,7 @@ import * as fs from 'fs/promises';
import { FileFolder } from 'twenty-shared/types';
import { Repository } from 'typeorm';
+import { type ObjectFieldIndexFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/object-field-index-flat-entity-maps.type';
import { ApplicationEntity } from 'src/engine/core-modules/application/application.entity';
import { FileStorageService } from 'src/engine/core-modules/file-storage/services/file-storage.service';
import {
@@ -65,15 +66,18 @@ export class SdkClientArchiveService {
workspaceId,
applicationId,
applicationUniversalIdentifier,
+ flatEntityMapsOverride,
}: {
workspaceId: string;
applicationId: string;
applicationUniversalIdentifier: string;
+ flatEntityMapsOverride?: ObjectFieldIndexFlatEntityMaps;
}): Promise<Buffer> {
return this.downloadArchiveBufferOrGenerate({
workspaceId,
applicationId,
applicationUniversalIdentifier,
+ flatEntityMapsOverride,
});
}
@@ -134,10 +138,12 @@ export class SdkClientArchiveService {
workspaceId,
applicationId,
applicationUniversalIdentifier,
+ flatEntityMapsOverride,
}: {
workspaceId: string;
applicationId: string;
applicationUniversalIdentifier: string;
+ flatEntityMapsOverride?: ObjectFieldIndexFlatEntityMaps;
}): Promise<Buffer> {
try {
const stream = await this.fileStorageService.readFile({
@@ -166,6 +172,7 @@ export class SdkClientArchiveService {
applicationId,
applicationUniversalIdentifier,
trigger: 'missing-archive',
+ flatEntityMapsOverride,
});
}
}
diff --git a/packages/twenty-server/src/engine/core-modules/sdk-client/sdk-client-generation.service.ts b/packages/twenty-server/src/engine/core-modules/sdk-client/sdk-client-generation.service.ts
index cd4055f16fb..195278dc0d5 100644
--- a/packages/twenty-server/src/engine/core-modules/sdk-client/sdk-client-generation.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/sdk-client/sdk-client-generation.service.ts
@@ -10,6 +10,7 @@ import { replaceCoreClient } from 'twenty-client-sdk/generate';
import { FileFolder } from 'twenty-shared/types';
import { Repository } from 'typeorm';
+import { type ObjectFieldIndexFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/object-field-index-flat-entity-maps.type';
import { WorkspaceSchemaFactory } from 'src/engine/api/graphql/workspace-schema.factory';
import { ApplicationService } from 'src/engine/core-modules/application/application.service';
import {
@@ -108,11 +109,13 @@ export class SdkClientGenerationService {
applicationId,
applicationUniversalIdentifier,
trigger = 'unknown',
+ flatEntityMapsOverride,
}: {
workspaceId: string;
applicationId: string;
applicationUniversalIdentifier: string;
trigger?: SdkClientGenerationTrigger;
+ flatEntityMapsOverride?: ObjectFieldIndexFlatEntityMaps;
}): Promise<Buffer> {
const generationStart = performance.now();
@@ -125,6 +128,7 @@ export class SdkClientGenerationService {
await this.workspaceSchemaFactory.createGraphQLSchema(
fromWorkspaceEntityToFlat(workspaceEntity),
applicationId,
+ flatEntityMapsOverride,
);
const archiveBuffer = await this.generateAndStore({
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/object-field-index-flat-entity-maps.type.ts b/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/object-field-index-flat-entity-maps.type.ts
new file mode 100644
index 00000000000..6ff99568cd5
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/object-field-index-flat-entity-maps.type.ts
@@ -0,0 +1,7 @@
+import { type AllFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/all-flat-entity-maps.type';
+
+export type ObjectFieldIndexFlatEntityMaps = Pick<
+ AllFlatEntityMaps,
+ 'flatObjectMetadataMaps' | 'flatFieldMetadataMaps'
+> &
+ Partial<Pick<AllFlatEntityMaps, 'flatIndexMaps'>>;
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-entity/utils/find-object-field-index-flat-entity-maps-in-all-flat-entity-maps.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-entity/utils/find-object-field-index-flat-entity-maps-in-all-flat-entity-maps.util.ts
new file mode 100644
index 00000000000..442c0668888
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-entity/utils/find-object-field-index-flat-entity-maps-in-all-flat-entity-maps.util.ts
@@ -0,0 +1,17 @@
+import { isDefined } from 'twenty-shared/utils';
+
+import { type AllFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/all-flat-entity-maps.type';
+import { type ObjectFieldIndexFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/object-field-index-flat-entity-maps.type';
+
+export const findObjectFieldIndexFlatEntityMapsInAllFlatEntityMaps = (
+ allFlatEntityMaps: Partial<AllFlatEntityMaps>,
+): ObjectFieldIndexFlatEntityMaps | undefined => {
+ const { flatObjectMetadataMaps, flatFieldMetadataMaps, flatIndexMaps } =
+ allFlatEntityMaps;
+
+ if (!isDefined(flatObjectMetadataMaps) || !isDefined(flatFieldMetadataMaps)) {
+ return undefined;
+ }
+
+ return { flatObjectMetadataMaps, flatFieldMetadataMaps, flatIndexMaps };
+};
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/logic-function/services/create-logic-function-action-handler.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/logic-function/services/create-logic-function-action-handler.service.ts
index 8aa6fa55d39..331c1764015 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/logic-function/services/create-logic-function-action-handler.service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/logic-function/services/create-logic-function-action-handler.service.ts
@@ -5,6 +5,7 @@ import { v4 } from 'uuid';
import { WorkspaceMigrationRunnerActionHandler } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/interfaces/workspace-migration-runner-action-handler-service.interface';
import { LOGIC_FUNCTION_DRIVER_FACTORY_TOKEN } from 'src/engine/core-modules/logic-function/logic-function-drivers/constants/logic-function-driver-factory.token';
+import { findObjectFieldIndexFlatEntityMapsInAllFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-object-field-index-flat-entity-maps-in-all-flat-entity-maps.util';
import { isLogicFunctionReadyForPrebuiltInstall } from 'src/engine/metadata-modules/logic-function/utils/is-logic-function-ready-for-prebuilt-install.util';
import type { LogicFunctionDriverFactory } from 'src/engine/core-modules/logic-function/logic-function-drivers/logic-function-driver.factory';
@@ -55,7 +56,8 @@ export class CreateLogicFunctionActionHandlerService extends WorkspaceMigrationR
async executeForMetadata(
context: WorkspaceMigrationActionRunnerContext<FlatCreateLogicFunctionAction>,
): Promise<void> {
- const { flatAction, queryRunner, flatApplication } = context;
+ const { flatAction, queryRunner, flatApplication, allFlatEntityMaps } =
+ context;
const { flatEntity: logicFunction } = flatAction;
await this.insertFlatEntitiesInRepository({
@@ -73,6 +75,10 @@ export class CreateLogicFunctionActionHandlerService extends WorkspaceMigrationR
flatLogicFunction: logicFunction,
flatApplication,
applicationUniversalIdentifier: flatApplication.universalIdentifier,
+ flatEntityMapsOverride:
+ findObjectFieldIndexFlatEntityMapsInAllFlatEntityMaps(
+ allFlatEntityMaps,
+ ),
});
this.logger.log(
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/logic-function/services/update-logic-function-action-handler.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/logic-function/services/update-logic-function-action-handler.service.ts
index 9e179a35064..f7fe2083b40 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/logic-function/services/update-logic-function-action-handler.service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/logic-function/services/update-logic-function-action-handler.service.ts
@@ -3,6 +3,7 @@ import { Inject, Injectable } from '@nestjs/common';
import { FileFolder } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
+import { findObjectFieldIndexFlatEntityMapsInAllFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-object-field-index-flat-entity-maps-in-all-flat-entity-maps.util';
import { WorkspaceMigrationRunnerActionHandler } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/interfaces/workspace-migration-runner-action-handler-service.interface';
import { FileStorageService } from 'src/engine/core-modules/file-storage/services/file-storage.service';
@@ -171,6 +172,10 @@ export class UpdateLogicFunctionActionHandlerService extends WorkspaceMigrationR
},
flatApplication: context.flatApplication,
applicationUniversalIdentifier,
+ flatEntityMapsOverride:
+ findObjectFieldIndexFlatEntityMapsInAllFlatEntityMaps(
+ context.allFlatEntityMaps,
+ ),
});
this.logger.log(
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/services/workspace-migration-runner.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/services/workspace-migration-runner.service.ts
index 47ab18ec9e1..76e9cd65535 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/services/workspace-migration-runner.service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/services/workspace-migration-runner.service.ts
@@ -138,6 +138,7 @@ export class WorkspaceMigrationRunnerService {
}: {
phase:
| 'initial-cache-retrieval'
+ | 'flat-maps-clone'
| 'action-execution'
| 'commit'
| 'cache-invalidation';
@@ -272,7 +273,7 @@ export class WorkspaceMigrationRunnerService {
getMetadataFlatEntityMapsKey,
);
- let allFlatEntityMaps =
+ const cachedAllFlatEntityMaps =
await this.flatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps<
typeof allFlatEntityMapsKeys
>({
@@ -296,6 +297,23 @@ export class WorkspaceMigrationRunnerService {
'Runner',
);
+ const cloneStart = performance.now();
+
+ let allFlatEntityMaps = structuredClone(cachedAllFlatEntityMaps);
+
+ const cloneMs = performance.now() - cloneStart;
+
+ this.recordRunPhaseMetric({
+ phase: 'flat-maps-clone',
+ status: 'success',
+ value: cloneMs,
+ });
+
+ this.logger.perf(
+ `[install-perf] Runner flat-maps clone took ${cloneMs.toFixed(1)}ms for ${allFlatEntityMapsKeys.length} flat-maps keys`,
+ 'Runner',
+ );
+
const { flatApplicationMaps } =
await this.workspaceCacheService.getOrRecompute(workspaceId, [
'flatApplicationMaps',