Fix message channel processing (#12021)

Several users have complained about not being able to read their emails
anymore.

This is because the find-messages post query hook is expecting
ObjectRecord[] as an input but is actually getting a graphql Connection

Typing was wrong. This PR fixes the typing and make sure the post query
hook always get an ObjectRecord[]

packages/twenty-server/src/engine/api/graphql/graphql-query-runner/errors/graphql-query-runner.exception.ts

@@ -24,4 +24,5 @@ export enum GraphqlQueryRunnerExceptionCode {
   RELATION_TARGET_OBJECT_METADATA_NOT_FOUND = 'RELATION_TARGET_OBJECT_METADATA_NOT_FOUND',
   NOT_IMPLEMENTED = 'NOT_IMPLEMENTED',
   OBJECT_METADATA_COLLECTION_NOT_FOUND = 'OBJECT_METADATA_COLLECTION_NOT_FOUND',
+  INVALID_POST_HOOK_PAYLOAD = 'INVALID_POST_HOOK_PAYLOAD',
 }

packages/twenty-server/src/engine/api/graphql/graphql-query-runner/interfaces/base-resolver-service.ts

@@ -171,20 +171,14 @@ export abstract class GraphqlQueryBaseResolverService<
         options.objectMetadataMaps,
       );
 
-      const resultWithGettersArray = Array.isArray(resultWithGetters)
-        ? resultWithGetters
-        : [resultWithGetters];
-
       await this.workspaceQueryHookService.executePostQueryHooks(
         authContext,
         objectMetadataItemWithFieldMaps.nameSingular,
         operationName,
-        resultWithGettersArray,
+        resultWithGetters,
       );
 
-      return Array.isArray(resultWithGetters)
+      return resultWithGetters;
-        ? resultWithGettersArray
-        : resultWithGettersArray[0];
     } catch (error) {
       workspaceQueryRunnerGraphqlApiExceptionHandler(error, options);
     }

packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface.ts

@@ -1,8 +1,9 @@
+import { QueryResultFieldValue } from 'src/engine/api/graphql/workspace-query-runner/factories/query-result-getters/interfaces/query-result-field-value';
 import { ResolverArgs } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
 
 import { AuthContext } from 'src/engine/core-modules/auth/types/auth-context.type';
 
-export interface WorkspaceQueryHookInstance {
+export interface WorkspacePreQueryHookInstance {
   execute(
     authContext: AuthContext,
     objectName: string,
@@ -10,10 +11,10 @@ export interface WorkspaceQueryHookInstance {
   ): Promise<ResolverArgs>;
 }
 
-export interface WorkspaceQueryPostHookInstance {
+export interface WorkspacePostQueryHookInstance {
   execute(
     authContext: AuthContext,
     objectName: string,
-    payload: unknown[],
+    payload: QueryResultFieldValue,
   ): Promise<void>;
 }

packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-hook/storage/workspace-query-hook.storage.ts

@@ -4,7 +4,10 @@ import { Module } from '@nestjs/core/injector/module';
 
 import { isDefined } from 'twenty-shared/utils';
 
-import { WorkspaceQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
+import {
+  WorkspacePostQueryHookInstance,
+  WorkspacePreQueryHookInstance,
+} from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
 import { WorkspaceResolverBuilderMethodNames } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
 
 import { WorkspaceQueryHookKey } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/decorators/workspace-query-hook.decorator';
@@ -19,16 +22,16 @@ interface WorkspaceQueryHookData<T> {
 export class WorkspaceQueryHookStorage {
   private preHookInstances = new Map<
     WorkspaceQueryHookKey,
-    WorkspaceQueryHookData<WorkspaceQueryHookInstance>[]
+    WorkspaceQueryHookData<WorkspacePreQueryHookInstance>[]
   >();
   private postHookInstances = new Map<
     WorkspaceQueryHookKey,
-    WorkspaceQueryHookData<WorkspaceQueryHookInstance>[]
+    WorkspaceQueryHookData<WorkspacePostQueryHookInstance>[]
   >();
 
   registerWorkspaceQueryPreHookInstance(
     key: WorkspaceQueryHookKey,
-    data: WorkspaceQueryHookData<WorkspaceQueryHookInstance>,
+    data: WorkspaceQueryHookData<WorkspacePreQueryHookInstance>,
   ) {
     if (!this.preHookInstances.has(key)) {
       this.preHookInstances.set(key, []);
@@ -39,11 +42,11 @@ export class WorkspaceQueryHookStorage {
 
   getWorkspaceQueryPreHookInstances(
     key: WorkspaceQueryHookKey,
-  ): WorkspaceQueryHookData<WorkspaceQueryHookInstance>[] {
+  ): WorkspaceQueryHookData<WorkspacePreQueryHookInstance>[] {
     const methodName = key.split('.')?.[1] as
       | WorkspaceResolverBuilderMethodNames
       | undefined;
-    let wildcardInstances: WorkspaceQueryHookData<WorkspaceQueryHookInstance>[] =
+    let wildcardInstances: WorkspaceQueryHookData<WorkspacePreQueryHookInstance>[] =
       [];
 
     if (!methodName) {
@@ -62,9 +65,9 @@ export class WorkspaceQueryHookStorage {
     return [...wildcardInstances, ...(this.preHookInstances.get(key) ?? [])];
   }
 
-  registerWorkspaceQueryPostHookInstance(
+  registerWorkspacePostQueryHookInstance(
     key: WorkspaceQueryHookKey,
-    data: WorkspaceQueryHookData<WorkspaceQueryHookInstance>,
+    data: WorkspaceQueryHookData<WorkspacePostQueryHookInstance>,
   ) {
     if (!this.postHookInstances.has(key)) {
       this.postHookInstances.set(key, []);
@@ -73,13 +76,13 @@ export class WorkspaceQueryHookStorage {
     this.postHookInstances.get(key)?.push(data);
   }
 
-  getWorkspaceQueryPostHookInstances(
+  getWorkspacePostQueryHookInstances(
     key: WorkspaceQueryHookKey,
-  ): WorkspaceQueryHookData<WorkspaceQueryHookInstance>[] {
+  ): WorkspaceQueryHookData<WorkspacePostQueryHookInstance>[] {
     const methodName = key.split('.')?.[1] as
       | WorkspaceResolverBuilderMethodNames
       | undefined;
-    let wildcardInstances: WorkspaceQueryHookData<WorkspaceQueryHookInstance>[] =
+    let wildcardInstances: WorkspaceQueryHookData<WorkspacePostQueryHookInstance>[] =
       [];
 
     if (!methodName) {

packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-hook/workspace-query-hook.explorer.ts

@@ -3,8 +3,21 @@ import { DiscoveryService, ModuleRef, createContextId } from '@nestjs/core';
 import { Injector } from '@nestjs/core/injector/injector';
 import { Module } from '@nestjs/core/injector/module';
 
-import { WorkspaceQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
+import { ObjectRecord } from 'src/engine/api/graphql/workspace-query-builder/interfaces/object-record.interface';
+import { QueryResultFieldValue } from 'src/engine/api/graphql/workspace-query-runner/factories/query-result-getters/interfaces/query-result-field-value';
+import {
+  WorkspacePostQueryHookInstance,
+  WorkspacePreQueryHookInstance,
+} from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
 
+import {
+  GraphqlQueryRunnerException,
+  GraphqlQueryRunnerExceptionCode,
+} from 'src/engine/api/graphql/graphql-query-runner/errors/graphql-query-runner.exception';
+import { isQueryResultFieldValueAConnection } from 'src/engine/api/graphql/workspace-query-runner/factories/query-result-getters/guards/is-query-result-field-value-a-connection.guard';
+import { isQueryResultFieldValueANestedRecordArray } from 'src/engine/api/graphql/workspace-query-runner/factories/query-result-getters/guards/is-query-result-field-value-a-nested-record-array.guard';
+import { isQueryResultFieldValueARecordArray } from 'src/engine/api/graphql/workspace-query-runner/factories/query-result-getters/guards/is-query-result-field-value-a-record-array.guard';
+import { isQueryResultFieldValueARecord } from 'src/engine/api/graphql/workspace-query-runner/factories/query-result-getters/guards/is-query-result-field-value-a-record.guard';
 import { WorkspaceQueryHookKey } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/decorators/workspace-query-hook.decorator';
 import { WorkspaceQueryHookStorage } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/storage/workspace-query-hook.storage';
 import { WorkspaceQueryHookType } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/types/workspace-query-hook.type';
@@ -68,12 +81,12 @@ export class WorkspaceQueryHookExplorer implements OnModuleInit {
     }
   }
 
-  async handleHook(
+  async handlePreHook(
-    payload: Parameters<WorkspaceQueryHookInstance['execute']>,
+    executeParams: Parameters<WorkspacePreQueryHookInstance['execute']>,
     instance: object,
     host: Module,
     isRequestScoped: boolean,
-  ): Promise<ReturnType<WorkspaceQueryHookInstance['execute']>> {
+  ): Promise<ReturnType<WorkspacePreQueryHookInstance['execute']>> {
     const methodName = 'execute';
 
     if (isRequestScoped) {
@@ -83,7 +96,7 @@ export class WorkspaceQueryHookExplorer implements OnModuleInit {
         this.moduleRef.registerRequestByContextId(
           {
             req: {
-              workspaceId: payload?.[0].workspace.id,
+              workspaceId: executeParams?.[0].workspace.id,
             },
           },
           contextId,
@@ -97,9 +110,82 @@ export class WorkspaceQueryHookExplorer implements OnModuleInit {
         contextId,
       );
 
-      return contextInstance[methodName].call(contextInstance, ...payload);
+      return contextInstance[methodName].call(
+        contextInstance,
+        ...executeParams,
+      );
     } else {
-      return instance[methodName].call(instance, ...payload);
+      return instance[methodName].call(instance, ...executeParams);
+    }
+  }
+
+  private transformPayload(payload: QueryResultFieldValue): ObjectRecord[] {
+    if (isQueryResultFieldValueAConnection(payload)) {
+      return payload.edges.map((edge) => edge.node);
+    }
+
+    if (isQueryResultFieldValueANestedRecordArray(payload)) {
+      return payload.records;
+    }
+
+    if (isQueryResultFieldValueARecordArray(payload)) {
+      return payload;
+    }
+
+    if (isQueryResultFieldValueARecord(payload)) {
+      return [payload];
+    }
+
+    throw new GraphqlQueryRunnerException(
+      `Unsupported payload type: ${payload}`,
+      GraphqlQueryRunnerExceptionCode.INVALID_POST_HOOK_PAYLOAD,
+    );
+  }
+
+  async handlePostHook(
+    executeParams: Parameters<WorkspacePostQueryHookInstance['execute']>,
+    instance: object,
+    host: Module,
+    isRequestScoped: boolean,
+  ): Promise<ReturnType<WorkspacePostQueryHookInstance['execute']>> {
+    const methodName = 'execute';
+
+    const transformedPayload = this.transformPayload(executeParams[2]);
+
+    if (isRequestScoped) {
+      const contextId = createContextId();
+
+      if (this.moduleRef.registerRequestByContextId) {
+        this.moduleRef.registerRequestByContextId(
+          {
+            req: {
+              workspaceId: executeParams?.[0].workspace.id,
+            },
+          },
+          contextId,
+        );
+      }
+
+      const contextInstance = await this.injector.loadPerContext(
+        instance,
+        host,
+        host.providers,
+        contextId,
+      );
+
+      return contextInstance[methodName].call(
+        contextInstance,
+        executeParams[0],
+        executeParams[1],
+        transformedPayload,
+      );
+    } else {
+      return instance[methodName].call(
+        instance,
+        executeParams[0],
+        executeParams[1],
+        transformedPayload,
+      );
     }
   }
 
@@ -115,17 +201,17 @@ export class WorkspaceQueryHookExplorer implements OnModuleInit {
         this.workspaceQueryHookStorage.registerWorkspaceQueryPreHookInstance(
           key,
           {
-            instance: instance as WorkspaceQueryHookInstance,
+            instance: instance as WorkspacePreQueryHookInstance,
             host,
             isRequestScoped,
           },
         );
         break;
       case WorkspaceQueryHookType.PostHook:
-        this.workspaceQueryHookStorage.registerWorkspaceQueryPostHookInstance(
+        this.workspaceQueryHookStorage.registerWorkspacePostQueryHookInstance(
           key,
           {
-            instance: instance as WorkspaceQueryHookInstance,
+            instance: instance as WorkspacePostQueryHookInstance,
             host,
             isRequestScoped,
           },

packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-hook/workspace-query-hook.service.ts

@@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common';
 
 import merge from 'lodash.merge';
 
-import { ObjectRecord } from 'src/engine/api/graphql/workspace-query-builder/interfaces/object-record.interface';
+import { QueryResultFieldValue } from 'src/engine/api/graphql/workspace-query-runner/factories/query-result-getters/interfaces/query-result-field-value';
 import { WorkspaceResolverBuilderMethodNames } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
 
 import { WorkspaceQueryHookKey } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/decorators/workspace-query-hook.decorator';
@@ -37,7 +37,7 @@ export class WorkspaceQueryHookService {
 
     for (const preHookInstance of preHookInstances) {
       // Deep merge all return of handleHook into payload before returning it
-      const hookPayload = await this.workspaceQueryHookExplorer.handleHook(
+      const hookPayload = await this.workspaceQueryHookExplorer.handlePreHook(
         [authContext, objectName, payload],
         preHookInstance.instance,
         preHookInstance.host,
@@ -53,24 +53,23 @@ export class WorkspaceQueryHookService {
 
   public async executePostQueryHooks<
     T extends WorkspaceResolverBuilderMethodNames,
-    U extends ObjectRecord = ObjectRecord,
   >(
     authContext: AuthContext,
     // TODO: We should allow wildcard for object name
     objectName: string,
     methodName: T,
-    payload: U[],
+    payload: QueryResultFieldValue,
   ): Promise<void> {
     const key: WorkspaceQueryHookKey = `${objectName}.${methodName}`;
     const postHookInstances =
-      this.workspaceQueryHookStorage.getWorkspaceQueryPostHookInstances(key);
+      this.workspaceQueryHookStorage.getWorkspacePostQueryHookInstances(key);
 
     if (!postHookInstances) {
       return;
     }
 
     for (const postHookInstance of postHookInstances) {
-      await this.workspaceQueryHookExplorer.handleHook(
+      await this.workspaceQueryHookExplorer.handlePostHook(
         [authContext, objectName, payload],
         postHookInstance.instance,
         postHookInstance.host,

packages/twenty-server/src/engine/core-modules/actor/query-hooks/created-by.create-many.pre-query-hook.ts

@@ -1,9 +1,9 @@
 import { InjectRepository } from '@nestjs/typeorm';
 
-import { Repository } from 'typeorm';
 import { isDefined } from 'twenty-shared/utils';
+import { Repository } from 'typeorm';
 
-import { WorkspaceQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
+import { WorkspacePreQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
 import { CreateManyResolverArgs } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
 
 import {
@@ -26,7 +26,7 @@ type CustomWorkspaceItem = Omit<
 
 @WorkspaceQueryHook(`*.createMany`)
 export class CreatedByCreateManyPreQueryHook
-  implements WorkspaceQueryHookInstance
+  implements WorkspacePreQueryHookInstance
 {
   constructor(
     @InjectRepository(FieldMetadataEntity, 'metadata')

packages/twenty-server/src/engine/core-modules/actor/query-hooks/created-by.create-one.pre-query-hook.ts

@@ -3,7 +3,7 @@ import { InjectRepository } from '@nestjs/typeorm';
 import { isDefined } from 'class-validator';
 import { Repository } from 'typeorm';
 
-import { WorkspaceQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
+import { WorkspacePreQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
 import { CreateOneResolverArgs } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
 
 import {
@@ -26,7 +26,7 @@ type CustomWorkspaceItem = Omit<
 
 @WorkspaceQueryHook(`*.createOne`)
 export class CreatedByCreateOnePreQueryHook
-  implements WorkspaceQueryHookInstance
+  implements WorkspacePreQueryHookInstance
 {
   constructor(
     @InjectRepository(FieldMetadataEntity, 'metadata')

packages/twenty-server/src/modules/blocklist/query-hooks/blocklist-create-many.pre-query.hook.ts

@@ -1,18 +1,18 @@
 import { BadRequestException } from '@nestjs/common';
 
-import { WorkspaceQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
+import { WorkspacePreQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
 import { CreateManyResolverArgs } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
 
 import { WorkspaceQueryHook } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/decorators/workspace-query-hook.decorator';
+import { AuthContext } from 'src/engine/core-modules/auth/types/auth-context.type';
 import {
   BlocklistItem,
   BlocklistValidationService,
 } from 'src/modules/blocklist/blocklist-validation-manager/services/blocklist-validation.service';
-import { AuthContext } from 'src/engine/core-modules/auth/types/auth-context.type';
 
 @WorkspaceQueryHook(`blocklist.createMany`)
 export class BlocklistCreateManyPreQueryHook
-  implements WorkspaceQueryHookInstance
+  implements WorkspacePreQueryHookInstance
 {
   constructor(
     private readonly blocklistValidationService: BlocklistValidationService,

packages/twenty-server/src/modules/blocklist/query-hooks/blocklist-update-many.pre-query.hook.ts

@@ -1,6 +1,6 @@
 import { MethodNotAllowedException } from '@nestjs/common';
 
-import { WorkspaceQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
+import { WorkspacePreQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
 import { UpdateManyResolverArgs } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
 
 import { WorkspaceQueryHook } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/decorators/workspace-query-hook.decorator';
@@ -8,7 +8,7 @@ import { BlocklistItem } from 'src/modules/blocklist/blocklist-validation-manage
 
 @WorkspaceQueryHook(`blocklist.updateMany`)
 export class BlocklistUpdateManyPreQueryHook
-  implements WorkspaceQueryHookInstance
+  implements WorkspacePreQueryHookInstance
 {
   constructor() {}
 

packages/twenty-server/src/modules/blocklist/query-hooks/blocklist-update-one.pre-query.hook.ts

@@ -1,18 +1,18 @@
 import { BadRequestException } from '@nestjs/common';
 
-import { WorkspaceQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
+import { WorkspacePreQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
 import { UpdateOneResolverArgs } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
 
 import { WorkspaceQueryHook } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/decorators/workspace-query-hook.decorator';
+import { AuthContext } from 'src/engine/core-modules/auth/types/auth-context.type';
 import {
   BlocklistItem,
   BlocklistValidationService,
 } from 'src/modules/blocklist/blocklist-validation-manager/services/blocklist-validation.service';
-import { AuthContext } from 'src/engine/core-modules/auth/types/auth-context.type';
 
 @WorkspaceQueryHook(`blocklist.updateOne`)
 export class BlocklistUpdateOnePreQueryHook
-  implements WorkspaceQueryHookInstance
+  implements WorkspacePreQueryHookInstance
 {
   constructor(
     private readonly blocklistValidationService: BlocklistValidationService,

packages/twenty-server/src/modules/calendar/common/query-hooks/calendar-event/calendar-event-find-many.post-query.hook.ts

@@ -1,4 +1,4 @@
-import { WorkspaceQueryPostHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
+import { WorkspacePostQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
 
 import { WorkspaceQueryHook } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/decorators/workspace-query-hook.decorator';
 import { WorkspaceQueryHookType } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/types/workspace-query-hook.type';
@@ -12,7 +12,7 @@ import { CalendarEventWorkspaceEntity } from 'src/modules/calendar/common/standa
   type: WorkspaceQueryHookType.PostHook,
 })
 export class CalendarEventFindManyPostQueryHook
-  implements WorkspaceQueryPostHookInstance
+  implements WorkspacePostQueryHookInstance
 {
   constructor(
     private readonly applyCalendarEventsVisibilityRestrictionsService: ApplyCalendarEventsVisibilityRestrictionsService,

packages/twenty-server/src/modules/calendar/common/query-hooks/calendar-event/calendar-event-find-one.post-query.hook.ts

@@ -1,4 +1,4 @@
-import { WorkspaceQueryPostHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
+import { WorkspacePostQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
 
 import { WorkspaceQueryHook } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/decorators/workspace-query-hook.decorator';
 import { WorkspaceQueryHookType } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/types/workspace-query-hook.type';
@@ -12,7 +12,7 @@ import { CalendarEventWorkspaceEntity } from 'src/modules/calendar/common/standa
   type: WorkspaceQueryHookType.PostHook,
 })
 export class CalendarEventFindOnePostQueryHook
-  implements WorkspaceQueryPostHookInstance
+  implements WorkspacePostQueryHookInstance
 {
   constructor(
     private readonly applyCalendarEventsVisibilityRestrictionsService: ApplyCalendarEventsVisibilityRestrictionsService,

packages/twenty-server/src/modules/connected-account/query-hooks/connected-account-delete-one.pre-query.hook.ts

@@ -2,7 +2,7 @@ import { InjectRepository } from '@nestjs/typeorm';
 
 import { Repository } from 'typeorm';
 
-import { WorkspaceQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
+import { WorkspacePreQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
 import { DeleteOneResolverArgs } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
 
 import { DatabaseEventAction } from 'src/engine/api/graphql/graphql-query-runner/enums/database-event-action';
@@ -15,7 +15,7 @@ import { MessageChannelWorkspaceEntity } from 'src/modules/messaging/common/stan
 
 @WorkspaceQueryHook(`connectedAccount.destroyOne`)
 export class ConnectedAccountDeleteOnePreQueryHook
-  implements WorkspaceQueryHookInstance
+  implements WorkspacePreQueryHookInstance
 {
   constructor(
     private readonly twentyORMManager: TwentyORMManager,

packages/twenty-server/src/modules/messaging/common/query-hooks/message/message-find-many.post-query.hook.ts

@@ -1,4 +1,4 @@
-import { WorkspaceQueryPostHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
+import { WorkspacePostQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
 
 import { WorkspaceQueryHook } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/decorators/workspace-query-hook.decorator';
 import { WorkspaceQueryHookType } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/types/workspace-query-hook.type';
@@ -12,7 +12,7 @@ import { MessageWorkspaceEntity } from 'src/modules/messaging/common/standard-ob
   type: WorkspaceQueryHookType.PostHook,
 })
 export class MessageFindManyPostQueryHook
-  implements WorkspaceQueryPostHookInstance
+  implements WorkspacePostQueryHookInstance
 {
   constructor(
     private readonly applyMessagesVisibilityRestrictionsService: ApplyMessagesVisibilityRestrictionsService,

packages/twenty-server/src/modules/messaging/common/query-hooks/message/message-find-one.post-query.hook.ts

@@ -1,4 +1,4 @@
-import { WorkspaceQueryPostHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
+import { WorkspacePostQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
 
 import { WorkspaceQueryHook } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/decorators/workspace-query-hook.decorator';
 import { WorkspaceQueryHookType } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/types/workspace-query-hook.type';
@@ -12,7 +12,7 @@ import { MessageWorkspaceEntity } from 'src/modules/messaging/common/standard-ob
   type: WorkspaceQueryHookType.PostHook,
 })
 export class MessageFindOnePostQueryHook
-  implements WorkspaceQueryPostHookInstance
+  implements WorkspacePostQueryHookInstance
 {
   constructor(
     private readonly applyMessagesVisibilityRestrictionsService: ApplyMessagesVisibilityRestrictionsService,

packages/twenty-server/src/modules/view/pre-hooks/view-delete-many.pre-query.hook.ts

@@ -1,4 +1,4 @@
-import { WorkspaceQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
+import { WorkspacePreQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
 import { DeleteManyResolverArgs } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
 
 import {
@@ -9,7 +9,9 @@ import { WorkspaceQueryHook } from 'src/engine/api/graphql/workspace-query-runne
 import { AuthContext } from 'src/engine/core-modules/auth/types/auth-context.type';
 
 @WorkspaceQueryHook(`view.deleteMany`)
-export class ViewDeleteManyPreQueryHook implements WorkspaceQueryHookInstance {
+export class ViewDeleteManyPreQueryHook
+  implements WorkspacePreQueryHookInstance
+{
   constructor() {}
 
   async execute(

packages/twenty-server/src/modules/view/pre-hooks/view-delete-one.pre-query.hook.ts

@@ -1,4 +1,4 @@
-import { WorkspaceQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
+import { WorkspacePreQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
 import { DeleteOneResolverArgs } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
 
 import {
@@ -9,7 +9,9 @@ import { WorkspaceQueryHook } from 'src/engine/api/graphql/workspace-query-runne
 import { AuthContext } from 'src/engine/core-modules/auth/types/auth-context.type';
 import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
 @WorkspaceQueryHook(`view.deleteOne`)
-export class ViewDeleteOnePreQueryHook implements WorkspaceQueryHookInstance {
+export class ViewDeleteOnePreQueryHook
+  implements WorkspacePreQueryHookInstance
+{
   constructor(
     private readonly twentyORMGlobalManager: TwentyORMGlobalManager,
   ) {}

packages/twenty-server/src/modules/workflow/common/query-hooks/workflow-create-many.post-query.hook.ts

@@ -2,7 +2,7 @@ import { InjectRepository } from '@nestjs/typeorm';
 
 import { Repository } from 'typeorm';
 
-import { WorkspaceQueryPostHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
+import { WorkspacePostQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
 
 import { DatabaseEventAction } from 'src/engine/api/graphql/graphql-query-runner/enums/database-event-action';
 import { WorkspaceQueryHook } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/decorators/workspace-query-hook.decorator';
@@ -23,7 +23,7 @@ import { WorkflowWorkspaceEntity } from 'src/modules/workflow/common/standard-ob
   type: WorkspaceQueryHookType.PostHook,
 })
 export class WorkflowCreateManyPostQueryHook
-  implements WorkspaceQueryPostHookInstance
+  implements WorkspacePostQueryHookInstance
 {
   constructor(
     private readonly twentyORMManager: TwentyORMManager,

packages/twenty-server/src/modules/workflow/common/query-hooks/workflow-create-many.pre-query.hook.ts

@@ -1,14 +1,14 @@
-import { WorkspaceQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
+import { WorkspacePreQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
 import { CreateManyResolverArgs } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
 
 import { WorkspaceQueryHook } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/decorators/workspace-query-hook.decorator';
 import { AuthContext } from 'src/engine/core-modules/auth/types/auth-context.type';
-import { assertWorkflowStatusesNotSetOrEmpty } from 'src/modules/workflow/common/utils/assert-workflow-statuses-not-set-or-empty';
 import { WorkflowWorkspaceEntity } from 'src/modules/workflow/common/standard-objects/workflow.workspace-entity';
+import { assertWorkflowStatusesNotSetOrEmpty } from 'src/modules/workflow/common/utils/assert-workflow-statuses-not-set-or-empty';
 
 @WorkspaceQueryHook(`workflow.createMany`)
 export class WorkflowCreateManyPreQueryHook
-  implements WorkspaceQueryHookInstance
+  implements WorkspacePreQueryHookInstance
 {
   async execute(
     _authContext: AuthContext,

packages/twenty-server/src/modules/workflow/common/query-hooks/workflow-create-one.post-query.hook.ts

@@ -2,7 +2,7 @@ import { InjectRepository } from '@nestjs/typeorm';
 
 import { Repository } from 'typeorm';
 
-import { WorkspaceQueryPostHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
+import { WorkspacePostQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
 
 import { DatabaseEventAction } from 'src/engine/api/graphql/graphql-query-runner/enums/database-event-action';
 import { WorkspaceQueryHook } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/decorators/workspace-query-hook.decorator';
@@ -23,7 +23,7 @@ import { WorkflowWorkspaceEntity } from 'src/modules/workflow/common/standard-ob
   type: WorkspaceQueryHookType.PostHook,
 })
 export class WorkflowCreateOnePostQueryHook
-  implements WorkspaceQueryPostHookInstance
+  implements WorkspacePostQueryHookInstance
 {
   constructor(
     private readonly twentyORMManager: TwentyORMManager,

packages/twenty-server/src/modules/workflow/common/query-hooks/workflow-create-one.pre-query.hook.ts

@@ -1,14 +1,14 @@
-import { WorkspaceQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
+import { WorkspacePreQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
 import { CreateOneResolverArgs } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
 
 import { WorkspaceQueryHook } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/decorators/workspace-query-hook.decorator';
 import { AuthContext } from 'src/engine/core-modules/auth/types/auth-context.type';
-import { assertWorkflowStatusesNotSetOrEmpty } from 'src/modules/workflow/common/utils/assert-workflow-statuses-not-set-or-empty';
 import { WorkflowWorkspaceEntity } from 'src/modules/workflow/common/standard-objects/workflow.workspace-entity';
+import { assertWorkflowStatusesNotSetOrEmpty } from 'src/modules/workflow/common/utils/assert-workflow-statuses-not-set-or-empty';
 
 @WorkspaceQueryHook(`workflow.createOne`)
 export class WorkflowCreateOnePreQueryHook
-  implements WorkspaceQueryHookInstance
+  implements WorkspacePreQueryHookInstance
 {
   async execute(
     _authContext: AuthContext,

packages/twenty-server/src/modules/workflow/common/query-hooks/workflow-delete-many.post-query.hook.ts

@@ -1,4 +1,4 @@
-import { WorkspaceQueryPostHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
+import { WorkspacePostQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
 
 import { WorkspaceQueryHook } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/decorators/workspace-query-hook.decorator';
 import { WorkspaceQueryHookType } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/types/workspace-query-hook.type';
@@ -11,7 +11,7 @@ import { WorkflowCommonWorkspaceService } from 'src/modules/workflow/common/work
   type: WorkspaceQueryHookType.PostHook,
 })
 export class WorkflowDeleteManyPostQueryHook
-  implements WorkspaceQueryPostHookInstance
+  implements WorkspacePostQueryHookInstance
 {
   constructor(
     private readonly workflowCommonWorkspaceService: WorkflowCommonWorkspaceService,

packages/twenty-server/src/modules/workflow/common/query-hooks/workflow-delete-one.post-query.hook.ts

@@ -1,4 +1,4 @@
-import { WorkspaceQueryPostHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
+import { WorkspacePostQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
 
 import { WorkspaceQueryHook } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/decorators/workspace-query-hook.decorator';
 import { WorkspaceQueryHookType } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/types/workspace-query-hook.type';
@@ -11,7 +11,7 @@ import { WorkflowCommonWorkspaceService } from 'src/modules/workflow/common/work
   type: WorkspaceQueryHookType.PostHook,
 })
 export class WorkflowDeleteOnePostQueryHook
-  implements WorkspaceQueryPostHookInstance
+  implements WorkspacePostQueryHookInstance
 {
   constructor(
     private readonly workflowCommonWorkspaceService: WorkflowCommonWorkspaceService,

packages/twenty-server/src/modules/workflow/common/query-hooks/workflow-run-create-many.pre-query.hook.ts

@@ -1,4 +1,4 @@
-import { WorkspaceQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
+import { WorkspacePreQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
 import { CreateManyResolverArgs } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
 
 import { WorkspaceQueryHook } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/decorators/workspace-query-hook.decorator';
@@ -10,7 +10,7 @@ import { WorkflowRunWorkspaceEntity } from 'src/modules/workflow/common/standard
 
 @WorkspaceQueryHook(`workflowRun.createMany`)
 export class WorkflowRunCreateManyPreQueryHook
-  implements WorkspaceQueryHookInstance
+  implements WorkspacePreQueryHookInstance
 {
   async execute(): Promise<CreateManyResolverArgs<WorkflowRunWorkspaceEntity>> {
     throw new WorkflowQueryValidationException(

packages/twenty-server/src/modules/workflow/common/query-hooks/workflow-run-create-one.pre-query.hook.ts

@@ -1,4 +1,4 @@
-import { WorkspaceQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
+import { WorkspacePreQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
 import { CreateOneResolverArgs } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
 
 import { WorkspaceQueryHook } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/decorators/workspace-query-hook.decorator';
@@ -10,7 +10,7 @@ import { WorkflowRunWorkspaceEntity } from 'src/modules/workflow/common/standard
 
 @WorkspaceQueryHook(`workflowRun.createOne`)
 export class WorkflowRunCreateOnePreQueryHook
-  implements WorkspaceQueryHookInstance
+  implements WorkspacePreQueryHookInstance
 {
   async execute(): Promise<CreateOneResolverArgs<WorkflowRunWorkspaceEntity>> {
     throw new WorkflowQueryValidationException(

packages/twenty-server/src/modules/workflow/common/query-hooks/workflow-run-delete-many.pre-query.hook.ts

@@ -1,4 +1,4 @@
-import { WorkspaceQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
+import { WorkspacePreQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
 import { DeleteManyResolverArgs } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
 
 import { WorkspaceQueryHook } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/decorators/workspace-query-hook.decorator';
@@ -10,7 +10,7 @@ import { WorkflowRunWorkspaceEntity } from 'src/modules/workflow/common/standard
 
 @WorkspaceQueryHook(`workflowRun.deleteMany`)
 export class WorkflowRunDeleteManyPreQueryHook
-  implements WorkspaceQueryHookInstance
+  implements WorkspacePreQueryHookInstance
 {
   async execute(): Promise<DeleteManyResolverArgs<WorkflowRunWorkspaceEntity>> {
     throw new WorkflowQueryValidationException(

packages/twenty-server/src/modules/workflow/common/query-hooks/workflow-run-delete-one.pre-query.hook.ts

@@ -1,4 +1,4 @@
-import { WorkspaceQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
+import { WorkspacePreQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
 import { DeleteOneResolverArgs } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
 
 import { WorkspaceQueryHook } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/decorators/workspace-query-hook.decorator';
@@ -9,7 +9,7 @@ import {
 
 @WorkspaceQueryHook(`workflowRun.deleteOne`)
 export class WorkflowRunDeleteOnePreQueryHook
-  implements WorkspaceQueryHookInstance
+  implements WorkspacePreQueryHookInstance
 {
   async execute(): Promise<DeleteOneResolverArgs> {
     throw new WorkflowQueryValidationException(

packages/twenty-server/src/modules/workflow/common/query-hooks/workflow-run-update-many.pre-query.hook.ts

@@ -1,4 +1,4 @@
-import { WorkspaceQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
+import { WorkspacePreQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
 import { UpdateManyResolverArgs } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
 
 import { WorkspaceQueryHook } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/decorators/workspace-query-hook.decorator';
@@ -10,7 +10,7 @@ import { WorkflowRunWorkspaceEntity } from 'src/modules/workflow/common/standard
 
 @WorkspaceQueryHook(`workflowRun.updateMany`)
 export class WorkflowRunUpdateManyPreQueryHook
-  implements WorkspaceQueryHookInstance
+  implements WorkspacePreQueryHookInstance
 {
   async execute(): Promise<UpdateManyResolverArgs<WorkflowRunWorkspaceEntity>> {
     throw new WorkflowQueryValidationException(

packages/twenty-server/src/modules/workflow/common/query-hooks/workflow-run-update-one.pre-query.hook.ts

@@ -1,4 +1,4 @@
-import { WorkspaceQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
+import { WorkspacePreQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
 import { UpdateOneResolverArgs } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
 
 import { WorkspaceQueryHook } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/decorators/workspace-query-hook.decorator';
@@ -10,7 +10,7 @@ import { WorkflowRunWorkspaceEntity } from 'src/modules/workflow/common/standard
 
 @WorkspaceQueryHook(`workflowRun.updateOne`)
 export class WorkflowRunUpdateOnePreQueryHook
-  implements WorkspaceQueryHookInstance
+  implements WorkspacePreQueryHookInstance
 {
   async execute(): Promise<UpdateOneResolverArgs<WorkflowRunWorkspaceEntity>> {
     throw new WorkflowQueryValidationException(

packages/twenty-server/src/modules/workflow/common/query-hooks/workflow-update-many.pre-query.hook.ts

@@ -1,4 +1,4 @@
-import { WorkspaceQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
+import { WorkspacePreQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
 import { UpdateManyResolverArgs } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
 
 import { WorkspaceQueryHook } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/decorators/workspace-query-hook.decorator';
@@ -10,7 +10,7 @@ import { WorkflowWorkspaceEntity } from 'src/modules/workflow/common/standard-ob
 
 @WorkspaceQueryHook(`workflow.updateMany`)
 export class WorkflowUpdateManyPreQueryHook
-  implements WorkspaceQueryHookInstance
+  implements WorkspacePreQueryHookInstance
 {
   async execute(): Promise<UpdateManyResolverArgs<WorkflowWorkspaceEntity>> {
     throw new WorkflowQueryValidationException(

packages/twenty-server/src/modules/workflow/common/query-hooks/workflow-update-one.pre-query.hook.ts

@@ -1,14 +1,14 @@
-import { WorkspaceQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
+import { WorkspacePreQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
 import { UpdateOneResolverArgs } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
 
 import { WorkspaceQueryHook } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/decorators/workspace-query-hook.decorator';
 import { AuthContext } from 'src/engine/core-modules/auth/types/auth-context.type';
-import { assertWorkflowStatusesNotSet } from 'src/modules/workflow/common/utils/assert-workflow-statuses-not-set';
 import { WorkflowWorkspaceEntity } from 'src/modules/workflow/common/standard-objects/workflow.workspace-entity';
+import { assertWorkflowStatusesNotSet } from 'src/modules/workflow/common/utils/assert-workflow-statuses-not-set';
 
 @WorkspaceQueryHook(`workflow.updateOne`)
 export class WorkflowUpdateOnePreQueryHook
-  implements WorkspaceQueryHookInstance
+  implements WorkspacePreQueryHookInstance
 {
   async execute(
     _authContext: AuthContext,

packages/twenty-server/src/modules/workflow/common/query-hooks/workflow-version-create-many.pre-query.hook.ts

@@ -1,4 +1,4 @@
-import { WorkspaceQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
+import { WorkspacePreQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
 import { CreateManyResolverArgs } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
 
 import { WorkspaceQueryHook } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/decorators/workspace-query-hook.decorator';
@@ -11,7 +11,7 @@ import { WorkflowVersionWorkspaceEntity } from 'src/modules/workflow/common/stan
 
 @WorkspaceQueryHook(`workflowVersion.createMany`)
 export class WorkflowVersionCreateManyPreQueryHook
-  implements WorkspaceQueryHookInstance
+  implements WorkspacePreQueryHookInstance
 {
   async execute(
     _authContext: AuthContext,

packages/twenty-server/src/modules/workflow/common/query-hooks/workflow-version-create-one.pre-query.hook.ts

@@ -1,4 +1,4 @@
-import { WorkspaceQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
+import { WorkspacePreQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
 import { CreateOneResolverArgs } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
 
 import { WorkspaceQueryHook } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/decorators/workspace-query-hook.decorator';
@@ -11,7 +11,7 @@ import { WorkflowVersionWorkspaceEntity } from 'src/modules/workflow/common/stan
 
 @WorkspaceQueryHook(`workflowVersion.createOne`)
 export class WorkflowVersionCreateOnePreQueryHook
-  implements WorkspaceQueryHookInstance
+  implements WorkspacePreQueryHookInstance
 {
   async execute(
     _authContext: AuthContext,

packages/twenty-server/src/modules/workflow/common/query-hooks/workflow-version-delete-many.pre-query.hook.ts

@@ -1,4 +1,4 @@
-import { WorkspaceQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
+import { WorkspacePreQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
 import { DeleteManyResolverArgs } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
 
 import { WorkspaceQueryHook } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/decorators/workspace-query-hook.decorator';
@@ -10,7 +10,7 @@ import { WorkflowVersionWorkspaceEntity } from 'src/modules/workflow/common/stan
 
 @WorkspaceQueryHook(`workflowVersion.deleteMany`)
 export class WorkflowVersionDeleteManyPreQueryHook
-  implements WorkspaceQueryHookInstance
+  implements WorkspacePreQueryHookInstance
 {
   async execute(): Promise<
     DeleteManyResolverArgs<WorkflowVersionWorkspaceEntity>

packages/twenty-server/src/modules/workflow/common/query-hooks/workflow-version-delete-one.pre-query.hook.ts

@@ -1,4 +1,4 @@
-import { WorkspaceQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
+import { WorkspacePreQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
 import { DeleteOneResolverArgs } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
 
 import { WorkspaceQueryHook } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/decorators/workspace-query-hook.decorator';
@@ -7,7 +7,7 @@ import { WorkflowVersionValidationWorkspaceService } from 'src/modules/workflow/
 
 @WorkspaceQueryHook(`workflowVersion.deleteOne`)
 export class WorkflowVersionDeleteOnePreQueryHook
-  implements WorkspaceQueryHookInstance
+  implements WorkspacePreQueryHookInstance
 {
   constructor(
     private readonly workflowVersionValidationWorkspaceService: WorkflowVersionValidationWorkspaceService,

packages/twenty-server/src/modules/workflow/common/query-hooks/workflow-version-update-many.pre-query.hook.ts

@@ -1,4 +1,4 @@
-import { WorkspaceQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
+import { WorkspacePreQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
 import { UpdateManyResolverArgs } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
 
 import { WorkspaceQueryHook } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/decorators/workspace-query-hook.decorator';
@@ -10,7 +10,7 @@ import { WorkflowVersionWorkspaceEntity } from 'src/modules/workflow/common/stan
 
 @WorkspaceQueryHook(`workflowVersion.updateMany`)
 export class WorkflowVersionUpdateManyPreQueryHook
-  implements WorkspaceQueryHookInstance
+  implements WorkspacePreQueryHookInstance
 {
   async execute(): Promise<
     UpdateManyResolverArgs<WorkflowVersionWorkspaceEntity>

packages/twenty-server/src/modules/workflow/common/query-hooks/workflow-version-update-one.pre-query.hook.ts

@@ -1,14 +1,14 @@
-import { WorkspaceQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
+import { WorkspacePreQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
 import { UpdateOneResolverArgs } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
 
 import { WorkspaceQueryHook } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/decorators/workspace-query-hook.decorator';
 import { AuthContext } from 'src/engine/core-modules/auth/types/auth-context.type';
-import { WorkflowVersionValidationWorkspaceService } from 'src/modules/workflow/common/workspace-services/workflow-version-validation.workspace-service';
 import { WorkflowVersionWorkspaceEntity } from 'src/modules/workflow/common/standard-objects/workflow-version.workspace-entity';
+import { WorkflowVersionValidationWorkspaceService } from 'src/modules/workflow/common/workspace-services/workflow-version-validation.workspace-service';
 
 @WorkspaceQueryHook(`workflowVersion.updateOne`)
 export class WorkflowVersionUpdateOnePreQueryHook
-  implements WorkspaceQueryHookInstance
+  implements WorkspacePreQueryHookInstance
 {
   constructor(
     private readonly workflowVersionValidationWorkspaceService: WorkflowVersionValidationWorkspaceService,

packages/twenty-server/src/modules/workspace-member/query-hooks/workspace-member-create-many.pre-query.hook.ts

@@ -1,4 +1,4 @@
-import { WorkspaceQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
+import { WorkspacePreQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
 import { CreateManyResolverArgs } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
 
 import { WorkspaceQueryHook } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/decorators/workspace-query-hook.decorator';
@@ -7,7 +7,7 @@ import { WorkspaceMemberPreQueryHookService } from 'src/modules/workspace-member
 
 @WorkspaceQueryHook(`workspaceMember.createMany`)
 export class WorkspaceMemberCreateManyPreQueryHook
-  implements WorkspaceQueryHookInstance
+  implements WorkspacePreQueryHookInstance
 {
   constructor(
     private readonly workspaceMemberPreQueryHookService: WorkspaceMemberPreQueryHookService,

packages/twenty-server/src/modules/workspace-member/query-hooks/workspace-member-create-one.pre-query.hook.ts

@@ -1,4 +1,4 @@
-import { WorkspaceQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
+import { WorkspacePreQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
 import { CreateOneResolverArgs } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
 
 import { WorkspaceQueryHook } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/decorators/workspace-query-hook.decorator';
@@ -7,7 +7,7 @@ import { WorkspaceMemberPreQueryHookService } from 'src/modules/workspace-member
 
 @WorkspaceQueryHook(`workspaceMember.createOne`)
 export class WorkspaceMemberCreateOnePreQueryHook
-  implements WorkspaceQueryHookInstance
+  implements WorkspacePreQueryHookInstance
 {
   constructor(
     private readonly workspaceMemberPreQueryHookService: WorkspaceMemberPreQueryHookService,

packages/twenty-server/src/modules/workspace-member/query-hooks/workspace-member-delete-many.pre-query.hook.ts

@@ -1,4 +1,4 @@
-import { WorkspaceQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
+import { WorkspacePreQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
 import { DeleteManyResolverArgs } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
 
 import { WorkspaceQueryHook } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/decorators/workspace-query-hook.decorator';
@@ -7,7 +7,7 @@ import { WorkspaceMemberPreQueryHookService } from 'src/modules/workspace-member
 
 @WorkspaceQueryHook(`workspaceMember.deleteMany`)
 export class WorkspaceMemberDeleteManyPreQueryHook
-  implements WorkspaceQueryHookInstance
+  implements WorkspacePreQueryHookInstance
 {
   constructor(
     private readonly workspaceMemberPreQueryHookService: WorkspaceMemberPreQueryHookService,

packages/twenty-server/src/modules/workspace-member/query-hooks/workspace-member-delete-one.pre-query.hook.ts

@@ -1,4 +1,4 @@
-import { WorkspaceQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
+import { WorkspacePreQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
 import { DeleteOneResolverArgs } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
 
 import { WorkspaceQueryHook } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/decorators/workspace-query-hook.decorator';
@@ -9,7 +9,7 @@ import { WorkspaceMemberPreQueryHookService } from 'src/modules/workspace-member
 
 @WorkspaceQueryHook(`workspaceMember.deleteOne`)
 export class WorkspaceMemberDeleteOnePreQueryHook
-  implements WorkspaceQueryHookInstance
+  implements WorkspacePreQueryHookInstance
 {
   constructor(
     private readonly twentyORMManager: TwentyORMManager,

packages/twenty-server/src/modules/workspace-member/query-hooks/workspace-member-destroy-many.pre-query.hook.ts

@@ -1,4 +1,4 @@
-import { WorkspaceQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
+import { WorkspacePreQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
 import { DeleteManyResolverArgs } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
 
 import { WorkspaceQueryHook } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/decorators/workspace-query-hook.decorator';
@@ -7,7 +7,7 @@ import { WorkspaceMemberPreQueryHookService } from 'src/modules/workspace-member
 
 @WorkspaceQueryHook(`workspaceMember.destroyMany`)
 export class WorkspaceMemberDestroyManyPreQueryHook
-  implements WorkspaceQueryHookInstance
+  implements WorkspacePreQueryHookInstance
 {
   constructor(
     private readonly workspaceMemberPreQueryHookService: WorkspaceMemberPreQueryHookService,

packages/twenty-server/src/modules/workspace-member/query-hooks/workspace-member-destroy-one.pre-query.hook.ts

@@ -1,4 +1,4 @@
-import { WorkspaceQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
+import { WorkspacePreQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
 import { DeleteOneResolverArgs } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
 
 import { WorkspaceQueryHook } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/decorators/workspace-query-hook.decorator';
@@ -7,7 +7,7 @@ import { WorkspaceMemberPreQueryHookService } from 'src/modules/workspace-member
 
 @WorkspaceQueryHook(`workspaceMember.destroyOne`)
 export class WorkspaceMemberDestroyOnePreQueryHook
-  implements WorkspaceQueryHookInstance
+  implements WorkspacePreQueryHookInstance
 {
   constructor(
     private readonly workspaceMemberPreQueryHookService: WorkspaceMemberPreQueryHookService,

packages/twenty-server/src/modules/workspace-member/query-hooks/workspace-member-restore-many.pre-query.hook.ts

@@ -1,4 +1,4 @@
-import { WorkspaceQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
+import { WorkspacePreQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
 import { RestoreManyResolverArgs } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
 
 import { WorkspaceQueryHook } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/decorators/workspace-query-hook.decorator';
@@ -7,7 +7,7 @@ import { WorkspaceMemberPreQueryHookService } from 'src/modules/workspace-member
 
 @WorkspaceQueryHook(`workspaceMember.restoreMany`)
 export class WorkspaceMemberRestoreManyPreQueryHook
-  implements WorkspaceQueryHookInstance
+  implements WorkspacePreQueryHookInstance
 {
   constructor(
     private readonly workspaceMemberPreQueryHookService: WorkspaceMemberPreQueryHookService,

packages/twenty-server/src/modules/workspace-member/query-hooks/workspace-member-restore-one.pre-query.hook.ts

@@ -1,4 +1,4 @@
-import { WorkspaceQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
+import { WorkspacePreQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
 import { RestoreOneResolverArgs } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
 
 import { WorkspaceQueryHook } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/decorators/workspace-query-hook.decorator';
@@ -7,7 +7,7 @@ import { WorkspaceMemberPreQueryHookService } from 'src/modules/workspace-member
 
 @WorkspaceQueryHook(`workspaceMember.restoreOne`)
 export class WorkspaceMemberRestoreOnePreQueryHook
-  implements WorkspaceQueryHookInstance
+  implements WorkspacePreQueryHookInstance
 {
   constructor(
     private readonly workspaceMemberPreQueryHookService: WorkspaceMemberPreQueryHookService,

packages/twenty-server/src/modules/workspace-member/query-hooks/workspace-member-update-many.pre-query.hook.ts

@@ -1,4 +1,4 @@
-import { WorkspaceQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
+import { WorkspacePreQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
 import { UpdateManyResolverArgs } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
 
 import { WorkspaceQueryHook } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/decorators/workspace-query-hook.decorator';
@@ -7,7 +7,7 @@ import { WorkspaceMemberPreQueryHookService } from 'src/modules/workspace-member
 
 @WorkspaceQueryHook(`workspaceMember.updateMany`)
 export class WorkspaceMemberUpdateManyPreQueryHook
-  implements WorkspaceQueryHookInstance
+  implements WorkspacePreQueryHookInstance
 {
   constructor(
     private readonly workspaceMemberPreQueryHookService: WorkspaceMemberPreQueryHookService,

packages/twenty-server/src/modules/workspace-member/query-hooks/workspace-member-update-one.pre-query.hook.ts

@@ -1,4 +1,4 @@
-import { WorkspaceQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
+import { WorkspacePreQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
 import { UpdateOneResolverArgs } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
 
 import { WorkspaceQueryHook } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/decorators/workspace-query-hook.decorator';
@@ -7,7 +7,7 @@ import { WorkspaceMemberPreQueryHookService } from 'src/modules/workspace-member
 
 @WorkspaceQueryHook(`workspaceMember.updateOne`)
 export class WorkspaceMemberUpdateOnePreQueryHook
-  implements WorkspaceQueryHookInstance
+  implements WorkspacePreQueryHookInstance
 {
   constructor(
     private readonly workspaceMemberPreQueryHookService: WorkspaceMemberPreQueryHookService,