Skip to content

The open alternative to Salesforce, designed for AI.

perf(server): serve the field-metadata query path from the lean projection (#24973)

Charles Bochet0e803543d61f
diff --git a/packages/twenty-server/src/engine/api/common/common-args-processors/data-arg-processor/data-arg-processor.service.ts b/packages/twenty-server/src/engine/api/common/common-args-processors/data-arg-processor/data-arg-processor.service.ts
index 67586e1fd6b..c0474d12d0f 100644
--- a/packages/twenty-server/src/engine/api/common/common-args-processors/data-arg-processor/data-arg-processor.service.ts
+++ b/packages/twenty-server/src/engine/api/common/common-args-processors/data-arg-processor/data-arg-processor.service.ts
@@ -60,7 +60,7 @@ import { transformRichTextValue } from 'src/engine/core-modules/record-transform
import { WorkspaceNotFoundDefaultError } from 'src/engine/core-modules/workspace/workspace.exception';
import { 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 { 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 { FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
@@ -79,7 +79,7 @@ export class DataArgProcessorService {
partialRecordInputs: Partial<ObjectRecord>[] | undefined;
authContext: WorkspaceAuthContext;
flatObjectMetadata: FlatObjectMetadata;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;
shouldBackfillPositionIfUndefined?: boolean;
}): Promise<Partial<ObjectRecord>[]> {
@@ -127,7 +127,7 @@ export class DataArgProcessorService {
}
const fieldMetadata =
- findFlatEntityByIdInFlatEntityMaps<FlatFieldMetadata>({
+ findFlatEntityByIdInFlatEntityMaps<OrmFlatFieldMetadata>({
flatEntityId: fieldMetadataId,
flatEntityMaps: flatFieldMetadataMaps,
});
@@ -171,10 +171,10 @@ export class DataArgProcessorService {
}
private async processField(
- fieldMetadata: FlatFieldMetadata,
+ fieldMetadata: OrmFlatFieldMetadata,
key: string,
value: unknown,
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>,
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>,
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>,
): Promise<unknown> {
switch (fieldMetadata.type) {
@@ -352,8 +352,8 @@ export class DataArgProcessorService {
private async processConnectWhere(
connectWhere: Record<string, unknown>,
- relationFieldMetadata: FlatFieldMetadata,
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>,
+ relationFieldMetadata: OrmFlatFieldMetadata,
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>,
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>,
): Promise<Record<string, unknown>> {
if (!isDefined(relationFieldMetadata.relationTargetObjectMetadataId)) {
@@ -394,7 +394,7 @@ export class DataArgProcessorService {
}
const whereFieldMetadata =
- findFlatEntityByIdInFlatEntityMaps<FlatFieldMetadata>({
+ findFlatEntityByIdInFlatEntityMaps<OrmFlatFieldMetadata>({
flatEntityId: fieldId,
flatEntityMaps: flatFieldMetadataMaps,
});
diff --git a/packages/twenty-server/src/engine/api/common/common-args-processors/filter-arg-processor/filter-arg-processor.service.ts b/packages/twenty-server/src/engine/api/common/common-args-processors/filter-arg-processor/filter-arg-processor.service.ts
index de338823eae..a694b8b8903 100644
--- a/packages/twenty-server/src/engine/api/common/common-args-processors/filter-arg-processor/filter-arg-processor.service.ts
+++ b/packages/twenty-server/src/engine/api/common/common-args-processors/filter-arg-processor/filter-arg-processor.service.ts
@@ -23,6 +23,7 @@ import { isCompositeFieldMetadataType } from 'src/engine/metadata-modules/field-
import { 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 { 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 { isFlatFieldMetadataOfType } from 'src/engine/metadata-modules/flat-field-metadata/utils/is-flat-field-metadata-of-type.util';
import { FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
@@ -52,7 +53,7 @@ export class FilterArgProcessorService {
filter: T;
flatObjectMetadata: FlatObjectMetadata;
flatObjectMetadataMaps?: FlatEntityMaps<FlatObjectMetadata>;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
}): T {
if (!isDefined(filter)) {
return filter;
@@ -79,7 +80,7 @@ export class FilterArgProcessorService {
filterObject: ObjectRecordFilter,
flatObjectMetadata: FlatObjectMetadata,
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata> | undefined,
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>,
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>,
fieldIdByName: Record<string, string>,
fieldIdByJoinColumnName: Record<string, string>,
depth: number,
@@ -157,7 +158,7 @@ export class FilterArgProcessorService {
key: string;
fieldIdByName: Record<string, string>;
fieldIdByJoinColumnName: Record<string, string>;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
}):
| FlatFieldMetadata<
FieldMetadataType.RELATION | FieldMetadataType.MORPH_RELATION
@@ -169,12 +170,11 @@ export class FilterArgProcessorService {
return undefined;
}
- const fieldMetadata = findFlatEntityByIdInFlatEntityMaps<FlatFieldMetadata>(
- {
+ const fieldMetadata =
+ findFlatEntityByIdInFlatEntityMaps<OrmFlatFieldMetadata>({
flatEntityId: resolvedByName,
flatEntityMaps: flatFieldMetadataMaps,
- },
- );
+ });
if (!isDefined(fieldMetadata)) {
return undefined;
@@ -197,7 +197,7 @@ export class FilterArgProcessorService {
FieldMetadataType.RELATION | FieldMetadataType.MORPH_RELATION
>,
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata> | undefined,
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>,
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>,
depth: number,
): ObjectRecordFilter {
if (fieldMetadata.settings?.relationType !== RelationType.MANY_TO_ONE) {
@@ -266,7 +266,7 @@ export class FilterArgProcessorService {
key: string,
filterValue: Record<string, unknown>,
flatObjectMetadata: FlatObjectMetadata,
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>,
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>,
fieldIdByName: Record<string, string>,
fieldIdByJoinColumnName: Record<string, string>,
): Record<string, unknown> {
@@ -284,12 +284,11 @@ export class FilterArgProcessorService {
);
}
- const fieldMetadata = findFlatEntityByIdInFlatEntityMaps<FlatFieldMetadata>(
- {
+ const fieldMetadata =
+ findFlatEntityByIdInFlatEntityMaps<OrmFlatFieldMetadata>({
flatEntityId: fieldMetadataId,
flatEntityMaps: flatFieldMetadataMaps,
- },
- );
+ });
if (!fieldMetadata) {
throw new CommonQueryRunnerException(
@@ -314,7 +313,7 @@ export class FilterArgProcessorService {
}
private validateAndTransformCompositeFieldFilter(
- fieldMetadata: FlatFieldMetadata,
+ fieldMetadata: OrmFlatFieldMetadata,
filterValue: Record<string, unknown>,
): Record<string, unknown> {
const compositeType = compositeTypeDefinitions.get(
diff --git a/packages/twenty-server/src/engine/api/common/common-args-processors/filter-arg-processor/utils/validate-and-transform-array-items.util.ts b/packages/twenty-server/src/engine/api/common/common-args-processors/filter-arg-processor/utils/validate-and-transform-array-items.util.ts
index 352da7f3d30..03d01359d93 100644
--- a/packages/twenty-server/src/engine/api/common/common-args-processors/filter-arg-processor/utils/validate-and-transform-array-items.util.ts
+++ b/packages/twenty-server/src/engine/api/common/common-args-processors/filter-arg-processor/utils/validate-and-transform-array-items.util.ts
@@ -1,10 +1,10 @@
-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 { validateAndTransformValueByFieldType } from './validate-and-transform-value-by-field-type.util';
export const validateAndTransformArrayItems = (
values: unknown[],
- fieldMetadata: FlatFieldMetadata,
+ fieldMetadata: OrmFlatFieldMetadata,
fieldName: string,
): unknown[] => {
return values.map((item) => {
diff --git a/packages/twenty-server/src/engine/api/common/common-args-processors/filter-arg-processor/utils/validate-and-transform-operator-and-value.util.ts b/packages/twenty-server/src/engine/api/common/common-args-processors/filter-arg-processor/utils/validate-and-transform-operator-and-value.util.ts
index 73907b9a9c6..2da42388f84 100644
--- a/packages/twenty-server/src/engine/api/common/common-args-processors/filter-arg-processor/utils/validate-and-transform-operator-and-value.util.ts
+++ b/packages/twenty-server/src/engine/api/common/common-args-processors/filter-arg-processor/utils/validate-and-transform-operator-and-value.util.ts
@@ -5,7 +5,7 @@ import {
CommonQueryRunnerException,
CommonQueryRunnerExceptionCode,
} from 'src/engine/api/common/common-query-runners/errors/common-query-runner.exception';
-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 { validateAndTransformValueOrThrow } from './validate-and-transform-value-or-throw.util';
import { validateOperatorForFieldTypeOrThrow } from './validate-operator-for-field-type-or-throw.util';
@@ -13,7 +13,7 @@ import { validateOperatorForFieldTypeOrThrow } from './validate-operator-for-fie
export const validateAndTransformOperatorAndValue = (
fieldName: string,
filterValue: Record<string, unknown>,
- fieldMetadata: FlatFieldMetadata,
+ fieldMetadata: OrmFlatFieldMetadata,
): Record<string, unknown> => {
if (filterValue === null || typeof filterValue !== 'object') {
throw new CommonQueryRunnerException(
diff --git a/packages/twenty-server/src/engine/api/common/common-args-processors/filter-arg-processor/utils/validate-and-transform-value-by-field-type.util.ts b/packages/twenty-server/src/engine/api/common/common-args-processors/filter-arg-processor/utils/validate-and-transform-value-by-field-type.util.ts
index c8a53bb66fb..1984c81b2b6 100644
--- a/packages/twenty-server/src/engine/api/common/common-args-processors/filter-arg-processor/utils/validate-and-transform-value-by-field-type.util.ts
+++ b/packages/twenty-server/src/engine/api/common/common-args-processors/filter-arg-processor/utils/validate-and-transform-value-by-field-type.util.ts
@@ -6,13 +6,13 @@ import { validateDateFieldOrThrow } from 'src/engine/api/common/common-args-proc
import { validateDateTimeFieldOrThrow } from 'src/engine/api/common/common-args-processors/filter-arg-processor/validator-utils/validate-date-time-field-or-throw.util';
import { validateNumberFieldOrThrow } from 'src/engine/api/common/common-args-processors/filter-arg-processor/validator-utils/validate-number-field-or-throw.util';
import { validateUUIDFieldOrThrow } from 'src/engine/api/common/common-args-processors/filter-arg-processor/validator-utils/validate-uuid-field-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 { parseNumberValue } from './parse-number-value.util';
export const validateAndTransformValueByFieldType = (
value: unknown,
- fieldMetadata: FlatFieldMetadata,
+ fieldMetadata: OrmFlatFieldMetadata,
fieldName: string,
): unknown => {
const fieldType = fieldMetadata.type;
diff --git a/packages/twenty-server/src/engine/api/common/common-args-processors/filter-arg-processor/utils/validate-and-transform-value-or-throw.util.ts b/packages/twenty-server/src/engine/api/common/common-args-processors/filter-arg-processor/utils/validate-and-transform-value-or-throw.util.ts
index 07852db9f29..ecae118f357 100644
--- a/packages/twenty-server/src/engine/api/common/common-args-processors/filter-arg-processor/utils/validate-and-transform-value-or-throw.util.ts
+++ b/packages/twenty-server/src/engine/api/common/common-args-processors/filter-arg-processor/utils/validate-and-transform-value-or-throw.util.ts
@@ -1,5 +1,5 @@
import { type FilterOperator } from 'src/engine/api/common/common-args-processors/filter-arg-processor/types/filter-operator.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 { validateAndTransformArrayItems } from './validate-and-transform-array-items.util';
import { validateAndTransformValueByFieldType } from './validate-and-transform-value-by-field-type.util';
@@ -11,7 +11,7 @@ import { validateStringOperatorValueOrThrow } from './validate-string-operator-v
export const validateAndTransformValueOrThrow = (
operator: FilterOperator,
value: unknown,
- fieldMetadata: FlatFieldMetadata,
+ fieldMetadata: OrmFlatFieldMetadata,
fieldName: string,
): unknown => {
switch (operator) {
diff --git a/packages/twenty-server/src/engine/api/common/common-args-processors/filter-arg-processor/utils/validate-operator-for-field-type-or-throw.util.ts b/packages/twenty-server/src/engine/api/common/common-args-processors/filter-arg-processor/utils/validate-operator-for-field-type-or-throw.util.ts
index 1951aeaf473..ff1a63197ad 100644
--- a/packages/twenty-server/src/engine/api/common/common-args-processors/filter-arg-processor/utils/validate-operator-for-field-type-or-throw.util.ts
+++ b/packages/twenty-server/src/engine/api/common/common-args-processors/filter-arg-processor/utils/validate-operator-for-field-type-or-throw.util.ts
@@ -6,11 +6,11 @@ import {
CommonQueryRunnerException,
CommonQueryRunnerExceptionCode,
} from 'src/engine/api/common/common-query-runners/errors/common-query-runner.exception';
-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 validateOperatorForFieldTypeOrThrow = (
operator: FilterOperator,
- fieldMetadata: FlatFieldMetadata,
+ fieldMetadata: OrmFlatFieldMetadata,
fieldName: string,
): void => {
const allowedOperators = getOperatorsForFieldType(fieldMetadata.type);
diff --git a/packages/twenty-server/src/engine/api/common/common-args-processors/group-by-arg-processor/group-by-arg-processor.service.ts b/packages/twenty-server/src/engine/api/common/common-args-processors/group-by-arg-processor/group-by-arg-processor.service.ts
index a3456598e9a..d249b48f966 100644
--- a/packages/twenty-server/src/engine/api/common/common-args-processors/group-by-arg-processor/group-by-arg-processor.service.ts
+++ b/packages/twenty-server/src/engine/api/common/common-args-processors/group-by-arg-processor/group-by-arg-processor.service.ts
@@ -23,7 +23,7 @@ import {
} from 'src/engine/api/graphql/workspace-query-builder/interfaces/object-record.interface';
import { findManyFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-many-flat-entity-by-id-in-flat-entity-maps.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 { resolveAggregateFieldKey } from 'src/engine/core-modules/record-crud/utils/resolve-aggregate-field-key.util';
@@ -66,7 +66,7 @@ export class GroupByArgProcessorService {
>;
flatObjectMetadata: FlatObjectMetadata;
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
}): GroupByField[] {
return validateAndTransformGroupByFieldsOrThrow({
groupBy,
@@ -82,7 +82,7 @@ export class GroupByArgProcessorService {
restrictedFields,
}: {
flatObjectMetadata: FlatObjectMetadata;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
restrictedFields?: RestrictedFieldsPermissions;
}): Record<string, AggregationField> {
const objectFields = findManyFlatEntityByIdInFlatEntityMaps({
diff --git a/packages/twenty-server/src/engine/api/common/common-args-processors/group-by-arg-processor/utils/is-relation-nested-field-supported-in-group-by.util.ts b/packages/twenty-server/src/engine/api/common/common-args-processors/group-by-arg-processor/utils/is-relation-nested-field-supported-in-group-by.util.ts
index 37fa2bb6545..8cae998ece5 100644
--- a/packages/twenty-server/src/engine/api/common/common-args-processors/group-by-arg-processor/utils/is-relation-nested-field-supported-in-group-by.util.ts
+++ b/packages/twenty-server/src/engine/api/common/common-args-processors/group-by-arg-processor/utils/is-relation-nested-field-supported-in-group-by.util.ts
@@ -1,6 +1,6 @@
import { isFieldMetadataSupportedInGroupBy } 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';
import { isMorphOrRelationFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/utils/is-morph-or-relation-flat-field-metadata.util';
export const isRelationNestedFieldSupportedInGroupBy = ({
@@ -8,7 +8,7 @@ export const isRelationNestedFieldSupportedInGroupBy = ({
nestedFieldMetadata,
}: {
nestedFieldName: string;
- nestedFieldMetadata: FlatFieldMetadata;
+ nestedFieldMetadata: OrmFlatFieldMetadata;
}): boolean => {
if (nestedFieldName === 'id') {
return true;
diff --git a/packages/twenty-server/src/engine/api/common/common-args-processors/group-by-arg-processor/utils/validate-and-transform-group-by-fields-or-throw.util.ts b/packages/twenty-server/src/engine/api/common/common-args-processors/group-by-arg-processor/utils/validate-and-transform-group-by-fields-or-throw.util.ts
index 46f494e85f6..77b54426e4e 100644
--- a/packages/twenty-server/src/engine/api/common/common-args-processors/group-by-arg-processor/utils/validate-and-transform-group-by-fields-or-throw.util.ts
+++ b/packages/twenty-server/src/engine/api/common/common-args-processors/group-by-arg-processor/utils/validate-and-transform-group-by-fields-or-throw.util.ts
@@ -23,7 +23,7 @@ import { getGroupableSubFieldsForCompositeType } from 'src/engine/metadata-modul
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';
@@ -37,8 +37,8 @@ const getFieldMetadataForGroupByOrThrow = ({
fieldName: string;
fieldIdByName: Record<string, string>;
fieldIdByJoinColumnName: Record<string, string>;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
-}): FlatFieldMetadata => {
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
+}): OrmFlatFieldMetadata => {
const fieldMetadataId =
fieldIdByName[fieldName] || fieldIdByJoinColumnName[fieldName];
const fieldMetadata = fieldMetadataId
@@ -66,7 +66,7 @@ const validateAndTransformCompositeGroupByDefinitionOrThrow = ({
groupByFields,
}: {
fieldName: string;
- fieldMetadata: FlatFieldMetadata;
+ fieldMetadata: OrmFlatFieldMetadata;
fieldGroupByDefinition: Record<string, unknown>;
groupByFields: GroupByField[];
}) => {
@@ -129,7 +129,7 @@ const validateAndTransformSingleGroupByFieldOrThrow = ({
fieldIdByName: Record<string, string>;
fieldIdByJoinColumnName: Record<string, string>;
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
groupByFields: GroupByField[];
}) => {
const fieldMetadata = getFieldMetadataForGroupByOrThrow({
@@ -251,7 +251,7 @@ export const validateAndTransformGroupByFieldsOrThrow = ({
>;
flatObjectMetadata: FlatObjectMetadata;
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
}): GroupByField[] => {
const groupByFields: GroupByField[] = [];
diff --git a/packages/twenty-server/src/engine/api/common/common-args-processors/group-by-arg-processor/utils/validate-and-transform-relation-group-by-field-or-throw.util.ts b/packages/twenty-server/src/engine/api/common/common-args-processors/group-by-arg-processor/utils/validate-and-transform-relation-group-by-field-or-throw.util.ts
index 3a4b1e08192..f08dfdc7c6b 100644
--- a/packages/twenty-server/src/engine/api/common/common-args-processors/group-by-arg-processor/utils/validate-and-transform-relation-group-by-field-or-throw.util.ts
+++ b/packages/twenty-server/src/engine/api/common/common-args-processors/group-by-arg-processor/utils/validate-and-transform-relation-group-by-field-or-throw.util.ts
@@ -14,7 +14,7 @@ import { isCompositeFieldMetadataType } from 'src/engine/metadata-modules/field-
import { getGroupableSubFieldsForCompositeType } from 'src/engine/metadata-modules/field-metadata/utils/get-groupable-sub-fields-for-composite-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 { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
@@ -27,9 +27,9 @@ const getNestedFieldMetadataDetails = ({
}: {
fieldNames: Record<string, unknown>;
fieldName: string;
- fieldMetadata: FlatFieldMetadata;
+ fieldMetadata: OrmFlatFieldMetadata;
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
}) => {
const nestedFieldGroupByDefinitions = fieldNames[fieldName];
@@ -130,8 +130,8 @@ const validateAndTransformNestedCompositeFieldOrThrow = ({
}: {
nestedFieldGroupByDefinition: unknown;
nestedFieldName: string;
- fieldMetadata: FlatFieldMetadata;
- nestedFieldMetadata: FlatFieldMetadata;
+ fieldMetadata: OrmFlatFieldMetadata;
+ nestedFieldMetadata: OrmFlatFieldMetadata;
groupByFields: GroupByField[];
}) => {
if (!isPlainObject(nestedFieldGroupByDefinition)) {
@@ -183,9 +183,9 @@ export const validateAndTransformRelationGroupByFieldOrThrow = ({
}: {
fieldNames: Record<string, unknown>;
fieldName: string;
- fieldMetadata: FlatFieldMetadata;
+ fieldMetadata: OrmFlatFieldMetadata;
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
groupByFields: GroupByField[];
}) => {
const { nestedFieldGroupByDefinition, nestedFieldMetadata, nestedFieldName } =
diff --git a/packages/twenty-server/src/engine/api/common/common-args-processors/query-runner-args.factory.ts b/packages/twenty-server/src/engine/api/common/common-args-processors/query-runner-args.factory.ts
index fdbceda8c18..10ae3ab8bef 100644
--- a/packages/twenty-server/src/engine/api/common/common-args-processors/query-runner-args.factory.ts
+++ b/packages/twenty-server/src/engine/api/common/common-args-processors/query-runner-args.factory.ts
@@ -3,7 +3,7 @@ import { Injectable } from '@nestjs/common';
import { RecordInputTransformerService } from 'src/engine/core-modules/record-transformer/services/record-input-transformer.service';
import { 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 { 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 { FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
@Injectable()
@@ -18,7 +18,7 @@ export class QueryRunnerArgsFactory {
value: any,
fieldIdByName: Record<string, string>,
flatObjectMetadata: FlatObjectMetadata,
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>,
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>,
) {
const fieldMetadata = findFlatEntityByIdInFlatEntityMaps({
flatEntityId: fieldIdByName[key],
diff --git a/packages/twenty-server/src/engine/api/common/common-nested-relations-processor/process-nested-relations.helper.ts b/packages/twenty-server/src/engine/api/common/common-nested-relations-processor/process-nested-relations.helper.ts
index d7ea5363855..a7f5455da78 100644
--- a/packages/twenty-server/src/engine/api/common/common-nested-relations-processor/process-nested-relations.helper.ts
+++ b/packages/twenty-server/src/engine/api/common/common-nested-relations-processor/process-nested-relations.helper.ts
@@ -24,7 +24,7 @@ import { type AggregationField } from 'src/engine/api/graphql/workspace-schema-b
import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
import { 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 { 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,
@@ -42,7 +42,7 @@ const NESTED_RELATION_QUERY_MAX_CONCURRENCY = 4;
type ProcessNestedRelationsArgs<T extends ObjectRecord = ObjectRecord> = {
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
parentObjectMetadataItem: FlatObjectMetadata;
parentObjectRecords: T[];
// oxlint-disable-next-line typescript/no-explicit-any
@@ -132,7 +132,7 @@ export class ProcessNestedRelationsHelper {
selectedFields,
}: {
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
parentObjectMetadataItem: FlatObjectMetadata;
parentObjectRecords: T[];
// oxlint-disable-next-line typescript/no-explicit-any
@@ -320,7 +320,7 @@ export class ProcessNestedRelationsHelper {
fieldMaps,
}: {
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
parentObjectMetadataItem: FlatObjectMetadata;
sourceFieldName: string;
fieldMaps: FieldMapsForObject;
diff --git a/packages/twenty-server/src/engine/api/common/common-query-runners/common-base-query-runner.service.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/common-base-query-runner.service.ts
index 12b78cee74b..2cf7a4dcd62 100644
--- a/packages/twenty-server/src/engine/api/common/common-query-runners/common-base-query-runner.service.ts
+++ b/packages/twenty-server/src/engine/api/common/common-query-runners/common-base-query-runner.service.ts
@@ -63,7 +63,7 @@ import { UsageOperationType } from 'src/engine/core-modules/usage/enums/usage-op
import { UsageResourceType } from 'src/engine/core-modules/usage/enums/usage-resource-type.enum';
import { 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 { 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 { FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
import {
@@ -202,7 +202,7 @@ export abstract class CommonBaseQueryRunnerService<
queryResult: Output,
flatObjectMetadata: FlatObjectMetadata,
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>,
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>,
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>,
authContext: WorkspaceAuthContext,
): Promise<Output>;
@@ -276,7 +276,7 @@ export abstract class CommonBaseQueryRunnerService<
authContext: WorkspaceAuthContext;
flatObjectMetadata: FlatObjectMetadata;
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
}): Promise<Output> {
const resultWithGetters = await this.processQueryResult(
results,
diff --git a/packages/twenty-server/src/engine/api/common/common-query-runners/common-create-many-query-runner/common-create-many-query-runner.service.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/common-create-many-query-runner/common-create-many-query-runner.service.ts
index bcbf6feb011..b02ace091bc 100644
--- a/packages/twenty-server/src/engine/api/common/common-query-runners/common-create-many-query-runner/common-create-many-query-runner.service.ts
+++ b/packages/twenty-server/src/engine/api/common/common-query-runners/common-create-many-query-runner/common-create-many-query-runner.service.ts
@@ -41,7 +41,7 @@ import { WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspa
import { RecordPositionService } from 'src/engine/core-modules/record-position/services/record-position.service';
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 { 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';
@@ -140,7 +140,7 @@ export class CommonCreateManyQueryRunnerService extends CommonBaseQueryRunnerSer
records: ObjectRecord[];
flatObjectMetadata: FlatObjectMetadata;
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
authContext: WorkspaceAuthContext;
rolePermissionConfig?: RolePermissionConfig;
nestedRelationsReadPathOptions: NestedRelationsReadPathOptions;
@@ -218,7 +218,7 @@ export class CommonCreateManyQueryRunnerService extends CommonBaseQueryRunnerSer
repository: WorkspaceRepository<ObjectLiteral>;
flatObjectMetadata: FlatObjectMetadata;
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
flatIndexMaps: FlatEntityMaps<FlatIndexMetadata>;
args: CommonExtendedInput<CreateManyQueryArgs>;
workspaceId: string;
@@ -274,7 +274,7 @@ export class CommonCreateManyQueryRunnerService extends CommonBaseQueryRunnerSer
repository: WorkspaceRepository<ObjectLiteral>;
flatObjectMetadata: FlatObjectMetadata;
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
flatIndexMaps: FlatEntityMaps<FlatIndexMetadata>;
args: CreateManyQueryArgs;
selectedFieldsResult: CommonSelectedFieldsResult;
@@ -350,7 +350,7 @@ export class CommonCreateManyQueryRunnerService extends CommonBaseQueryRunnerSer
}: {
recordsToInsert: Partial<ObjectRecord>[];
flatObjectMetadata: FlatObjectMetadata;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
workspaceId: string;
}): Promise<Partial<ObjectRecord>[]> {
if (recordsToInsert.length === 0) {
@@ -383,7 +383,7 @@ export class CommonCreateManyQueryRunnerService extends CommonBaseQueryRunnerSer
}: {
repository: WorkspaceRepository<ObjectLiteral>;
flatObjectMetadata: FlatObjectMetadata;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
args: CreateManyQueryArgs;
conflictingFieldGroups: ConflictingFieldGroup[];
}): Promise<PartialObjectRecordWithId[]> {
@@ -442,7 +442,7 @@ export class CommonCreateManyQueryRunnerService extends CommonBaseQueryRunnerSer
}: {
partialRecordsToUpdate: PartialObjectRecordWithId[];
flatObjectMetadata: FlatObjectMetadata;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
result: InsertResult;
columnsToReturn: string[];
queryRunnerContext: CommonExtendedQueryRunnerContext;
@@ -525,7 +525,7 @@ export class CommonCreateManyQueryRunnerService extends CommonBaseQueryRunnerSer
objectRecords: InsertResult;
flatObjectMetadata: FlatObjectMetadata;
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
repository: WorkspaceRepository<ObjectLiteral>;
selectedFieldsResult: CommonSelectedFieldsResult;
}): Promise<ObjectRecord[]> {
@@ -567,7 +567,7 @@ export class CommonCreateManyQueryRunnerService extends CommonBaseQueryRunnerSer
queryResult: ObjectRecord[],
flatObjectMetadata: FlatObjectMetadata,
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>,
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>,
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>,
authContext: WorkspaceAuthContext,
): Promise<ObjectRecord[]> {
return await this.commonResultGettersService.processRecordArray(
@@ -582,7 +582,7 @@ export class CommonCreateManyQueryRunnerService extends CommonBaseQueryRunnerSer
private getRecordWithoutCreatedBy(
record: PartialObjectRecordWithId,
flatObjectMetadata: FlatObjectMetadata,
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>,
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>,
): Omit<PartialObjectRecordWithId, 'createdBy'> {
let recordWithoutCreatedByUpdate = record;
diff --git a/packages/twenty-server/src/engine/api/common/common-query-runners/common-create-many-query-runner/utils/get-conflicting-fields.util.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/common-create-many-query-runner/utils/get-conflicting-fields.util.ts
index 16fd53e21fa..c7ad3321152 100644
--- a/packages/twenty-server/src/engine/api/common/common-query-runners/common-create-many-query-runner/utils/get-conflicting-fields.util.ts
+++ b/packages/twenty-server/src/engine/api/common/common-query-runners/common-create-many-query-runner/utils/get-conflicting-fields.util.ts
@@ -12,7 +12,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 { isMorphOrRelationFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/utils/is-morph-or-relation-flat-field-metadata.util';
import {
type FlatIndexFieldMetadata,
@@ -24,7 +24,7 @@ const computeConflictingPropertiesForIndexField = ({
flatFieldMetadata,
subFieldName,
}: {
- flatFieldMetadata: FlatFieldMetadata;
+ flatFieldMetadata: OrmFlatFieldMetadata;
subFieldName: string | null;
}): ConflictingProperty[] | undefined => {
if (isMorphOrRelationFlatFieldMetadata(flatFieldMetadata)) {
@@ -85,7 +85,7 @@ const computeConflictingPropertiesForIndex = ({
flatFieldMetadataMaps,
}: {
flatIndexFieldMetadatas: FlatIndexFieldMetadata[];
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
}):
| { baseFields: string[]; conflictingProperties: ConflictingProperty[] }
| undefined => {
@@ -127,7 +127,7 @@ const computeConflictingPropertiesForIndex = ({
export const getConflictingFields = (
flatObjectMetadata: FlatObjectMetadata,
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>,
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>,
flatIndexMaps: FlatEntityMaps<FlatIndexMetadata>,
): ConflictingFieldGroup[] => {
const conflictingFieldGroups: ConflictingFieldGroup[] = [];
diff --git a/packages/twenty-server/src/engine/api/common/common-query-runners/common-create-one-query-runner.service.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/common-create-one-query-runner.service.ts
index b7726297822..f0a60345d89 100644
--- a/packages/twenty-server/src/engine/api/common/common-query-runners/common-create-one-query-runner.service.ts
+++ b/packages/twenty-server/src/engine/api/common/common-query-runners/common-create-one-query-runner.service.ts
@@ -16,7 +16,7 @@ import {
import { assertIsValidUuid } from 'src/engine/api/graphql/workspace-query-runner/utils/assert-is-valid-uuid.util';
import { WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
import { FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
-import { 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 { FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
import { assertMutationNotOnRemoteObject } from 'src/engine/metadata-modules/object-metadata/utils/assert-mutation-not-on-remote-object.util';
@@ -78,7 +78,7 @@ export class CommonCreateOneQueryRunnerService extends CommonBaseQueryRunnerServ
queryResult: ObjectRecord,
flatObjectMetadata: FlatObjectMetadata,
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>,
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>,
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>,
authContext: WorkspaceAuthContext,
): Promise<ObjectRecord> {
return this.commonResultGettersService.processRecord(
diff --git a/packages/twenty-server/src/engine/api/common/common-query-runners/common-delete-many-query-runner.service.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/common-delete-many-query-runner.service.ts
index 480b97965c1..aa7b92dc060 100644
--- a/packages/twenty-server/src/engine/api/common/common-query-runners/common-delete-many-query-runner.service.ts
+++ b/packages/twenty-server/src/engine/api/common/common-query-runners/common-delete-many-query-runner.service.ts
@@ -23,7 +23,7 @@ import {
import { buildColumnsToReturn } from 'src/engine/api/graphql/graphql-query-runner/utils/build-columns-to-return';
import { assertIsValidUuid } from 'src/engine/api/graphql/workspace-query-runner/utils/assert-is-valid-uuid.util';
import { FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
-import { 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 { FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
import { assertMutationNotOnRemoteObject } from 'src/engine/metadata-modules/object-metadata/utils/assert-mutation-not-on-remote-object.util';
@@ -107,7 +107,7 @@ export class CommonDeleteManyQueryRunnerService extends CommonBaseQueryRunnerSer
queryResult: ObjectRecord[],
flatObjectMetadata: FlatObjectMetadata,
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>,
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>,
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>,
authContext: WorkspaceAuthContext,
): Promise<ObjectRecord[]> {
return this.commonResultGettersService.processRecordArray(
diff --git a/packages/twenty-server/src/engine/api/common/common-query-runners/common-destroy-many-query-runner.service.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/common-destroy-many-query-runner.service.ts
index c3f4db4aa98..0b2071b6c84 100644
--- a/packages/twenty-server/src/engine/api/common/common-query-runners/common-destroy-many-query-runner.service.ts
+++ b/packages/twenty-server/src/engine/api/common/common-query-runners/common-destroy-many-query-runner.service.ts
@@ -23,7 +23,7 @@ import {
import { buildColumnsToReturn } from 'src/engine/api/graphql/graphql-query-runner/utils/build-columns-to-return';
import { assertIsValidUuid } from 'src/engine/api/graphql/workspace-query-runner/utils/assert-is-valid-uuid.util';
import { FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
-import { 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 { FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
import { assertMutationNotOnRemoteObject } from 'src/engine/metadata-modules/object-metadata/utils/assert-mutation-not-on-remote-object.util';
@@ -107,7 +107,7 @@ export class CommonDestroyManyQueryRunnerService extends CommonBaseQueryRunnerSe
queryResult: ObjectRecord[],
flatObjectMetadata: FlatObjectMetadata,
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>,
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>,
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>,
authContext: WorkspaceAuthContext,
): Promise<ObjectRecord[]> {
return this.commonResultGettersService.processRecordArray(
diff --git a/packages/twenty-server/src/engine/api/common/common-query-runners/common-find-duplicates-query-runner.service.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/common-find-duplicates-query-runner.service.ts
index d0c138bbb83..e4e1f30f805 100644
--- a/packages/twenty-server/src/engine/api/common/common-query-runners/common-find-duplicates-query-runner.service.ts
+++ b/packages/twenty-server/src/engine/api/common/common-query-runners/common-find-duplicates-query-runner.service.ts
@@ -29,7 +29,7 @@ import { getPageInfo } from 'src/engine/api/common/utils/get-page-info.util';
import { buildColumnsToSelect } from 'src/engine/api/graphql/graphql-query-runner/utils/build-columns-to-select';
import { buildDuplicateConditions } from 'src/engine/api/utils/build-duplicate-conditions.utils';
import { FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
-import { 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 { FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
@@ -219,7 +219,7 @@ export class CommonFindDuplicatesQueryRunnerService extends CommonBaseQueryRunne
queryResult: CommonFindDuplicatesOutputItem[],
flatObjectMetadata: FlatObjectMetadata,
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>,
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>,
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>,
authContext: WorkspaceAuthContext,
): Promise<CommonFindDuplicatesOutputItem[]> {
const processedResults = await Promise.all(
diff --git a/packages/twenty-server/src/engine/api/common/common-query-runners/common-find-many-query-runner.service.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/common-find-many-query-runner.service.ts
index d94761492ca..9afed1425b9 100644
--- a/packages/twenty-server/src/engine/api/common/common-query-runners/common-find-many-query-runner.service.ts
+++ b/packages/twenty-server/src/engine/api/common/common-query-runners/common-find-many-query-runner.service.ts
@@ -47,7 +47,7 @@ import {
} from 'src/engine/api/utils/resolve-order-by-leaves.utils';
import { WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
import { FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
-import { 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 { FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
@Injectable()
@@ -297,7 +297,7 @@ export class CommonFindManyQueryRunnerService extends CommonBaseQueryRunnerServi
queryResult: CommonFindManyOutput,
flatObjectMetadata: FlatObjectMetadata,
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>,
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>,
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>,
authContext: WorkspaceAuthContext,
): Promise<CommonFindManyOutput> {
const processedRecords =
diff --git a/packages/twenty-server/src/engine/api/common/common-query-runners/common-find-one-query-runner.service.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/common-find-one-query-runner.service.ts
index 47841e78cdc..7520c77cdda 100644
--- a/packages/twenty-server/src/engine/api/common/common-query-runners/common-find-one-query-runner.service.ts
+++ b/packages/twenty-server/src/engine/api/common/common-query-runners/common-find-one-query-runner.service.ts
@@ -25,7 +25,7 @@ import {
} from 'src/engine/api/common/types/common-query-args.type';
import { buildColumnsToSelect } from 'src/engine/api/graphql/graphql-query-runner/utils/build-columns-to-select';
import { FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
-import { 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 { FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
@Injectable()
@@ -137,7 +137,7 @@ export class CommonFindOneQueryRunnerService extends CommonBaseQueryRunnerServic
queryResult: ObjectRecord,
flatObjectMetadata: FlatObjectMetadata,
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>,
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>,
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>,
authContext: WorkspaceAuthContext,
): Promise<ObjectRecord> {
return this.commonResultGettersService.processRecord(
diff --git a/packages/twenty-server/src/engine/api/common/common-query-runners/common-group-by-query-runner.service.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/common-group-by-query-runner.service.ts
index c3b758b4ebb..26dd04a3e54 100644
--- a/packages/twenty-server/src/engine/api/common/common-query-runners/common-group-by-query-runner.service.ts
+++ b/packages/twenty-server/src/engine/api/common/common-query-runners/common-group-by-query-runner.service.ts
@@ -47,7 +47,7 @@ import { getFlatFieldsFromFlatObjectMetadata } from 'src/engine/api/graphql/work
import { WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
import { 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 { 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 { FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
import { ViewFilterGroupService } from 'src/engine/metadata-modules/view-filter-group/services/view-filter-group.service';
@@ -176,7 +176,7 @@ export class CommonGroupByQueryRunnerService extends CommonBaseQueryRunnerServic
queryResult: CommonGroupByOutputItem[],
_flatObjectMetadata: FlatObjectMetadata,
_flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>,
- _flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>,
+ _flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>,
_authContext: WorkspaceAuthContext,
): Promise<CommonGroupByOutputItem[]> {
return queryResult;
@@ -192,7 +192,7 @@ export class CommonGroupByQueryRunnerService extends CommonBaseQueryRunnerServic
}: {
args: GroupByQueryArgs;
flatObjectMetadata: FlatObjectMetadata;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
restrictedFields: RestrictedFieldsPermissions;
appliedFilters: ObjectRecordFilter;
workspaceId: string;
@@ -307,7 +307,7 @@ export class CommonGroupByQueryRunnerService extends CommonBaseQueryRunnerServic
appliedFilters: ObjectRecordFilter;
queryBuilder: WorkspaceSelectQueryBuilder;
flatObjectMetadata: FlatObjectMetadata;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
workspaceId: string;
commonQueryParser: GraphqlQueryParser;
}): Promise<void> {
diff --git a/packages/twenty-server/src/engine/api/common/common-query-runners/common-merge-many-query-runner.service.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/common-merge-many-query-runner.service.ts
index 9435058186b..ea30440c54a 100644
--- a/packages/twenty-server/src/engine/api/common/common-query-runners/common-merge-many-query-runner.service.ts
+++ b/packages/twenty-server/src/engine/api/common/common-query-runners/common-merge-many-query-runner.service.ts
@@ -38,7 +38,7 @@ import { MetricsKeys } from 'src/engine/core-modules/metrics/types/metrics-keys.
import { computeMorphOrRelationFieldJoinColumnName } from 'src/engine/metadata-modules/field-metadata/utils/compute-morph-or-relation-field-join-column-name.util';
import { 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 { 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 { FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
@@ -180,7 +180,7 @@ export class CommonMergeManyQueryRunnerService extends CommonBaseQueryRunnerServ
recordsToMerge: ObjectRecord[],
priorityRecordId: string,
flatObjectMetadata: FlatObjectMetadata,
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>,
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>,
isDryRun = false,
): Partial<ObjectRecord> {
const mergedResult: Partial<ObjectRecord> = {};
@@ -254,7 +254,7 @@ export class CommonMergeManyQueryRunnerService extends CommonBaseQueryRunnerServ
private shouldExcludeFieldFromMerge(
fieldName: string,
fieldIdByName: Record<string, string>,
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>,
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>,
): boolean {
const fieldMetadata = findFlatEntityByIdInFlatEntityMaps({
flatEntityId: fieldIdByName[fieldName],
@@ -478,7 +478,7 @@ export class CommonMergeManyQueryRunnerService extends CommonBaseQueryRunnerServ
queryResult: ObjectRecord,
_flatObjectMetadata: FlatObjectMetadata,
_flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>,
- _flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>,
+ _flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>,
_authContext: WorkspaceAuthContext,
): Promise<ObjectRecord> {
return queryResult;
diff --git a/packages/twenty-server/src/engine/api/common/common-query-runners/common-restore-many-query-runner.service.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/common-restore-many-query-runner.service.ts
index 0a2700feaf3..e09f6355967 100644
--- a/packages/twenty-server/src/engine/api/common/common-query-runners/common-restore-many-query-runner.service.ts
+++ b/packages/twenty-server/src/engine/api/common/common-query-runners/common-restore-many-query-runner.service.ts
@@ -23,7 +23,7 @@ import {
import { buildColumnsToReturn } from 'src/engine/api/graphql/graphql-query-runner/utils/build-columns-to-return';
import { assertIsValidUuid } from 'src/engine/api/graphql/workspace-query-runner/utils/assert-is-valid-uuid.util';
import { FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
-import { 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 { FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
import { assertMutationNotOnRemoteObject } from 'src/engine/metadata-modules/object-metadata/utils/assert-mutation-not-on-remote-object.util';
@@ -107,7 +107,7 @@ export class CommonRestoreManyQueryRunnerService extends CommonBaseQueryRunnerSe
queryResult: ObjectRecord[],
flatObjectMetadata: FlatObjectMetadata,
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>,
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>,
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>,
authContext: WorkspaceAuthContext,
): Promise<ObjectRecord[]> {
return this.commonResultGettersService.processRecordArray(
diff --git a/packages/twenty-server/src/engine/api/common/common-query-runners/common-update-many-query-runner.service.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/common-update-many-query-runner.service.ts
index 28fc4fbee21..3159d6d0ce7 100644
--- a/packages/twenty-server/src/engine/api/common/common-query-runners/common-update-many-query-runner.service.ts
+++ b/packages/twenty-server/src/engine/api/common/common-query-runners/common-update-many-query-runner.service.ts
@@ -23,7 +23,7 @@ import { buildColumnsToReturn } from 'src/engine/api/graphql/graphql-query-runne
import { assertIsValidUuid } from 'src/engine/api/graphql/workspace-query-runner/utils/assert-is-valid-uuid.util';
import { WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
import { FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
-import { 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 { FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
import { assertMutationNotOnRemoteObject } from 'src/engine/metadata-modules/object-metadata/utils/assert-mutation-not-on-remote-object.util';
@@ -137,7 +137,7 @@ export class CommonUpdateManyQueryRunnerService extends CommonBaseQueryRunnerSer
queryResult: ObjectRecord[],
flatObjectMetadata: FlatObjectMetadata,
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>,
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>,
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>,
authContext: WorkspaceAuthContext,
): Promise<ObjectRecord[]> {
return await this.commonResultGettersService.processRecordArray(
diff --git a/packages/twenty-server/src/engine/api/common/common-query-runners/common-update-one-query-runner.service.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/common-update-one-query-runner.service.ts
index 4ca6c814a1b..a2818e29b36 100644
--- a/packages/twenty-server/src/engine/api/common/common-query-runners/common-update-one-query-runner.service.ts
+++ b/packages/twenty-server/src/engine/api/common/common-query-runners/common-update-one-query-runner.service.ts
@@ -20,7 +20,7 @@ import {
} from 'src/engine/api/common/types/common-query-args.type';
import { assertIsValidUuid } from 'src/engine/api/graphql/workspace-query-runner/utils/assert-is-valid-uuid.util';
import { FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
-import { 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 { FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
import { assertMutationNotOnRemoteObject } from 'src/engine/metadata-modules/object-metadata/utils/assert-mutation-not-on-remote-object.util';
@@ -91,7 +91,7 @@ export class CommonUpdateOneQueryRunnerService extends CommonBaseQueryRunnerServ
queryResult: ObjectRecord,
flatObjectMetadata: FlatObjectMetadata,
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>,
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>,
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>,
authContext: WorkspaceAuthContext,
): Promise<ObjectRecord> {
return this.commonResultGettersService.processRecord(
diff --git a/packages/twenty-server/src/engine/api/common/common-query-runners/types/group-by-field.types.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/types/group-by-field.types.ts
index f1ac8be658b..7af92e0f7ac 100644
--- a/packages/twenty-server/src/engine/api/common/common-query-runners/types/group-by-field.types.ts
+++ b/packages/twenty-server/src/engine/api/common/common-query-runners/types/group-by-field.types.ts
@@ -3,16 +3,16 @@ import {
type ObjectRecordGroupByDateGranularity,
} 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 type GroupByRegularField = {
- fieldMetadata: FlatFieldMetadata;
+ fieldMetadata: OrmFlatFieldMetadata;
subFieldName?: string;
shouldUnnest?: boolean;
};
export type GroupByDateField = {
- fieldMetadata: FlatFieldMetadata;
+ fieldMetadata: OrmFlatFieldMetadata;
subFieldName?: string;
dateGranularity: ObjectRecordGroupByDateGranularity;
weekStartDay?: FirstDayOfTheWeek;
@@ -20,8 +20,8 @@ export type GroupByDateField = {
};
export type GroupByRelationField = {
- fieldMetadata: FlatFieldMetadata;
- nestedFieldMetadata: FlatFieldMetadata;
+ fieldMetadata: OrmFlatFieldMetadata;
+ nestedFieldMetadata: OrmFlatFieldMetadata;
nestedSubFieldName?: string;
dateGranularity?: ObjectRecordGroupByDateGranularity;
weekStartDay?: FirstDayOfTheWeek;
diff --git a/packages/twenty-server/src/engine/api/common/common-result-getters/common-result-getters.service.ts b/packages/twenty-server/src/engine/api/common/common-result-getters/common-result-getters.service.ts
index 7dc9accbf8c..95cbb4d4bce 100644
--- a/packages/twenty-server/src/engine/api/common/common-result-getters/common-result-getters.service.ts
+++ b/packages/twenty-server/src/engine/api/common/common-result-getters/common-result-getters.service.ts
@@ -17,17 +17,17 @@ import { getFlatFieldsFromFlatObjectMetadata } from 'src/engine/api/graphql/work
import { FileUrlService } from 'src/engine/core-modules/file/file-url/file-url.service';
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 { 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';
type ResultProcessingContext = {
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
workspaceId: string;
fieldMetadataByNameByObjectMetadataId: Map<
string,
- ReadonlyMap<string, FlatFieldMetadata>
+ ReadonlyMap<string, OrmFlatFieldMetadata>
>;
};
@@ -76,7 +76,7 @@ export class CommonResultGettersService {
recordArray: ObjectRecord[],
flatObjectMetadata: FlatObjectMetadata,
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>,
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>,
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>,
workspaceId: string,
): Promise<ObjectRecord[]> {
return this.processRecordArrayWithContext(recordArray, flatObjectMetadata, {
@@ -91,7 +91,7 @@ export class CommonResultGettersService {
record: ObjectRecord,
flatObjectMetadata: FlatObjectMetadata,
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>,
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>,
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>,
workspaceId: string,
): Promise<ObjectRecord> {
return this.processRecordWithContext(record, flatObjectMetadata, {
@@ -201,7 +201,7 @@ export class CommonResultGettersService {
private getOrBuildFieldMetadataByName(
flatObjectMetadata: FlatObjectMetadata,
context: ResultProcessingContext,
- ): ReadonlyMap<string, FlatFieldMetadata> {
+ ): ReadonlyMap<string, OrmFlatFieldMetadata> {
const cachedFieldMetadataByName =
context.fieldMetadataByNameByObjectMetadataId.get(flatObjectMetadata.id);
@@ -228,7 +228,7 @@ export class CommonResultGettersService {
record: ObjectRecord,
workspaceId: string,
handlers: QueryResultGetterHandlerInterface[],
- fieldMetadata: FlatFieldMetadata[],
+ fieldMetadata: OrmFlatFieldMetadata[],
): Promise<ObjectRecord> {
let processedRecord = record;
diff --git a/packages/twenty-server/src/engine/api/common/common-select-fields/common-select-fields-helper.ts b/packages/twenty-server/src/engine/api/common/common-select-fields/common-select-fields-helper.ts
index bc0cf67c9b0..4416ee1f5ec 100644
--- a/packages/twenty-server/src/engine/api/common/common-select-fields/common-select-fields-helper.ts
+++ b/packages/twenty-server/src/engine/api/common/common-select-fields/common-select-fields-helper.ts
@@ -7,7 +7,7 @@ import { getRelationsSelectFields } from 'src/engine/api/common/common-select-fi
import { CommonSelectedFields } from 'src/engine/api/common/types/common-selected-fields-result.type';
import { Depth } from 'src/engine/api/rest/input-request-parsers/types/depth.type';
import { FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
-import { 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 { FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
@Injectable()
@@ -23,7 +23,7 @@ export class CommonSelectFieldsHelper {
}: {
objectsPermissions: ObjectsPermissions;
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
flatObjectMetadata: FlatObjectMetadata;
depth: Depth | undefined;
onlyUseLabelIdentifierFieldsInRelations?: boolean;
diff --git a/packages/twenty-server/src/engine/api/common/common-select-fields/utils/get-all-selectable-fields.util.ts b/packages/twenty-server/src/engine/api/common/common-select-fields/utils/get-all-selectable-fields.util.ts
index 40d12d50524..67cc22ce958 100644
--- a/packages/twenty-server/src/engine/api/common/common-select-fields/utils/get-all-selectable-fields.util.ts
+++ b/packages/twenty-server/src/engine/api/common/common-select-fields/utils/get-all-selectable-fields.util.ts
@@ -13,7 +13,7 @@ import { computeMorphOrRelationFieldJoinColumnName } from 'src/engine/metadata-m
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 { 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';
@@ -30,7 +30,7 @@ export const getAllSelectableFields = ({
}: {
restrictedFields: RestrictedFieldsPermissions;
flatObjectMetadata: FlatObjectMetadata;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
onlyUseLabelIdentifierFieldsInRelations?: boolean;
}): SelectableFieldsStructured => {
const result: SelectableFieldsStructured = {};
diff --git a/packages/twenty-server/src/engine/api/common/common-select-fields/utils/get-relations-select-fields.util.ts b/packages/twenty-server/src/engine/api/common/common-select-fields/utils/get-relations-select-fields.util.ts
index 2cf5627300b..cbf6c7c21ef 100644
--- a/packages/twenty-server/src/engine/api/common/common-select-fields/utils/get-relations-select-fields.util.ts
+++ b/packages/twenty-server/src/engine/api/common/common-select-fields/utils/get-relations-select-fields.util.ts
@@ -9,7 +9,7 @@ import { MAX_DEPTH } from 'src/engine/api/rest/input-request-parsers/constants/m
import { Depth } from 'src/engine/api/rest/input-request-parsers/types/depth.type';
import { 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 { 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 { FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
@@ -24,7 +24,7 @@ export const getRelationsSelectFields = ({
recurseIntoJunctionTableRelations = false,
}: {
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
flatObjectMetadata: FlatObjectMetadata;
objectsPermissions: ObjectsPermissions;
depth: Depth | undefined;
diff --git a/packages/twenty-server/src/engine/api/common/types/common-base-query-runner-context.type.ts b/packages/twenty-server/src/engine/api/common/types/common-base-query-runner-context.type.ts
index aff74ac614c..3c015f766d3 100644
--- a/packages/twenty-server/src/engine/api/common/types/common-base-query-runner-context.type.ts
+++ b/packages/twenty-server/src/engine/api/common/types/common-base-query-runner-context.type.ts
@@ -1,6 +1,6 @@
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 RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config';
@@ -9,7 +9,7 @@ export type CommonBaseQueryRunnerContext = {
authContext: WorkspaceAuthContext;
flatObjectMetadata: FlatObjectMetadata;
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
flatIndexMaps?: FlatEntityMaps<FlatIndexMetadata>;
objectIdByNameSingular: Record<string, string>;
rolePermissionConfig?: RolePermissionConfig;
diff --git a/packages/twenty-server/src/engine/api/common/utils/get-page-info.util.ts b/packages/twenty-server/src/engine/api/common/utils/get-page-info.util.ts
index 1ed05c2e386..6863f96802f 100644
--- a/packages/twenty-server/src/engine/api/common/utils/get-page-info.util.ts
+++ b/packages/twenty-server/src/engine/api/common/utils/get-page-info.util.ts
@@ -7,7 +7,7 @@ import { type CursorPageFlags } from 'src/engine/api/types/cursor-page-flags.typ
import { encodeCursor } from 'src/engine/api/graphql/graphql-query-runner/utils/cursors.util';
import { type OrderByValuesByRecordId } from 'src/engine/api/utils/build-order-by-values-by-record-id.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 const getPageInfo = ({
@@ -24,7 +24,7 @@ export const getPageInfo = ({
pageInfo: CursorPageFlags;
flatObjectMetadata: FlatObjectMetadata;
flatObjectMetadataMaps?: FlatEntityMaps<FlatObjectMetadata>;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
orderByValuesByRecordId?: OrderByValuesByRecordId;
}): CommonPageInfo => {
const encodeRecordCursor = (record: ObjectRecord) =>
diff --git a/packages/twenty-server/src/engine/api/graphql/direct-execution/direct-execution.service.ts b/packages/twenty-server/src/engine/api/graphql/direct-execution/direct-execution.service.ts
index 0f106d6b2a8..291d844ad12 100644
--- a/packages/twenty-server/src/engine/api/graphql/direct-execution/direct-execution.service.ts
+++ b/packages/twenty-server/src/engine/api/graphql/direct-execution/direct-execution.service.ts
@@ -229,12 +229,12 @@ export class DirectExecutionService {
const {
graphQLResolverNameMap,
flatObjectMetadataMaps,
- flatFieldMetadataMaps,
+ flatFieldMetadataMapsOrm: flatFieldMetadataMaps,
flatIndexMaps,
} = await this.workspaceCacheService.getOrRecompute(workspaceId, [
'graphQLResolverNameMap',
'flatObjectMetadataMaps',
- 'flatFieldMetadataMaps',
+ 'flatFieldMetadataMapsOrm',
'flatIndexMaps',
]);
diff --git a/packages/twenty-server/src/engine/api/graphql/direct-execution/utils/build-workspace-schema-builder-context.util.ts b/packages/twenty-server/src/engine/api/graphql/direct-execution/utils/build-workspace-schema-builder-context.util.ts
index 6d5332c0ebb..6a5be1fdb1d 100644
--- a/packages/twenty-server/src/engine/api/graphql/direct-execution/utils/build-workspace-schema-builder-context.util.ts
+++ b/packages/twenty-server/src/engine/api/graphql/direct-execution/utils/build-workspace-schema-builder-context.util.ts
@@ -1,14 +1,14 @@
import { type ResolverNameMapEntry } from 'src/engine/api/graphql/direct-execution/utils/build-resolver-name-map.util';
import { type WorkspaceSchemaBuilderContext } from 'src/engine/api/graphql/workspace-schema-builder/interfaces/workspace-schema-builder-context.interface';
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';
export const buildWorkspaceSchemaBuilderContext = (
entry: ResolverNameMapEntry,
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>,
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>,
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>,
flatIndexMaps: FlatEntityMaps<FlatIndexMetadata>,
objectIdByNameSingular: Record<string, string>,
): WorkspaceSchemaBuilderContext => {
diff --git a/packages/twenty-server/src/engine/api/graphql/direct-execution/utils/graphql-format-result-from-selected-fields.util.ts b/packages/twenty-server/src/engine/api/graphql/direct-execution/utils/graphql-format-result-from-selected-fields.util.ts
index 98ec4c7203a..f9f6770a6d9 100644
--- a/packages/twenty-server/src/engine/api/graphql/direct-execution/utils/graphql-format-result-from-selected-fields.util.ts
+++ b/packages/twenty-server/src/engine/api/graphql/direct-execution/utils/graphql-format-result-from-selected-fields.util.ts
@@ -25,7 +25,7 @@ import { ResolverOutput } from 'src/engine/api/graphql/workspace-query-runner/in
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 { 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 {
@@ -40,13 +40,13 @@ import {
type GraphQLFormatInput = {
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
objectIdByNameSingular: Record<string, string>;
method: string;
};
type GraphQLFormatContext = GraphQLFormatInput & {
- fieldMetadataByNameCache: Map<string, Map<string, FlatFieldMetadata>>;
+ fieldMetadataByNameCache: Map<string, Map<string, OrmFlatFieldMetadata>>;
};
export const graphQLFormatResultFromSelectedFields = (
@@ -344,14 +344,14 @@ const backfillNullValuesAndComputeTypeNameForConnectionArray = (
const getOrBuildFieldMetadataByNameMap = (
objectNameSingular: string,
context: GraphQLFormatContext,
-): Map<string, FlatFieldMetadata> => {
+): Map<string, OrmFlatFieldMetadata> => {
const cached = context.fieldMetadataByNameCache.get(objectNameSingular);
if (isDefined(cached)) {
return cached;
}
- const map = new Map<string, FlatFieldMetadata>();
+ const map = new Map<string, OrmFlatFieldMetadata>();
const objectId = context.objectIdByNameSingular[objectNameSingular];
if (!isDefined(objectId)) {
@@ -391,7 +391,7 @@ const findFieldMetadataByName = (
objectNameSingular: string,
fieldName: string,
context: GraphQLFormatContext,
-): FlatFieldMetadata | undefined => {
+): OrmFlatFieldMetadata | undefined => {
return getOrBuildFieldMetadataByNameMap(objectNameSingular, context).get(
fieldName,
);
diff --git a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-order/graphql-query-order-group-by.parser.ts b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-order/graphql-query-order-group-by.parser.ts
index 730c042c823..af24111c54b 100644
--- a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-order/graphql-query-order-group-by.parser.ts
+++ b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-order/graphql-query-order-group-by.parser.ts
@@ -34,7 +34,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 } 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';
@@ -45,14 +45,14 @@ import { type OrderByClause } from './types/order-by-condition.type';
export class GraphqlQueryOrderGroupByParser {
private flatObjectMetadata: FlatObjectMetadata;
private flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;
- private flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ private flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
private fieldIdByName: Record<string, string>;
private objectAlias: string;
constructor(
flatObjectMetadata: FlatObjectMetadata,
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>,
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>,
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>,
) {
this.flatObjectMetadata = flatObjectMetadata;
this.flatObjectMetadataMaps = flatObjectMetadataMaps;
@@ -322,7 +322,7 @@ export class GraphqlQueryOrderGroupByParser {
| ObjectRecordOrderByForCompositeField
| ObjectRecordOrderByWithGroupByDateField
| ObjectRecordOrderByForRelationField,
- fieldMetadata: FlatFieldMetadata,
+ fieldMetadata: OrmFlatFieldMetadata,
): orderByArg is ObjectRecordOrderByForRelationField => {
if (!isMorphOrRelationFlatFieldMetadata(fieldMetadata)) {
return false;
@@ -383,7 +383,7 @@ export class GraphqlQueryOrderGroupByParser {
}: {
groupByFields: GroupByField[];
orderByArg: ObjectRecordOrderByForScalarField;
- fieldMetadata: FlatFieldMetadata;
+ fieldMetadata: OrmFlatFieldMetadata;
}): Record<string, OrderByClause> | null => {
const groupByField = groupByFields.find(
(groupByField) => groupByField.fieldMetadata.id === fieldMetadata.id,
@@ -422,7 +422,7 @@ export class GraphqlQueryOrderGroupByParser {
}: {
groupByFields: GroupByField[];
orderByArg: ObjectRecordOrderByForCompositeField;
- fieldMetadata: FlatFieldMetadata;
+ fieldMetadata: OrmFlatFieldMetadata;
}): Record<string, OrderByClause> | null => {
const fieldName = Object.keys(orderByArg)[0];
const orderBySubField = orderByArg[fieldName];
@@ -519,7 +519,7 @@ export class GraphqlQueryOrderGroupByParser {
}: {
groupByFields: GroupByField[];
orderByArg: ObjectRecordOrderByForRelationField;
- fieldMetadata: FlatFieldMetadata;
+ fieldMetadata: OrmFlatFieldMetadata;
}): Record<string, OrderByClause> | null => {
const {
associatedGroupByField,
diff --git a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-order/graphql-query-order.parser.ts b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-order/graphql-query-order.parser.ts
index 89d833947d4..a8950338fbb 100644
--- a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-order/graphql-query-order.parser.ts
+++ b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-order/graphql-query-order.parser.ts
@@ -12,7 +12,7 @@ import { convertOrderByToFindOptionsOrder } from 'src/engine/api/graphql/graphql
import { computeOrderByLeafColumn } from 'src/engine/api/utils/compute-order-by-leaf-column.util';
import { resolveOrderByLeaves } from 'src/engine/api/utils/resolve-order-by-leaves.utils';
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 OrderByClause } from './types/order-by-condition.type';
@@ -29,12 +29,12 @@ export { OrderByClause, ParseOrderByResult, RelationJoinInfo };
export class GraphqlQueryOrderFieldParser {
private flatObjectMetadata: FlatObjectMetadata;
private flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;
- private flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ private flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
constructor(
flatObjectMetadata: FlatObjectMetadata,
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>,
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>,
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>,
) {
this.flatObjectMetadata = flatObjectMetadata;
this.flatObjectMetadataMaps = flatObjectMetadataMaps;
diff --git a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-order/utils/parse-composite-field-for-order.util.ts b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-order/utils/parse-composite-field-for-order.util.ts
index 9eda397c539..599a5445ae8 100644
--- a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-order/utils/parse-composite-field-for-order.util.ts
+++ b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-order/utils/parse-composite-field-for-order.util.ts
@@ -10,10 +10,10 @@ import {
import { convertOrderByToFindOptionsOrder } from 'src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-order/utils/convert-order-by-to-find-options-order';
import { isOrderByDirection } from 'src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-order/utils/is-order-by-direction.util';
import { type CompositeFieldMetadataType } from 'src/engine/metadata-modules/field-metadata/types/composite-field-metadata-type.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';
export const parseCompositeFieldForOrder = (
- fieldMetadata: FlatFieldMetadata,
+ fieldMetadata: OrmFlatFieldMetadata,
value: Record<string, unknown>,
prefix: string,
isForwardPagination = true,
diff --git a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-order/utils/prepare-for-order-by-relation-field-parsing.util.ts b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-order/utils/prepare-for-order-by-relation-field-parsing.util.ts
index c14cf9d4424..18bc45efa98 100644
--- a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-order/utils/prepare-for-order-by-relation-field-parsing.util.ts
+++ b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-order/utils/prepare-for-order-by-relation-field-parsing.util.ts
@@ -12,7 +12,7 @@ import { isCompositeFieldMetadataType } from 'src/engine/metadata-modules/field-
import { isMorphOrRelationFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/utils/is-morph-or-relation-flat-field-metadata.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 { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
@@ -24,9 +24,9 @@ export const prepareForOrderByRelationFieldParsing = ({
groupByFields,
}: {
orderByArg: ObjectRecordOrderByForRelationField;
- fieldMetadata: FlatFieldMetadata;
+ fieldMetadata: OrmFlatFieldMetadata;
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
groupByFields: GroupByField[];
}) => {
const relationFieldName = Object.keys(orderByArg)[0];
diff --git a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-selected-fields/graphql-selected-fields-aggregate.parser.ts b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-selected-fields/graphql-selected-fields-aggregate.parser.ts
index 18e485455f7..2531b4a1553 100644
--- a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-selected-fields/graphql-selected-fields-aggregate.parser.ts
+++ b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-selected-fields/graphql-selected-fields-aggregate.parser.ts
@@ -7,7 +7,7 @@ import {
} from 'src/engine/api/graphql/workspace-schema-builder/utils/get-available-aggregations-from-object-fields.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';
export class GraphqlQuerySelectedFieldsAggregateParser {
@@ -15,7 +15,7 @@ export class GraphqlQuerySelectedFieldsAggregateParser {
// oxlint-disable-next-line typescript/no-explicit-any
graphqlSelectedFields: Partial<Record<string, any>>,
flatObjectMetadata: FlatObjectMetadata,
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>,
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>,
accumulator: GraphqlQuerySelectedFieldsResult,
): void {
const fields = flatObjectMetadata.fieldIds
diff --git a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-selected-fields/graphql-selected-fields-relation.parser.ts b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-selected-fields/graphql-selected-fields-relation.parser.ts
index 0d2a4e98bfd..47328d44afd 100644
--- a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-selected-fields/graphql-selected-fields-relation.parser.ts
+++ b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-selected-fields/graphql-selected-fields-relation.parser.ts
@@ -8,15 +8,16 @@ import {
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 { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
export class GraphqlQuerySelectedFieldsRelationParser {
private flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;
- private flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ private flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
constructor(
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>,
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>,
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>,
) {
this.flatObjectMetadataMaps = flatObjectMetadataMaps;
this.flatFieldMetadataMaps = flatFieldMetadataMaps;
diff --git a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-selected-fields/graphql-selected-fields.parser.ts b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-selected-fields/graphql-selected-fields.parser.ts
index 6dfdb27483e..107fe70563f 100644
--- a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-selected-fields/graphql-selected-fields.parser.ts
+++ b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-selected-fields/graphql-selected-fields.parser.ts
@@ -12,7 +12,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 { 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 { 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';
@@ -31,11 +31,11 @@ export class GraphqlQuerySelectedFieldsParser {
private graphqlQuerySelectedFieldsRelationParser: GraphqlQuerySelectedFieldsRelationParser;
private aggregateParser: GraphqlQuerySelectedFieldsAggregateParser;
private flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;
- private flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ private flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
constructor(
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>,
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>,
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>,
) {
this.flatObjectMetadataMaps = flatObjectMetadataMaps;
this.flatFieldMetadataMaps = flatFieldMetadataMaps;
@@ -234,7 +234,7 @@ export class GraphqlQuerySelectedFieldsParser {
}
private parseCompositeField(
- fieldMetadata: FlatFieldMetadata,
+ fieldMetadata: OrmFlatFieldMetadata,
// oxlint-disable-next-line typescript/no-explicit-any
fieldValue: any,
// oxlint-disable-next-line typescript/no-explicit-any
diff --git a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query.parser.ts b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query.parser.ts
index 691d1be520a..3ab60962e35 100644
--- a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query.parser.ts
+++ b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query.parser.ts
@@ -22,14 +22,14 @@ import {
} from 'src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-selected-fields/graphql-selected-fields.parser';
import { addRelationJoinAliasToQueryBuilder } from 'src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/utils/add-relation-join-alias.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 WorkspaceSelectQueryBuilder } from 'src/engine/twenty-orm/query-builder/workspace-select-query-builder';
export class GraphqlQueryParser {
private flatObjectMetadata: FlatObjectMetadata;
private flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;
- private flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ private flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
private filterConditionParser: GraphqlQueryFilterConditionParser;
private orderFieldParser: GraphqlQueryOrderFieldParser;
private orderGroupByParser: GraphqlQueryOrderGroupByParser;
@@ -37,7 +37,7 @@ export class GraphqlQueryParser {
constructor(
flatObjectMetadata: FlatObjectMetadata,
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>,
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>,
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>,
) {
this.flatObjectMetadata = flatObjectMetadata;
this.flatObjectMetadataMaps = flatObjectMetadataMaps;
diff --git a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/group-by/resolvers/utils/format-result-with-group-by-dimension-values.util.ts b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/group-by/resolvers/utils/format-result-with-group-by-dimension-values.util.ts
index 6116b6e19db..03c4c1681c4 100644
--- a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/group-by/resolvers/utils/format-result-with-group-by-dimension-values.util.ts
+++ b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/group-by/resolvers/utils/format-result-with-group-by-dimension-values.util.ts
@@ -8,7 +8,7 @@ import { isDefined } from 'twenty-shared/utils';
import { type CommonGroupByOutputItem } from 'src/engine/api/common/types/common-group-by-output-item.type';
import { type GroupByDefinition } from 'src/engine/api/common/common-query-runners/types/group-by-definition.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 FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
import { formatResult } from 'src/engine/twenty-orm/utils/format-result.util';
@@ -29,7 +29,7 @@ export const formatResultWithGroupByDimensionValues = async ({
recordsResult?: Array<Record<string, unknown>>;
flatObjectMetadata?: FlatObjectMetadata;
flatObjectMetadataMaps?: FlatEntityMaps<FlatObjectMetadata>;
- flatFieldMetadataMaps?: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps?: FlatEntityMaps<OrmFlatFieldMetadata>;
}): Promise<CommonGroupByOutputItem[]> => {
const formattedResult: CommonGroupByOutputItem[] = [];
diff --git a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/group-by/services/group-by-with-records.service.ts b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/group-by/services/group-by-with-records.service.ts
index 1f3aa9a1ade..a699e9ea287 100644
--- a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/group-by/services/group-by-with-records.service.ts
+++ b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/group-by/services/group-by-with-records.service.ts
@@ -27,7 +27,7 @@ import { buildGroupByRecordConditions } from 'src/engine/api/graphql/graphql-que
import { getGroupLimit } from 'src/engine/api/graphql/graphql-query-runner/group-by/utils/get-group-limit.util';
import { buildColumnsToSelect } from 'src/engine/api/graphql/graphql-query-runner/utils/build-columns-to-select';
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 WorkspaceSelectQueryBuilder } from 'src/engine/twenty-orm/query-builder/workspace-select-query-builder';
import { type WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace-repository';
@@ -165,7 +165,7 @@ export class GroupByWithRecordsService {
orderByForRecords: ObjectRecordOrderBy;
flatObjectMetadata: FlatObjectMetadata;
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
offsetForRecords: number;
}): { sql: string; parameters: Record<string, unknown> } {
const objectAlias = getObjectAlias(flatObjectMetadata);
@@ -248,7 +248,7 @@ export class GroupByWithRecordsService {
subQueryBuilder: WorkspaceSelectQueryBuilder;
flatObjectMetadata: FlatObjectMetadata;
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
}): string {
const partitionBy = groupByDefinitions
.map((groupByDefinition) => groupByDefinition.expression)
diff --git a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/helpers/object-records-to-graphql-connection.helper.ts b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/helpers/object-records-to-graphql-connection.helper.ts
index f8f61dcb3cf..2b65ef387be 100644
--- a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/helpers/object-records-to-graphql-connection.helper.ts
+++ b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/helpers/object-records-to-graphql-connection.helper.ts
@@ -24,19 +24,19 @@ import { isCompositeFieldMetadataType } from 'src/engine/metadata-modules/field-
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 { 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 { 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';
// TODO: Refacto-common - Rename CommonRecordsToGraphqlConnectionHelper
export class ObjectRecordsToGraphqlConnectionHelper {
private flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;
- private flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ private flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
private objectIdByNameSingular: Record<string, string>;
constructor(
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>,
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>,
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>,
objectIdByNameSingular: Record<string, string>,
) {
this.flatObjectMetadataMaps = flatObjectMetadataMaps;
@@ -295,7 +295,7 @@ export class ObjectRecordsToGraphqlConnectionHelper {
}
private processCompositeField(
- fieldMetadata: FlatFieldMetadata,
+ fieldMetadata: OrmFlatFieldMetadata,
// oxlint-disable-next-line typescript/no-explicit-any
fieldValue: any,
// oxlint-disable-next-line typescript/no-explicit-any
diff --git a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/utils/build-columns-to-return.ts b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/utils/build-columns-to-return.ts
index c647e449cf2..8f179d891c3 100644
--- a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/utils/build-columns-to-return.ts
+++ b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/utils/build-columns-to-return.ts
@@ -1,6 +1,6 @@
import { buildColumnsToSelect } from 'src/engine/api/graphql/graphql-query-runner/utils/build-columns-to-select';
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 const buildColumnsToReturn = ({
@@ -14,7 +14,7 @@ export const buildColumnsToReturn = ({
relations: Record<string, unknown>;
flatObjectMetadata: FlatObjectMetadata;
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
}): string[] => {
return Object.entries(
buildColumnsToSelect({
diff --git a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/utils/build-columns-to-select.ts b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/utils/build-columns-to-select.ts
index af87e16260e..e7cccd6ef26 100644
--- a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/utils/build-columns-to-select.ts
+++ b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/utils/build-columns-to-select.ts
@@ -7,7 +7,7 @@ import { RelationType } from 'src/engine/metadata-modules/field-metadata/interfa
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 { 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 { 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';
@@ -22,7 +22,7 @@ export const buildColumnsToSelect = ({
relations: Record<string, unknown>;
flatObjectMetadata: FlatObjectMetadata;
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
}) => {
const requiredRelationColumns = getRequiredRelationColumns(
relations,
@@ -50,7 +50,7 @@ const getRequiredRelationColumns = (
relations: Record<string, unknown>,
flatObjectMetadata: FlatObjectMetadata,
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>,
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>,
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>,
): string[] => {
const requiredColumns: string[] = [];
diff --git a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/utils/build-order-by-columns-to-select.ts b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/utils/build-order-by-columns-to-select.ts
index d347d5a09f1..b723d9ee88d 100644
--- a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/utils/build-order-by-columns-to-select.ts
+++ b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/utils/build-order-by-columns-to-select.ts
@@ -8,7 +8,7 @@ import {
resolveOrderByLeaves,
} from 'src/engine/api/utils/resolve-order-by-leaves.utils';
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';
// Cursor encoding reads orderBy values from the hydrated record, so every column the
@@ -22,7 +22,7 @@ export const buildOrderByColumnsToSelect = ({
}: {
orderBy: ObjectRecordOrderBy | undefined;
flatObjectMetadata: FlatObjectMetadata;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
}): Record<string, boolean> => {
const columnsToSelect: Record<string, boolean> = {};
diff --git a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/utils/cursors.util.ts b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/utils/cursors.util.ts
index abd246afe6f..829d2d49c06 100644
--- a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/utils/cursors.util.ts
+++ b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/utils/cursors.util.ts
@@ -14,7 +14,7 @@ import {
resolveOrderByLeaves,
} from 'src/engine/api/utils/resolve-order-by-leaves.utils';
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 interface CursorData {
@@ -46,7 +46,7 @@ export const encodeCursor = <T extends ObjectRecord = ObjectRecord>({
order: ObjectRecordOrderBy | undefined;
flatObjectMetadata: FlatObjectMetadata;
flatObjectMetadataMaps?: FlatEntityMaps<FlatObjectMetadata>;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
// Sort values read from the scan's raw rows by the find-many runner: they
// carry the exact SQL values (NULLs included) the continuation must mirror.
// Falling back to the formatted record covers callers without them (e.g.
diff --git a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/utils/get-target-object-metadata.util.ts b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/utils/get-target-object-metadata.util.ts
index 24352429026..54f457794a5 100644
--- a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/utils/get-target-object-metadata.util.ts
+++ b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/utils/get-target-object-metadata.util.ts
@@ -5,11 +5,11 @@ import {
} from 'src/engine/api/graphql/graphql-query-runner/errors/graphql-query-runner.exception';
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';
export const getTargetObjectMetadataOrThrow = (
- fieldMetadata: FlatFieldMetadata,
+ fieldMetadata: OrmFlatFieldMetadata,
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>,
): FlatObjectMetadata => {
if (!fieldMetadata.relationTargetObjectMetadataId) {
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/factories/query-result-getters/interfaces/query-result-getter-handler.interface.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/factories/query-result-getters/interfaces/query-result-getter-handler.interface.ts
index 3db3b1aa3d1..a171e2847ea 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/factories/query-result-getters/interfaces/query-result-getter-handler.interface.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/factories/query-result-getters/interfaces/query-result-getter-handler.interface.ts
@@ -1,11 +1,11 @@
import { type ObjectRecord } 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 interface QueryResultGetterHandlerInterface {
handle(
objectRecord: ObjectRecord,
workspaceId: string,
- flatFieldMetadata: FlatFieldMetadata[],
+ flatFieldMetadata: OrmFlatFieldMetadata[],
): Promise<ObjectRecord>;
}
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/interfaces/workspace-schema-builder-context.interface.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/interfaces/workspace-schema-builder-context.interface.ts
index a9e79ee1df4..cf42cd2272a 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/interfaces/workspace-schema-builder-context.interface.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/interfaces/workspace-schema-builder-context.interface.ts
@@ -1,12 +1,12 @@
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';
export interface WorkspaceSchemaBuilderContext {
flatObjectMetadata: FlatObjectMetadata;
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
flatIndexMaps: FlatEntityMaps<FlatIndexMetadata>;
objectIdByNameSingular: Record<string, string>;
}
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/get-available-aggregations-from-object-fields.util.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/get-available-aggregations-from-object-fields.util.ts
index 64258d7de08..d4b3ec580f5 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/get-available-aggregations-from-object-fields.util.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/get-available-aggregations-from-object-fields.util.ts
@@ -5,7 +5,7 @@ import { FIELD_FOR_TOTAL_COUNT_AGGREGATE_OPERATION } from 'twenty-shared/constan
import { AggregateOperations, FieldMetadataType } from 'twenty-shared/types';
import { capitalize, isFieldMetadataDateKind } 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';
import { getSubfieldsForAggregateOperation } from 'src/engine/twenty-orm/utils/get-subfields-for-aggregate-operation.util';
export type AggregationField = {
@@ -19,7 +19,7 @@ export type AggregationField = {
};
export const getAvailableAggregationsFromObjectFields = (
- fields: FlatFieldMetadata[],
+ fields: OrmFlatFieldMetadata[],
): Record<string, AggregationField> => {
return fields.reduce<Record<string, AggregationField>>(
(acc, field) => {
diff --git a/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-base.handler.ts b/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-base.handler.ts
index 5bdb3026327..ffd215486fc 100644
--- a/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-base.handler.ts
+++ b/packages/twenty-server/src/engine/api/rest/core/handlers/rest-api-base.handler.ts
@@ -26,7 +26,7 @@ import { WorkspaceNotFoundDefaultError } from 'src/engine/core-modules/workspace
import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
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 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 { buildObjectIdByNameMaps } from 'src/engine/metadata-modules/flat-object-metadata/utils/build-object-id-by-name-maps.util';
@@ -138,7 +138,7 @@ export abstract class RestApiBaseHandler {
depth?: Depth | undefined;
flatObjectMetadata: FlatObjectMetadata;
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
}): Promise<CommonSelectedFields> {
const { objectsPermissions } =
await this.getObjectsPermissions(authContext);
@@ -181,7 +181,7 @@ export abstract class RestApiBaseHandler {
): Promise<{
flatObjectMetadata: FlatObjectMetadata;
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
flatIndexMaps: FlatEntityMaps<FlatIndexMetadata>;
objectIdByNameSingular: Record<string, string>;
}> {
@@ -206,17 +206,20 @@ export abstract class RestApiBaseHandler {
}
}
- const { flatObjectMetadataMaps, flatFieldMetadataMaps, flatIndexMaps } =
- await this.workspaceManyOrAllFlatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(
- {
- workspaceId: workspace.id,
- flatMapsKeys: [
- 'flatObjectMetadataMaps',
- 'flatFieldMetadataMaps',
- 'flatIndexMaps',
- ],
- },
- );
+ const {
+ flatObjectMetadataMaps,
+ flatFieldMetadataMapsOrm: flatFieldMetadataMaps,
+ flatIndexMaps,
+ } = await this.workspaceManyOrAllFlatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(
+ {
+ workspaceId: workspace.id,
+ flatMapsKeys: [
+ 'flatObjectMetadataMaps',
+ 'flatFieldMetadataMapsOrm',
+ 'flatIndexMaps',
+ ],
+ },
+ );
if (!isDefined(flatObjectMetadataMaps)) {
throw new BadRequestException(
diff --git a/packages/twenty-server/src/engine/api/utils/build-duplicate-conditions.utils.ts b/packages/twenty-server/src/engine/api/utils/build-duplicate-conditions.utils.ts
index 5ab8eb72ccc..e2971bba8cc 100644
--- a/packages/twenty-server/src/engine/api/utils/build-duplicate-conditions.utils.ts
+++ b/packages/twenty-server/src/engine/api/utils/build-duplicate-conditions.utils.ts
@@ -5,7 +5,7 @@ import { type ObjectRecordFilter } from 'src/engine/api/graphql/workspace-query-
import { settings } from 'src/engine/constants/settings';
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 { formatData } from 'src/engine/twenty-orm/utils/format-data.util';
import { getCompositeFieldMetadataMap } from 'src/engine/twenty-orm/utils/format-result.util';
@@ -13,7 +13,7 @@ import { getCompositeFieldMetadataMap } from 'src/engine/twenty-orm/utils/format
export const buildDuplicateConditions = (
flatObjectMetadata: FlatObjectMetadata,
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>,
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>,
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>,
records?: Partial<ObjectRecord>[] | undefined,
filteringByExistingRecordId?: string,
): Partial<ObjectRecordFilter> => {
diff --git a/packages/twenty-server/src/engine/api/utils/compute-cursor-arg-filter.utils.ts b/packages/twenty-server/src/engine/api/utils/compute-cursor-arg-filter.utils.ts
index 7e40c895d97..acc43941446 100644
--- a/packages/twenty-server/src/engine/api/utils/compute-cursor-arg-filter.utils.ts
+++ b/packages/twenty-server/src/engine/api/utils/compute-cursor-arg-filter.utils.ts
@@ -18,7 +18,7 @@ import {
resolveOrderByLeaves,
} from 'src/engine/api/utils/resolve-order-by-leaves.utils';
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';
type ComputeCursorArgFilterParams = {
@@ -26,7 +26,7 @@ type ComputeCursorArgFilterParams = {
orderBy: ObjectRecordOrderBy;
flatObjectMetadata: FlatObjectMetadata;
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
isForwardPagination: boolean;
};
diff --git a/packages/twenty-server/src/engine/api/utils/get-all-selectable-column-names.utils.ts b/packages/twenty-server/src/engine/api/utils/get-all-selectable-column-names.utils.ts
index acfc535ddb0..07d1e5328ac 100644
--- a/packages/twenty-server/src/engine/api/utils/get-all-selectable-column-names.utils.ts
+++ b/packages/twenty-server/src/engine/api/utils/get-all-selectable-column-names.utils.ts
@@ -2,7 +2,7 @@ import { type RestrictedFieldsPermissions } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
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 { getFieldMetadataIdToColumnNamesMap } from 'src/engine/twenty-orm/utils/get-field-metadata-id-to-column-names-map.util';
@@ -10,7 +10,7 @@ type GetAllSelectableFieldsArgs = {
restrictedFields: RestrictedFieldsPermissions;
objectMetadata: {
objectMetadataMapItem: FlatObjectMetadata;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
};
};
diff --git a/packages/twenty-server/src/engine/api/utils/resolve-order-by-leaves.utils.ts b/packages/twenty-server/src/engine/api/utils/resolve-order-by-leaves.utils.ts
index 2ac6c4c4fab..cfe76eb6377 100644
--- a/packages/twenty-server/src/engine/api/utils/resolve-order-by-leaves.utils.ts
+++ b/packages/twenty-server/src/engine/api/utils/resolve-order-by-leaves.utils.ts
@@ -20,7 +20,7 @@ import { resolveFilterKeyFieldMetadata } from 'src/engine/api/graphql/graphql-qu
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';
@@ -32,7 +32,7 @@ export type OrderByLeaf = {
// of the keyset conditions.
path: string[];
direction: OrderByDirection;
- fieldMetadata: FlatFieldMetadata;
+ fieldMetadata: OrmFlatFieldMetadata;
} & (
| // Scalar columns, including join columns addressed directly (e.g. companyId)
{ kind: 'scalar' }
@@ -41,7 +41,7 @@ export type OrderByLeaf = {
kind: 'relation';
// Resolved against the target object when flatObjectMetadataMaps is
// provided; the keyset condition builder relies on it for NULL semantics
- targetFieldMetadata?: FlatFieldMetadata;
+ targetFieldMetadata?: OrmFlatFieldMetadata;
targetCompositeProperty?: CompositeProperty;
}
);
@@ -97,11 +97,11 @@ const resolveRelationLeaf = ({
strictValidation,
objectsPermissions,
}: {
- fieldMetadata: FlatFieldMetadata;
+ fieldMetadata: OrmFlatFieldMetadata;
path: string[];
direction: OrderByDirection;
flatObjectMetadataMaps?: FlatEntityMaps<FlatObjectMetadata>;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
strictValidation: boolean;
objectsPermissions?: ObjectsPermissions;
}): OrderByLeaf | null => {
@@ -215,7 +215,7 @@ export const resolveOrderByLeaves = ({
// Needed to resolve relation leaves against their target object; without it
// they stay unresolved, which lenient callers tolerate
flatObjectMetadataMaps?: FlatEntityMaps<FlatObjectMetadata>;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
strictValidation?: boolean;
// Sort values embed into cursors, so ordering by a field the role cannot
// read is rejected like filtering by one is
diff --git a/packages/twenty-server/src/engine/core-modules/record-crud/utils/get-record-display-name.util.ts b/packages/twenty-server/src/engine/core-modules/record-crud/utils/get-record-display-name.util.ts
index d699bee3e18..ae4d1146fb7 100644
--- a/packages/twenty-server/src/engine/core-modules/record-crud/utils/get-record-display-name.util.ts
+++ b/packages/twenty-server/src/engine/core-modules/record-crud/utils/get-record-display-name.util.ts
@@ -3,14 +3,14 @@ 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';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
// Mirrors frontend's getLabelIdentifierFieldValue logic
export const getRecordDisplayName = (
record: Record<string, unknown>,
flatObjectMetadata: FlatObjectMetadata,
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>,
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>,
): string => {
const { labelIdentifierFieldMetadataId } = flatObjectMetadata;
diff --git a/packages/twenty-server/src/engine/core-modules/record-transformer/services/record-input-transformer.service.ts b/packages/twenty-server/src/engine/core-modules/record-transformer/services/record-input-transformer.service.ts
index 5f9f6c2c1f7..0aeb1d49fb5 100644
--- a/packages/twenty-server/src/engine/core-modules/record-transformer/services/record-input-transformer.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/record-transformer/services/record-input-transformer.service.ts
@@ -13,7 +13,7 @@ import { transformPhonesValue } from 'src/engine/core-modules/record-transformer
import { transformRichTextValue } from 'src/engine/core-modules/record-transformer/utils/transform-rich-text.util';
import { 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 { 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 { FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
@@ -26,7 +26,7 @@ export class RecordInputTransformerService {
}: {
recordInput: Partial<ObjectRecord>;
flatObjectMetadata: FlatObjectMetadata;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
}): Promise<Partial<ObjectRecord>> {
let transformedEntries = {};
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 bca38468de4..71eab3e0cce 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
@@ -11,7 +11,8 @@ import {
export type FlatEntityMapsCacheKeyName =
| keyof AllFlatEntityMaps
- | 'flatApplicationMaps';
+ | 'flatApplicationMaps'
+ | 'flatFieldMetadataMapsOrm';
@Injectable()
export class WorkspaceManyOrAllFlatEntityMapsCacheService {
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
index 485e1ae5eb9..845eae45391 100644
--- 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
@@ -20,6 +20,10 @@ export const ORM_FLAT_FIELD_METADATA_KEYS = [
'relationTargetFieldMetadataId',
'relationTargetObjectMetadataId',
'morphId',
+ // Read by the shared query runners (merge, create, group-by support gates)
+ // and REST/direct-execution paths that also consume this projection.
+ 'isActive',
+ 'isSystem',
] as const satisfies readonly (keyof FlatFieldMetadata)[];
export type OrmFlatFieldMetadataKey =
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/find-all-others-morph-relation-flat-field-metadatas-or-throw.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/find-all-others-morph-relation-flat-field-metadatas-or-throw.util.ts
index 63ca2162f35..bb6651c0232 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/find-all-others-morph-relation-flat-field-metadatas-or-throw.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/find-all-others-morph-relation-flat-field-metadatas-or-throw.util.ts
@@ -9,11 +9,12 @@ import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/typ
import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
import { findManyFlatEntityByIdInFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-many-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 { 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';
export type FindAllMorphRelationFlatFieldMetadatasOrThrowArgs = {
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
flatFieldMetadata: FlatFieldMetadata<FieldMetadataType.MORPH_RELATION>;
flatObjectMetadata: FlatObjectMetadata;
};
diff --git a/packages/twenty-server/src/modules/timeline/services/timeline-activity-routing-plan.service.ts b/packages/twenty-server/src/modules/timeline/services/timeline-activity-routing-plan.service.ts
index 9913da29489..95f0a7c8dbe 100644
--- a/packages/twenty-server/src/modules/timeline/services/timeline-activity-routing-plan.service.ts
+++ b/packages/twenty-server/src/modules/timeline/services/timeline-activity-routing-plan.service.ts
@@ -5,7 +5,7 @@ import { isDefined } from 'twenty-shared/utils';
import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
import { findFlatEntityByUniversalIdentifier } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-universal-identifier.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 { type FlatTimelineActivityTypeMaps } from 'src/engine/metadata-modules/flat-timeline-activity-type/types/flat-timeline-activity-type-maps.type';
import { type TimelineActivityRule } from 'src/modules/timeline/types/timeline-activity-rule.type';
@@ -23,7 +23,7 @@ import {
type TimelineActivityRulesForEventBatch = {
sourceRules: TimelineActivityRule[];
junctionRules: TimelineActivityRule[];
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
resolveTimelineActivityType: TimelineActivityTypeResolver;
};
@@ -31,7 +31,7 @@ type TimelineActivityRoutingPlan = {
activeTimelineActivityTypes: ResolvableTimelineActivityType[];
throughRules: TimelineActivityRule[];
eligibleNonAuditedObjectMetadataIds: Set<string>;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
resolveTimelineActivityType: TimelineActivityTypeResolver;
};
@@ -103,14 +103,14 @@ export class TimelineActivityRoutingPlanService {
workspaceId,
flatMapsKeys: [
'flatObjectMetadataMaps',
- 'flatFieldMetadataMaps',
+ 'flatFieldMetadataMapsOrm',
'flatTimelineActivityTypeMaps',
],
},
);
const cacheKey = [
hashes.flatObjectMetadataMaps,
- hashes.flatFieldMetadataMaps,
+ hashes.flatFieldMetadataMapsOrm,
hashes.flatTimelineActivityTypeMaps,
].join('|');
const cachedRoutingPlan = this.routingPlanByWorkspaceId.get(workspaceId);
@@ -131,11 +131,11 @@ export class TimelineActivityRoutingPlanService {
private buildRoutingPlan({
flatObjectMetadataMaps,
- flatFieldMetadataMaps,
+ flatFieldMetadataMapsOrm: flatFieldMetadataMaps,
flatTimelineActivityTypeMaps,
}: {
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMapsOrm: FlatEntityMaps<OrmFlatFieldMetadata>;
flatTimelineActivityTypeMaps: FlatTimelineActivityTypeMaps;
}): TimelineActivityRoutingPlan {
const { effectiveTimelineActivityTypes, resolveTimelineActivityType } =
diff --git a/packages/twenty-server/src/modules/timeline/services/timeline-activity.service.ts b/packages/twenty-server/src/modules/timeline/services/timeline-activity.service.ts
index 7235c81bd1c..99a8688d5dc 100644
--- a/packages/twenty-server/src/modules/timeline/services/timeline-activity.service.ts
+++ b/packages/twenty-server/src/modules/timeline/services/timeline-activity.service.ts
@@ -9,7 +9,7 @@ import { In } from 'typeorm';
import { getFlatFieldsFromFlatObjectMetadata } from 'src/engine/api/graphql/workspace-schema-builder/utils/get-flat-fields-for-flat-object-metadata.util';
import { type DatabaseEventAction } from 'src/engine/api/graphql/graphql-query-runner/enums/database-event-action';
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 { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';
@@ -41,7 +41,7 @@ type BuildPayloadsForRuleArgs = {
rule: TimelineActivityRule;
events: ObjectRecordBaseEvent[];
action: DatabaseEventAction;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
resolveTimelineActivityType: TimelineActivityTypeResolver;
};
@@ -531,7 +531,7 @@ export class TimelineActivityService {
}: {
events: ObjectRecordBaseEvent[];
objectMetadata: FlatObjectMetadata;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
}): ObjectRecordBaseEvent[] {
const someEventHasDiff = events.some((event) =>
isDefined(event.properties.diff),
diff --git a/packages/twenty-server/src/modules/timeline/utils/build-direct-relation-target-shape.util.ts b/packages/twenty-server/src/modules/timeline/utils/build-direct-relation-target-shape.util.ts
index 33447e9684c..1076d4ed5b2 100644
--- a/packages/twenty-server/src/modules/timeline/utils/build-direct-relation-target-shape.util.ts
+++ b/packages/twenty-server/src/modules/timeline/utils/build-direct-relation-target-shape.util.ts
@@ -2,7 +2,7 @@ import { FieldMetadataType, RelationType } from 'twenty-shared/types';
import { isFieldMetadataSettingsOfType } from 'src/engine/metadata-modules/field-metadata/utils/is-field-metadata-settings-of-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';
import { type TimelineActivityRuleTargetShape } from 'src/modules/timeline/types/timeline-activity-rule-target-shape.type';
import { buildTimelineActivityTargetJoinColumns } from 'src/modules/timeline/utils/build-timeline-activity-target-join-columns.util';
@@ -12,9 +12,9 @@ export const buildDirectRelationTargetShape = ({
flatObjectMetadataMaps,
flatFieldMetadataMaps,
}: {
- relationFlatFieldMetadata: FlatFieldMetadata;
+ relationFlatFieldMetadata: OrmFlatFieldMetadata;
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
}): TimelineActivityRuleTargetShape | undefined => {
const { settings, type } = relationFlatFieldMetadata;
diff --git a/packages/twenty-server/src/modules/timeline/utils/build-junction-target-shape.util.ts b/packages/twenty-server/src/modules/timeline/utils/build-junction-target-shape.util.ts
index d8f5a3d6d75..0c4ea57114c 100644
--- a/packages/twenty-server/src/modules/timeline/utils/build-junction-target-shape.util.ts
+++ b/packages/twenty-server/src/modules/timeline/utils/build-junction-target-shape.util.ts
@@ -5,15 +5,15 @@ import { getJoinColumnNameForRelationField } from 'src/engine/metadata-modules/f
import { isFieldMetadataSettingsOfType } from 'src/engine/metadata-modules/field-metadata/utils/is-field-metadata-settings-of-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 { type TimelineActivityRuleTargetShape } from 'src/modules/timeline/types/timeline-activity-rule-target-shape.type';
import { buildTimelineActivityTargetJoinColumns } from 'src/modules/timeline/utils/build-timeline-activity-target-join-columns.util';
type BuildJunctionTargetShapeArgs = {
- relationFlatFieldMetadata: FlatFieldMetadata;
+ relationFlatFieldMetadata: OrmFlatFieldMetadata;
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
};
export const buildJunctionTargetShape = ({
diff --git a/packages/twenty-server/src/modules/timeline/utils/build-timeline-activity-target-join-columns.util.ts b/packages/twenty-server/src/modules/timeline/utils/build-timeline-activity-target-join-columns.util.ts
index e7b366bbd0f..dd3979fe61a 100644
--- a/packages/twenty-server/src/modules/timeline/utils/build-timeline-activity-target-join-columns.util.ts
+++ b/packages/twenty-server/src/modules/timeline/utils/build-timeline-activity-target-join-columns.util.ts
@@ -5,7 +5,7 @@ import { getJoinColumnNameForRelationField } from 'src/engine/metadata-modules/f
import { FlatEntityMapsException } from 'src/engine/metadata-modules/flat-entity/exceptions/flat-entity-maps.exception';
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 { findAllOthersMorphRelationFlatFieldMetadatasOrThrow } from 'src/engine/metadata-modules/flat-field-metadata/utils/find-all-others-morph-relation-flat-field-metadatas-or-throw.util';
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';
@@ -16,9 +16,9 @@ export const buildTimelineActivityTargetJoinColumns = ({
flatObjectMetadataMaps,
flatFieldMetadataMaps,
}: {
- targetFlatFieldMetadata: FlatFieldMetadata;
+ targetFlatFieldMetadata: OrmFlatFieldMetadata;
flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
}): TimelineActivityRuleTargetJoinColumn[] => {
const containingFlatObjectMetadata = findFlatEntityByIdInFlatEntityMaps({
flatEntityId: targetFlatFieldMetadata.objectMetadataId,
@@ -29,7 +29,7 @@ export const buildTimelineActivityTargetJoinColumns = ({
return [];
}
- let targetFlatFieldMetadatas: FlatFieldMetadata[];
+ let targetFlatFieldMetadatas: OrmFlatFieldMetadata[];
try {
targetFlatFieldMetadatas = isFlatFieldMetadataOfType(
diff --git a/packages/twenty-server/src/modules/timeline/utils/resolve-linked-record-cached-name.util.ts b/packages/twenty-server/src/modules/timeline/utils/resolve-linked-record-cached-name.util.ts
index 2e047905f16..5b00a1d669b 100644
--- a/packages/twenty-server/src/modules/timeline/utils/resolve-linked-record-cached-name.util.ts
+++ b/packages/twenty-server/src/modules/timeline/utils/resolve-linked-record-cached-name.util.ts
@@ -2,7 +2,7 @@ import { isDefined } from 'twenty-shared/utils';
import { getRecordDisplayName } from 'src/engine/core-modules/record-crud/utils/get-record-display-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 TimelineActivityRule } from 'src/modules/timeline/types/timeline-activity-rule.type';
// Shared so both event streams label a linked record the same way, including
@@ -14,7 +14,7 @@ export const resolveLinkedRecordCachedName = ({
}: {
rule: TimelineActivityRule;
record: Record<string, unknown> | undefined;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;
}): string | undefined =>
isDefined(record)
? getRecordDisplayName(