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

Migrate standard objects (#2439)

Browse Source 
* Migrate standard objects

* Add migrations

* fix relation

* fix: register RelationMetadataType enum

* fix: correctly fix null relation

---------

Co-authored-by: corentin <corentin@twenty.com>
Co-authored-by: Jérémy Magrin <jeremy.magrin@gmail.com>
This commit is contained in:
Charles Bochet
2023-11-13 16:08:27 +01:00
committed by GitHub
parent c7568ff28b
commit 9a109758c8
68 changed files with 3031 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/src/tenant/query-builder/factories/composite-field-alias.factory.ts
View File

@ -68,10 +68,10 @@ export class CompositeFieldAliasFactory {
fieldMetadata.objectMetadataId,
relationMetadata,
);
const targetTableName =
const referencedObjectMetadata =
relationDirection == RelationDirection.TO
? relationMetadata.fromObjectMetadata.targetTableName
: relationMetadata.toObjectMetadata.targetTableName;
? relationMetadata.fromObjectMetadata
: relationMetadata.toObjectMetadata;
// If it's a relation destination is of kind MANY, we need to add the collection suffix and extract the args
if (
@ -84,7 +84,7 @@ export class CompositeFieldAliasFactory {
relationMetadata.toObjectMetadata.fields ?? [],
);
return `
${fieldKey}: ${targetTableName}Collection${
${fieldKey}: ${referencedObjectMetadata.targetTableName}Collection${
argsString ? `(${argsString})` : ''
} {
${this.fieldsStringFactory.createFieldsStringRecursive(
@ -98,11 +98,11 @@ export class CompositeFieldAliasFactory {
// Otherwise it means it's a relation destination is of kind ONE
return `
${fieldKey}: ${targetTableName} {
${fieldKey}: ${referencedObjectMetadata.targetTableName} {
${this.fieldsStringFactory.createFieldsStringRecursive(
info,
fieldValue,
relationMetadata.toObjectMetadata.fields ?? [],
referencedObjectMetadata.fields ?? [],
)}
}
`;