houseassassin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Failing morph relation creation v2 integration testing & fixes (#14253)

Browse Source 
# Introduction
closes https://github.com/twentyhq/core-team-issues/issues/1408
This commit is contained in:
Paul Rastoin
2025-09-03 12:14:43 +02:00
committed by GitHub
parent 2e7fe238ed
commit 6522498df0
43 changed files with 4022 additions and 2730 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/twenty-server/src/engine/metadata-modules/flat-object-metadata-maps/__tests__/utils/expect-flat-field-metadata-to-be-in-flat-object-metadata-maps.util.test.ts
+2 -5
View File
@@ -3,7 +3,7 @@ import { FieldMetadataType } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
import { isFlatFieldMetadataEntityOfType } from 'src/engine/metadata-modules/flat-field-metadata/utils/is-flat-field-metadata-of-type.util';
import { isFlatFieldMetadataOfType } from 'src/engine/metadata-modules/flat-field-metadata/utils/is-flat-field-metadata-of-type.util';
import { type FlatObjectMetadataMaps } from 'src/engine/metadata-modules/flat-object-metadata-maps/types/flat-object-metadata-maps.type';
type ExpectFlatFieldMetadataToBeInFlatObjectMetadataMapsArgs = {
@@ -21,10 +21,7 @@ export const expectFlatFieldMetadataToBeInFlatObjectMetadataMaps = ({
jestExpectToBeDefined(matchingFlatObjectMetadata);
if (
isFlatFieldMetadataEntityOfType(
flatFieldMetadata,
FieldMetadataType.RELATION,
) &&
isFlatFieldMetadataOfType(flatFieldMetadata, FieldMetadataType.RELATION) &&
isDefined(flatFieldMetadata.settings.joinColumnName)
) {
expect(
packages/twenty-server/src/engine/metadata-modules/flat-object-metadata-maps/utils/add-flat-field-metadata-to-flat-object-metadata-with-flat-field-maps-or-throw.util.ts
+3 -13
View File
@@ -1,8 +1,7 @@
import { FieldMetadataType } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
import { isFlatFieldMetadataEntityOfType } from 'src/engine/metadata-modules/flat-field-metadata/utils/is-flat-field-metadata-of-type.util';
import { isMorphOrRelationFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/utils/is-morph-or-relation-flat-field-metadata.util';
import {
FlatObjectMetadataMapsException,
FlatObjectMetadataMapsExceptionCode,
@@ -36,17 +35,8 @@ export const addFlatFieldMetadataToFlatObjectMetadataWithFlatFieldMapsOrThrow =
| FlatFieldMetadataMaps['fieldIdByJoinColumnName']
| undefined = undefined;
if (
isFlatFieldMetadataEntityOfType(
flatFieldMetadata,
FieldMetadataType.RELATION,
) ||
isFlatFieldMetadataEntityOfType(
flatFieldMetadata,
FieldMetadataType.MORPH_RELATION,
)
) {
if (isDefined(flatFieldMetadata.settings?.joinColumnName)) {
if (isMorphOrRelationFlatFieldMetadata(flatFieldMetadata)) {
if (isDefined(flatFieldMetadata.settings.joinColumnName)) {
updatedFieldIdByJoinColumnName = {
[flatFieldMetadata.settings.joinColumnName]: flatFieldMetadata.id,
};