Common - Remove feature flag (#15371)

To be done in an other PR, move graphql-query-runner handlers in
common-api-query-runner folder (+ renaming + typing improvments)


Fixes : 
- totalCount on findMany (Rest)
- getAllSelectedFields did not handle composite field (Rest)
- issue with endCursor (Rest)
- args processing for updateOne and createOne (Rest + Gql)
- fix findDuplicates (Gql)

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

@@ -3,7 +3,6 @@ import { Injectable } from '@nestjs/common';
 import graphqlFields from 'graphql-fields';
 import { ObjectRecord } from 'twenty-shared/types';
 
-import { type WorkspaceQueryRunnerOptions } from 'src/engine/api/graphql/workspace-query-runner/interfaces/query-runner-option.interface';
 import { type WorkspaceResolverBuilderFactoryInterface } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolver-builder-factory.interface';
 import {
   type CreateManyResolverArgs,
@@ -13,11 +12,8 @@ import { type WorkspaceSchemaBuilderContext } from 'src/engine/api/graphql/works
 
 import { CommonCreateManyQueryRunnerService } from 'src/engine/api/common/common-query-runners/common-create-many-query-runner/common-create-many-query-runner.service';
 import { ObjectRecordsToGraphqlConnectionHelper } from 'src/engine/api/graphql/graphql-query-runner/helpers/object-records-to-graphql-connection.helper';
-import { GraphqlQueryCreateManyResolverService } from 'src/engine/api/graphql/graphql-query-runner/resolvers/graphql-query-create-many-resolver.service';
 import { workspaceQueryRunnerGraphqlApiExceptionHandler } from 'src/engine/api/graphql/workspace-query-runner/utils/workspace-query-runner-graphql-api-exception-handler.util';
 import { RESOLVER_METHOD_NAMES } from 'src/engine/api/graphql/workspace-resolver-builder/constants/resolver-method-names';
-import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
-import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
 
 @Injectable()
 export class CreateManyResolverFactory
@@ -26,9 +22,7 @@ export class CreateManyResolverFactory
   public static methodName = RESOLVER_METHOD_NAMES.CREATE_MANY;
 
   constructor(
-    private readonly graphqlQueryRunnerService: GraphqlQueryCreateManyResolverService,
     private readonly commonCreateManyQueryRunnerService: CommonCreateManyQueryRunnerService,
-    private readonly twentyORMGlobalManager: TwentyORMGlobalManager,
   ) {}
 
   create(
@@ -37,54 +31,31 @@ export class CreateManyResolverFactory
     const internalContext = context;
 
     return async (_source, args, _context, info) => {
-      const workspaceDataSource =
-        await this.twentyORMGlobalManager.getDataSourceForWorkspace({
-          workspaceId: internalContext.authContext.workspace?.id as string,
-        });
+      const selectedFields = graphqlFields(info);
 
-      const featureFlagsMap = workspaceDataSource.featureFlagMap;
+      try {
+        const records = await this.commonCreateManyQueryRunnerService.execute(
+          { ...args, selectedFields },
+          internalContext,
+        );
 
-      if (featureFlagsMap[FeatureFlagKey.IS_COMMON_API_ENABLED]) {
-        const selectedFields = graphqlFields(info);
-
-        try {
-          const records = await this.commonCreateManyQueryRunnerService.execute(
-            { ...args, selectedFields },
-            internalContext,
+        const typeORMObjectRecordsParser =
+          new ObjectRecordsToGraphqlConnectionHelper(
+            internalContext.objectMetadataMaps,
           );
 
-          const typeORMObjectRecordsParser =
-            new ObjectRecordsToGraphqlConnectionHelper(
-              internalContext.objectMetadataMaps,
-            );
-
-          return records.map((record: ObjectRecord) =>
-            typeORMObjectRecordsParser.processRecord({
-              objectRecord: record,
-              objectName:
-                internalContext.objectMetadataItemWithFieldMaps.nameSingular,
-              take: 1,
-              totalCount: 1,
-            }),
-          );
-        } catch (error) {
-          workspaceQueryRunnerGraphqlApiExceptionHandler(error);
-        }
+        return records.map((record: ObjectRecord) =>
+          typeORMObjectRecordsParser.processRecord({
+            objectRecord: record,
+            objectName:
+              internalContext.objectMetadataItemWithFieldMaps.nameSingular,
+            take: 1,
+            totalCount: 1,
+          }),
+        );
+      } catch (error) {
+        workspaceQueryRunnerGraphqlApiExceptionHandler(error);
       }
-
-      const options: WorkspaceQueryRunnerOptions = {
-        authContext: internalContext.authContext,
-        info,
-        objectMetadataMaps: internalContext.objectMetadataMaps,
-        objectMetadataItemWithFieldMaps:
-          internalContext.objectMetadataItemWithFieldMaps,
-      };
-
-      return await this.graphqlQueryRunnerService.execute(
-        args,
-        options,
-        CreateManyResolverFactory.methodName,
-      );
     };
   }
 }

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

@@ -2,7 +2,6 @@ import { Injectable } from '@nestjs/common';
 
 import graphqlFields from 'graphql-fields';
 
-import { type WorkspaceQueryRunnerOptions } from 'src/engine/api/graphql/workspace-query-runner/interfaces/query-runner-option.interface';
 import { type WorkspaceResolverBuilderFactoryInterface } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolver-builder-factory.interface';
 import {
   type CreateOneResolverArgs,
@@ -12,11 +11,8 @@ import { type WorkspaceSchemaBuilderContext } from 'src/engine/api/graphql/works
 
 import { CommonCreateOneQueryRunnerService } from 'src/engine/api/common/common-query-runners/common-create-one-query-runner.service';
 import { ObjectRecordsToGraphqlConnectionHelper } from 'src/engine/api/graphql/graphql-query-runner/helpers/object-records-to-graphql-connection.helper';
-import { GraphqlQueryCreateOneResolverService } from 'src/engine/api/graphql/graphql-query-runner/resolvers/graphql-query-create-one-resolver.service';
 import { workspaceQueryRunnerGraphqlApiExceptionHandler } from 'src/engine/api/graphql/workspace-query-runner/utils/workspace-query-runner-graphql-api-exception-handler.util';
 import { RESOLVER_METHOD_NAMES } from 'src/engine/api/graphql/workspace-resolver-builder/constants/resolver-method-names';
-import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
-import { FeatureFlagService } from 'src/engine/core-modules/feature-flag/services/feature-flag.service';
 
 @Injectable()
 export class CreateOneResolverFactory
@@ -25,8 +21,6 @@ export class CreateOneResolverFactory
   public static methodName = RESOLVER_METHOD_NAMES.CREATE_ONE;
 
   constructor(
-    private readonly graphqlQueryRunnerService: GraphqlQueryCreateOneResolverService,
-    private readonly featureFlagService: FeatureFlagService,
     private readonly commonCreateOneQueryRunnerService: CommonCreateOneQueryRunnerService,
   ) {}
 
@@ -36,50 +30,29 @@ export class CreateOneResolverFactory
     const internalContext = context;
 
     return async (_source, args, _context, info) => {
-      const isCommonApiEnabled = await this.featureFlagService.isFeatureEnabled(
-        FeatureFlagKey.IS_COMMON_API_ENABLED,
-        internalContext.authContext.workspace?.id as string,
-      );
+      const selectedFields = graphqlFields(info);
 
-      if (isCommonApiEnabled) {
-        const selectedFields = graphqlFields(info);
+      try {
+        const record = await this.commonCreateOneQueryRunnerService.execute(
+          { ...args, selectedFields },
+          internalContext,
+        );
 
-        try {
-          const record = await this.commonCreateOneQueryRunnerService.execute(
-            { ...args, selectedFields },
-            internalContext,
+        const typeORMObjectRecordsParser =
+          new ObjectRecordsToGraphqlConnectionHelper(
+            internalContext.objectMetadataMaps,
           );
 
-          const typeORMObjectRecordsParser =
-            new ObjectRecordsToGraphqlConnectionHelper(
-              internalContext.objectMetadataMaps,
-            );
-
-          return typeORMObjectRecordsParser.processRecord({
-            objectRecord: record,
-            objectName:
-              internalContext.objectMetadataItemWithFieldMaps.nameSingular,
-            take: 1,
-            totalCount: 1,
-          });
-        } catch (error) {
-          workspaceQueryRunnerGraphqlApiExceptionHandler(error);
-        }
+        return typeORMObjectRecordsParser.processRecord({
+          objectRecord: record,
+          objectName:
+            internalContext.objectMetadataItemWithFieldMaps.nameSingular,
+          take: 1,
+          totalCount: 1,
+        });
+      } catch (error) {
+        workspaceQueryRunnerGraphqlApiExceptionHandler(error);
       }
-
-      const options: WorkspaceQueryRunnerOptions = {
-        authContext: internalContext.authContext,
-        info,
-        objectMetadataMaps: internalContext.objectMetadataMaps,
-        objectMetadataItemWithFieldMaps:
-          internalContext.objectMetadataItemWithFieldMaps,
-      };
-
-      return await this.graphqlQueryRunnerService.execute(
-        args,
-        options,
-        CreateOneResolverFactory.methodName,
-      );
     };
   }
 }

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

@@ -3,7 +3,6 @@ import { Injectable } from '@nestjs/common';
 import graphqlFields from 'graphql-fields';
 import { ObjectRecord } from 'twenty-shared/types';
 
-import { type WorkspaceQueryRunnerOptions } from 'src/engine/api/graphql/workspace-query-runner/interfaces/query-runner-option.interface';
 import { type WorkspaceResolverBuilderFactoryInterface } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolver-builder-factory.interface';
 import {
   type DeleteManyResolverArgs,
@@ -13,11 +12,8 @@ import { type WorkspaceSchemaBuilderContext } from 'src/engine/api/graphql/works
 
 import { CommonDeleteManyQueryRunnerService } from 'src/engine/api/common/common-query-runners/common-delete-many-query-runner.service';
 import { ObjectRecordsToGraphqlConnectionHelper } from 'src/engine/api/graphql/graphql-query-runner/helpers/object-records-to-graphql-connection.helper';
-import { GraphqlQueryDeleteManyResolverService } from 'src/engine/api/graphql/graphql-query-runner/resolvers/graphql-query-delete-many-resolver.service';
 import { workspaceQueryRunnerGraphqlApiExceptionHandler } from 'src/engine/api/graphql/workspace-query-runner/utils/workspace-query-runner-graphql-api-exception-handler.util';
 import { RESOLVER_METHOD_NAMES } from 'src/engine/api/graphql/workspace-resolver-builder/constants/resolver-method-names';
-import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
-import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
 
 @Injectable()
 export class DeleteManyResolverFactory
@@ -26,9 +22,7 @@ export class DeleteManyResolverFactory
   public static methodName = RESOLVER_METHOD_NAMES.DELETE_MANY;
 
   constructor(
-    private readonly graphqlQueryRunnerService: GraphqlQueryDeleteManyResolverService,
     private readonly commonDeleteManyQueryRunnerService: CommonDeleteManyQueryRunnerService,
-    private readonly twentyORMGlobalManager: TwentyORMGlobalManager,
   ) {}
 
   create(
@@ -37,54 +31,31 @@ export class DeleteManyResolverFactory
     const internalContext = context;
 
     return async (_source, args, _context, info) => {
-      const workspaceDataSource =
-        await this.twentyORMGlobalManager.getDataSourceForWorkspace({
-          workspaceId: internalContext.authContext.workspace?.id as string,
-        });
+      const selectedFields = graphqlFields(info);
 
-      const featureFlagsMap = workspaceDataSource.featureFlagMap;
+      try {
+        const records = await this.commonDeleteManyQueryRunnerService.execute(
+          { ...args, selectedFields },
+          internalContext,
+        );
 
-      if (featureFlagsMap[FeatureFlagKey.IS_COMMON_API_ENABLED]) {
-        const selectedFields = graphqlFields(info);
-
-        try {
-          const records = await this.commonDeleteManyQueryRunnerService.execute(
-            { ...args, selectedFields },
-            internalContext,
+        const typeORMObjectRecordsParser =
+          new ObjectRecordsToGraphqlConnectionHelper(
+            internalContext.objectMetadataMaps,
           );
 
-          const typeORMObjectRecordsParser =
-            new ObjectRecordsToGraphqlConnectionHelper(
-              internalContext.objectMetadataMaps,
-            );
-
-          return records.map((record: ObjectRecord) =>
-            typeORMObjectRecordsParser.processRecord({
-              objectRecord: record,
-              objectName:
-                internalContext.objectMetadataItemWithFieldMaps.nameSingular,
-              take: 1,
-              totalCount: 1,
-            }),
-          );
-        } catch (error) {
-          workspaceQueryRunnerGraphqlApiExceptionHandler(error);
-        }
+        return records.map((record: ObjectRecord) =>
+          typeORMObjectRecordsParser.processRecord({
+            objectRecord: record,
+            objectName:
+              internalContext.objectMetadataItemWithFieldMaps.nameSingular,
+            take: 1,
+            totalCount: 1,
+          }),
+        );
+      } catch (error) {
+        workspaceQueryRunnerGraphqlApiExceptionHandler(error);
       }
-
-      const options: WorkspaceQueryRunnerOptions = {
-        authContext: internalContext.authContext,
-        info,
-        objectMetadataMaps: internalContext.objectMetadataMaps,
-        objectMetadataItemWithFieldMaps:
-          internalContext.objectMetadataItemWithFieldMaps,
-      };
-
-      return await this.graphqlQueryRunnerService.execute(
-        args,
-        options,
-        DeleteManyResolverFactory.methodName,
-      );
     };
   }
 }

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

@@ -2,7 +2,6 @@ import { Injectable } from '@nestjs/common';
 
 import graphqlFields from 'graphql-fields';
 
-import { type WorkspaceQueryRunnerOptions } from 'src/engine/api/graphql/workspace-query-runner/interfaces/query-runner-option.interface';
 import { type WorkspaceResolverBuilderFactoryInterface } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolver-builder-factory.interface';
 import {
   type DeleteOneResolverArgs,
@@ -12,11 +11,8 @@ import { type WorkspaceSchemaBuilderContext } from 'src/engine/api/graphql/works
 
 import { CommonDeleteOneQueryRunnerService } from 'src/engine/api/common/common-query-runners/common-delete-one-query-runner.service';
 import { ObjectRecordsToGraphqlConnectionHelper } from 'src/engine/api/graphql/graphql-query-runner/helpers/object-records-to-graphql-connection.helper';
-import { GraphqlQueryDeleteOneResolverService } from 'src/engine/api/graphql/graphql-query-runner/resolvers/graphql-query-delete-one-resolver.service';
 import { workspaceQueryRunnerGraphqlApiExceptionHandler } from 'src/engine/api/graphql/workspace-query-runner/utils/workspace-query-runner-graphql-api-exception-handler.util';
 import { RESOLVER_METHOD_NAMES } from 'src/engine/api/graphql/workspace-resolver-builder/constants/resolver-method-names';
-import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
-import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
 
 @Injectable()
 export class DeleteOneResolverFactory
@@ -25,9 +21,7 @@ export class DeleteOneResolverFactory
   public static methodName = RESOLVER_METHOD_NAMES.DELETE_ONE;
 
   constructor(
-    private readonly graphqlQueryRunnerService: GraphqlQueryDeleteOneResolverService,
     private readonly commonDeleteOneQueryRunnerService: CommonDeleteOneQueryRunnerService,
-    private readonly twentyORMGlobalManager: TwentyORMGlobalManager,
   ) {}
 
   create(
@@ -36,52 +30,29 @@ export class DeleteOneResolverFactory
     const internalContext = context;
 
     return async (_source, args, _context, info) => {
-      const workspaceDataSource =
-        await this.twentyORMGlobalManager.getDataSourceForWorkspace({
-          workspaceId: internalContext.authContext.workspace?.id as string,
-        });
+      const selectedFields = graphqlFields(info);
 
-      const featureFlagsMap = workspaceDataSource.featureFlagMap;
+      try {
+        const record = await this.commonDeleteOneQueryRunnerService.execute(
+          { ...args, selectedFields },
+          internalContext,
+        );
 
-      if (featureFlagsMap[FeatureFlagKey.IS_COMMON_API_ENABLED]) {
-        const selectedFields = graphqlFields(info);
-
-        try {
-          const record = await this.commonDeleteOneQueryRunnerService.execute(
-            { ...args, selectedFields },
-            internalContext,
+        const typeORMObjectRecordsParser =
+          new ObjectRecordsToGraphqlConnectionHelper(
+            internalContext.objectMetadataMaps,
           );
 
-          const typeORMObjectRecordsParser =
-            new ObjectRecordsToGraphqlConnectionHelper(
-              internalContext.objectMetadataMaps,
-            );
-
-          return typeORMObjectRecordsParser.processRecord({
-            objectRecord: record,
-            objectName:
-              internalContext.objectMetadataItemWithFieldMaps.nameSingular,
-            take: 1,
-            totalCount: 1,
-          });
-        } catch (error) {
-          workspaceQueryRunnerGraphqlApiExceptionHandler(error);
-        }
+        return typeORMObjectRecordsParser.processRecord({
+          objectRecord: record,
+          objectName:
+            internalContext.objectMetadataItemWithFieldMaps.nameSingular,
+          take: 1,
+          totalCount: 1,
+        });
+      } catch (error) {
+        workspaceQueryRunnerGraphqlApiExceptionHandler(error);
       }
-
-      const options: WorkspaceQueryRunnerOptions = {
-        authContext: internalContext.authContext,
-        info,
-        objectMetadataMaps: internalContext.objectMetadataMaps,
-        objectMetadataItemWithFieldMaps:
-          internalContext.objectMetadataItemWithFieldMaps,
-      };
-
-      return await this.graphqlQueryRunnerService.execute(
-        args,
-        options,
-        DeleteOneResolverFactory.methodName,
-      );
     };
   }
 }

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

@@ -3,7 +3,6 @@ import { Injectable } from '@nestjs/common';
 import graphqlFields from 'graphql-fields';
 import { ObjectRecord } from 'twenty-shared/types';
 
-import { type WorkspaceQueryRunnerOptions } from 'src/engine/api/graphql/workspace-query-runner/interfaces/query-runner-option.interface';
 import { type WorkspaceResolverBuilderFactoryInterface } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolver-builder-factory.interface';
 import {
   type DestroyManyResolverArgs,
@@ -13,11 +12,8 @@ import { type WorkspaceSchemaBuilderContext } from 'src/engine/api/graphql/works
 
 import { CommonDestroyManyQueryRunnerService } from 'src/engine/api/common/common-query-runners/common-destroy-many-query-runner.service';
 import { ObjectRecordsToGraphqlConnectionHelper } from 'src/engine/api/graphql/graphql-query-runner/helpers/object-records-to-graphql-connection.helper';
-import { GraphqlQueryDestroyManyResolverService } from 'src/engine/api/graphql/graphql-query-runner/resolvers/graphql-query-destroy-many-resolver.service';
 import { workspaceQueryRunnerGraphqlApiExceptionHandler } from 'src/engine/api/graphql/workspace-query-runner/utils/workspace-query-runner-graphql-api-exception-handler.util';
 import { RESOLVER_METHOD_NAMES } from 'src/engine/api/graphql/workspace-resolver-builder/constants/resolver-method-names';
-import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
-import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
 
 @Injectable()
 export class DestroyManyResolverFactory
@@ -26,9 +22,7 @@ export class DestroyManyResolverFactory
   public static methodName = RESOLVER_METHOD_NAMES.DESTROY_MANY;
 
   constructor(
-    private readonly graphqlQueryRunnerService: GraphqlQueryDestroyManyResolverService,
     private readonly commonDestroyManyQueryRunnerService: CommonDestroyManyQueryRunnerService,
-    private readonly twentyORMGlobalManager: TwentyORMGlobalManager,
   ) {}
 
   create(
@@ -37,55 +31,31 @@ export class DestroyManyResolverFactory
     const internalContext = context;
 
     return async (_source, args, _context, info) => {
-      const workspaceDataSource =
-        await this.twentyORMGlobalManager.getDataSourceForWorkspace({
-          workspaceId: internalContext.authContext.workspace?.id as string,
-        });
+      const selectedFields = graphqlFields(info);
 
-      const featureFlagsMap = workspaceDataSource.featureFlagMap;
+      try {
+        const records = await this.commonDestroyManyQueryRunnerService.execute(
+          { ...args, selectedFields },
+          internalContext,
+        );
 
-      if (featureFlagsMap[FeatureFlagKey.IS_COMMON_API_ENABLED]) {
-        const selectedFields = graphqlFields(info);
-
-        try {
-          const records =
-            await this.commonDestroyManyQueryRunnerService.execute(
-              { ...args, selectedFields },
-              internalContext,
-            );
-
-          const typeORMObjectRecordsParser =
-            new ObjectRecordsToGraphqlConnectionHelper(
-              internalContext.objectMetadataMaps,
-            );
-
-          return records.map((record: ObjectRecord) =>
-            typeORMObjectRecordsParser.processRecord({
-              objectRecord: record,
-              objectName:
-                internalContext.objectMetadataItemWithFieldMaps.nameSingular,
-              take: 1,
-              totalCount: 1,
-            }),
+        const typeORMObjectRecordsParser =
+          new ObjectRecordsToGraphqlConnectionHelper(
+            internalContext.objectMetadataMaps,
           );
-        } catch (error) {
-          workspaceQueryRunnerGraphqlApiExceptionHandler(error);
-        }
+
+        return records.map((record: ObjectRecord) =>
+          typeORMObjectRecordsParser.processRecord({
+            objectRecord: record,
+            objectName:
+              internalContext.objectMetadataItemWithFieldMaps.nameSingular,
+            take: 1,
+            totalCount: 1,
+          }),
+        );
+      } catch (error) {
+        workspaceQueryRunnerGraphqlApiExceptionHandler(error);
       }
-
-      const options: WorkspaceQueryRunnerOptions = {
-        authContext: internalContext.authContext,
-        info,
-        objectMetadataMaps: internalContext.objectMetadataMaps,
-        objectMetadataItemWithFieldMaps:
-          internalContext.objectMetadataItemWithFieldMaps,
-      };
-
-      return await this.graphqlQueryRunnerService.execute(
-        args,
-        options,
-        DestroyManyResolverFactory.methodName,
-      );
     };
   }
 }

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

@@ -2,7 +2,6 @@ import { Injectable } from '@nestjs/common';
 
 import graphqlFields from 'graphql-fields';
 
-import { type WorkspaceQueryRunnerOptions } from 'src/engine/api/graphql/workspace-query-runner/interfaces/query-runner-option.interface';
 import { type WorkspaceResolverBuilderFactoryInterface } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolver-builder-factory.interface';
 import {
   type DestroyOneResolverArgs,
@@ -12,11 +11,8 @@ import { type WorkspaceSchemaBuilderContext } from 'src/engine/api/graphql/works
 
 import { CommonDestroyOneQueryRunnerService } from 'src/engine/api/common/common-query-runners/common-destroy-one-query-runner.service';
 import { ObjectRecordsToGraphqlConnectionHelper } from 'src/engine/api/graphql/graphql-query-runner/helpers/object-records-to-graphql-connection.helper';
-import { GraphqlQueryDestroyOneResolverService } from 'src/engine/api/graphql/graphql-query-runner/resolvers/graphql-query-destroy-one-resolver.service';
 import { workspaceQueryRunnerGraphqlApiExceptionHandler } from 'src/engine/api/graphql/workspace-query-runner/utils/workspace-query-runner-graphql-api-exception-handler.util';
 import { RESOLVER_METHOD_NAMES } from 'src/engine/api/graphql/workspace-resolver-builder/constants/resolver-method-names';
-import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
-import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
 
 @Injectable()
 export class DestroyOneResolverFactory
@@ -25,9 +21,7 @@ export class DestroyOneResolverFactory
   public static methodName = RESOLVER_METHOD_NAMES.DESTROY_ONE;
 
   constructor(
-    private readonly graphQLQueryRunnerService: GraphqlQueryDestroyOneResolverService,
     private readonly commonDestroyOneQueryRunnerService: CommonDestroyOneQueryRunnerService,
-    private readonly twentyORMGlobalManager: TwentyORMGlobalManager,
   ) {}
 
   create(
@@ -36,52 +30,29 @@ export class DestroyOneResolverFactory
     const internalContext = context;
 
     return async (_source, args, _context, info) => {
-      const workspaceDataSource =
-        await this.twentyORMGlobalManager.getDataSourceForWorkspace({
-          workspaceId: internalContext.authContext.workspace?.id as string,
-        });
+      const selectedFields = graphqlFields(info);
 
-      const featureFlagsMap = workspaceDataSource.featureFlagMap;
+      try {
+        const record = await this.commonDestroyOneQueryRunnerService.execute(
+          { ...args, selectedFields },
+          internalContext,
+        );
 
-      if (featureFlagsMap[FeatureFlagKey.IS_COMMON_API_ENABLED]) {
-        const selectedFields = graphqlFields(info);
-
-        try {
-          const record = await this.commonDestroyOneQueryRunnerService.execute(
-            { ...args, selectedFields },
-            internalContext,
+        const typeORMObjectRecordsParser =
+          new ObjectRecordsToGraphqlConnectionHelper(
+            internalContext.objectMetadataMaps,
           );
 
-          const typeORMObjectRecordsParser =
-            new ObjectRecordsToGraphqlConnectionHelper(
-              internalContext.objectMetadataMaps,
-            );
-
-          return typeORMObjectRecordsParser.processRecord({
-            objectRecord: record,
-            objectName:
-              internalContext.objectMetadataItemWithFieldMaps.nameSingular,
-            take: 1,
-            totalCount: 1,
-          });
-        } catch (error) {
-          workspaceQueryRunnerGraphqlApiExceptionHandler(error);
-        }
+        return typeORMObjectRecordsParser.processRecord({
+          objectRecord: record,
+          objectName:
+            internalContext.objectMetadataItemWithFieldMaps.nameSingular,
+          take: 1,
+          totalCount: 1,
+        });
+      } catch (error) {
+        workspaceQueryRunnerGraphqlApiExceptionHandler(error);
       }
-
-      const options: WorkspaceQueryRunnerOptions = {
-        authContext: internalContext.authContext,
-        info,
-        objectMetadataMaps: internalContext.objectMetadataMaps,
-        objectMetadataItemWithFieldMaps:
-          internalContext.objectMetadataItemWithFieldMaps,
-      };
-
-      return await this.graphQLQueryRunnerService.execute(
-        args,
-        options,
-        DestroyOneResolverFactory.methodName,
-      );
     };
   }
 }

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

@@ -3,7 +3,6 @@ import { Injectable } from '@nestjs/common';
 import graphqlFields from 'graphql-fields';
 import { OrderByDirection } from 'twenty-shared/types';
 
-import { type WorkspaceQueryRunnerOptions } from 'src/engine/api/graphql/workspace-query-runner/interfaces/query-runner-option.interface';
 import { type WorkspaceResolverBuilderFactoryInterface } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolver-builder-factory.interface';
 import {
   type FindDuplicatesResolverArgs,
@@ -13,11 +12,8 @@ import { type WorkspaceSchemaBuilderContext } from 'src/engine/api/graphql/works
 
 import { CommonFindDuplicatesQueryRunnerService } from 'src/engine/api/common/common-query-runners/common-find-duplicates-query-runner.service';
 import { ObjectRecordsToGraphqlConnectionHelper } from 'src/engine/api/graphql/graphql-query-runner/helpers/object-records-to-graphql-connection.helper';
-import { GraphqlQueryFindDuplicatesResolverService } from 'src/engine/api/graphql/graphql-query-runner/resolvers/graphql-query-find-duplicates-resolver.service';
 import { workspaceQueryRunnerGraphqlApiExceptionHandler } from 'src/engine/api/graphql/workspace-query-runner/utils/workspace-query-runner-graphql-api-exception-handler.util';
 import { RESOLVER_METHOD_NAMES } from 'src/engine/api/graphql/workspace-resolver-builder/constants/resolver-method-names';
-import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
-import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
 
 @Injectable()
 export class FindDuplicatesResolverFactory
@@ -26,9 +22,7 @@ export class FindDuplicatesResolverFactory
   public static methodName = RESOLVER_METHOD_NAMES.FIND_DUPLICATES;
 
   constructor(
-    private readonly graphqlQueryRunnerService: GraphqlQueryFindDuplicatesResolverService,
     private readonly commonFindDuplicatesQueryRunnerService: CommonFindDuplicatesQueryRunnerService,
-    private readonly twentyORMGlobalManager: TwentyORMGlobalManager,
   ) {}
 
   create(
@@ -37,58 +31,35 @@ export class FindDuplicatesResolverFactory
     const internalContext = context;
 
     return async (_source, args, _context, info) => {
-      const workspaceDataSource =
-        await this.twentyORMGlobalManager.getDataSourceForWorkspace({
-          workspaceId: internalContext.authContext.workspace?.id as string,
-        });
+      const selectedFields = graphqlFields(info);
 
-      const featureFlagsMap = workspaceDataSource.featureFlagMap;
-
-      if (featureFlagsMap[FeatureFlagKey.IS_COMMON_API_ENABLED]) {
-        const selectedFields = graphqlFields(info);
-
-        try {
-          const paginatedDuplicates =
-            await this.commonFindDuplicatesQueryRunnerService.execute(
-              { ...args, selectedFields },
-              internalContext,
-            );
-
-          const typeORMObjectRecordsParser =
-            new ObjectRecordsToGraphqlConnectionHelper(
-              internalContext.objectMetadataMaps,
-            );
-
-          return paginatedDuplicates.map((duplicate) =>
-            typeORMObjectRecordsParser.createConnection({
-              objectRecords: duplicate.records,
-              objectName:
-                internalContext.objectMetadataItemWithFieldMaps.nameSingular,
-              take: duplicate.records.length,
-              totalCount: duplicate.totalCount,
-              order: [{ id: OrderByDirection.AscNullsFirst }],
-              hasNextPage: duplicate.hasNextPage,
-              hasPreviousPage: duplicate.hasPreviousPage,
-            }),
+      try {
+        const paginatedDuplicates =
+          await this.commonFindDuplicatesQueryRunnerService.execute(
+            { ...args, selectedFields },
+            internalContext,
           );
-        } catch (error) {
-          workspaceQueryRunnerGraphqlApiExceptionHandler(error);
-        }
+
+        const typeORMObjectRecordsParser =
+          new ObjectRecordsToGraphqlConnectionHelper(
+            internalContext.objectMetadataMaps,
+          );
+
+        return paginatedDuplicates.map((duplicate) =>
+          typeORMObjectRecordsParser.createConnection({
+            objectRecords: duplicate.records,
+            objectName:
+              internalContext.objectMetadataItemWithFieldMaps.nameSingular,
+            take: duplicate.records.length,
+            totalCount: duplicate.totalCount,
+            order: [{ id: OrderByDirection.AscNullsFirst }],
+            hasNextPage: duplicate.hasNextPage,
+            hasPreviousPage: duplicate.hasPreviousPage,
+          }),
+        );
+      } catch (error) {
+        workspaceQueryRunnerGraphqlApiExceptionHandler(error);
       }
-
-      const options: WorkspaceQueryRunnerOptions = {
-        authContext: internalContext.authContext,
-        info,
-        objectMetadataMaps: internalContext.objectMetadataMaps,
-        objectMetadataItemWithFieldMaps:
-          internalContext.objectMetadataItemWithFieldMaps,
-      };
-
-      return await this.graphqlQueryRunnerService.execute(
-        args,
-        options,
-        FindDuplicatesResolverFactory.methodName,
-      );
     };
   }
 }

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

@@ -12,11 +12,8 @@ import { WorkspaceSchemaBuilderContext } from 'src/engine/api/graphql/workspace-
 
 import { CommonFindManyQueryRunnerService } from 'src/engine/api/common/common-query-runners/common-find-many-query-runner.service';
 import { ObjectRecordsToGraphqlConnectionHelper } from 'src/engine/api/graphql/graphql-query-runner/helpers/object-records-to-graphql-connection.helper';
-import { GraphqlQueryFindManyResolverService } from 'src/engine/api/graphql/graphql-query-runner/resolvers/graphql-query-find-many-resolver.service';
 import { workspaceQueryRunnerGraphqlApiExceptionHandler } from 'src/engine/api/graphql/workspace-query-runner/utils/workspace-query-runner-graphql-api-exception-handler.util';
 import { RESOLVER_METHOD_NAMES } from 'src/engine/api/graphql/workspace-resolver-builder/constants/resolver-method-names';
-import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
-import { FeatureFlagService } from 'src/engine/core-modules/feature-flag/services/feature-flag.service';
 
 @Injectable()
 export class FindManyResolverFactory
@@ -26,8 +23,6 @@ export class FindManyResolverFactory
 
   constructor(
     private readonly commonFindManyQueryRunnerService: CommonFindManyQueryRunnerService,
-    private readonly graphqlQueryRunnerService: GraphqlQueryFindManyResolverService,
-    private readonly featureFlagService: FeatureFlagService,
   ) {}
 
   create(
@@ -36,59 +31,40 @@ export class FindManyResolverFactory
     const internalContext = context;
 
     return async (_source, args, _context, info) => {
-      const isCommonApiEnabled = await this.featureFlagService.isFeatureEnabled(
-        FeatureFlagKey.IS_COMMON_API_ENABLED,
-        internalContext.authContext.workspace?.id as string,
-      );
+      const selectedFields = graphqlFields(info);
 
-      if (isCommonApiEnabled) {
-        const selectedFields = graphqlFields(info);
+      try {
+        const {
+          records,
+          aggregatedValues,
+          totalCount,
+          pageInfo,
+          selectedFieldsResult,
+        } = await this.commonFindManyQueryRunnerService.execute(
+          { ...args, selectedFields },
+          internalContext,
+        );
 
-        try {
-          const {
-            records,
-            aggregatedValues,
-            totalCount,
-            pageInfo,
-            selectedFieldsResult,
-          } = await this.commonFindManyQueryRunnerService.execute(
-            { ...args, selectedFields },
-            internalContext,
+        const typeORMObjectRecordsParser =
+          new ObjectRecordsToGraphqlConnectionHelper(
+            internalContext.objectMetadataMaps,
           );
 
-          const typeORMObjectRecordsParser =
-            new ObjectRecordsToGraphqlConnectionHelper(
-              internalContext.objectMetadataMaps,
-            );
-
-          return typeORMObjectRecordsParser.createConnection({
-            objectRecords: records,
-            objectRecordsAggregatedValues: aggregatedValues,
-            selectedAggregatedFields: selectedFieldsResult.aggregate,
-            objectName:
-              internalContext.objectMetadataItemWithFieldMaps.nameSingular,
-            take: args.first ?? args.last ?? QUERY_MAX_RECORDS,
-            totalCount,
-            order: args.orderBy,
-            hasNextPage: pageInfo.hasNextPage,
-            hasPreviousPage: pageInfo.hasPreviousPage,
-          });
-        } catch (error) {
-          workspaceQueryRunnerGraphqlApiExceptionHandler(error);
-        }
+        return typeORMObjectRecordsParser.createConnection({
+          objectRecords: records,
+          objectRecordsAggregatedValues: aggregatedValues,
+          selectedAggregatedFields: selectedFieldsResult.aggregate,
+          objectName:
+            internalContext.objectMetadataItemWithFieldMaps.nameSingular,
+          take: args.first ?? args.last ?? QUERY_MAX_RECORDS,
+          totalCount,
+          order: args.orderBy,
+          hasNextPage: pageInfo.hasNextPage,
+          hasPreviousPage: pageInfo.hasPreviousPage,
+        });
+      } catch (error) {
+        workspaceQueryRunnerGraphqlApiExceptionHandler(error);
       }
-
-      return await this.graphqlQueryRunnerService.execute(
-        args,
-        {
-          authContext: internalContext.authContext,
-          info,
-          objectMetadataMaps: internalContext.objectMetadataMaps,
-          objectMetadataItemWithFieldMaps:
-            internalContext.objectMetadataItemWithFieldMaps,
-        },
-        FindManyResolverFactory.methodName,
-      );
     };
   }
 }

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

@@ -11,11 +11,8 @@ import { WorkspaceSchemaBuilderContext } from 'src/engine/api/graphql/workspace-
 
 import { CommonFindOneQueryRunnerService } from 'src/engine/api/common/common-query-runners/common-find-one-query-runner.service';
 import { ObjectRecordsToGraphqlConnectionHelper } from 'src/engine/api/graphql/graphql-query-runner/helpers/object-records-to-graphql-connection.helper';
-import { GraphqlQueryFindOneResolverService } from 'src/engine/api/graphql/graphql-query-runner/resolvers/graphql-query-find-one-resolver.service';
 import { workspaceQueryRunnerGraphqlApiExceptionHandler } from 'src/engine/api/graphql/workspace-query-runner/utils/workspace-query-runner-graphql-api-exception-handler.util';
 import { RESOLVER_METHOD_NAMES } from 'src/engine/api/graphql/workspace-resolver-builder/constants/resolver-method-names';
-import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
-import { FeatureFlagService } from 'src/engine/core-modules/feature-flag/services/feature-flag.service';
 
 @Injectable()
 export class FindOneResolverFactory
@@ -25,8 +22,6 @@ export class FindOneResolverFactory
 
   constructor(
     private readonly commonFindOneQueryRunnerService: CommonFindOneQueryRunnerService,
-    private readonly featureFlagService: FeatureFlagService,
-    private readonly graphqlQueryRunnerService: GraphqlQueryFindOneResolverService,
   ) {}
 
   create(
@@ -35,48 +30,29 @@ export class FindOneResolverFactory
     const internalContext = context;
 
     return async (_source, args, _context, info) => {
-      const isCommonApiEnabled = await this.featureFlagService.isFeatureEnabled(
-        FeatureFlagKey.IS_COMMON_API_ENABLED,
-        internalContext.authContext.workspace?.id as string,
-      );
+      try {
+        const selectedFields = graphqlFields(info);
 
-      if (isCommonApiEnabled) {
-        try {
-          const selectedFields = graphqlFields(info);
+        const record = await this.commonFindOneQueryRunnerService.execute(
+          { ...args, selectedFields },
+          internalContext,
+        );
 
-          const record = await this.commonFindOneQueryRunnerService.execute(
-            { ...args, selectedFields },
-            internalContext,
+        const typeORMObjectRecordsParser =
+          new ObjectRecordsToGraphqlConnectionHelper(
+            internalContext.objectMetadataMaps,
           );
 
-          const typeORMObjectRecordsParser =
-            new ObjectRecordsToGraphqlConnectionHelper(
-              internalContext.objectMetadataMaps,
-            );
-
-          return typeORMObjectRecordsParser.processRecord({
-            objectRecord: record,
-            objectName:
-              internalContext.objectMetadataItemWithFieldMaps.nameSingular,
-            take: 1,
-            totalCount: 1,
-          });
-        } catch (error) {
-          workspaceQueryRunnerGraphqlApiExceptionHandler(error);
-        }
+        return typeORMObjectRecordsParser.processRecord({
+          objectRecord: record,
+          objectName:
+            internalContext.objectMetadataItemWithFieldMaps.nameSingular,
+          take: 1,
+          totalCount: 1,
+        });
+      } catch (error) {
+        workspaceQueryRunnerGraphqlApiExceptionHandler(error);
       }
-
-      return await this.graphqlQueryRunnerService.execute(
-        args,
-        {
-          authContext: internalContext.authContext,
-          info,
-          objectMetadataMaps: internalContext.objectMetadataMaps,
-          objectMetadataItemWithFieldMaps:
-            internalContext.objectMetadataItemWithFieldMaps,
-        },
-        FindOneResolverFactory.methodName,
-      );
     };
   }
 }

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

@@ -2,7 +2,6 @@ import { Injectable } from '@nestjs/common';
 
 import graphqlFields from 'graphql-fields';
 
-import { type WorkspaceQueryRunnerOptions } from 'src/engine/api/graphql/workspace-query-runner/interfaces/query-runner-option.interface';
 import { type WorkspaceResolverBuilderFactoryInterface } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolver-builder-factory.interface';
 import {
   type MergeManyResolverArgs,
@@ -12,11 +11,8 @@ import { WorkspaceSchemaBuilderContext } from 'src/engine/api/graphql/workspace-
 
 import { CommonMergeManyQueryRunnerService } from 'src/engine/api/common/common-query-runners/common-merge-many-query-runner.service';
 import { ObjectRecordsToGraphqlConnectionHelper } from 'src/engine/api/graphql/graphql-query-runner/helpers/object-records-to-graphql-connection.helper';
-import { GraphqlQueryMergeManyResolverService } from 'src/engine/api/graphql/graphql-query-runner/resolvers/graphql-query-merge-many-resolver.service';
 import { workspaceQueryRunnerGraphqlApiExceptionHandler } from 'src/engine/api/graphql/workspace-query-runner/utils/workspace-query-runner-graphql-api-exception-handler.util';
 import { RESOLVER_METHOD_NAMES } from 'src/engine/api/graphql/workspace-resolver-builder/constants/resolver-method-names';
-import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
-import { FeatureFlagService } from 'src/engine/core-modules/feature-flag/services/feature-flag.service';
 
 @Injectable()
 export class MergeManyResolverFactory
@@ -25,9 +21,7 @@ export class MergeManyResolverFactory
   public static methodName = RESOLVER_METHOD_NAMES.MERGE_MANY;
 
   constructor(
-    private readonly graphqlQueryRunnerService: GraphqlQueryMergeManyResolverService,
     private readonly commonMergeManyQueryRunnerService: CommonMergeManyQueryRunnerService,
-    private readonly featureFlagService: FeatureFlagService,
   ) {}
 
   create(
@@ -36,50 +30,29 @@ export class MergeManyResolverFactory
     const internalContext = context;
 
     return async (_source, args, _context, info) => {
-      const isCommonApiEnabled = await this.featureFlagService.isFeatureEnabled(
-        FeatureFlagKey.IS_COMMON_API_ENABLED,
-        internalContext.authContext.workspace?.id as string,
-      );
+      const selectedFields = graphqlFields(info);
 
-      if (isCommonApiEnabled) {
-        const selectedFields = graphqlFields(info);
+      try {
+        const record = await this.commonMergeManyQueryRunnerService.execute(
+          { ...args, selectedFields },
+          internalContext,
+        );
 
-        try {
-          const record = await this.commonMergeManyQueryRunnerService.execute(
-            { ...args, selectedFields },
-            internalContext,
+        const typeORMObjectRecordsParser =
+          new ObjectRecordsToGraphqlConnectionHelper(
+            internalContext.objectMetadataMaps,
           );
 
-          const typeORMObjectRecordsParser =
-            new ObjectRecordsToGraphqlConnectionHelper(
-              internalContext.objectMetadataMaps,
-            );
-
-          return typeORMObjectRecordsParser.processRecord({
-            objectRecord: record,
-            objectName:
-              internalContext.objectMetadataItemWithFieldMaps.nameSingular,
-            take: 1,
-            totalCount: 1,
-          });
-        } catch (error) {
-          workspaceQueryRunnerGraphqlApiExceptionHandler(error);
-        }
+        return typeORMObjectRecordsParser.processRecord({
+          objectRecord: record,
+          objectName:
+            internalContext.objectMetadataItemWithFieldMaps.nameSingular,
+          take: 1,
+          totalCount: 1,
+        });
+      } catch (error) {
+        workspaceQueryRunnerGraphqlApiExceptionHandler(error);
       }
-
-      const options: WorkspaceQueryRunnerOptions = {
-        authContext: internalContext.authContext,
-        info,
-        objectMetadataMaps: internalContext.objectMetadataMaps,
-        objectMetadataItemWithFieldMaps:
-          internalContext.objectMetadataItemWithFieldMaps,
-      };
-
-      return await this.graphqlQueryRunnerService.execute(
-        args,
-        options,
-        MergeManyResolverFactory.methodName,
-      );
     };
   }
 }

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

@@ -3,7 +3,6 @@ import { Injectable } from '@nestjs/common';
 import graphqlFields from 'graphql-fields';
 import { ObjectRecord } from 'twenty-shared/types';
 
-import { type WorkspaceQueryRunnerOptions } from 'src/engine/api/graphql/workspace-query-runner/interfaces/query-runner-option.interface';
 import { type WorkspaceResolverBuilderFactoryInterface } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolver-builder-factory.interface';
 import {
   type Resolver,
@@ -13,11 +12,8 @@ import { type WorkspaceSchemaBuilderContext } from 'src/engine/api/graphql/works
 
 import { CommonRestoreManyQueryRunnerService } from 'src/engine/api/common/common-query-runners/common-restore-many-query-runner.service';
 import { ObjectRecordsToGraphqlConnectionHelper } from 'src/engine/api/graphql/graphql-query-runner/helpers/object-records-to-graphql-connection.helper';
-import { GraphqlQueryRestoreManyResolverService } from 'src/engine/api/graphql/graphql-query-runner/resolvers/graphql-query-restore-many-resolver.service';
 import { workspaceQueryRunnerGraphqlApiExceptionHandler } from 'src/engine/api/graphql/workspace-query-runner/utils/workspace-query-runner-graphql-api-exception-handler.util';
 import { RESOLVER_METHOD_NAMES } from 'src/engine/api/graphql/workspace-resolver-builder/constants/resolver-method-names';
-import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
-import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
 
 @Injectable()
 export class RestoreManyResolverFactory
@@ -26,8 +22,6 @@ export class RestoreManyResolverFactory
   public static methodName = RESOLVER_METHOD_NAMES.RESTORE_MANY;
 
   constructor(
-    private readonly graphqlQueryRunnerService: GraphqlQueryRestoreManyResolverService,
-    private readonly twentyORMGlobalManager: TwentyORMGlobalManager,
     private readonly commonRestoreManyQueryRunnerService: CommonRestoreManyQueryRunnerService,
   ) {}
 
@@ -37,54 +31,31 @@ export class RestoreManyResolverFactory
     const internalContext = context;
 
     return async (_source, args, _context, info) => {
-      const workspaceDataSource =
-        await this.twentyORMGlobalManager.getDataSourceForWorkspace({
-          workspaceId: internalContext.authContext.workspace?.id as string,
-        });
+      const selectedFields = graphqlFields(info);
 
-      const featureFlagsMap = workspaceDataSource.featureFlagMap;
+      try {
+        const records = await this.commonRestoreManyQueryRunnerService.execute(
+          { ...args, selectedFields },
+          internalContext,
+        );
 
-      if (featureFlagsMap[FeatureFlagKey.IS_COMMON_API_ENABLED]) {
-        const selectedFields = graphqlFields(info);
-
-        try {
-          const records =
-            await this.commonRestoreManyQueryRunnerService.execute(
-              { ...args, selectedFields },
-              internalContext,
-            );
-
-          const typeORMObjectRecordsParser =
-            new ObjectRecordsToGraphqlConnectionHelper(
-              internalContext.objectMetadataMaps,
-            );
-
-          return records.map((record: ObjectRecord) =>
-            typeORMObjectRecordsParser.processRecord({
-              objectRecord: record,
-              objectName:
-                internalContext.objectMetadataItemWithFieldMaps.nameSingular,
-              take: 1,
-              totalCount: 1,
-            }),
+        const typeORMObjectRecordsParser =
+          new ObjectRecordsToGraphqlConnectionHelper(
+            internalContext.objectMetadataMaps,
           );
-        } catch (error) {
-          workspaceQueryRunnerGraphqlApiExceptionHandler(error);
-        }
-      }
-      const options: WorkspaceQueryRunnerOptions = {
-        authContext: internalContext.authContext,
-        info,
-        objectMetadataMaps: internalContext.objectMetadataMaps,
-        objectMetadataItemWithFieldMaps:
-          internalContext.objectMetadataItemWithFieldMaps,
-      };
 
-      return await this.graphqlQueryRunnerService.execute(
-        args,
-        options,
-        RestoreManyResolverFactory.methodName,
-      );
+        return records.map((record: ObjectRecord) =>
+          typeORMObjectRecordsParser.processRecord({
+            objectRecord: record,
+            objectName:
+              internalContext.objectMetadataItemWithFieldMaps.nameSingular,
+            take: 1,
+            totalCount: 1,
+          }),
+        );
+      } catch (error) {
+        workspaceQueryRunnerGraphqlApiExceptionHandler(error);
+      }
     };
   }
 }

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

@@ -2,7 +2,6 @@ import { Injectable } from '@nestjs/common';
 
 import graphqlFields from 'graphql-fields';
 
-import { type WorkspaceQueryRunnerOptions } from 'src/engine/api/graphql/workspace-query-runner/interfaces/query-runner-option.interface';
 import { type WorkspaceResolverBuilderFactoryInterface } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolver-builder-factory.interface';
 import {
   type Resolver,
@@ -12,11 +11,8 @@ import { type WorkspaceSchemaBuilderContext } from 'src/engine/api/graphql/works
 
 import { CommonRestoreOneQueryRunnerService } from 'src/engine/api/common/common-query-runners/common-restore-one-query-runner.service';
 import { ObjectRecordsToGraphqlConnectionHelper } from 'src/engine/api/graphql/graphql-query-runner/helpers/object-records-to-graphql-connection.helper';
-import { GraphqlQueryRestoreOneResolverService } from 'src/engine/api/graphql/graphql-query-runner/resolvers/graphql-query-restore-one-resolver.service';
 import { workspaceQueryRunnerGraphqlApiExceptionHandler } from 'src/engine/api/graphql/workspace-query-runner/utils/workspace-query-runner-graphql-api-exception-handler.util';
 import { RESOLVER_METHOD_NAMES } from 'src/engine/api/graphql/workspace-resolver-builder/constants/resolver-method-names';
-import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
-import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
 
 @Injectable()
 export class RestoreOneResolverFactory
@@ -25,8 +21,6 @@ export class RestoreOneResolverFactory
   public static methodName = RESOLVER_METHOD_NAMES.RESTORE_ONE;
 
   constructor(
-    private readonly graphqlQueryRunnerService: GraphqlQueryRestoreOneResolverService,
-    private readonly twentyORMGlobalManager: TwentyORMGlobalManager,
     private readonly commonRestoreOneQueryRunnerService: CommonRestoreOneQueryRunnerService,
   ) {}
 
@@ -36,52 +30,29 @@ export class RestoreOneResolverFactory
     const internalContext = context;
 
     return async (_source, args, _context, info) => {
-      const workspaceDataSource =
-        await this.twentyORMGlobalManager.getDataSourceForWorkspace({
-          workspaceId: internalContext.authContext.workspace?.id as string,
-        });
+      const selectedFields = graphqlFields(info);
 
-      const featureFlagsMap = workspaceDataSource.featureFlagMap;
+      try {
+        const record = await this.commonRestoreOneQueryRunnerService.execute(
+          { ...args, selectedFields },
+          internalContext,
+        );
 
-      if (featureFlagsMap[FeatureFlagKey.IS_COMMON_API_ENABLED]) {
-        const selectedFields = graphqlFields(info);
-
-        try {
-          const record = await this.commonRestoreOneQueryRunnerService.execute(
-            { ...args, selectedFields },
-            internalContext,
+        const typeORMObjectRecordsParser =
+          new ObjectRecordsToGraphqlConnectionHelper(
+            internalContext.objectMetadataMaps,
           );
 
-          const typeORMObjectRecordsParser =
-            new ObjectRecordsToGraphqlConnectionHelper(
-              internalContext.objectMetadataMaps,
-            );
-
-          return typeORMObjectRecordsParser.processRecord({
-            objectRecord: record,
-            objectName:
-              internalContext.objectMetadataItemWithFieldMaps.nameSingular,
-            take: 1,
-            totalCount: 1,
-          });
-        } catch (error) {
-          workspaceQueryRunnerGraphqlApiExceptionHandler(error);
-        }
+        return typeORMObjectRecordsParser.processRecord({
+          objectRecord: record,
+          objectName:
+            internalContext.objectMetadataItemWithFieldMaps.nameSingular,
+          take: 1,
+          totalCount: 1,
+        });
+      } catch (error) {
+        workspaceQueryRunnerGraphqlApiExceptionHandler(error);
       }
-
-      const options: WorkspaceQueryRunnerOptions = {
-        authContext: internalContext.authContext,
-        info,
-        objectMetadataMaps: internalContext.objectMetadataMaps,
-        objectMetadataItemWithFieldMaps:
-          internalContext.objectMetadataItemWithFieldMaps,
-      };
-
-      return await this.graphqlQueryRunnerService.execute(
-        args,
-        options,
-        RestoreOneResolverFactory.methodName,
-      );
     };
   }
 }

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

@@ -3,7 +3,6 @@ import { Injectable } from '@nestjs/common';
 import graphqlFields from 'graphql-fields';
 import { ObjectRecord } from 'twenty-shared/types';
 
-import { type WorkspaceQueryRunnerOptions } from 'src/engine/api/graphql/workspace-query-runner/interfaces/query-runner-option.interface';
 import { type WorkspaceResolverBuilderFactoryInterface } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolver-builder-factory.interface';
 import {
   type Resolver,
@@ -13,11 +12,8 @@ import { type WorkspaceSchemaBuilderContext } from 'src/engine/api/graphql/works
 
 import { CommonUpdateManyQueryRunnerService } from 'src/engine/api/common/common-query-runners/common-update-many-query-runner.service';
 import { ObjectRecordsToGraphqlConnectionHelper } from 'src/engine/api/graphql/graphql-query-runner/helpers/object-records-to-graphql-connection.helper';
-import { GraphqlQueryUpdateManyResolverService } from 'src/engine/api/graphql/graphql-query-runner/resolvers/graphql-query-update-many-resolver.service';
 import { workspaceQueryRunnerGraphqlApiExceptionHandler } from 'src/engine/api/graphql/workspace-query-runner/utils/workspace-query-runner-graphql-api-exception-handler.util';
 import { RESOLVER_METHOD_NAMES } from 'src/engine/api/graphql/workspace-resolver-builder/constants/resolver-method-names';
-import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
-import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
 
 @Injectable()
 export class UpdateManyResolverFactory
@@ -26,9 +22,7 @@ export class UpdateManyResolverFactory
   public static methodName = RESOLVER_METHOD_NAMES.UPDATE_MANY;
 
   constructor(
-    private readonly graphqlQueryRunnerService: GraphqlQueryUpdateManyResolverService,
     private readonly commonUpdateManyQueryRunnerService: CommonUpdateManyQueryRunnerService,
-    private readonly twentyORMGlobalManager: TwentyORMGlobalManager,
   ) {}
 
   create(
@@ -37,54 +31,31 @@ export class UpdateManyResolverFactory
     const internalContext = context;
 
     return async (_source, args, _context, info) => {
-      const workspaceDataSource =
-        await this.twentyORMGlobalManager.getDataSourceForWorkspace({
-          workspaceId: internalContext.authContext.workspace?.id as string,
-        });
+      const selectedFields = graphqlFields(info);
 
-      const featureFlagsMap = workspaceDataSource.featureFlagMap;
+      try {
+        const records = await this.commonUpdateManyQueryRunnerService.execute(
+          { ...args, selectedFields },
+          internalContext,
+        );
 
-      if (featureFlagsMap[FeatureFlagKey.IS_COMMON_API_ENABLED]) {
-        const selectedFields = graphqlFields(info);
-
-        try {
-          const records = await this.commonUpdateManyQueryRunnerService.execute(
-            { ...args, selectedFields },
-            internalContext,
+        const typeORMObjectRecordsParser =
+          new ObjectRecordsToGraphqlConnectionHelper(
+            internalContext.objectMetadataMaps,
           );
 
-          const typeORMObjectRecordsParser =
-            new ObjectRecordsToGraphqlConnectionHelper(
-              internalContext.objectMetadataMaps,
-            );
-
-          return records.map((record: ObjectRecord) =>
-            typeORMObjectRecordsParser.processRecord({
-              objectRecord: record,
-              objectName:
-                internalContext.objectMetadataItemWithFieldMaps.nameSingular,
-              take: 1,
-              totalCount: 1,
-            }),
-          );
-        } catch (error) {
-          workspaceQueryRunnerGraphqlApiExceptionHandler(error);
-        }
+        return records.map((record: ObjectRecord) =>
+          typeORMObjectRecordsParser.processRecord({
+            objectRecord: record,
+            objectName:
+              internalContext.objectMetadataItemWithFieldMaps.nameSingular,
+            take: 1,
+            totalCount: 1,
+          }),
+        );
+      } catch (error) {
+        workspaceQueryRunnerGraphqlApiExceptionHandler(error);
       }
-
-      const options: WorkspaceQueryRunnerOptions = {
-        authContext: internalContext.authContext,
-        info,
-        objectMetadataMaps: internalContext.objectMetadataMaps,
-        objectMetadataItemWithFieldMaps:
-          internalContext.objectMetadataItemWithFieldMaps,
-      };
-
-      return await this.graphqlQueryRunnerService.execute(
-        args,
-        options,
-        UpdateManyResolverFactory.methodName,
-      );
     };
   }
 }

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

@@ -2,7 +2,6 @@ import { Injectable } from '@nestjs/common';
 
 import graphqlFields from 'graphql-fields';
 
-import { type WorkspaceQueryRunnerOptions } from 'src/engine/api/graphql/workspace-query-runner/interfaces/query-runner-option.interface';
 import { type WorkspaceResolverBuilderFactoryInterface } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolver-builder-factory.interface';
 import {
   type Resolver,
@@ -12,11 +11,8 @@ import { type WorkspaceSchemaBuilderContext } from 'src/engine/api/graphql/works
 
 import { CommonUpdateOneQueryRunnerService } from 'src/engine/api/common/common-query-runners/common-update-one-query-runner.service';
 import { ObjectRecordsToGraphqlConnectionHelper } from 'src/engine/api/graphql/graphql-query-runner/helpers/object-records-to-graphql-connection.helper';
-import { GraphqlQueryUpdateOneResolverService } from 'src/engine/api/graphql/graphql-query-runner/resolvers/graphql-query-update-one-resolver.service';
 import { workspaceQueryRunnerGraphqlApiExceptionHandler } from 'src/engine/api/graphql/workspace-query-runner/utils/workspace-query-runner-graphql-api-exception-handler.util';
 import { RESOLVER_METHOD_NAMES } from 'src/engine/api/graphql/workspace-resolver-builder/constants/resolver-method-names';
-import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
-import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
 
 @Injectable()
 export class UpdateOneResolverFactory
@@ -25,9 +21,7 @@ export class UpdateOneResolverFactory
   public static methodName = RESOLVER_METHOD_NAMES.UPDATE_ONE;
 
   constructor(
-    private readonly graphqlQueryRunnerService: GraphqlQueryUpdateOneResolverService,
     private readonly commonUpdateOneQueryRunnerService: CommonUpdateOneQueryRunnerService,
-    private readonly twentyORMGlobalManager: TwentyORMGlobalManager,
   ) {}
 
   create(
@@ -36,52 +30,29 @@ export class UpdateOneResolverFactory
     const internalContext = context;
 
     return async (_source, args, _context, info) => {
-      const workspaceDataSource =
-        await this.twentyORMGlobalManager.getDataSourceForWorkspace({
-          workspaceId: internalContext.authContext.workspace?.id as string,
-        });
+      const selectedFields = graphqlFields(info);
 
-      const featureFlagsMap = workspaceDataSource.featureFlagMap;
+      try {
+        const record = await this.commonUpdateOneQueryRunnerService.execute(
+          { ...args, selectedFields },
+          internalContext,
+        );
 
-      if (featureFlagsMap[FeatureFlagKey.IS_COMMON_API_ENABLED]) {
-        const selectedFields = graphqlFields(info);
-
-        try {
-          const record = await this.commonUpdateOneQueryRunnerService.execute(
-            { ...args, selectedFields },
-            internalContext,
+        const typeORMObjectRecordsParser =
+          new ObjectRecordsToGraphqlConnectionHelper(
+            internalContext.objectMetadataMaps,
           );
 
-          const typeORMObjectRecordsParser =
-            new ObjectRecordsToGraphqlConnectionHelper(
-              internalContext.objectMetadataMaps,
-            );
-
-          return typeORMObjectRecordsParser.processRecord({
-            objectRecord: record,
-            objectName:
-              internalContext.objectMetadataItemWithFieldMaps.nameSingular,
-            take: 1,
-            totalCount: 1,
-          });
-        } catch (error) {
-          workspaceQueryRunnerGraphqlApiExceptionHandler(error);
-        }
+        return typeORMObjectRecordsParser.processRecord({
+          objectRecord: record,
+          objectName:
+            internalContext.objectMetadataItemWithFieldMaps.nameSingular,
+          take: 1,
+          totalCount: 1,
+        });
+      } catch (error) {
+        workspaceQueryRunnerGraphqlApiExceptionHandler(error);
       }
-
-      const options: WorkspaceQueryRunnerOptions = {
-        authContext: internalContext.authContext,
-        info,
-        objectMetadataMaps: internalContext.objectMetadataMaps,
-        objectMetadataItemWithFieldMaps:
-          internalContext.objectMetadataItemWithFieldMaps,
-      };
-
-      return await this.graphqlQueryRunnerService.execute(
-        args,
-        options,
-        UpdateOneResolverFactory.methodName,
-      );
     };
   }
 }