Refactor morph field name and morph data loader (#14299)

# Introduction
Storing morph relation field names directly in database, using morphId
to aggregate them
Removing dynamic morph field metadata computation in schemas and data
loader

Will add integration tests on morph data loader entry

closes https://github.com/twentyhq/core-team-issues/issues/1425 
closes https://github.com/twentyhq/core-team-issues/issues/1424 
closes https://github.com/twentyhq/core-team-issues/issues/1423
This commit is contained in:
Paul Rastoin
2025-09-08 17:20:18 +02:00
committed by GitHub
parent 49ee73a16c
commit 9e81618773
54 changed files with 807 additions and 1019 deletions
@@ -5,7 +5,6 @@ import { GraphqlQuerySelectedFieldsAggregateParser } from 'src/engine/api/graphq
import { GraphqlQuerySelectedFieldsRelationParser } from 'src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-selected-fields/graphql-selected-fields-relation.parser';
import { compositeTypeDefinitions } from 'src/engine/metadata-modules/field-metadata/composite-types';
import { type FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
import { computeMorphRelationFieldName } from 'src/engine/metadata-modules/field-metadata/utils/compute-morph-relation-field-name.util';
import { isCompositeFieldMetadataType } from 'src/engine/metadata-modules/field-metadata/utils/is-composite-field-metadata-type.util';
import { type ObjectMetadataItemWithFieldMaps } from 'src/engine/metadata-modules/types/object-metadata-item-with-field-maps';
import { type ObjectMetadataMaps } from 'src/engine/metadata-modules/types/object-metadata-maps';
@@ -134,14 +133,8 @@ export class GraphqlQuerySelectedFieldsParser {
accumulator.select[joinColumnName] = true;
}
const morphRelationFieldName = computeMorphRelationFieldName({
fieldName: fieldMetadata.name,
relationDirection: fieldMetadata.settings.relationType,
targetObjectMetadata,
});
const graphqlSelectedFieldValue =
graphqlSelectedFields[morphRelationFieldName];
graphqlSelectedFields[fieldMetadata.name];
if (!isDefined(graphqlSelectedFieldValue)) {
continue;
@@ -149,7 +142,7 @@ export class GraphqlQuerySelectedFieldsParser {
this.graphqlQuerySelectedFieldsRelationParser.parseRelationField(
fieldMetadata,
morphRelationFieldName,
fieldMetadata.name,
graphqlSelectedFieldValue,
accumulator,
);
@@ -17,7 +17,6 @@ import { getTargetObjectMetadataOrThrow } from 'src/engine/api/graphql/graphql-q
import { type AggregationField } from 'src/engine/api/graphql/workspace-schema-builder/utils/get-available-aggregations-from-object-fields.util';
import { compositeTypeDefinitions } from 'src/engine/metadata-modules/field-metadata/composite-types';
import { type FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
import { computeMorphRelationFieldName } from 'src/engine/metadata-modules/field-metadata/utils/compute-morph-relation-field-name.util';
import { isCompositeFieldMetadataType } from 'src/engine/metadata-modules/field-metadata/utils/is-composite-field-metadata-type.util';
import { isFieldMetadataTypeMorphRelation } from 'src/engine/metadata-modules/field-metadata/utils/is-field-metadata-type-morph-relation.util';
import { isFieldMetadataTypeRelation } from 'src/engine/metadata-modules/field-metadata/utils/is-field-metadata-type-relation.util';
@@ -255,52 +254,44 @@ export class ObjectRecordsToGraphqlConnectionHelper {
continue;
}
const morphRelationFieldName = computeMorphRelationFieldName({
fieldName: fieldMetadata.name,
relationDirection: fieldMetadata.settings.relationType,
targetObjectMetadata,
});
const fieldMetadataNameWithId = `${morphRelationFieldName}Id`;
const fieldMetadataNameWithId = `${fieldMetadata.name}Id`;
if (isDefined(objectRecord[fieldMetadataNameWithId])) {
processedObjectRecord[fieldMetadataNameWithId] =
objectRecord[fieldMetadataNameWithId];
}
const objectValue = objectRecord[morphRelationFieldName];
const objectValue = objectRecord[fieldMetadata.name];
if (!isDefined(objectValue)) {
continue;
}
if (Array.isArray(objectValue)) {
processedObjectRecord[morphRelationFieldName] = this.createConnection(
{
objectRecords: objectValue,
parentObjectRecord: objectRecord,
objectRecordsAggregatedValues:
objectRecordsAggregatedValues[fieldMetadata.name],
selectedAggregatedFields:
selectedAggregatedFields[fieldMetadata.name],
objectName: targetObjectMetadata.nameSingular,
take,
totalCount:
objectRecordsAggregatedValues[fieldMetadata.name]?.totalCount ??
objectValue.length,
order,
hasNextPage: false,
hasPreviousPage: false,
depth: depth + 1,
},
);
processedObjectRecord[fieldMetadata.name] = this.createConnection({
objectRecords: objectValue,
parentObjectRecord: objectRecord,
objectRecordsAggregatedValues:
objectRecordsAggregatedValues[fieldMetadata.name],
selectedAggregatedFields:
selectedAggregatedFields[fieldMetadata.name],
objectName: targetObjectMetadata.nameSingular,
take,
totalCount:
objectRecordsAggregatedValues[fieldMetadata.name]?.totalCount ??
objectValue.length,
order,
hasNextPage: false,
hasPreviousPage: false,
depth: depth + 1,
});
} else if (isPlainObject(objectValue)) {
const targetObjectMetadata = getTargetObjectMetadataOrThrow(
fieldMetadata,
this.objectMetadataMaps,
);
processedObjectRecord[morphRelationFieldName] = this.processRecord({
processedObjectRecord[fieldMetadata.name] = this.processRecord({
objectRecord: objectValue,
objectRecordsAggregatedValues:
objectRecordsAggregatedValues[fieldMetadata.name],
@@ -2,11 +2,9 @@ import { isDefined } from 'twenty-shared/utils';
import { RelationType } from 'src/engine/metadata-modules/field-metadata/interfaces/relation-type.interface';
import { computeMorphRelationFieldName } from 'src/engine/metadata-modules/field-metadata/utils/compute-morph-relation-field-name.util';
import { isFieldMetadataTypeMorphRelation } from 'src/engine/metadata-modules/field-metadata/utils/is-field-metadata-type-morph-relation.util';
import { isFieldMetadataTypeRelation } from 'src/engine/metadata-modules/field-metadata/utils/is-field-metadata-type-relation.util';
import { type ObjectMetadataItemWithFieldMaps } from 'src/engine/metadata-modules/types/object-metadata-item-with-field-maps';
export const buildColumnsToSelect = ({
select,
relations,
@@ -84,13 +82,7 @@ const getRequiredRelationColumns = (
continue;
}
const morphRelationFieldName = computeMorphRelationFieldName({
fieldName: fieldMetadata.name,
relationDirection: fieldMetadata.settings.relationType,
targetObjectMetadata,
});
const relationValue = relations[morphRelationFieldName];
const relationValue = relations[fieldMetadata.name];
if (
!isDefined(relationValue) ||
@@ -3,7 +3,6 @@ import { isDefined } from 'twenty-shared/utils';
import { getTargetObjectMetadataOrThrow } from 'src/engine/api/graphql/graphql-query-runner/utils/get-target-object-metadata.util';
import { type FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
import { computeMorphRelationFieldName } from 'src/engine/metadata-modules/field-metadata/utils/compute-morph-relation-field-name.util';
import { isFieldMetadataTypeMorphRelation } from 'src/engine/metadata-modules/field-metadata/utils/is-field-metadata-type-morph-relation.util';
import { type ObjectMetadataItemWithFieldMaps } from 'src/engine/metadata-modules/types/object-metadata-item-with-field-maps';
import { type ObjectMetadataMaps } from 'src/engine/metadata-modules/types/object-metadata-maps';
@@ -58,14 +57,8 @@ export function getFieldMetadataFromGraphQLField({
return;
}
const name = computeMorphRelationFieldName({
fieldName: morphRelation.fieldMetadata.name,
relationDirection: morphRelation.fieldMetadata.settings.relationType,
targetObjectMetadata: morphRelation.targetObjectMetadata,
});
possibleGraphQLFieldNames.push({
graphQLField: name,
graphQLField: morphRelation.fieldMetadata.name,
fieldMetadata: morphRelation.fieldMetadata,
targetObjectMetadata: morphRelation.targetObjectMetadata,
});
@@ -14,7 +14,6 @@ import { RelationTypeV2Factory } from 'src/engine/api/graphql/workspace-schema-b
import { TypeDefinitionsStorage } from 'src/engine/api/graphql/workspace-schema-builder/storages/type-definitions.storage';
import { getResolverArgs } from 'src/engine/api/graphql/workspace-schema-builder/utils/get-resolver-args.util';
import { objectContainsRelationField } from 'src/engine/api/graphql/workspace-schema-builder/utils/object-contains-relation-field';
import { computeMorphRelationFieldName } from 'src/engine/metadata-modules/field-metadata/utils/compute-morph-relation-field-name.util';
import { type ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
import { isFieldMetadataEntityOfType } from 'src/engine/utils/is-field-metadata-of-type.util';
@@ -169,16 +168,7 @@ export class ExtendObjectTypeDefinitionV2Factory {
);
}
const fieldName =
fieldMetadata.type === FieldMetadataType.MORPH_RELATION
? computeMorphRelationFieldName({
fieldName: fieldMetadata.name,
relationDirection: fieldMetadata.settings.relationType,
targetObjectMetadata: objectMetadataTarget,
})
: fieldMetadata.name;
fields[fieldName] = {
fields[fieldMetadata.name] = {
type: relationType,
args: argsType,
description: fieldMetadata.description,