Skip to content

Commit 9b2a351

Browse files
committed
Fix
1 parent ca2d760 commit 9b2a351

File tree

1 file changed

+7
-13
lines changed

1 file changed

+7
-13
lines changed

packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/factories/standard-field-relation.factory.ts

+7-13
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import { FieldMetadataType } from 'twenty-shared/types';
44
import { ObjectType } from 'typeorm/common/ObjectType';
55

66
import { WorkspaceDynamicRelationMetadataArgs } from 'src/engine/twenty-orm/interfaces/workspace-dynamic-relation-metadata-args.interface';
7-
import { WorkspaceEntityMetadataArgs } from 'src/engine/twenty-orm/interfaces/workspace-entity-metadata-args.interface';
87
import { WorkspaceJoinColumnsMetadataArgs } from 'src/engine/twenty-orm/interfaces/workspace-join-columns-metadata-args.interface';
98
import { WorkspaceRelationMetadataArgs } from 'src/engine/twenty-orm/interfaces/workspace-relation-metadata-args.interface';
109
import { WorkspaceSyncContext } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/workspace-sync-context.interface';
@@ -32,10 +31,7 @@ export class StandardFieldRelationFactory {
3231
): FieldMetadataEntity<FieldMetadataType.RELATION>[] {
3332
return customObjectFactories.flatMap((customObjectFactory) =>
3433
this.computeFieldRelationMetadataFromDecorators({
35-
workspaceEntityMetadataArgs: {
36-
...customObjectFactory.metadata,
37-
object: customObjectFactory.object,
38-
},
34+
objectNameSingular: customObjectFactory.object.nameSingular,
3935
workspaceStaticRelationMetadataArgsCollection: [],
4036
workspaceDynamicRelationMetadataArgsCollection: [],
4137
joinColumnsMetadataArgsCollection: [],
@@ -81,7 +77,7 @@ export class StandardFieldRelationFactory {
8177
acc.set(
8278
workspaceEntityMetadataArgs.standardId,
8379
this.computeFieldRelationMetadataFromDecorators({
84-
workspaceEntityMetadataArgs,
80+
objectNameSingular: workspaceEntityMetadataArgs.nameSingular,
8581
workspaceStaticRelationMetadataArgsCollection,
8682
workspaceDynamicRelationMetadataArgsCollection,
8783
joinColumnsMetadataArgsCollection,
@@ -97,14 +93,14 @@ export class StandardFieldRelationFactory {
9793
}
9894

9995
private computeFieldRelationMetadataFromDecorators({
100-
workspaceEntityMetadataArgs,
96+
objectNameSingular,
10197
workspaceStaticRelationMetadataArgsCollection,
10298
workspaceDynamicRelationMetadataArgsCollection,
10399
joinColumnsMetadataArgsCollection,
104100
context,
105101
originalObjectMetadataMap,
106102
}: {
107-
workspaceEntityMetadataArgs: WorkspaceEntityMetadataArgs;
103+
objectNameSingular: string;
108104
workspaceStaticRelationMetadataArgsCollection: WorkspaceRelationMetadataArgs[];
109105
workspaceDynamicRelationMetadataArgsCollection: WorkspaceDynamicRelationMetadataArgs[];
110106
joinColumnsMetadataArgsCollection: WorkspaceJoinColumnsMetadataArgs[];
@@ -118,13 +114,11 @@ export class StandardFieldRelationFactory {
118114
return [];
119115
}
120116

121-
const sourceObjectNameSingular = workspaceEntityMetadataArgs.nameSingular;
122-
const sourceObjectMetadata =
123-
originalObjectMetadataMap[sourceObjectNameSingular];
117+
const sourceObjectMetadata = originalObjectMetadataMap[objectNameSingular];
124118

125119
assert(
126120
sourceObjectMetadata,
127-
`Source object ${sourceObjectNameSingular} not found in database while parsing ${workspaceEntityMetadataArgs.nameSingular} relations`,
121+
`Source object ${objectNameSingular} not found in database while parsing ${objectNameSingular} relations`,
128122
);
129123

130124
const staticRelationsFromDynamicRelations =
@@ -183,7 +177,7 @@ export class StandardFieldRelationFactory {
183177
const sourceFieldMetadataName = workspaceRelationMetadataArgs.name;
184178
const targetFieldMetadataName =
185179
workspaceRelationMetadataArgs.inverseSideFieldKey ??
186-
sourceObjectNameSingular;
180+
objectNameSingular;
187181

188182
let joinColumnName;
189183

0 commit comments

Comments
 (0)