Skip to content

The open alternative to Salesforce, designed for AI.

perf(server): hold an ORM field-metadata projection on the record query path (#24831)

Charles Bochet7408f36470be
diff --git a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-filter/graphql-query-filter-condition.parser.ts b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-filter/graphql-query-filter-condition.parser.ts
index 983cc5f0437..5cea529b3a3 100644
--- a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-filter/graphql-query-filter-condition.parser.ts
+++ b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-filter/graphql-query-filter-condition.parser.ts
@@ -4,7 +4,7 @@ import { type ObjectRecordFilter } from 'src/engine/api/graphql/workspace-query-
import { applyFilterEntriesToWhereExpression } from 'src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/utils/apply-filter-entries-to-where-expression.util';
import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
-import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
+import { type OrmFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/orm-flat-field-metadata.type';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
import { GraphqlQueryFilterFieldParser } from './graphql-query-filter-field.parser';
@@ -15,7 +15,7 @@ export class GraphqlQueryFilterConditionParser {
constructor(
flatObjectMetadata: FlatObjectMetadata,
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>,
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>,
flatObjectMetadataMaps?: FlatEntityMaps<FlatObjectMetadata>,
depth = 0,
) {
diff --git a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-filter/graphql-query-filter-field.parser.ts b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-filter/graphql-query-filter-field.parser.ts
index df4300d3577..5d82e615ebb 100644
--- a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-filter/graphql-query-filter-field.parser.ts
+++ b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-filter/graphql-query-filter-field.parser.ts
@@ -18,7 +18,7 @@ import { type CompositeFieldMetadataType } from 'src/engine/metadata-modules/fie
import { isCompositeFieldMetadataType } from 'src/engine/metadata-modules/field-metadata/utils/is-composite-field-metadata-type.util';
import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
-import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
+import { type OrmFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/orm-flat-field-metadata.type';
import { buildFieldMapsFromFlatObjectMetadata } from 'src/engine/metadata-modules/flat-field-metadata/utils/build-field-maps-from-flat-object-metadata.util';
import { isMorphOrRelationFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/utils/is-morph-or-relation-flat-field-metadata.util';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
@@ -33,7 +33,7 @@ import { type WorkspaceSelectQueryBuilder } from 'src/engine/twenty-orm/query-bu
export class GraphqlQueryFilterFieldParser {
private flatObjectMetadata: FlatObjectMetadata;
- private flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ private flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
private flatObjectMetadataMaps?: FlatEntityMaps<FlatObjectMetadata>;
private fieldIdByName: Record<string, string>;
private fieldIdByJoinColumnName: Record<string, string>;
@@ -41,7 +41,7 @@ export class GraphqlQueryFilterFieldParser {
constructor(
flatObjectMetadata: FlatObjectMetadata,
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>,
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>,
flatObjectMetadataMaps?: FlatEntityMaps<FlatObjectMetadata>,
depth = 0,
) {
@@ -146,7 +146,7 @@ export class GraphqlQueryFilterFieldParser {
queryBuilder: WhereExpressionBuilder,
outerQueryBuilder: WorkspaceSelectQueryBuilder,
parentAlias: string,
- fieldMetadata: FlatFieldMetadata,
+ fieldMetadata: OrmFlatFieldMetadata,
filterValue: Partial<ObjectRecordFilter>,
isFirst: boolean,
): void {
@@ -223,7 +223,7 @@ export class GraphqlQueryFilterFieldParser {
private parseCompositeFieldForFilter(
queryBuilder: WhereExpressionBuilder,
- fieldMetadata: FlatFieldMetadata,
+ fieldMetadata: OrmFlatFieldMetadata,
objectNameSingular: string,
// oxlint-disable-next-line typescript/no-explicit-any
fieldValue: any,
diff --git a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/utils/resolve-filter-key-field-metadata.util.ts b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/utils/resolve-filter-key-field-metadata.util.ts
index bfe98c52880..c1456b8c0ec 100644
--- a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/utils/resolve-filter-key-field-metadata.util.ts
+++ b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/utils/resolve-filter-key-field-metadata.util.ts
@@ -3,8 +3,11 @@ import { isDefined } from 'twenty-shared/utils';
import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
+import { type OrmFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/orm-flat-field-metadata.type';
-export const resolveFilterKeyFieldMetadata = ({
+export const resolveFilterKeyFieldMetadata = <
+ T extends OrmFlatFieldMetadata = FlatFieldMetadata,
+>({
filterKey,
fieldIdByName,
fieldIdByJoinColumnName,
@@ -13,9 +16,9 @@ export const resolveFilterKeyFieldMetadata = ({
filterKey: string;
fieldIdByName: Record<string, string>;
fieldIdByJoinColumnName: Record<string, string>;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<T>;
}): {
- fieldMetadata: FlatFieldMetadata | undefined;
+ fieldMetadata: T | undefined;
isReferencedByFieldName: boolean;
} => {
const isReferencedByFieldName = isDefined(fieldIdByName[filterKey]);
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/get-flat-fields-for-flat-object-metadata.util.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/get-flat-fields-for-flat-object-metadata.util.ts
index 97ac2670f0d..a07dd27c879 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/get-flat-fields-for-flat-object-metadata.util.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/get-flat-fields-for-flat-object-metadata.util.ts
@@ -1,12 +1,15 @@
import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
import { findManyFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-many-flat-entity-by-id-in-flat-entity-maps.util';
import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
+import { type OrmFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/orm-flat-field-metadata.type';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
-export const getFlatFieldsFromFlatObjectMetadata = (
+export const getFlatFieldsFromFlatObjectMetadata = <
+ T extends OrmFlatFieldMetadata = FlatFieldMetadata,
+>(
flatObjectMetadata: FlatObjectMetadata,
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>,
-): FlatFieldMetadata[] => {
+ flatFieldMetadataMaps: FlatEntityMaps<T>,
+): T[] => {
return findManyFlatEntityByIdInFlatEntityMaps({
flatEntityIds: flatObjectMetadata.fieldIds,
flatEntityMaps: flatFieldMetadataMaps,
diff --git a/packages/twenty-server/src/engine/core-modules/event-emitter/utils/object-record-changed-values.ts b/packages/twenty-server/src/engine/core-modules/event-emitter/utils/object-record-changed-values.ts
index c00c43100e4..f59c55f1c88 100644
--- a/packages/twenty-server/src/engine/core-modules/event-emitter/utils/object-record-changed-values.ts
+++ b/packages/twenty-server/src/engine/core-modules/event-emitter/utils/object-record-changed-values.ts
@@ -10,7 +10,7 @@ import { computeMorphOrRelationFieldJoinColumnName } from 'src/engine/metadata-m
import { getJoinColumnNameForRelationField } from 'src/engine/metadata-modules/field-metadata/utils/get-join-column-name-for-relation-field.util';
import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
-import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
+import { type OrmFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/orm-flat-field-metadata.type';
import { buildFieldMapsFromFlatObjectMetadata } from 'src/engine/metadata-modules/flat-field-metadata/utils/build-field-maps-from-flat-object-metadata.util';
import { isMorphOrRelationFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/utils/is-morph-or-relation-flat-field-metadata.util';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
@@ -25,7 +25,9 @@ const buildRelationFieldChangeValue = (
id: isDefined(relationId) ? relationId : null,
});
-const isManyToOneMorphOrRelationField = (field: FlatFieldMetadata): boolean => {
+const isManyToOneMorphOrRelationField = (
+ field: OrmFlatFieldMetadata,
+): boolean => {
return (
isMorphOrRelationFlatFieldMetadata(field) &&
field.settings?.relationType === RelationType.MANY_TO_ONE
@@ -35,7 +37,7 @@ const isManyToOneMorphOrRelationField = (field: FlatFieldMetadata): boolean => {
export const computeUpdatedFieldsFromDiff = (
diff: Record<string, unknown>,
objectMetadataItem: FlatObjectMetadata,
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>,
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>,
): string[] => {
const { fieldIdByName } = buildFieldMapsFromFlatObjectMetadata(
flatFieldMetadataMaps,
@@ -69,7 +71,7 @@ export const objectRecordChangedValues = (
oldRecord: Partial<ObjectRecord>,
newRecord: Partial<ObjectRecord>,
objectMetadataItem: FlatObjectMetadata,
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>,
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>,
) => {
const { fieldIdByName, fieldIdByJoinColumnName } =
buildFieldMapsFromFlatObjectMetadata(
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/get-join-column-name-for-relation-field.util.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/get-join-column-name-for-relation-field.util.ts
index 7c378363b02..7e7ffa0d2e0 100644
--- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/get-join-column-name-for-relation-field.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/get-join-column-name-for-relation-field.util.ts
@@ -3,12 +3,12 @@ import { isDefined } from 'twenty-shared/utils';
import { computeMorphOrRelationFieldJoinColumnName } from 'src/engine/metadata-modules/field-metadata/utils/compute-morph-or-relation-field-join-column-name.util';
import { isFieldMetadataSettingsOfType } from 'src/engine/metadata-modules/field-metadata/utils/is-field-metadata-settings-of-type.util';
-import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
+import { type OrmFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/orm-flat-field-metadata.type';
// The ORM derives relation columns from the field name, so fall back to it
// when settings carry no explicit join column.
export const getJoinColumnNameForRelationField = (
- flatFieldMetadata: FlatFieldMetadata,
+ flatFieldMetadata: OrmFlatFieldMetadata,
): string => {
const { settings } = flatFieldMetadata;
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module.ts b/packages/twenty-server/src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module.ts
index 22cb96165d6..87fcc29b2bf 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module.ts
@@ -6,6 +6,7 @@ import { CommandMenuItemEntity } from 'src/engine/metadata-modules/command-menu-
import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
import { WorkspaceFlatFieldMetadataMapCacheService } from 'src/engine/metadata-modules/flat-field-metadata/services/workspace-flat-field-metadata-map-cache.service';
+import { WorkspaceOrmFlatFieldMetadataMapCacheService } from 'src/engine/metadata-modules/flat-field-metadata/services/workspace-orm-flat-field-metadata-map-cache.service';
import { WorkspaceFlatFieldPermissionMapCacheService } from 'src/engine/metadata-modules/flat-field-permission/services/workspace-flat-field-permission-map-cache.service';
import { WorkspaceFlatIndexMapCacheService } from 'src/engine/metadata-modules/flat-index-metadata/services/workspace-flat-index-map-cache.service';
import { WorkspaceFlatObjectMetadataMapCacheService } from 'src/engine/metadata-modules/flat-object-metadata/services/workspace-flat-object-metadata-map-cache.service';
@@ -94,6 +95,7 @@ import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache
WorkspaceFlatViewFilterGroupMapCacheService,
WorkspaceFlatIndexMapCacheService,
WorkspaceFlatFieldMetadataMapCacheService,
+ WorkspaceOrmFlatFieldMetadataMapCacheService,
WorkspaceFlatViewGroupMapCacheService,
WorkspaceFlatObjectPermissionMapCacheService,
WorkspaceFlatFieldPermissionMapCacheService,
@@ -138,6 +140,7 @@ import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache
WorkspaceFlatViewFilterGroupMapCacheService,
WorkspaceFlatIndexMapCacheService,
WorkspaceFlatFieldMetadataMapCacheService,
+ WorkspaceOrmFlatFieldMetadataMapCacheService,
WorkspaceFlatViewGroupMapCacheService,
WorkspaceFlatObjectPermissionMapCacheService,
WorkspaceFlatFieldPermissionMapCacheService,
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service.ts b/packages/twenty-server/src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service.ts
index e8580a6904f..b40a8994367 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service.ts
@@ -59,8 +59,10 @@ export class WorkspaceManyOrAllFlatEntityMapsCacheService {
}): Promise<void> {
await this.workspaceCacheService.invalidateAndRecompute(
workspaceId,
- (flatMapsKeys ??
- ALL_FLAT_ENTITY_MAPS_PROPERTIES) as (keyof WorkspaceCacheDataMap)[],
+ this.withDerivedFieldMetadataMaps(
+ (flatMapsKeys ??
+ ALL_FLAT_ENTITY_MAPS_PROPERTIES) as (keyof WorkspaceCacheDataMap)[],
+ ),
);
}
@@ -75,8 +77,20 @@ export class WorkspaceManyOrAllFlatEntityMapsCacheService {
}): Promise<void> {
await this.workspaceCacheService.flush(
workspaceId,
- (flatMapsKeys ??
- ALL_FLAT_ENTITY_MAPS_PROPERTIES) as (keyof WorkspaceCacheDataMap)[],
+ this.withDerivedFieldMetadataMaps(
+ (flatMapsKeys ??
+ ALL_FLAT_ENTITY_MAPS_PROPERTIES) as (keyof WorkspaceCacheDataMap)[],
+ ),
);
}
+
+ // flatFieldMetadataMapsOrm is a projection of flatFieldMetadataMaps, so it has
+ // to be recomputed whenever the field metadata maps are.
+ private withDerivedFieldMetadataMaps(
+ keys: (keyof WorkspaceCacheDataMap)[],
+ ): (keyof WorkspaceCacheDataMap)[] {
+ return keys.includes('flatFieldMetadataMaps')
+ ? [...keys, 'flatFieldMetadataMapsOrm']
+ : keys;
+ }
}
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/services/workspace-orm-flat-field-metadata-map-cache.service.ts b/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/services/workspace-orm-flat-field-metadata-map-cache.service.ts
new file mode 100644
index 00000000000..e2bd8905b5f
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/services/workspace-orm-flat-field-metadata-map-cache.service.ts
@@ -0,0 +1,69 @@
+import { Injectable } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+
+import { Repository } from 'typeorm';
+
+import { WorkspaceCacheProvider } from 'src/engine/workspace-cache/interfaces/workspace-cache-provider.service';
+
+import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { createEmptyFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/constant/create-empty-flat-entity-maps.constant';
+import { FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
+import { type OrmFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/orm-flat-field-metadata.type';
+import { fromFieldMetadataEntityToOrmFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/utils/from-field-metadata-entity-to-orm-flat-field-metadata.util';
+import { IndexMetadataEntity } from 'src/engine/metadata-modules/index-metadata/index-metadata.entity';
+import { computeUniqueFieldMetadataIdsFromIndexEntities } from 'src/engine/metadata-modules/index-metadata/utils/compute-unique-field-metadata-ids-from-index-entities.util';
+import { InjectWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/inject-workspace-scoped-repository.decorator';
+import { WorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/workspace-scoped-repository';
+import { WorkspaceCache } from 'src/engine/workspace-cache/decorators/workspace-cache.decorator';
+import { addFlatEntityToFlatEntityMapsThroughMutationOrThrow } from 'src/engine/workspace-manager/workspace-migration/utils/add-flat-entity-to-flat-entity-maps-through-mutation-or-throw.util';
+
+@Injectable()
+@WorkspaceCache('flatFieldMetadataMapsOrm', { packingPonderation: 8 })
+export class WorkspaceOrmFlatFieldMetadataMapCacheService extends WorkspaceCacheProvider<
+ FlatEntityMaps<OrmFlatFieldMetadata>
+> {
+ constructor(
+ @InjectRepository(FieldMetadataEntity)
+ private readonly fieldMetadataRepository: Repository<FieldMetadataEntity>,
+ @InjectWorkspaceScopedRepository(IndexMetadataEntity)
+ private readonly indexMetadataRepository: WorkspaceScopedRepository<IndexMetadataEntity>,
+ ) {
+ super();
+ }
+
+ async computeForCache(
+ workspaceId: string,
+ ): Promise<FlatEntityMaps<OrmFlatFieldMetadata>> {
+ const [fieldMetadatas, indexMetadatas] = await Promise.all([
+ this.fieldMetadataRepository.find({
+ where: { workspaceId },
+ withDeleted: true,
+ }),
+ this.indexMetadataRepository.find(workspaceId, {
+ where: { isUnique: true },
+ relations: ['indexFieldMetadatas'],
+ withDeleted: true,
+ }),
+ ]);
+
+ const uniqueFieldMetadataIds =
+ computeUniqueFieldMetadataIdsFromIndexEntities(indexMetadatas);
+
+ const ormFlatFieldMetadataMaps = createEmptyFlatEntityMaps();
+
+ for (const fieldMetadataEntity of fieldMetadatas) {
+ const ormFlatFieldMetadata =
+ fromFieldMetadataEntityToOrmFlatFieldMetadata({
+ entity: fieldMetadataEntity,
+ isUnique: uniqueFieldMetadataIds.has(fieldMetadataEntity.id),
+ });
+
+ addFlatEntityToFlatEntityMapsThroughMutationOrThrow({
+ flatEntity: ormFlatFieldMetadata,
+ flatEntityMapsToMutate: ormFlatFieldMetadataMaps,
+ });
+ }
+
+ return ormFlatFieldMetadataMaps;
+ }
+}
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/types/orm-flat-field-metadata.type.ts b/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/types/orm-flat-field-metadata.type.ts
new file mode 100644
index 00000000000..485e1ae5eb9
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/types/orm-flat-field-metadata.type.ts
@@ -0,0 +1,33 @@
+import { type FieldMetadataType } from 'twenty-shared/types';
+
+import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
+
+export const ORM_FLAT_FIELD_METADATA_KEYS = [
+ 'id',
+ 'universalIdentifier',
+ 'applicationId',
+ 'workspaceId',
+ 'objectMetadataId',
+ 'type',
+ 'name',
+ 'label',
+ 'defaultValue',
+ 'options',
+ 'settings',
+ 'isNullable',
+ 'isUnique',
+ 'writability',
+ 'relationTargetFieldMetadataId',
+ 'relationTargetObjectMetadataId',
+ 'morphId',
+] as const satisfies readonly (keyof FlatFieldMetadata)[];
+
+export type OrmFlatFieldMetadataKey =
+ (typeof ORM_FLAT_FIELD_METADATA_KEYS)[number];
+
+export type OrmFlatFieldMetadata<
+ T extends FieldMetadataType = FieldMetadataType,
+> = Pick<
+ FlatFieldMetadata<T>,
+ Extract<keyof FlatFieldMetadata<T>, OrmFlatFieldMetadataKey>
+>;
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/build-field-maps-from-flat-object-metadata.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/build-field-maps-from-flat-object-metadata.util.ts
index 15af21c3695..226995a5e5e 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/build-field-maps-from-flat-object-metadata.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/build-field-maps-from-flat-object-metadata.util.ts
@@ -4,6 +4,7 @@ import { computeMorphOrRelationFieldJoinColumnName } from 'src/engine/metadata-m
import { getFlatFieldsFromFlatObjectMetadata } from 'src/engine/api/graphql/workspace-schema-builder/utils/get-flat-fields-for-flat-object-metadata.util';
import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
+import { type OrmFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/orm-flat-field-metadata.type';
import { isFlatFieldMetadataOfType } from 'src/engine/metadata-modules/flat-field-metadata/utils/is-flat-field-metadata-of-type.util';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
@@ -17,12 +18,14 @@ export type FieldMapsForObject = {
// be memoized by identity: several helpers rebuild them per request otherwise
// (order parsing, cursor encoding per record, cursor conditions per key).
const fieldMapsCache = new WeakMap<
- FlatEntityMaps<FlatFieldMetadata>,
+ FlatEntityMaps<OrmFlatFieldMetadata>,
WeakMap<FlatObjectMetadata, FieldMapsForObject>
>();
-export const buildFieldMapsFromFlatObjectMetadata = (
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>,
+export const buildFieldMapsFromFlatObjectMetadata = <
+ T extends OrmFlatFieldMetadata = FlatFieldMetadata,
+>(
+ flatFieldMetadataMaps: FlatEntityMaps<T>,
flatObjectMetadata: FlatObjectMetadata,
): FieldMapsForObject => {
const cachedByObjectMetadata = fieldMapsCache.get(flatFieldMetadataMaps);
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/from-field-metadata-entity-to-orm-flat-field-metadata.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/from-field-metadata-entity-to-orm-flat-field-metadata.util.ts
new file mode 100644
index 00000000000..eeeba36c86f
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/from-field-metadata-entity-to-orm-flat-field-metadata.util.ts
@@ -0,0 +1,20 @@
+import { type FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import {
+ ORM_FLAT_FIELD_METADATA_KEYS,
+ type OrmFlatFieldMetadata,
+} from 'src/engine/metadata-modules/flat-field-metadata/types/orm-flat-field-metadata.type';
+
+export const fromFieldMetadataEntityToOrmFlatFieldMetadata = ({
+ entity,
+ isUnique,
+}: {
+ entity: FieldMetadataEntity;
+ isUnique: boolean;
+}): OrmFlatFieldMetadata => {
+ return Object.fromEntries(
+ ORM_FLAT_FIELD_METADATA_KEYS.map((key) => [
+ key,
+ key === 'isUnique' ? isUnique : entity[key],
+ ]),
+ ) as OrmFlatFieldMetadata;
+};
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/is-flat-field-metadata-of-type.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/is-flat-field-metadata-of-type.util.ts
index 3214f3deb77..b6015aba0a9 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/is-flat-field-metadata-of-type.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/is-flat-field-metadata-of-type.util.ts
@@ -1,9 +1,10 @@
import { type FieldMetadataType } from 'twenty-shared/types';
import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
+import { type OrmFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/orm-flat-field-metadata.type';
export function isFlatFieldMetadataOfType<
- Field extends FlatFieldMetadata<FieldMetadataType>,
+ Field extends OrmFlatFieldMetadata<FieldMetadataType>,
Type extends FieldMetadataType,
>(
fieldMetadata: Pick<Field, 'type'>,
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/is-flat-field-metadata-of-types.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/is-flat-field-metadata-of-types.util.ts
index 681896c4587..377f834d623 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/is-flat-field-metadata-of-types.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/is-flat-field-metadata-of-types.util.ts
@@ -1,9 +1,10 @@
import { type FieldMetadataType } from 'twenty-shared/types';
import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
+import { type OrmFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/orm-flat-field-metadata.type';
export function isFlatFieldMetadataOfTypes<
- Field extends FlatFieldMetadata<FieldMetadataType>,
+ Field extends OrmFlatFieldMetadata<FieldMetadataType>,
Types extends FieldMetadataType[],
>(
fieldMetadata: Pick<Field, 'type'>,
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/is-morph-or-relation-flat-field-metadata.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/is-morph-or-relation-flat-field-metadata.util.ts
index 8475c8acb63..304d326523f 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/is-morph-or-relation-flat-field-metadata.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/is-morph-or-relation-flat-field-metadata.util.ts
@@ -2,13 +2,19 @@ import {
MORPH_OR_RELATION_FIELD_TYPES,
type MorphOrRelationFieldMetadataType,
} from 'src/engine/metadata-modules/field-metadata/types/morph-or-relation-field-metadata-type.type';
+import { type FieldMetadataType } from 'twenty-shared/types';
+
import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
+import { type OrmFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/orm-flat-field-metadata.type';
import { isFlatFieldMetadataOfTypes } from 'src/engine/metadata-modules/flat-field-metadata/utils/is-flat-field-metadata-of-types.util';
import { type UniversalFlatFieldMetadata } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/universal-flat-field-metadata.type';
-export const isMorphOrRelationFlatFieldMetadata = (
- flatFieldMetadata: FlatFieldMetadata,
-): flatFieldMetadata is FlatFieldMetadata<MorphOrRelationFieldMetadataType> =>
+export const isMorphOrRelationFlatFieldMetadata = <
+ T extends OrmFlatFieldMetadata<FieldMetadataType>,
+>(
+ flatFieldMetadata: T,
+): flatFieldMetadata is T &
+ FlatFieldMetadata<MorphOrRelationFieldMetadataType> =>
isFlatFieldMetadataOfTypes(flatFieldMetadata, [
...MORPH_OR_RELATION_FIELD_TYPES,
]);
diff --git a/packages/twenty-server/src/engine/twenty-orm/entity-manager/types/relation-connect-query-config.type.ts b/packages/twenty-server/src/engine/twenty-orm/entity-manager/types/relation-connect-query-config.type.ts
index c1ad1200bb3..300908d3f88 100644
--- a/packages/twenty-server/src/engine/twenty-orm/entity-manager/types/relation-connect-query-config.type.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/entity-manager/types/relation-connect-query-config.type.ts
@@ -1,4 +1,4 @@
-import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
+import { type OrmFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/orm-flat-field-metadata.type';
export type UniqueFieldCondition = [field: string, value: string];
@@ -9,7 +9,7 @@ export type RelationConnectQueryConfig = {
recordToConnectConditions: UniqueConstraintCondition[];
relationFieldName: string;
connectFieldName: string;
- uniqueConstraintFields: FlatFieldMetadata[];
+ uniqueConstraintFields: OrmFlatFieldMetadata[];
recordToConnectConditionByEntityIndex: {
[entityIndex: number]: UniqueConstraintCondition;
};
diff --git a/packages/twenty-server/src/engine/twenty-orm/field-operations/files-field-sync/files-field-sync.ts b/packages/twenty-server/src/engine/twenty-orm/field-operations/files-field-sync/files-field-sync.ts
index 1917d2d8166..ce5db6c363f 100644
--- a/packages/twenty-server/src/engine/twenty-orm/field-operations/files-field-sync/files-field-sync.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/field-operations/files-field-sync/files-field-sync.ts
@@ -21,7 +21,7 @@ import { getFlatFieldsFromFlatObjectMetadata } from 'src/engine/api/graphql/work
import { FileEntity } from 'src/engine/core-modules/file/entities/file.entity';
import { FILE_STATUS } from 'src/engine/core-modules/file/types/file-status.types';
import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
-import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
+import { type OrmFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/orm-flat-field-metadata.type';
import {
TwentyOrmException,
TwentyOrmExceptionCode,
@@ -268,7 +268,7 @@ export class FilesFieldSync {
}
private validateFilesFieldMaxValues(
- filesField: FlatFieldMetadata,
+ filesField: OrmFlatFieldMetadata,
newFilesValue: FileItem[],
): void {
const filesFieldMaxNumberOfValues = (
@@ -310,7 +310,7 @@ export class FilesFieldSync {
private validateAndComputeFilesFieldDiff(
entity: Record<string, unknown>,
- filesField: FlatFieldMetadata,
+ filesField: OrmFlatFieldMetadata,
existingFilesValue: FileItem[],
): FilesFieldDiff | null {
const newFilesValue = entity[filesField.name] as
@@ -635,7 +635,7 @@ export class FilesFieldSync {
});
}
- private getFilesFields(objectMetadataId: string): FlatFieldMetadata[] {
+ private getFilesFields(objectMetadataId: string): OrmFlatFieldMetadata[] {
const objectMetadata = findFlatEntityByIdInFlatEntityMaps({
flatEntityId: objectMetadataId,
flatEntityMaps: this.internalContext.flatObjectMetadataMaps,
diff --git a/packages/twenty-server/src/engine/twenty-orm/interfaces/workspace-internal-context.interface.ts b/packages/twenty-server/src/engine/twenty-orm/interfaces/workspace-internal-context.interface.ts
index a7179940a90..d774b371acc 100644
--- a/packages/twenty-server/src/engine/twenty-orm/interfaces/workspace-internal-context.interface.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/interfaces/workspace-internal-context.interface.ts
@@ -2,7 +2,7 @@ import { type DataSource } from 'typeorm';
import { type FeatureFlagKey } from 'twenty-shared/types';
import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
-import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
+import { type OrmFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/orm-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 { type UserWorkspaceRoleMap } from 'src/engine/metadata-modules/role-target/types/user-workspace-role-map';
@@ -13,7 +13,7 @@ import { type WorkspaceEventEmitter } from 'src/engine/workspace-event-emitter/w
export interface WorkspaceInternalContext {
workspaceId: string;
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
flatIndexMaps: FlatEntityMaps<FlatIndexMetadata>;
flatRowLevelPermissionPredicateMaps: FlatRowLevelPermissionPredicateMaps;
flatRowLevelPermissionPredicateGroupMaps: FlatRowLevelPermissionPredicateGroupMaps;
diff --git a/packages/twenty-server/src/engine/twenty-orm/repository/permissions.utils.ts b/packages/twenty-server/src/engine/twenty-orm/repository/permissions.utils.ts
index 7a7caf33d53..8e98a492dfe 100644
--- a/packages/twenty-server/src/engine/twenty-orm/repository/permissions.utils.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/repository/permissions.utils.ts
@@ -10,7 +10,7 @@ import { isDefined } from 'twenty-shared/utils';
import { InternalServerError } from 'src/engine/core-modules/graphql/utils/graphql-errors.util';
import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
-import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
+import { type OrmFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/orm-flat-field-metadata.type';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
import {
PermissionsException,
@@ -37,7 +37,7 @@ type ValidateOperationIsPermittedOrThrowArgs = {
operationType: OperationType;
objectsPermissions: ObjectsPermissions;
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
objectIdByNameSingular: Record<string, string>;
selectedColumns: string[] | '*';
allFieldsSelected: boolean;
@@ -243,7 +243,7 @@ const buildFieldPermissionDeniedMessage = ({
column: string;
fieldMetadataId: string;
entityName: string;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
}): string => {
const fieldMetadata = findFlatEntityByIdInFlatEntityMaps({
flatEntityId: fieldMetadataId,
@@ -266,7 +266,7 @@ const validateReadFieldPermissionOrThrow = ({
selectedColumns: string[] | '*';
columnNameToFieldMetadataIdMap: Record<string, string>;
entityName: string;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
allFieldsSelected?: boolean;
}) => {
const noReadRestrictions =
@@ -319,7 +319,7 @@ const validateUpdateFieldPermissionOrThrow = ({
updatedColumns: string[];
columnNameToFieldMetadataIdMap: Record<string, string>;
entityName: string;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
}) => {
if (isEmpty(restrictedFields)) {
return;
diff --git a/packages/twenty-server/src/engine/twenty-orm/repository/validate-writability-or-throw.util.ts b/packages/twenty-server/src/engine/twenty-orm/repository/validate-writability-or-throw.util.ts
index bc479cb4a4f..571b9000dab 100644
--- a/packages/twenty-server/src/engine/twenty-orm/repository/validate-writability-or-throw.util.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/repository/validate-writability-or-throw.util.ts
@@ -4,7 +4,7 @@ import { isDefined } from 'twenty-shared/utils';
import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
-import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
+import { type OrmFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/orm-flat-field-metadata.type';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
import {
PermissionsException,
@@ -48,7 +48,7 @@ type ValidateWritabilityOrThrowArgs = {
>;
updatedColumns: string[];
columnNameToFieldMetadataIdMap: Record<string, string>;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
authContext: WorkspaceAuthContext | undefined;
};
diff --git a/packages/twenty-server/src/engine/twenty-orm/storage/orm-workspace-context.storage.ts b/packages/twenty-server/src/engine/twenty-orm/storage/orm-workspace-context.storage.ts
index d7504dbc381..3d83f0fa8d1 100644
--- a/packages/twenty-server/src/engine/twenty-orm/storage/orm-workspace-context.storage.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/storage/orm-workspace-context.storage.ts
@@ -7,7 +7,7 @@ import {
import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
-import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
+import { type OrmFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/orm-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 { type UserWorkspaceRoleMap } from 'src/engine/metadata-modules/role-target/types/user-workspace-role-map';
@@ -17,7 +17,7 @@ import { type FlatRowLevelPermissionPredicateMaps } from 'src/engine/metadata-mo
export type ORMWorkspaceContext = {
authContext: WorkspaceAuthContext;
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
flatIndexMaps: FlatEntityMaps<FlatIndexMetadata>;
objectIdByNameSingular: Record<string, string>;
featureFlagsMap: Record<FeatureFlagKey, boolean>;
diff --git a/packages/twenty-server/src/engine/twenty-orm/table-shape/utils/build-workspace-table-shape.util.ts b/packages/twenty-server/src/engine/twenty-orm/table-shape/utils/build-workspace-table-shape.util.ts
index b640e6e34f9..0425c327ed0 100644
--- a/packages/twenty-server/src/engine/twenty-orm/table-shape/utils/build-workspace-table-shape.util.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/table-shape/utils/build-workspace-table-shape.util.ts
@@ -7,7 +7,7 @@ import { computeCompositeColumnName } from 'src/engine/metadata-modules/field-me
import { computeMorphOrRelationFieldJoinColumnName } from 'src/engine/metadata-modules/field-metadata/utils/compute-morph-or-relation-field-join-column-name.util';
import { isCompositeFieldMetadataType } from 'src/engine/metadata-modules/field-metadata/utils/is-composite-field-metadata-type.util';
import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
-import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
+import { type OrmFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/orm-flat-field-metadata.type';
import { isMorphOrRelationFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/utils/is-morph-or-relation-flat-field-metadata.util';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
import {
@@ -29,7 +29,7 @@ export const buildWorkspaceTableShape = ({
}: {
workspaceId: string;
flatObjectMetadata: FlatObjectMetadata;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
}): WorkspaceTableShape => {
const flatFieldMetadatas = getFlatFieldsFromFlatObjectMetadata(
flatObjectMetadata,
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/build-row-level-permission-record-filter.util.ts b/packages/twenty-server/src/engine/twenty-orm/utils/build-row-level-permission-record-filter.util.ts
index 67703f0a32d..b4cca8ad9a5 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/build-row-level-permission-record-filter.util.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/utils/build-row-level-permission-record-filter.util.ts
@@ -21,7 +21,7 @@ import { type UserWorkspaceAuthContext } from 'src/engine/core-modules/auth/type
import { isCompositeFieldMetadataType } from 'src/engine/metadata-modules/field-metadata/utils/is-composite-field-metadata-type.util';
import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
-import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
+import { type OrmFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/orm-flat-field-metadata.type';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
import {
PermissionsException,
@@ -34,7 +34,7 @@ import { validateEnumValueCompatibility } from 'src/engine/twenty-orm/utils/vali
type BuildRecordFilterForRoleArgs = {
flatRowLevelPermissionPredicateMaps: FlatRowLevelPermissionPredicateMaps;
flatRowLevelPermissionPredicateGroupMaps: FlatRowLevelPermissionPredicateGroupMaps;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
objectMetadata: FlatObjectMetadata;
roleId: string;
workspaceMember?: UserWorkspaceAuthContext['workspaceMember'];
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/compute-relation-connect-query-configs.util.ts b/packages/twenty-server/src/engine/twenty-orm/utils/compute-relation-connect-query-configs.util.ts
index 23f58e9915e..8b8b2e0e359 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/compute-relation-connect-query-configs.util.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/utils/compute-relation-connect-query-configs.util.ts
@@ -13,7 +13,7 @@ import { isCompositeFieldMetadataType } from 'src/engine/metadata-modules/field-
import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
import { findManyFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-many-flat-entity-by-id-in-flat-entity-maps.util';
-import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
+import { type OrmFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/orm-flat-field-metadata.type';
import {
buildFieldMapsFromFlatObjectMetadata,
type FieldMapsForObject,
@@ -38,7 +38,7 @@ export const computeRelationConnectQueryConfigs = (
entities: Record<string, unknown>[],
flatObjectMetadata: FlatObjectMetadata,
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>,
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>,
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>,
flatIndexMaps: FlatEntityMaps<FlatIndexMetadata>,
relationConnectQueryFieldsByEntityIndex: RelationConnectQueryFieldsByEntityIndex,
) => {
@@ -122,7 +122,7 @@ const updateConnectQueryConfigs = (
const createConnectQueryConfig = (
connectFieldName: string,
recordToConnectCondition: UniqueConstraintCondition,
- uniqueConstraintFields: FlatFieldMetadata<FieldMetadataType>[],
+ uniqueConstraintFields: OrmFlatFieldMetadata<FieldMetadataType>[],
targetObjectNameSingular: string,
entityIndex: number,
) => {
@@ -143,13 +143,13 @@ const computeRecordToConnectCondition = (
connectObject: ConnectObject,
flatObjectMetadata: FlatObjectMetadata,
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>,
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>,
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>,
flatIndexMaps: FlatEntityMaps<FlatIndexMetadata>,
entity: Record<string, unknown>,
fieldMaps: FieldMapsForObject,
): {
recordToConnectCondition: UniqueConstraintCondition;
- uniqueConstraintFields: FlatFieldMetadata<FieldMetadataType>[];
+ uniqueConstraintFields: OrmFlatFieldMetadata<FieldMetadataType>[];
targetObjectNameSingular: string;
} => {
const field = findFlatEntityByIdInFlatEntityMaps({
@@ -212,7 +212,7 @@ const computeRecordToConnectCondition = (
const checkUniqueConstraintFullyPopulated = (
flatObjectMetadata: FlatObjectMetadata,
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>,
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>,
flatIndexMaps: FlatEntityMaps<FlatIndexMetadata>,
connectObject: ConnectObject,
connectFieldName: string,
@@ -234,11 +234,11 @@ const checkUniqueConstraintFullyPopulated = (
}));
const uniqueConstraintsFields = getUniqueConstraintsFields<
- FlatFieldMetadata,
+ OrmFlatFieldMetadata,
{
id: string;
indexMetadatas: typeof indexMetadatas;
- fields: FlatFieldMetadata[];
+ fields: OrmFlatFieldMetadata[];
}
>({
id: flatObjectMetadata.id,
@@ -298,7 +298,7 @@ const checkNoRelationFieldConflictOrThrow = (
};
const computeUniqueConstraintCondition = (
- uniqueConstraintFields: FlatFieldMetadata<FieldMetadataType>[],
+ uniqueConstraintFields: OrmFlatFieldMetadata<FieldMetadataType>[],
connectObject: ConnectObject,
): UniqueConstraintCondition => {
return uniqueConstraintFields.reduce((acc, uniqueConstraintField) => {
@@ -326,7 +326,7 @@ const computeUniqueConstraintCondition = (
const checkUniqueConstraintsAreSameOrThrow = (
relationConnectQueryConfig: RelationConnectQueryConfig,
- uniqueConstraintFields: FlatFieldMetadata<FieldMetadataType>[],
+ uniqueConstraintFields: OrmFlatFieldMetadata<FieldMetadataType>[],
) => {
if (
!fastDeepEqual(
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/format-composite-field-value.util.ts b/packages/twenty-server/src/engine/twenty-orm/utils/format-composite-field-value.util.ts
index 86ab8c37df6..84843a6f2a5 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/format-composite-field-value.util.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/utils/format-composite-field-value.util.ts
@@ -1,12 +1,12 @@
import { isNonEmptyString } from '@sniptt/guards';
import { FieldMetadataType } from 'twenty-shared/types';
-import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
+import { type OrmFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/orm-flat-field-metadata.type';
export const formatCompositeFieldValue = (
value: unknown,
compositePropertyName: string,
- fieldMetadata: FlatFieldMetadata,
+ fieldMetadata: OrmFlatFieldMetadata,
) => {
switch (fieldMetadata.type) {
case FieldMetadataType.CURRENCY: {
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/format-data.util.ts b/packages/twenty-server/src/engine/twenty-orm/utils/format-data.util.ts
index f77c810f629..f534af2e74e 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/format-data.util.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/utils/format-data.util.ts
@@ -8,7 +8,7 @@ import { type CompositeFieldMetadataType } from 'src/engine/metadata-modules/fie
import { isCompositeFieldMetadataType } from 'src/engine/metadata-modules/field-metadata/utils/is-composite-field-metadata-type.util';
import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
-import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
+import { type OrmFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/orm-flat-field-metadata.type';
import {
buildFieldMapsFromFlatObjectMetadata,
type FieldMapsForObject,
@@ -18,7 +18,7 @@ import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object
export function formatData<T>(
data: T,
flatObjectMetadata: FlatObjectMetadata,
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>,
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>,
fieldMapsForObject?: FieldMapsForObject,
): T {
if (!data) {
@@ -75,7 +75,7 @@ export function formatData<T>(
export function formatCompositeField(
// oxlint-disable-next-line typescript/no-explicit-any
value: any,
- fieldMetadata: FlatFieldMetadata,
+ fieldMetadata: OrmFlatFieldMetadata,
// oxlint-disable-next-line typescript/no-explicit-any
): Record<string, any> {
const compositeType = compositeTypeDefinitions.get(
@@ -98,7 +98,7 @@ export function formatCompositeField(
if (value && value[subFieldKey] !== undefined) {
formattedCompositeField[fullFieldName] = formatFieldMetadataValue(
value[subFieldKey],
- property as unknown as FlatFieldMetadata,
+ property as unknown as OrmFlatFieldMetadata,
);
}
}
@@ -109,7 +109,7 @@ export function formatCompositeField(
function formatFieldMetadataValue(
// oxlint-disable-next-line typescript/no-explicit-any
value: any,
- fieldMetadata: FlatFieldMetadata,
+ fieldMetadata: OrmFlatFieldMetadata,
) {
if (
fieldMetadata.type === FieldMetadataType.RAW_JSON &&
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/format-result.util.ts b/packages/twenty-server/src/engine/twenty-orm/utils/format-result.util.ts
index 3b71726943f..89fee3d2da5 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/format-result.util.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/utils/format-result.util.ts
@@ -18,7 +18,7 @@ import { computeCompositeColumnName } from 'src/engine/metadata-modules/field-me
import { isCompositeFieldMetadataType } from 'src/engine/metadata-modules/field-metadata/utils/is-composite-field-metadata-type.util';
import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
-import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
+import { type OrmFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/orm-flat-field-metadata.type';
import {
buildFieldMapsFromFlatObjectMetadata,
type FieldMapsForObject,
@@ -29,7 +29,7 @@ import { getCompositeFieldMetadataCollection } from 'src/engine/twenty-orm/utils
import { isFieldMetadataEntityOfType } from 'src/engine/utils/is-field-metadata-of-type.util';
type CompositeFieldMetadataWithRequiredProperties = {
- fieldMetadata: FlatFieldMetadata;
+ fieldMetadata: OrmFlatFieldMetadata;
requiredPropertyNames: string[];
};
@@ -39,12 +39,12 @@ type FormatResultObjectCache = {
typeof getCompositeFieldMetadataMapFromCollection
>;
compositeFieldMetadataWithRequiredProperties: CompositeFieldMetadataWithRequiredProperties[];
- dateTimeFieldMetadataItems: FlatFieldMetadata[];
+ dateTimeFieldMetadataItems: OrmFlatFieldMetadata[];
};
type FormatResultCache = {
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
objectCacheByObjectMetadataId: Map<string, FormatResultObjectCache>;
};
@@ -53,7 +53,7 @@ export function formatResult<T>(
data: any,
flatObjectMetadata: FlatObjectMetadata | undefined,
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>,
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>,
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>,
fieldMapsForObject?: FieldMapsForObject,
): T {
return formatResultRecursively(
@@ -286,7 +286,7 @@ function getOrCreateFormatResultObjectCache({
export function getCompositeFieldMetadataMap(
flatObjectMetadata: FlatObjectMetadata,
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>,
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>,
) {
const compositeFieldMetadataCollection = getCompositeFieldMetadataCollection(
flatObjectMetadata,
@@ -299,7 +299,7 @@ export function getCompositeFieldMetadataMap(
}
function getCompositeFieldMetadataMapFromCollection(
- compositeFieldMetadataCollection: FlatFieldMetadata[],
+ compositeFieldMetadataCollection: OrmFlatFieldMetadata[],
) {
return new Map(
compositeFieldMetadataCollection.flatMap((fieldMetadata) => {
@@ -354,7 +354,7 @@ function formatFieldMetadataValue(
function transformCompositeFieldNullValue(
value: unknown,
compositePropertyName: string,
- fieldMetadata: FlatFieldMetadata,
+ fieldMetadata: OrmFlatFieldMetadata,
) {
if (!isNull(value)) return value;
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/format-twenty-orm-event-to-database-batch-event.util.ts b/packages/twenty-server/src/engine/twenty-orm/utils/format-twenty-orm-event-to-database-batch-event.util.ts
index aa0cc2bc20e..408cc59f73e 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/format-twenty-orm-event-to-database-batch-event.util.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/utils/format-twenty-orm-event-to-database-batch-event.util.ts
@@ -22,7 +22,7 @@ import {
objectRecordChangedValues,
} from 'src/engine/core-modules/event-emitter/utils/object-record-changed-values';
import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
-import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
+import { type OrmFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/orm-flat-field-metadata.type';
import type { FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
import {
TwentyOrmException,
@@ -43,7 +43,7 @@ export const formatTwentyOrmEventToDatabaseBatchEvent = <
}: {
action: DatabaseEventAction;
objectMetadataItem: FlatObjectMetadata;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
workspaceId: string;
authContext?: RawAuthContext;
recordsAfter?: T[];
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/get-column-name-to-field-metadata-id.util.ts b/packages/twenty-server/src/engine/twenty-orm/utils/get-column-name-to-field-metadata-id.util.ts
index 54f01222d8a..ea02e28e588 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/get-column-name-to-field-metadata-id.util.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/utils/get-column-name-to-field-metadata-id.util.ts
@@ -3,7 +3,7 @@ import { isDefined } from 'twenty-shared/utils';
import { computeCompositeColumnName } from 'src/engine/metadata-modules/field-metadata/utils/compute-column-name.util';
import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
-import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
+import { type OrmFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/orm-flat-field-metadata.type';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
import {
type ColumnNameProcessor,
@@ -12,7 +12,7 @@ import {
export function getColumnNameToFieldMetadataIdMap(
flatObjectMetadata: FlatObjectMetadata,
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>,
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>,
) {
const columnNameToFieldMetadataIdMap: Record<string, string> = {};
@@ -23,7 +23,7 @@ export function getColumnNameToFieldMetadataIdMap(
compositeType,
}: {
fieldMetadataId: string;
- fieldMetadata: FlatFieldMetadata;
+ fieldMetadata: OrmFlatFieldMetadata;
compositeType: CompositeType;
}) => {
compositeType.properties.forEach((compositeProperty) => {
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/get-composite-field-metadata-collection.ts b/packages/twenty-server/src/engine/twenty-orm/utils/get-composite-field-metadata-collection.ts
index 6092699e344..8937dbc781c 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/get-composite-field-metadata-collection.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/utils/get-composite-field-metadata-collection.ts
@@ -1,12 +1,12 @@
import { getFlatFieldsFromFlatObjectMetadata } from 'src/engine/api/graphql/workspace-schema-builder/utils/get-flat-fields-for-flat-object-metadata.util';
import { isCompositeFieldMetadataType } from 'src/engine/metadata-modules/field-metadata/utils/is-composite-field-metadata-type.util';
import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
-import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
+import { type OrmFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/orm-flat-field-metadata.type';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
export function getCompositeFieldMetadataCollection(
flatObjectMetadata: FlatObjectMetadata,
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>,
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>,
) {
const compositeFieldMetadataCollection = getFlatFieldsFromFlatObjectMetadata(
flatObjectMetadata,
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/get-field-metadata-id-to-column-names-map.util.ts b/packages/twenty-server/src/engine/twenty-orm/utils/get-field-metadata-id-to-column-names-map.util.ts
index 1adf6bf2af3..e0e7e0449c5 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/get-field-metadata-id-to-column-names-map.util.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/utils/get-field-metadata-id-to-column-names-map.util.ts
@@ -1,7 +1,7 @@
import { type CompositeType } from 'twenty-shared/types';
import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
-import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
+import { type OrmFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/orm-flat-field-metadata.type';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
import { computeCompositeColumnName } from 'src/engine/metadata-modules/field-metadata/utils/compute-column-name.util';
import {
@@ -11,7 +11,7 @@ import {
export function getFieldMetadataIdToColumnNamesMap(
flatObjectMetadata: FlatObjectMetadata,
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>,
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>,
) {
const fieldMetadataToColumnNamesMap = new Map<string, string[]>();
@@ -22,7 +22,7 @@ export function getFieldMetadataIdToColumnNamesMap(
compositeType,
}: {
fieldMetadataId: string;
- fieldMetadata: FlatFieldMetadata;
+ fieldMetadata: OrmFlatFieldMetadata;
compositeType: CompositeType;
}) => {
compositeType.properties.forEach((compositeProperty) => {
@@ -54,7 +54,7 @@ export function getFieldMetadataIdToColumnNamesMap(
columnName,
}: {
fieldMetadataId: string;
- fieldMetadata: FlatFieldMetadata;
+ fieldMetadata: OrmFlatFieldMetadata;
columnName: string;
}) => {
fieldMetadataToColumnNamesMap.set(fieldMetadataId, [columnName]);
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/is-record-matching-rls-row-level-permission-predicate.util.ts b/packages/twenty-server/src/engine/twenty-orm/utils/is-record-matching-rls-row-level-permission-predicate.util.ts
index 676b8754f33..1f76bdf15d5 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/is-record-matching-rls-row-level-permission-predicate.util.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/utils/is-record-matching-rls-row-level-permission-predicate.util.ts
@@ -50,7 +50,7 @@ import {
import { computeMorphOrRelationFieldJoinColumnName } from 'src/engine/metadata-modules/field-metadata/utils/compute-morph-or-relation-field-join-column-name.util';
import { getFlatFieldsFromFlatObjectMetadata } from 'src/engine/api/graphql/workspace-schema-builder/utils/get-flat-fields-for-flat-object-metadata.util';
import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
-import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
+import { type OrmFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/orm-flat-field-metadata.type';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
const isLeafFilter = (
@@ -85,7 +85,7 @@ export const isRecordMatchingRLSRowLevelPermissionPredicate = ({
record: any;
filter: RecordGqlOperationFilter;
flatObjectMetadata: FlatObjectMetadata;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
shouldIgnoreSoftDeleteDefaultFilter?: boolean;
}): boolean => {
if (Object.keys(filter).length === 0 && record.deletedAt === null) {
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/process-field-metadata-for-column-name-mapping.util.ts b/packages/twenty-server/src/engine/twenty-orm/utils/process-field-metadata-for-column-name-mapping.util.ts
index 792900b3cd9..75da2920fd8 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/process-field-metadata-for-column-name-mapping.util.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/utils/process-field-metadata-for-column-name-mapping.util.ts
@@ -10,7 +10,7 @@ import { computeColumnName } from 'src/engine/metadata-modules/field-metadata/ut
import { isCompositeFieldMetadataType } from 'src/engine/metadata-modules/field-metadata/utils/is-composite-field-metadata-type.util';
import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
import { findFlatEntityByIdInFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps-or-throw.util';
-import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
+import { type OrmFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/orm-flat-field-metadata.type';
import { isMorphOrRelationFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/utils/is-morph-or-relation-flat-field-metadata.util';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
import {
@@ -25,7 +25,7 @@ export type ColumnNameProcessor = {
compositeType,
}: {
fieldMetadataId: string;
- fieldMetadata: FlatFieldMetadata;
+ fieldMetadata: OrmFlatFieldMetadata;
compositeType: CompositeType;
}) => void;
processRelationField: ({
@@ -35,7 +35,7 @@ export type ColumnNameProcessor = {
connectFieldName,
}: {
fieldMetadataId: string;
- fieldMetadata: FlatFieldMetadata;
+ fieldMetadata: OrmFlatFieldMetadata;
joinColumnName: string;
connectFieldName?: string;
}) => void;
@@ -45,14 +45,14 @@ export type ColumnNameProcessor = {
columnName,
}: {
fieldMetadataId: string;
- fieldMetadata: FlatFieldMetadata;
+ fieldMetadata: OrmFlatFieldMetadata;
columnName: string;
}) => void;
};
export function processFieldMetadataForColumnNameMapping(
flatObjectMetadata: FlatObjectMetadata,
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>,
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>,
processor: ColumnNameProcessor,
) {
for (const fieldMetadataId of flatObjectMetadata.fieldIds) {
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/render-row-level-permission-filter-to-sql.util.ts b/packages/twenty-server/src/engine/twenty-orm/utils/render-row-level-permission-filter-to-sql.util.ts
index c31c30d46c7..8f04e09c278 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/render-row-level-permission-filter-to-sql.util.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/utils/render-row-level-permission-filter-to-sql.util.ts
@@ -14,7 +14,7 @@ import { computeWhereConditionParts } from 'src/engine/api/graphql/graphql-query
import { type CompositeFieldMetadataType } from 'src/engine/metadata-modules/field-metadata/types/composite-field-metadata-type.type';
import { isCompositeFieldMetadataType } from 'src/engine/metadata-modules/field-metadata/utils/is-composite-field-metadata-type.util';
import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
-import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
+import { type OrmFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/orm-flat-field-metadata.type';
import { buildFieldMapsFromFlatObjectMetadata } from 'src/engine/metadata-modules/flat-field-metadata/utils/build-field-maps-from-flat-object-metadata.util';
import { isMorphOrRelationFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/utils/is-morph-or-relation-flat-field-metadata.util';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
@@ -29,7 +29,7 @@ type SqlRenderingContext = {
tableAlias: string;
fieldIdByName: Record<string, string>;
fieldIdByJoinColumnName: Record<string, string>;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
collectedParameters: ObjectLiteral;
};
@@ -47,7 +47,7 @@ export const renderRowLevelPermissionFilterToSql = ({
recordFilter: RecordGqlOperationFilter;
tableAlias: string;
objectMetadata: FlatObjectMetadata;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
}): RenderedSqlCondition | null => {
const { fieldIdByName, fieldIdByJoinColumnName } =
buildFieldMapsFromFlatObjectMetadata(flatFieldMetadataMaps, objectMetadata);
@@ -221,7 +221,7 @@ const renderFieldCondition = (
};
const renderCompositeFieldCondition = (
- fieldMetadata: FlatFieldMetadata,
+ fieldMetadata: OrmFlatFieldMetadata,
filterValue: unknown,
context: SqlRenderingContext,
): string => {
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/validate-enum-value-compatibility.util.ts b/packages/twenty-server/src/engine/twenty-orm/utils/validate-enum-value-compatibility.util.ts
index 90d38d2a17c..0fdb3648630 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/validate-enum-value-compatibility.util.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/utils/validate-enum-value-compatibility.util.ts
@@ -1,11 +1,11 @@
import { FieldMetadataType } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
+import { type OrmFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/orm-flat-field-metadata.type';
type ValidateEnumValueCompatibilityArgs = {
- workspaceMemberFieldMetadata: FlatFieldMetadata;
- targetFieldMetadata: FlatFieldMetadata;
+ workspaceMemberFieldMetadata: OrmFlatFieldMetadata;
+ targetFieldMetadata: OrmFlatFieldMetadata;
predicateValue: unknown;
};
diff --git a/packages/twenty-server/src/engine/twenty-orm/workspace-orm.manager.ts b/packages/twenty-server/src/engine/twenty-orm/workspace-orm.manager.ts
index 6551b494e37..f9fde19dc4b 100644
--- a/packages/twenty-server/src/engine/twenty-orm/workspace-orm.manager.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/workspace-orm.manager.ts
@@ -92,7 +92,7 @@ export class WorkspaceOrmManager {
const {
flatObjectMetadataMaps,
- flatFieldMetadataMaps,
+ flatFieldMetadataMapsOrm,
flatIndexMaps,
featureFlagsMap,
rolesPermissions: permissionsPerRoleId,
@@ -102,7 +102,7 @@ export class WorkspaceOrmManager {
flatRowLevelPermissionPredicateGroupMaps,
} = await this.workspaceCacheService.getOrRecompute(workspaceId, [
'flatObjectMetadataMaps',
- 'flatFieldMetadataMaps',
+ 'flatFieldMetadataMapsOrm',
'flatIndexMaps',
'featureFlagsMap',
'rolesPermissions',
@@ -118,7 +118,7 @@ export class WorkspaceOrmManager {
return {
authContext,
flatObjectMetadataMaps,
- flatFieldMetadataMaps,
+ flatFieldMetadataMaps: flatFieldMetadataMapsOrm,
flatIndexMaps,
flatRowLevelPermissionPredicateMaps,
flatRowLevelPermissionPredicateGroupMaps,
@@ -135,10 +135,10 @@ export class WorkspaceOrmManager {
): Promise<ORMWorkspaceContext> {
const workspaceId = authContext.workspace.id;
- const { flatObjectMetadataMaps, flatFieldMetadataMaps } =
+ const { flatObjectMetadataMaps, flatFieldMetadataMapsOrm } =
await this.workspaceCacheService.getOrRecompute(workspaceId, [
'flatObjectMetadataMaps',
- 'flatFieldMetadataMaps',
+ 'flatFieldMetadataMapsOrm',
]);
const { idByNameSingular: objectIdByNameSingular } =
@@ -147,7 +147,7 @@ export class WorkspaceOrmManager {
return {
authContext,
flatObjectMetadataMaps,
- flatFieldMetadataMaps,
+ flatFieldMetadataMaps: flatFieldMetadataMapsOrm,
flatIndexMaps: {
byUniversalIdentifier: {},
universalIdentifierById: {},
diff --git a/packages/twenty-server/src/engine/workspace-cache/services/workspace-cache.service.ts b/packages/twenty-server/src/engine/workspace-cache/services/workspace-cache.service.ts
index ff1a1c992bb..043c31028cd 100644
--- a/packages/twenty-server/src/engine/workspace-cache/services/workspace-cache.service.ts
+++ b/packages/twenty-server/src/engine/workspace-cache/services/workspace-cache.service.ts
@@ -64,6 +64,7 @@ const MIN_IDLE_BEFORE_PACKING_MS = 60 * 1000;
const MAX_LOCAL_ENTRIES_BY_KEY_NAME = new Map<string, number>([
['ORMEntityMetadatas', 128],
['flatFieldMetadataMaps', 256],
+ ['flatFieldMetadataMapsOrm', 512],
]);
type CacheDataType = WorkspaceCacheDataMap[WorkspaceCacheKeyName];
type StoredCacheDataType = WorkspaceCacheStoredDataMap[WorkspaceCacheKeyName];
diff --git a/packages/twenty-server/src/engine/workspace-cache/types/workspace-cache-key.type.ts b/packages/twenty-server/src/engine/workspace-cache/types/workspace-cache-key.type.ts
index 191a819387b..695b3760eb2 100644
--- a/packages/twenty-server/src/engine/workspace-cache/types/workspace-cache-key.type.ts
+++ b/packages/twenty-server/src/engine/workspace-cache/types/workspace-cache-key.type.ts
@@ -5,6 +5,8 @@ import {
import { type EntityMetadata } from 'typeorm';
import { type CompactFlatFieldMetadataMaps } from 'src/engine/metadata-modules/flat-field-metadata/types/compact-flat-field-metadata-maps.type';
+import { type OrmFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/orm-flat-field-metadata.type';
+import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
import { type ResolverNameMapEntry } from 'src/engine/api/graphql/direct-execution/utils/build-resolver-name-map.util';
import { type FlatApiKey } from 'src/engine/core-modules/api-key/types/flat-api-key.type';
import { type ApplicationVariableCacheMaps } from 'src/engine/core-modules/application/application-variable/types/application-variable-cache-maps.type';
@@ -26,6 +28,7 @@ export type AdditionalCacheDataMaps = {
apiKeyMap: Record<string, FlatApiKey>;
flatApplicationMaps: FlatApplicationCacheMaps;
ORMEntityMetadatas: EntityMetadata[];
+ flatFieldMetadataMapsOrm: FlatEntityMaps<OrmFlatFieldMetadata>;
flatRoleTargetByAgentIdMaps: FlatRoleTargetByAgentIdMaps;
flatRowLevelPermissionPredicateMaps: FlatRowLevelPermissionPredicateMaps;
flatRowLevelPermissionPredicateGroupMaps: FlatRowLevelPermissionPredicateGroupMaps;