rebase

Author: etiennejouan

packages/twenty-server/src/engine/api/common/common-query-runners/common-create-many-query-runner/common-create-many-query-runner.service.ts

@@ -67,27 +67,56 @@ export class CommonCreateManyQueryRunnerService extends CommonBaseQueryRunnerSer
       selectedFieldsResult: args.selectedFieldsResult,
     });
 
-    if (!isDefined(args.selectedFieldsResult.relations)) {
-      await this.processNestedRelationsHelper.processNestedRelations({
-        objectMetadataMaps,
-        parentObjectMetadataItem: objectMetadataItemWithFieldMaps,
-        parentObjectRecords: upsertedRecords,
-        //TODO : Refacto-common - Typing to fix when switching processNestedRelationsHelper to Common
-        relations: args.selectedFieldsResult.relations as Record<
-          string,
-          FindOptionsRelations<ObjectLiteral>
-        >,
-        limit: QUERY_MAX_RECORDS,
-        authContext,
-        workspaceDataSource,
-        rolePermissionConfig,
-        selectedFields: args.selectedFieldsResult.select,
-      });
-    }
+    await this.processNestedRelationsIfNeeded({
+      args,
+      records: upsertedRecords,
+      objectMetadataItemWithFieldMaps,
+      objectMetadataMaps,
+      authContext,
+      workspaceDataSource,
+      rolePermissionConfig,
+    });
 
     return upsertedRecords;
   }
 
+  private async processNestedRelationsIfNeeded({
+    args,
+    records,
+    objectMetadataItemWithFieldMaps,
+    objectMetadataMaps,
+    authContext,
+    workspaceDataSource,
+    rolePermissionConfig,
+  }: {
+    args: CommonExtendedInput<CreateManyQueryArgs>;
+    records: ObjectRecord[];
+    objectMetadataItemWithFieldMaps: ObjectMetadataItemWithFieldMaps;
+    objectMetadataMaps: ObjectMetadataMaps;
+    authContext: AuthContext;
+    workspaceDataSource: WorkspaceDataSource;
+    rolePermissionConfig?: RolePermissionConfig;
+  }): Promise<void> {
+    if (!args.selectedFieldsResult.relations) {
+      return;
+    }
+
+    await this.processNestedRelationsHelper.processNestedRelations({
+      objectMetadataMaps,
+      parentObjectMetadataItem: objectMetadataItemWithFieldMaps,
+      parentObjectRecords: records,
+      relations: args.selectedFieldsResult.relations as Record<
+        string,
+        FindOptionsRelations<ObjectLiteral>
+      >,
+      limit: QUERY_MAX_RECORDS,
+      authContext,
+      workspaceDataSource,
+      rolePermissionConfig,
+      selectedFields: args.selectedFieldsResult.select,
+    });
+  }
+
   async computeArgs(
     args: CommonInput<CreateManyQueryArgs>,
     queryRunnerContext: CommonBaseQueryRunnerContext,
@@ -355,44 +384,6 @@ export class CommonCreateManyQueryRunnerService extends CommonBaseQueryRunnerSer
     return upsertedRecords as ObjectRecord[];
   }
 
-  private async processNestedRelationsIfNeeded({
-    records,
-    objectMetadataItemWithFieldMaps,
-    objectMetadataMaps,
-    rolePermissionConfig,
-    authContext,
-    workspaceDataSource,
-    selectedFieldsResult,
-  }: {
-    records: ObjectRecord[];
-    objectMetadataItemWithFieldMaps: ObjectMetadataItemWithFieldMaps;
-    objectMetadataMaps: ObjectMetadataMaps;
-    authContext: AuthContext;
-    workspaceDataSource: WorkspaceDataSource;
-    rolePermissionConfig?: RolePermissionConfig;
-    selectedFieldsResult: CommonSelectedFieldsResult;
-  }): Promise<void> {
-    if (!selectedFieldsResult.relations) {
-      return;
-    }
-
-    await this.processNestedRelationsHelper.processNestedRelations({
-      objectMetadataMaps,
-      parentObjectMetadataItem: objectMetadataItemWithFieldMaps,
-      parentObjectRecords: records,
-      //TODO : Refacto-common - Typing to fix when switching processNestedRelationsHelper to Common
-      relations: selectedFieldsResult.relations as Record<
-        string,
-        FindOptionsRelations<ObjectLiteral>
-      >,
-      limit: QUERY_MAX_RECORDS,
-      authContext,
-      workspaceDataSource,
-      rolePermissionConfig,
-      selectedFields: selectedFieldsResult.select,
-    });
-  }
-
   private getRecordWithoutCreatedBy(
     record: PartialObjectRecordWithId,
     objectMetadataItemWithFieldMaps: ObjectMetadataItemWithFieldMaps,

packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/create-many-resolver.factory.ts

@@ -52,7 +52,7 @@ export class CreateManyResolverFactory
           const records = await this.commonCreateManyQueryRunnerService.execute(
             { ...args, selectedFields },
             internalContext,
-            CommonQueryNames.createMany,
+            CommonQueryNames.CREATE_MANY,
           );
 
           const typeORMObjectRecordsParser =

packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/create-one-resolver.factory.ts

@@ -49,7 +49,7 @@ export class CreateOneResolverFactory
           const record = await this.commonCreateOneQueryRunnerService.execute(
             { ...args, selectedFields },
             internalContext,
-            CommonQueryNames.createOne,
+            CommonQueryNames.CREATE_ONE,
           );
 
           const typeORMObjectRecordsParser =

packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/delete-many-resolver.factory.ts

@@ -52,7 +52,7 @@ export class DeleteManyResolverFactory
           const records = await this.commonDeleteManyQueryRunnerService.execute(
             { ...args, selectedFields },
             internalContext,
-            CommonQueryNames.deleteMany,
+            CommonQueryNames.DELETE_MANY,
           );
 
           const typeORMObjectRecordsParser =

packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/delete-one-resolver.factory.ts

@@ -51,7 +51,7 @@ export class DeleteOneResolverFactory
           const record = await this.commonDeleteOneQueryRunnerService.execute(
             { ...args, selectedFields },
             internalContext,
-            CommonQueryNames.deleteOne,
+            CommonQueryNames.DELETE_ONE,
           );
 
           const typeORMObjectRecordsParser =

packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/destroy-many-resolver.factory.ts

@@ -53,7 +53,7 @@ export class DestroyManyResolverFactory
             await this.commonDestroyManyQueryRunnerService.execute(
               { ...args, selectedFields },
               internalContext,
-              CommonQueryNames.destroyMany,
+              CommonQueryNames.DESTROY_MANY,
             );
 
           const typeORMObjectRecordsParser =

packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/destroy-one-resolver.factory.ts

@@ -51,7 +51,7 @@ export class DestroyOneResolverFactory
           const record = await this.commonDestroyOneQueryRunnerService.execute(
             { ...args, selectedFields },
             internalContext,
-            CommonQueryNames.destroyOne,
+            CommonQueryNames.DESTROY_ONE,
           );
 
           const typeORMObjectRecordsParser =

packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/find-many-resolver.factory.ts

@@ -55,7 +55,7 @@ export class FindManyResolverFactory
           } = await this.commonFindManyQueryRunnerService.execute(
             { ...args, selectedFields },
             internalContext,
-            CommonQueryNames.findMany,
+            CommonQueryNames.FIND_MANY,
           );
 
           const typeORMObjectRecordsParser =

packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/find-one-resolver.factory.ts

@@ -48,7 +48,7 @@ export class FindOneResolverFactory
           const record = await this.commonFindOneQueryRunnerService.execute(
             { ...args, selectedFields },
             internalContext,
-            CommonQueryNames.findOne,
+            CommonQueryNames.FIND_ONE,
           );
 
           const typeORMObjectRecordsParser =

packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/group-by-resolver.factory.ts

@@ -48,7 +48,7 @@ export class GroupByResolverFactory
           return await this.commonGroupByQueryRunnerService.execute(
             { ...args, selectedFields },
             internalContext,
-            CommonQueryNames.groupBy,
+            CommonQueryNames.GROUP_BY,
           );
         } catch (error) {
           return workspaceQueryRunnerGraphqlApiExceptionHandler(error);