@@ -4,7 +4,6 @@ import { FieldMetadataType } from 'twenty-shared/types';
4
4
import { ObjectType } from 'typeorm/common/ObjectType' ;
5
5
6
6
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' ;
8
7
import { WorkspaceJoinColumnsMetadataArgs } from 'src/engine/twenty-orm/interfaces/workspace-join-columns-metadata-args.interface' ;
9
8
import { WorkspaceRelationMetadataArgs } from 'src/engine/twenty-orm/interfaces/workspace-relation-metadata-args.interface' ;
10
9
import { WorkspaceSyncContext } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/workspace-sync-context.interface' ;
@@ -32,10 +31,7 @@ export class StandardFieldRelationFactory {
32
31
) : FieldMetadataEntity < FieldMetadataType . RELATION > [ ] {
33
32
return customObjectFactories . flatMap ( ( customObjectFactory ) =>
34
33
this . computeFieldRelationMetadataFromDecorators ( {
35
- workspaceEntityMetadataArgs : {
36
- ...customObjectFactory . metadata ,
37
- object : customObjectFactory . object ,
38
- } ,
34
+ objectNameSingular : customObjectFactory . object . nameSingular ,
39
35
workspaceStaticRelationMetadataArgsCollection : [ ] ,
40
36
workspaceDynamicRelationMetadataArgsCollection : [ ] ,
41
37
joinColumnsMetadataArgsCollection : [ ] ,
@@ -81,7 +77,7 @@ export class StandardFieldRelationFactory {
81
77
acc . set (
82
78
workspaceEntityMetadataArgs . standardId ,
83
79
this . computeFieldRelationMetadataFromDecorators ( {
84
- workspaceEntityMetadataArgs,
80
+ objectNameSingular : workspaceEntityMetadataArgs . nameSingular ,
85
81
workspaceStaticRelationMetadataArgsCollection,
86
82
workspaceDynamicRelationMetadataArgsCollection,
87
83
joinColumnsMetadataArgsCollection,
@@ -97,14 +93,14 @@ export class StandardFieldRelationFactory {
97
93
}
98
94
99
95
private computeFieldRelationMetadataFromDecorators ( {
100
- workspaceEntityMetadataArgs ,
96
+ objectNameSingular ,
101
97
workspaceStaticRelationMetadataArgsCollection,
102
98
workspaceDynamicRelationMetadataArgsCollection,
103
99
joinColumnsMetadataArgsCollection,
104
100
context,
105
101
originalObjectMetadataMap,
106
102
} : {
107
- workspaceEntityMetadataArgs : WorkspaceEntityMetadataArgs ;
103
+ objectNameSingular : string ;
108
104
workspaceStaticRelationMetadataArgsCollection : WorkspaceRelationMetadataArgs [ ] ;
109
105
workspaceDynamicRelationMetadataArgsCollection : WorkspaceDynamicRelationMetadataArgs [ ] ;
110
106
joinColumnsMetadataArgsCollection : WorkspaceJoinColumnsMetadataArgs [ ] ;
@@ -118,13 +114,11 @@ export class StandardFieldRelationFactory {
118
114
return [ ] ;
119
115
}
120
116
121
- const sourceObjectNameSingular = workspaceEntityMetadataArgs . nameSingular ;
122
- const sourceObjectMetadata =
123
- originalObjectMetadataMap [ sourceObjectNameSingular ] ;
117
+ const sourceObjectMetadata = originalObjectMetadataMap [ objectNameSingular ] ;
124
118
125
119
assert (
126
120
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` ,
128
122
) ;
129
123
130
124
const staticRelationsFromDynamicRelations =
@@ -183,7 +177,7 @@ export class StandardFieldRelationFactory {
183
177
const sourceFieldMetadataName = workspaceRelationMetadataArgs . name ;
184
178
const targetFieldMetadataName =
185
179
workspaceRelationMetadataArgs . inverseSideFieldKey ??
186
- sourceObjectNameSingular ;
180
+ objectNameSingular ;
187
181
188
182
let joinColumnName ;
189
183
0 commit comments