From 22d0fb96c5bd20f032637d1e4ef359dd211b026a Mon Sep 17 00:00:00 2001
From: Charles Bochet <charles@twenty.com>
Date: Mon, 11 Nov 2024 16:56:26 +0100
Subject: [PATCH] Fix

---
 .../graphql-selected-fields-relation.parser.ts              | 2 +-
 .../graphql-selected-fields.parser.ts                       | 6 +++---
 .../graphql-query-parsers/graphql-query.parser.ts           | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-selected-fields/graphql-selected-fields-relation.parser.ts b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-selected-fields/graphql-selected-fields-relation.parser.ts
index 1924b743fea8..0b703946dcdd 100644
--- a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-selected-fields/graphql-selected-fields-relation.parser.ts
+++ b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-selected-fields/graphql-selected-fields-relation.parser.ts
@@ -28,7 +28,7 @@ export class GraphqlQuerySelectedFieldsRelationParser {
       this.objectMetadataMaps,
     );
 
-    const relationFields = referencedObjectMetadata.fieldsById;
+    const relationFields = referencedObjectMetadata.fieldsByName;
     const fieldParser = new GraphqlQuerySelectedFieldsParser(
       this.objectMetadataMaps,
     );
diff --git a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-selected-fields/graphql-selected-fields.parser.ts b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-selected-fields/graphql-selected-fields.parser.ts
index 6c60df475959..15579b261c5d 100644
--- a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-selected-fields/graphql-selected-fields.parser.ts
+++ b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-selected-fields/graphql-selected-fields.parser.ts
@@ -23,7 +23,7 @@ export class GraphqlQuerySelectedFieldsParser {
 
   parse(
     graphqlSelectedFields: Partial<Record<string, any>>,
-    fieldMetadataMap: Record<string, FieldMetadataInterface>,
+    fieldMetadataMapByName: Record<string, FieldMetadataInterface>,
   ): { select: Record<string, any>; relations: Record<string, any> } {
     const result: {
       select: Record<string, any>;
@@ -46,14 +46,14 @@ export class GraphqlQuerySelectedFieldsParser {
       }
 
       if (this.isConnectionField(fieldKey, fieldValue)) {
-        const subResult = this.parse(fieldValue, fieldMetadataMap);
+        const subResult = this.parse(fieldValue, fieldMetadataMapByName);
 
         Object.assign(result.select, subResult.select);
         Object.assign(result.relations, subResult.relations);
         continue;
       }
 
-      const fieldMetadata = fieldMetadataMap[fieldKey];
+      const fieldMetadata = fieldMetadataMapByName[fieldKey];
 
       if (!fieldMetadata) {
         throw new GraphqlQueryRunnerException(
diff --git a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query.parser.ts b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query.parser.ts
index 7142ab71d529..fdbba862b7fa 100644
--- a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query.parser.ts
+++ b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query.parser.ts
@@ -107,7 +107,7 @@ export class GraphqlQueryParser {
   ): { select: Record<string, any>; relations: Record<string, any> } {
     const parentFields =
       this.objectMetadataMaps.byNameSingular[parentObjectMetadata.nameSingular]
-        ?.fieldsById;
+        ?.fieldsByName;
 
     if (!parentFields) {
       throw new Error(