From a360f9bdec334b08b2f61a7c9b530b2b9f962314 Mon Sep 17 00:00:00 2001
From: Abdul Rahman <81605929+abdulrahmancodes@users.noreply.github.com>
Date: Fri, 10 Jul 2026 14:51:52 +0530
Subject: [PATCH] migrate 10 modules off NestjsQueryTypeOrmModule wiring
(#22763)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
## Summary
Continues the incremental removal of `@ptc-org/nestjs-query`. Migrates
ten modules from `NestjsQueryTypeOrmModule.forFeature` to the standard
`TypeOrmModule.forFeature`. These modules only used `nestjs-query` for
repository registration — none register `NestjsQueryGraphQLModule` /
auto-generated
resolvers — so this is a pure module-wiring swap with no behavior or
schema change.
---------
Co-authored-by: Weiko
---
.../core-modules/cloudflare/cloudflare.module.ts | 5 -----
.../src/engine/core-modules/sso/sso.module.ts | 13 ++-----------
.../logic-function/logic-function.module.ts | 9 +++++----
.../calendar-event-participant-manager.module.ts | 4 +---
.../query-hooks/workflow-query-hook.module.ts | 4 ----
.../workflow-builder/workflow-builder.module.ts | 4 ----
.../workflow-version-step.module.ts | 10 ++--------
.../workflow-version/workflow-version.module.ts | 4 ----
.../workflow-run/workflow-run.module.ts | 8 --------
.../workflow-trigger/workflow-trigger.module.ts | 4 ----
10 files changed, 10 insertions(+), 55 deletions(-)
diff --git a/packages/twenty-server/src/engine/core-modules/cloudflare/cloudflare.module.ts b/packages/twenty-server/src/engine/core-modules/cloudflare/cloudflare.module.ts
index ba118efe9e..abb101430e 100644
--- a/packages/twenty-server/src/engine/core-modules/cloudflare/cloudflare.module.ts
+++ b/packages/twenty-server/src/engine/core-modules/cloudflare/cloudflare.module.ts
@@ -1,18 +1,13 @@
import { Module } from '@nestjs/common';
-import { NestjsQueryTypeOrmModule } from '@ptc-org/nestjs-query-typeorm';
-
import { DnsCloudflareController } from 'src/engine/core-modules/cloudflare/controllers/dns-cloudflare.controller';
import { DnsCloudflareService } from 'src/engine/core-modules/cloudflare/services/dns-cloudflare.service';
import { CustomDomainManagerModule } from 'src/engine/core-modules/domain/custom-domain-manager/custom-domain-manager.module';
import { WorkspaceDomainsModule } from 'src/engine/core-modules/domain/workspace-domains/workspace-domains.module';
-import { PublicDomainEntity } from 'src/engine/core-modules/public-domain/public-domain.entity';
import { PublicDomainModule } from 'src/engine/core-modules/public-domain/public-domain.module';
-import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
@Module({
imports: [
- NestjsQueryTypeOrmModule.forFeature([PublicDomainEntity, WorkspaceEntity]),
WorkspaceDomainsModule,
CustomDomainManagerModule,
PublicDomainModule,
diff --git a/packages/twenty-server/src/engine/core-modules/sso/sso.module.ts b/packages/twenty-server/src/engine/core-modules/sso/sso.module.ts
index 888517e5b0..32d097abfa 100644
--- a/packages/twenty-server/src/engine/core-modules/sso/sso.module.ts
+++ b/packages/twenty-server/src/engine/core-modules/sso/sso.module.ts
@@ -1,28 +1,19 @@
/* @license Enterprise */
import { Module } from '@nestjs/common';
+import { TypeOrmModule } from '@nestjs/typeorm';
-import { NestjsQueryTypeOrmModule } from '@ptc-org/nestjs-query-typeorm';
-
-import { AppTokenEntity } from 'src/engine/core-modules/app-token/app-token.entity';
import { BillingModule } from 'src/engine/core-modules/billing/billing.module';
import { EnterpriseModule } from 'src/engine/core-modules/enterprise/enterprise.module';
-import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';
import { GuardRedirectModule } from 'src/engine/core-modules/guard-redirect/guard-redirect.module';
import { SSOService } from 'src/engine/core-modules/sso/services/sso.service';
import { SSOResolver } from 'src/engine/core-modules/sso/sso.resolver';
import { WorkspaceSSOIdentityProviderEntity } from 'src/engine/core-modules/sso/workspace-sso-identity-provider.entity';
-import { UserEntity } from 'src/engine/core-modules/user/user.entity';
import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';
@Module({
imports: [
- NestjsQueryTypeOrmModule.forFeature([
- WorkspaceSSOIdentityProviderEntity,
- UserEntity,
- AppTokenEntity,
- FeatureFlagEntity,
- ]),
+ TypeOrmModule.forFeature([WorkspaceSSOIdentityProviderEntity]),
BillingModule,
EnterpriseModule,
GuardRedirectModule,
diff --git a/packages/twenty-server/src/engine/metadata-modules/logic-function/logic-function.module.ts b/packages/twenty-server/src/engine/metadata-modules/logic-function/logic-function.module.ts
index 4f4e542a85..6cf66ae03d 100644
--- a/packages/twenty-server/src/engine/metadata-modules/logic-function/logic-function.module.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/logic-function/logic-function.module.ts
@@ -1,8 +1,6 @@
import { Module } from '@nestjs/common';
import { TypeOrmModule } from '@nestjs/typeorm';
-import { NestjsQueryTypeOrmModule } from '@ptc-org/nestjs-query-typeorm';
-
import { ApplicationEntity } from 'src/engine/core-modules/application/application.entity';
import { ApplicationModule } from 'src/engine/core-modules/application/application.module';
import { EventLogLiveModule } from 'src/engine/core-modules/event-logs/live/event-log-live.module';
@@ -25,8 +23,11 @@ import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspace
@Module({
imports: [
- NestjsQueryTypeOrmModule.forFeature([LogicFunctionEntity]),
- TypeOrmModule.forFeature([ApplicationEntity, FeatureFlagEntity]),
+ TypeOrmModule.forFeature([
+ LogicFunctionEntity,
+ ApplicationEntity,
+ FeatureFlagEntity,
+ ]),
ThrottlerModule,
ApplicationModule,
EventLogLiveModule,
diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-participant-manager/calendar-event-participant-manager.module.ts b/packages/twenty-server/src/modules/calendar/calendar-event-participant-manager/calendar-event-participant-manager.module.ts
index 226617896a..ed6d6ce1a5 100644
--- a/packages/twenty-server/src/modules/calendar/calendar-event-participant-manager/calendar-event-participant-manager.module.ts
+++ b/packages/twenty-server/src/modules/calendar/calendar-event-participant-manager/calendar-event-participant-manager.module.ts
@@ -1,8 +1,6 @@
import { Module } from '@nestjs/common';
import { TypeOrmModule } from '@nestjs/typeorm';
-import { NestjsQueryTypeOrmModule } from '@ptc-org/nestjs-query-typeorm';
-
import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
import { FeatureFlagService } from 'src/engine/core-modules/feature-flag/services/feature-flag.service';
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
@@ -31,8 +29,8 @@ import { MatchParticipantModule } from 'src/modules/match-participant/match-part
ObjectMetadataEntity,
FieldMetadataEntity,
FeatureFlagEntity,
+ WorkspaceEntity,
]),
- NestjsQueryTypeOrmModule.forFeature([WorkspaceEntity]),
ContactCreationManagerModule,
MatchParticipantModule,
WorkspaceCacheModule,
diff --git a/packages/twenty-server/src/modules/workflow/common/query-hooks/workflow-query-hook.module.ts b/packages/twenty-server/src/modules/workflow/common/query-hooks/workflow-query-hook.module.ts
index ce3c39d062..a2f75f7733 100644
--- a/packages/twenty-server/src/modules/workflow/common/query-hooks/workflow-query-hook.module.ts
+++ b/packages/twenty-server/src/modules/workflow/common/query-hooks/workflow-query-hook.module.ts
@@ -1,13 +1,10 @@
import { Module } from '@nestjs/common';
-import { NestjsQueryTypeOrmModule } from '@ptc-org/nestjs-query-typeorm';
-
import { CommandMenuItemModule } from 'src/engine/metadata-modules/command-menu-item/command-menu-item.module';
import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';
import { RecordPositionModule } from 'src/engine/core-modules/record-position/record-position.module';
import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';
import { LogicFunctionModule } from 'src/engine/metadata-modules/logic-function/logic-function.module';
-import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
import { ObjectMetadataModule } from 'src/engine/metadata-modules/object-metadata/object-metadata.module';
import { CodeStepBuildModule } from 'src/modules/workflow/workflow-builder/workflow-version-step/code-step/code-step-build.module';
import { WorkflowCreateManyPostQueryHook } from 'src/modules/workflow/common/query-hooks/workflow-create-many.post-query.hook';
@@ -41,7 +38,6 @@ import { WorkflowVersionValidationWorkspaceService } from 'src/modules/workflow/
@Module({
imports: [
- NestjsQueryTypeOrmModule.forFeature([ObjectMetadataEntity]),
LogicFunctionModule,
RecordPositionModule,
WorkspaceManyOrAllFlatEntityMapsCacheModule,
diff --git a/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-builder.module.ts b/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-builder.module.ts
index 13828b55b3..291a491c80 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-builder.module.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-builder.module.ts
@@ -1,8 +1,5 @@
import { Module } from '@nestjs/common';
-import { NestjsQueryTypeOrmModule } from '@ptc-org/nestjs-query-typeorm';
-
-import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
import { WorkflowSchemaModule } from 'src/modules/workflow/workflow-builder/workflow-schema/workflow-schema.module';
import { WorkflowVersionStepModule } from 'src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step.module';
import { WorkflowVersionModule } from 'src/modules/workflow/workflow-builder/workflow-version/workflow-version.module';
@@ -14,7 +11,6 @@ import { WorkflowVersionEdgeModule } from 'src/modules/workflow/workflow-builder
WorkflowVersionModule,
WorkflowVersionStepModule,
WorkflowVersionEdgeModule,
- NestjsQueryTypeOrmModule.forFeature([ObjectMetadataEntity]),
],
exports: [
WorkflowSchemaModule,
diff --git a/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step.module.ts b/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step.module.ts
index c8014bb506..adaf14addd 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step.module.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step.module.ts
@@ -1,6 +1,5 @@
import { Module } from '@nestjs/common';
-
-import { NestjsQueryTypeOrmModule } from '@ptc-org/nestjs-query-typeorm';
+import { TypeOrmModule } from '@nestjs/typeorm';
import { AiAgentRoleModule } from 'src/engine/metadata-modules/ai/ai-agent-role/ai-agent-role.module';
import { AiAgentModule } from 'src/engine/metadata-modules/ai/ai-agent/ai-agent.module';
@@ -8,7 +7,6 @@ import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata
import { LogicFunctionModule } from 'src/engine/metadata-modules/logic-function/logic-function.module';
import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
import { RoleTargetEntity } from 'src/engine/metadata-modules/role-target/role-target.entity';
-import { RoleEntity } from 'src/engine/metadata-modules/role/role.entity';
import { provideWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/provide-workspace-scoped-repository';
import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';
import { WorkflowCommonModule } from 'src/modules/workflow/common/workflow-common.module';
@@ -30,11 +28,7 @@ import { WorkflowVersionStepWorkspaceService } from 'src/modules/workflow/workfl
AiAgentRoleModule,
AiAgentModule,
WorkspaceCacheModule,
- NestjsQueryTypeOrmModule.forFeature([
- ObjectMetadataEntity,
- RoleTargetEntity,
- RoleEntity,
- ]),
+ TypeOrmModule.forFeature([ObjectMetadataEntity, RoleTargetEntity]),
WorkspaceManyOrAllFlatEntityMapsCacheModule,
],
providers: [
diff --git a/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version/workflow-version.module.ts b/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version/workflow-version.module.ts
index 18f184fef0..bdb4759116 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version/workflow-version.module.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version/workflow-version.module.ts
@@ -1,11 +1,8 @@
import { Module } from '@nestjs/common';
-import { NestjsQueryTypeOrmModule } from '@ptc-org/nestjs-query-typeorm';
-
import { CacheLockModule } from 'src/engine/core-modules/cache-lock/cache-lock.module';
import { RecordPositionModule } from 'src/engine/core-modules/record-position/record-position.module';
import { LogicFunctionModule } from 'src/engine/metadata-modules/logic-function/logic-function.module';
-import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
import { WorkflowCommonModule } from 'src/modules/workflow/common/workflow-common.module';
import { WorkflowSchemaModule } from 'src/modules/workflow/workflow-builder/workflow-schema/workflow-schema.module';
import { WorkflowVersionStepModule } from 'src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step.module';
@@ -17,7 +14,6 @@ import { WorkflowVersionWorkspaceService } from 'src/modules/workflow/workflow-b
LogicFunctionModule,
WorkflowVersionStepModule,
WorkflowCommonModule,
- NestjsQueryTypeOrmModule.forFeature([ObjectMetadataEntity]),
RecordPositionModule,
CacheLockModule,
],
diff --git a/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run/workflow-run.module.ts b/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run/workflow-run.module.ts
index 9951651791..ccb6239878 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run/workflow-run.module.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run/workflow-run.module.ts
@@ -1,14 +1,10 @@
import { Module } from '@nestjs/common';
-import { NestjsQueryTypeOrmModule } from '@ptc-org/nestjs-query-typeorm';
-
import { WorkspaceIteratorModule } from 'src/database/commands/command-runners/workspace-iterator.module';
import { CacheLockModule } from 'src/engine/core-modules/cache-lock/cache-lock.module';
import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';
import { MetricsModule } from 'src/engine/core-modules/metrics/metrics.module';
import { RecordPositionModule } from 'src/engine/core-modules/record-position/record-position.module';
-import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
-import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
import { WorkflowCommonModule } from 'src/modules/workflow/common/workflow-common.module';
import { DeleteWorkflowRunsCommand } from 'src/modules/workflow/workflow-runner/workflow-run/command/delete-workflow-runs.command';
import { WorkflowRunStepLogWorkspaceService } from 'src/modules/workflow/workflow-runner/workflow-run/workflow-run-step-log.workspace-service';
@@ -17,10 +13,6 @@ import { WorkflowRunWorkspaceService } from 'src/modules/workflow/workflow-runne
@Module({
imports: [
WorkflowCommonModule,
- NestjsQueryTypeOrmModule.forFeature([
- ObjectMetadataEntity,
- WorkspaceEntity,
- ]),
RecordPositionModule,
CacheLockModule,
MetricsModule,
diff --git a/packages/twenty-server/src/modules/workflow/workflow-trigger/workflow-trigger.module.ts b/packages/twenty-server/src/modules/workflow/workflow-trigger/workflow-trigger.module.ts
index ae9f0100fa..2527555198 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-trigger/workflow-trigger.module.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-trigger/workflow-trigger.module.ts
@@ -1,12 +1,9 @@
import { Module } from '@nestjs/common';
-import { NestjsQueryTypeOrmModule } from '@ptc-org/nestjs-query-typeorm';
-
import { CacheStorageModule } from 'src/engine/core-modules/cache-storage/cache-storage.module';
import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';
import { CommandMenuItemModule } from 'src/engine/metadata-modules/command-menu-item/command-menu-item.module';
import { LogicFunctionModule } from 'src/engine/metadata-modules/logic-function/logic-function.module';
-import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
import { WorkflowCommonModule } from 'src/modules/workflow/common/workflow-common.module';
import { CodeStepBuildModule } from 'src/modules/workflow/workflow-builder/workflow-version-step/code-step/code-step-build.module';
import { WorkflowRunnerModule } from 'src/modules/workflow/workflow-runner/workflow-runner.module';
@@ -23,7 +20,6 @@ import { WorkflowTriggerWorkspaceService } from 'src/modules/workflow/workflow-t
CacheStorageModule,
CommandMenuItemModule,
FeatureFlagModule,
- NestjsQueryTypeOrmModule.forFeature([ObjectMetadataEntity]),
LogicFunctionModule,
],
providers: [WorkflowTriggerWorkspaceService, WorkflowTriggerJob],