Refactor graphql query runner and add mutation resolvers (#7418)

Fixes https://github.com/twentyhq/twenty/issues/6859 This PR adds all the remaining resolvers for - updateOne/updateMany - createOne/createMany - deleteOne/deleteMany - destroyOne - restoreMany Also - refactored the graphql-query-runner to be able to add other resolvers without too much boilerplate. - add missing events that were not sent anymore as well as webhooks - make resolver injectable so they can inject other services as well - use objectMetadataMap from cache instead of computing it multiple time - various fixes (mutation not correctly parsing JSON, relationHelper fetching data with empty ids set, ...) Next steps: - Wrapping query builder to handle DB events properly - Move webhook emitters to db event listener - Add pagination where it's missing (findDuplicates, nested relations, etc...)
2024-10-04 11:58:33 +02:00
parent 8afa504b65
commit 511150a2d3
43 changed files with 1696 additions and 775 deletions
--- a/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/create-many-resolver.factory.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/create-many-resolver.factory.ts
@ -1,5 +1,6 @@
 import { Injectable } from '@nestjs/common';

+import { WorkspaceQueryRunnerOptions } from 'src/engine/api/graphql/workspace-query-runner/interfaces/query-runner-option.interface';
 import { WorkspaceResolverBuilderFactoryInterface } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolver-builder-factory.interface';
 import {
  CreateManyResolverArgs,
@ -32,12 +33,14 @@ export class CreateManyResolverFactory

    return async (_source, args, _context, info) => {
      try {
-        const options = {
+        const options: WorkspaceQueryRunnerOptions = {
          authContext: internalContext.authContext,
          objectMetadataItem: internalContext.objectMetadataItem,
          info,
          fieldMetadataCollection: internalContext.fieldMetadataCollection,
          objectMetadataCollection: internalContext.objectMetadataCollection,
+          objectMetadataMap: internalContext.objectMetadataMap,
+          objectMetadataMapItem: internalContext.objectMetadataMapItem,
        };

        const isQueryRunnerTwentyORMEnabled =
--- a/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/create-one-resolver.factory.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/create-one-resolver.factory.ts
@ -1,5 +1,6 @@
 import { Injectable } from '@nestjs/common';

+import { WorkspaceQueryRunnerOptions } from 'src/engine/api/graphql/workspace-query-runner/interfaces/query-runner-option.interface';
 import { WorkspaceResolverBuilderFactoryInterface } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolver-builder-factory.interface';
 import {
  CreateOneResolverArgs,
@ -32,12 +33,14 @@ export class CreateOneResolverFactory

    return async (_source, args, _context, info) => {
      try {
-        const options = {
+        const options: WorkspaceQueryRunnerOptions = {
          authContext: internalContext.authContext,
          objectMetadataItem: internalContext.objectMetadataItem,
          info,
          fieldMetadataCollection: internalContext.fieldMetadataCollection,
          objectMetadataCollection: internalContext.objectMetadataCollection,
+          objectMetadataMap: internalContext.objectMetadataMap,
+          objectMetadataMapItem: internalContext.objectMetadataMapItem,
        };

        const isQueryRunnerTwentyORMEnabled =
@ -50,13 +53,7 @@ export class CreateOneResolverFactory
          return await this.graphqlQueryRunnerService.createOne(args, options);
        }

-        return await this.workspaceQueryRunnerService.createOne(args, {
-          authContext: internalContext.authContext,
-          objectMetadataItem: internalContext.objectMetadataItem,
-          info,
-          fieldMetadataCollection: internalContext.fieldMetadataCollection,
-          objectMetadataCollection: internalContext.objectMetadataCollection,
-        });
+        return await this.workspaceQueryRunnerService.createOne(args, options);
      } catch (error) {
        workspaceQueryRunnerGraphqlApiExceptionHandler(error);
      }
--- a/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/delete-many-resolver.factory.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/delete-many-resolver.factory.ts
@ -1,5 +1,6 @@
 import { Injectable } from '@nestjs/common';

+import { WorkspaceQueryRunnerOptions } from 'src/engine/api/graphql/workspace-query-runner/interfaces/query-runner-option.interface';
 import { WorkspaceResolverBuilderFactoryInterface } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolver-builder-factory.interface';
 import {
  DeleteManyResolverArgs,
@ -7,8 +8,11 @@ import {
 } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
 import { WorkspaceSchemaBuilderContext } from 'src/engine/api/graphql/workspace-schema-builder/interfaces/workspace-schema-builder-context.interface';

+import { GraphqlQueryRunnerService } from 'src/engine/api/graphql/graphql-query-runner/graphql-query-runner.service';
 import { workspaceQueryRunnerGraphqlApiExceptionHandler } from 'src/engine/api/graphql/workspace-query-runner/utils/workspace-query-runner-graphql-api-exception-handler.util';
 import { WorkspaceQueryRunnerService } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-runner.service';
+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 DeleteManyResolverFactory
@ -18,6 +22,8 @@ export class DeleteManyResolverFactory

  constructor(
    private readonly workspaceQueryRunnerService: WorkspaceQueryRunnerService,
+    private readonly featureFlagService: FeatureFlagService,
+    private readonly graphqlQueryRunnerService: GraphqlQueryRunnerService,
  ) {}

  create(
@ -27,13 +33,27 @@ export class DeleteManyResolverFactory

    return async (_source, args, context, info) => {
      try {
-        return await this.workspaceQueryRunnerService.deleteMany(args, {
+        const options: WorkspaceQueryRunnerOptions = {
          authContext: internalContext.authContext,
          objectMetadataItem: internalContext.objectMetadataItem,
          info,
          fieldMetadataCollection: internalContext.fieldMetadataCollection,
          objectMetadataCollection: internalContext.objectMetadataCollection,
-        });
+          objectMetadataMap: internalContext.objectMetadataMap,
+          objectMetadataMapItem: internalContext.objectMetadataMapItem,
+        };
+
+        const isQueryRunnerTwentyORMEnabled =
+          await this.featureFlagService.isFeatureEnabled(
+            FeatureFlagKey.IsQueryRunnerTwentyORMEnabled,
+            internalContext.authContext.workspace.id,
+          );
+
+        if (isQueryRunnerTwentyORMEnabled) {
+          return await this.graphqlQueryRunnerService.deleteMany(args, options);
+        }
+
+        return await this.workspaceQueryRunnerService.deleteMany(args, options);
      } catch (error) {
        workspaceQueryRunnerGraphqlApiExceptionHandler(error);
      }
--- a/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/delete-one-resolver.factory.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/delete-one-resolver.factory.ts
@ -1,5 +1,6 @@
 import { Injectable } from '@nestjs/common';

+import { WorkspaceQueryRunnerOptions } from 'src/engine/api/graphql/workspace-query-runner/interfaces/query-runner-option.interface';
 import { WorkspaceResolverBuilderFactoryInterface } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolver-builder-factory.interface';
 import {
  DeleteOneResolverArgs,
@ -7,8 +8,11 @@ import {
 } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
 import { WorkspaceSchemaBuilderContext } from 'src/engine/api/graphql/workspace-schema-builder/interfaces/workspace-schema-builder-context.interface';

+import { GraphqlQueryRunnerService } from 'src/engine/api/graphql/graphql-query-runner/graphql-query-runner.service';
 import { workspaceQueryRunnerGraphqlApiExceptionHandler } from 'src/engine/api/graphql/workspace-query-runner/utils/workspace-query-runner-graphql-api-exception-handler.util';
 import { WorkspaceQueryRunnerService } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-runner.service';
+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 DeleteOneResolverFactory
@ -18,6 +22,8 @@ export class DeleteOneResolverFactory

  constructor(
    private readonly workspaceQueryRunnerService: WorkspaceQueryRunnerService,
+    private readonly featureFlagService: FeatureFlagService,
+    private readonly graphqlQueryRunnerService: GraphqlQueryRunnerService,
  ) {}

  create(
@ -27,13 +33,27 @@ export class DeleteOneResolverFactory

    return async (_source, args, context, info) => {
      try {
-        return await this.workspaceQueryRunnerService.deleteOne(args, {
+        const options: WorkspaceQueryRunnerOptions = {
          authContext: internalContext.authContext,
          objectMetadataItem: internalContext.objectMetadataItem,
          info,
          fieldMetadataCollection: internalContext.fieldMetadataCollection,
          objectMetadataCollection: internalContext.objectMetadataCollection,
-        });
+          objectMetadataMap: internalContext.objectMetadataMap,
+          objectMetadataMapItem: internalContext.objectMetadataMapItem,
+        };
+
+        const isQueryRunnerTwentyORMEnabled =
+          await this.featureFlagService.isFeatureEnabled(
+            FeatureFlagKey.IsQueryRunnerTwentyORMEnabled,
+            internalContext.authContext.workspace.id,
+          );
+
+        if (isQueryRunnerTwentyORMEnabled) {
+          return await this.graphqlQueryRunnerService.deleteOne(args, options);
+        }
+
+        return await this.workspaceQueryRunnerService.deleteOne(args, options);
      } catch (error) {
        workspaceQueryRunnerGraphqlApiExceptionHandler(error);
      }
--- a/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/destroy-many-resolver.factory.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/destroy-many-resolver.factory.ts
@ -1,5 +1,6 @@
 import { Injectable } from '@nestjs/common';

+import { WorkspaceQueryRunnerOptions } from 'src/engine/api/graphql/workspace-query-runner/interfaces/query-runner-option.interface';
 import { WorkspaceResolverBuilderFactoryInterface } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolver-builder-factory.interface';
 import {
  DestroyManyResolverArgs,
@ -27,13 +28,20 @@ export class DestroyManyResolverFactory

    return async (_source, args, context, info) => {
      try {
-        return await this.workspaceQueryRunnerService.destroyMany(args, {
+        const options: WorkspaceQueryRunnerOptions = {
          authContext: internalContext.authContext,
          objectMetadataItem: internalContext.objectMetadataItem,
          info,
          fieldMetadataCollection: internalContext.fieldMetadataCollection,
          objectMetadataCollection: internalContext.objectMetadataCollection,
-        });
+          objectMetadataMap: internalContext.objectMetadataMap,
+          objectMetadataMapItem: internalContext.objectMetadataMapItem,
+        };
+
+        return await this.workspaceQueryRunnerService.destroyMany(
+          args,
+          options,
+        );
      } catch (error) {
        workspaceQueryRunnerGraphqlApiExceptionHandler(error);
      }
--- a/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/destroy-one-resolver.factory.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/destroy-one-resolver.factory.ts
@ -1,5 +1,6 @@
 import { Injectable } from '@nestjs/common';

+import { WorkspaceQueryRunnerOptions } from 'src/engine/api/graphql/workspace-query-runner/interfaces/query-runner-option.interface';
 import { WorkspaceResolverBuilderFactoryInterface } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolver-builder-factory.interface';
 import {
  DestroyOneResolverArgs,
@ -27,13 +28,17 @@ export class DestroyOneResolverFactory

    return async (_source, args, context, info) => {
      try {
-        return await this.graphQLQueryRunnerService.destroyOne(args, {
+        const options: WorkspaceQueryRunnerOptions = {
          authContext: internalContext.authContext,
          objectMetadataItem: internalContext.objectMetadataItem,
          info,
          fieldMetadataCollection: internalContext.fieldMetadataCollection,
          objectMetadataCollection: internalContext.objectMetadataCollection,
-        });
+          objectMetadataMap: internalContext.objectMetadataMap,
+          objectMetadataMapItem: internalContext.objectMetadataMapItem,
+        };
+
+        return await this.graphQLQueryRunnerService.destroyOne(args, options);
      } catch (error) {
        workspaceQueryRunnerGraphqlApiExceptionHandler(error);
      }
--- a/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/find-duplicates-resolver.factory.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/find-duplicates-resolver.factory.ts
@ -1,5 +1,6 @@
 import { Injectable } from '@nestjs/common';

+import { WorkspaceQueryRunnerOptions } from 'src/engine/api/graphql/workspace-query-runner/interfaces/query-runner-option.interface';
 import { WorkspaceResolverBuilderFactoryInterface } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolver-builder-factory.interface';
 import {
  FindDuplicatesResolverArgs,
@ -7,8 +8,11 @@ import {
 } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
 import { WorkspaceSchemaBuilderContext } from 'src/engine/api/graphql/workspace-schema-builder/interfaces/workspace-schema-builder-context.interface';

+import { GraphqlQueryRunnerService } from 'src/engine/api/graphql/graphql-query-runner/graphql-query-runner.service';
 import { workspaceQueryRunnerGraphqlApiExceptionHandler } from 'src/engine/api/graphql/workspace-query-runner/utils/workspace-query-runner-graphql-api-exception-handler.util';
 import { WorkspaceQueryRunnerService } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-runner.service';
+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 FindDuplicatesResolverFactory
@ -18,6 +22,8 @@ export class FindDuplicatesResolverFactory

  constructor(
    private readonly workspaceQueryRunnerService: WorkspaceQueryRunnerService,
+    private readonly featureFlagService: FeatureFlagService,
+    private readonly graphqlQueryRunnerService: GraphqlQueryRunnerService,
  ) {}

  create(
@ -27,13 +33,33 @@ export class FindDuplicatesResolverFactory

    return async (_source, args, context, info) => {
      try {
-        return await this.workspaceQueryRunnerService.findDuplicates(args, {
+        const options: WorkspaceQueryRunnerOptions = {
          authContext: internalContext.authContext,
          objectMetadataItem: internalContext.objectMetadataItem,
          info,
          fieldMetadataCollection: internalContext.fieldMetadataCollection,
          objectMetadataCollection: internalContext.objectMetadataCollection,
-        });
+          objectMetadataMap: internalContext.objectMetadataMap,
+          objectMetadataMapItem: internalContext.objectMetadataMapItem,
+        };
+
+        const isQueryRunnerTwentyORMEnabled =
+          await this.featureFlagService.isFeatureEnabled(
+            FeatureFlagKey.IsQueryRunnerTwentyORMEnabled,
+            internalContext.authContext.workspace.id,
+          );
+
+        if (isQueryRunnerTwentyORMEnabled) {
+          return await this.graphqlQueryRunnerService.findDuplicates(
+            args,
+            options,
+          );
+        }
+
+        return await this.workspaceQueryRunnerService.findDuplicates(
+          args,
+          options,
+        );
      } catch (error) {
        workspaceQueryRunnerGraphqlApiExceptionHandler(error);
      }
--- a/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/find-many-resolver.factory.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/find-many-resolver.factory.ts
@ -1,5 +1,6 @@
 import { Injectable } from '@nestjs/common';

+import { WorkspaceQueryRunnerOptions } from 'src/engine/api/graphql/workspace-query-runner/interfaces/query-runner-option.interface';
 import { WorkspaceResolverBuilderFactoryInterface } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolver-builder-factory.interface';
 import {
  FindManyResolverArgs,
@ -27,12 +28,14 @@ export class FindManyResolverFactory

    return async (_source, args, _context, info) => {
      try {
-        const options = {
+        const options: WorkspaceQueryRunnerOptions = {
          authContext: internalContext.authContext,
          objectMetadataItem: internalContext.objectMetadataItem,
          info,
          fieldMetadataCollection: internalContext.fieldMetadataCollection,
          objectMetadataCollection: internalContext.objectMetadataCollection,
+          objectMetadataMap: internalContext.objectMetadataMap,
+          objectMetadataMapItem: internalContext.objectMetadataMapItem,
        };

        return await this.graphqlQueryRunnerService.findMany(args, options);
--- a/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/find-one-resolver.factory.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/find-one-resolver.factory.ts
@ -1,5 +1,6 @@
 import { Injectable } from '@nestjs/common';

+import { WorkspaceQueryRunnerOptions } from 'src/engine/api/graphql/workspace-query-runner/interfaces/query-runner-option.interface';
 import { WorkspaceResolverBuilderFactoryInterface } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolver-builder-factory.interface';
 import {
  FindOneResolverArgs,
@ -27,12 +28,14 @@ export class FindOneResolverFactory

    return async (_source, args, _context, info) => {
      try {
-        const options = {
+        const options: WorkspaceQueryRunnerOptions = {
          authContext: internalContext.authContext,
          objectMetadataItem: internalContext.objectMetadataItem,
          info,
          fieldMetadataCollection: internalContext.fieldMetadataCollection,
          objectMetadataCollection: internalContext.objectMetadataCollection,
+          objectMetadataMap: internalContext.objectMetadataMap,
+          objectMetadataMapItem: internalContext.objectMetadataMapItem,
        };

        return await this.graphqlQueryRunnerService.findOne(args, options);
--- a/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/restore-many-resolver.factory.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/restore-many-resolver.factory.ts
@ -1,5 +1,6 @@
 import { Injectable } from '@nestjs/common';

+import { WorkspaceQueryRunnerOptions } from 'src/engine/api/graphql/workspace-query-runner/interfaces/query-runner-option.interface';
 import { WorkspaceResolverBuilderFactoryInterface } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolver-builder-factory.interface';
 import {
  Resolver,
@ -7,8 +8,11 @@ import {
 } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
 import { WorkspaceSchemaBuilderContext } from 'src/engine/api/graphql/workspace-schema-builder/interfaces/workspace-schema-builder-context.interface';

+import { GraphqlQueryRunnerService } from 'src/engine/api/graphql/graphql-query-runner/graphql-query-runner.service';
 import { workspaceQueryRunnerGraphqlApiExceptionHandler } from 'src/engine/api/graphql/workspace-query-runner/utils/workspace-query-runner-graphql-api-exception-handler.util';
 import { WorkspaceQueryRunnerService } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-runner.service';
+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 RestoreManyResolverFactory
@ -18,6 +22,8 @@ export class RestoreManyResolverFactory

  constructor(
    private readonly workspaceQueryRunnerService: WorkspaceQueryRunnerService,
+    private readonly featureFlagService: FeatureFlagService,
+    private readonly graphqlQueryRunnerService: GraphqlQueryRunnerService,
  ) {}

  create(
@ -27,13 +33,33 @@ export class RestoreManyResolverFactory

    return async (_source, args, context, info) => {
      try {
-        return await this.workspaceQueryRunnerService.restoreMany(args, {
+        const options: WorkspaceQueryRunnerOptions = {
          authContext: internalContext.authContext,
          objectMetadataItem: internalContext.objectMetadataItem,
          info,
          fieldMetadataCollection: internalContext.fieldMetadataCollection,
          objectMetadataCollection: internalContext.objectMetadataCollection,
-        });
+          objectMetadataMap: internalContext.objectMetadataMap,
+          objectMetadataMapItem: internalContext.objectMetadataMapItem,
+        };
+
+        const isQueryRunnerTwentyORMEnabled =
+          await this.featureFlagService.isFeatureEnabled(
+            FeatureFlagKey.IsQueryRunnerTwentyORMEnabled,
+            internalContext.authContext.workspace.id,
+          );
+
+        if (isQueryRunnerTwentyORMEnabled) {
+          return await this.graphqlQueryRunnerService.restoreMany(
+            args,
+            options,
+          );
+        }
+
+        return await this.workspaceQueryRunnerService.restoreMany(
+          args,
+          options,
+        );
      } catch (error) {
        workspaceQueryRunnerGraphqlApiExceptionHandler(error);
      }
--- a/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/search-resolver-factory.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/search-resolver-factory.ts
@ -1,5 +1,6 @@
 import { Injectable } from '@nestjs/common';

+import { WorkspaceQueryRunnerOptions } from 'src/engine/api/graphql/workspace-query-runner/interfaces/query-runner-option.interface';
 import { WorkspaceResolverBuilderFactoryInterface } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolver-builder-factory.interface';
 import {
  Resolver,
@ -25,13 +26,17 @@ export class SearchResolverFactory

    return async (_source, args, _context, info) => {
      try {
-        return await this.graphqlQueryRunnerService.search(args, {
+        const options: WorkspaceQueryRunnerOptions = {
          authContext: internalContext.authContext,
          objectMetadataItem: internalContext.objectMetadataItem,
          info,
          fieldMetadataCollection: internalContext.fieldMetadataCollection,
          objectMetadataCollection: internalContext.objectMetadataCollection,
-        });
+          objectMetadataMap: internalContext.objectMetadataMap,
+          objectMetadataMapItem: internalContext.objectMetadataMapItem,
+        };
+
+        return await this.graphqlQueryRunnerService.search(args, options);
      } catch (error) {
        workspaceQueryRunnerGraphqlApiExceptionHandler(error);
      }
--- a/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/update-many-resolver.factory.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/update-many-resolver.factory.ts
@ -1,5 +1,6 @@
 import { Injectable } from '@nestjs/common';

+import { WorkspaceQueryRunnerOptions } from 'src/engine/api/graphql/workspace-query-runner/interfaces/query-runner-option.interface';
 import { WorkspaceResolverBuilderFactoryInterface } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolver-builder-factory.interface';
 import {
  Resolver,
@ -7,8 +8,11 @@ import {
 } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
 import { WorkspaceSchemaBuilderContext } from 'src/engine/api/graphql/workspace-schema-builder/interfaces/workspace-schema-builder-context.interface';

+import { GraphqlQueryRunnerService } from 'src/engine/api/graphql/graphql-query-runner/graphql-query-runner.service';
 import { workspaceQueryRunnerGraphqlApiExceptionHandler } from 'src/engine/api/graphql/workspace-query-runner/utils/workspace-query-runner-graphql-api-exception-handler.util';
 import { WorkspaceQueryRunnerService } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-runner.service';
+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 UpdateManyResolverFactory
@ -18,6 +22,8 @@ export class UpdateManyResolverFactory

  constructor(
    private readonly workspaceQueryRunnerService: WorkspaceQueryRunnerService,
+    private readonly featureFlagService: FeatureFlagService,
+    private readonly graphqlQueryRunnerService: GraphqlQueryRunnerService,
  ) {}

  create(
@ -27,13 +33,27 @@ export class UpdateManyResolverFactory

    return async (_source, args, context, info) => {
      try {
-        return await this.workspaceQueryRunnerService.updateMany(args, {
+        const options: WorkspaceQueryRunnerOptions = {
          authContext: internalContext.authContext,
          objectMetadataItem: internalContext.objectMetadataItem,
          info,
          fieldMetadataCollection: internalContext.fieldMetadataCollection,
          objectMetadataCollection: internalContext.objectMetadataCollection,
-        });
+          objectMetadataMap: internalContext.objectMetadataMap,
+          objectMetadataMapItem: internalContext.objectMetadataMapItem,
+        };
+
+        const isQueryRunnerTwentyORMEnabled =
+          await this.featureFlagService.isFeatureEnabled(
+            FeatureFlagKey.IsQueryRunnerTwentyORMEnabled,
+            internalContext.authContext.workspace.id,
+          );
+
+        if (isQueryRunnerTwentyORMEnabled) {
+          return await this.graphqlQueryRunnerService.updateMany(args, options);
+        }
+
+        return await this.workspaceQueryRunnerService.updateMany(args, options);
      } catch (error) {
        workspaceQueryRunnerGraphqlApiExceptionHandler(error);
      }
--- a/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/update-one-resolver.factory.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/update-one-resolver.factory.ts
@ -1,5 +1,6 @@
 import { Injectable } from '@nestjs/common';

+import { WorkspaceQueryRunnerOptions } from 'src/engine/api/graphql/workspace-query-runner/interfaces/query-runner-option.interface';
 import { WorkspaceResolverBuilderFactoryInterface } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolver-builder-factory.interface';
 import {
  Resolver,
@ -7,8 +8,11 @@ import {
 } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
 import { WorkspaceSchemaBuilderContext } from 'src/engine/api/graphql/workspace-schema-builder/interfaces/workspace-schema-builder-context.interface';

+import { GraphqlQueryRunnerService } from 'src/engine/api/graphql/graphql-query-runner/graphql-query-runner.service';
 import { workspaceQueryRunnerGraphqlApiExceptionHandler } from 'src/engine/api/graphql/workspace-query-runner/utils/workspace-query-runner-graphql-api-exception-handler.util';
 import { WorkspaceQueryRunnerService } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-runner.service';
+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 UpdateOneResolverFactory
@ -18,6 +22,8 @@ export class UpdateOneResolverFactory

  constructor(
    private readonly workspaceQueryRunnerService: WorkspaceQueryRunnerService,
+    private readonly featureFlagService: FeatureFlagService,
+    private readonly graphqlQueryRunnerService: GraphqlQueryRunnerService,
  ) {}

  create(
@ -27,13 +33,27 @@ export class UpdateOneResolverFactory

    return async (_source, args, context, info) => {
      try {
-        return await this.workspaceQueryRunnerService.updateOne(args, {
+        const options: WorkspaceQueryRunnerOptions = {
          authContext: internalContext.authContext,
          objectMetadataItem: internalContext.objectMetadataItem,
          info,
          fieldMetadataCollection: internalContext.fieldMetadataCollection,
          objectMetadataCollection: internalContext.objectMetadataCollection,
-        });
+          objectMetadataMap: internalContext.objectMetadataMap,
+          objectMetadataMapItem: internalContext.objectMetadataMapItem,
+        };
+
+        const isQueryRunnerTwentyORMEnabled =
+          await this.featureFlagService.isFeatureEnabled(
+            FeatureFlagKey.IsQueryRunnerTwentyORMEnabled,
+            internalContext.authContext.workspace.id,
+          );
+
+        if (isQueryRunnerTwentyORMEnabled) {
+          return await this.graphqlQueryRunnerService.updateOne(args, options);
+        }
+
+        return await this.workspaceQueryRunnerService.updateOne(args, options);
      } catch (error) {
        workspaceQueryRunnerGraphqlApiExceptionHandler(error);
      }
--- a/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/workspace-resolver.factory.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/workspace-resolver.factory.ts
@ -11,6 +11,7 @@ import { RestoreManyResolverFactory } from 'src/engine/api/graphql/workspace-res
 import { SearchResolverFactory } from 'src/engine/api/graphql/workspace-resolver-builder/factories/search-resolver-factory';
 import { UpdateManyResolverFactory } from 'src/engine/api/graphql/workspace-resolver-builder/factories/update-many-resolver.factory';
 import { AuthContext } from 'src/engine/core-modules/auth/types/auth-context.type';
+import { ObjectMetadataMap } from 'src/engine/metadata-modules/utils/generate-object-metadata-map.util';
 import { getResolverName } from 'src/engine/utils/get-resolver-name.util';

 import { CreateManyResolverFactory } from './factories/create-many-resolver.factory';
@ -49,6 +50,7 @@ export class WorkspaceResolverFactory {
  async create(
    authContext: AuthContext,
    objectMetadataCollection: ObjectMetadataInterface[],
+    objectMetadataMap: ObjectMetadataMap,
    workspaceResolverBuilderMethods: WorkspaceResolverBuilderMethods,
  ): Promise<IResolvers> {
    const factories = new Map<
@ -94,7 +96,9 @@ export class WorkspaceResolverFactory {
          authContext,
          objectMetadataItem: objectMetadata,
          fieldMetadataCollection: objectMetadata.fields,
-          objectMetadataCollection: objectMetadataCollection,
+          objectMetadataCollection,
+          objectMetadataMap,
+          objectMetadataMapItem: objectMetadataMap[objectMetadata.nameSingular],
        });
      }

@ -117,7 +121,9 @@ export class WorkspaceResolverFactory {
          authContext,
          objectMetadataItem: objectMetadata,
          fieldMetadataCollection: objectMetadata.fields,
-          objectMetadataCollection: objectMetadataCollection,
+          objectMetadataCollection,
+          objectMetadataMap,
+          objectMetadataMapItem: objectMetadataMap[objectMetadata.nameSingular],
        });
      }
    }