Skip to content

The open alternative to Salesforce, designed for AI.

chore(server): migrate 5 modules off NestjsQueryTypeOrmModule wiring (#22595)

Abdul Rahman81cfcecdc7ac
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-variable/application-variable.module.ts b/packages/twenty-server/src/engine/core-modules/application/application-variable/application-variable.module.ts
index 124260a646e..0d3448aab8e 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application-variable/application-variable.module.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-variable/application-variable.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 { ApplicationVariableEntity } from 'src/engine/core-modules/application/application-variable/application-variable.entity';
import { ApplicationVariableEntityResolver } from 'src/engine/core-modules/application/application-variable/application-variable.resolver';
@@ -15,7 +13,6 @@ import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache
@Module({
imports: [
- NestjsQueryTypeOrmModule.forFeature([ApplicationVariableEntity]),
TypeOrmModule.forFeature([ApplicationVariableEntity, ApplicationEntity]),
PermissionsModule,
WorkspaceCacheModule,
diff --git a/packages/twenty-server/src/engine/core-modules/approved-access-domain/approved-access-domain.module.ts b/packages/twenty-server/src/engine/core-modules/approved-access-domain/approved-access-domain.module.ts
index 634f7d8bddf..63cb620b4e8 100644
--- a/packages/twenty-server/src/engine/core-modules/approved-access-domain/approved-access-domain.module.ts
+++ b/packages/twenty-server/src/engine/core-modules/approved-access-domain/approved-access-domain.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 { ApprovedAccessDomainEntity } from 'src/engine/core-modules/approved-access-domain/approved-access-domain.entity';
import { ApprovedAccessDomainResolver } from 'src/engine/core-modules/approved-access-domain/approved-access-domain.resolver';
@@ -15,7 +14,7 @@ import { provideWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspac
WorkspaceDomainsModule,
FileModule,
JwtModule,
- NestjsQueryTypeOrmModule.forFeature([ApprovedAccessDomainEntity]),
+ TypeOrmModule.forFeature([ApprovedAccessDomainEntity]),
PermissionsModule,
],
exports: [ApprovedAccessDomainService],
diff --git a/packages/twenty-server/src/engine/core-modules/emailing-domain/emailing-domain.module.ts b/packages/twenty-server/src/engine/core-modules/emailing-domain/emailing-domain.module.ts
index 11f0e10a639..24b7ea88863 100644
--- a/packages/twenty-server/src/engine/core-modules/emailing-domain/emailing-domain.module.ts
+++ b/packages/twenty-server/src/engine/core-modules/emailing-domain/emailing-domain.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 { TypeORMModule } from 'src/database/typeorm/typeorm.module';
import { BillingModule } from 'src/engine/core-modules/billing/billing.module';
import { DnsManagerModule } from 'src/engine/core-modules/dns-manager/dns-manager.module';
@@ -32,8 +30,7 @@ import { provideWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspac
@Module({
imports: [
TypeORMModule,
- TypeOrmModule.forFeature([WorkspaceEntity]),
- NestjsQueryTypeOrmModule.forFeature([EmailingDomainEntity]),
+ TypeOrmModule.forFeature([WorkspaceEntity, EmailingDomainEntity]),
FeatureFlagModule,
PermissionsModule,
DnsManagerModule,
diff --git a/packages/twenty-server/src/engine/core-modules/public-domain/public-domain.module.ts b/packages/twenty-server/src/engine/core-modules/public-domain/public-domain.module.ts
index 9f5f9c809ad..dbe35641a9a 100644
--- a/packages/twenty-server/src/engine/core-modules/public-domain/public-domain.module.ts
+++ b/packages/twenty-server/src/engine/core-modules/public-domain/public-domain.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 { ApplicationEntity } from 'src/engine/core-modules/application/application.entity';
import { PublicDomainService } from 'src/engine/core-modules/public-domain/public-domain.service';
@@ -14,7 +13,7 @@ import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permi
import { provideWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/provide-workspace-scoped-repository';
@Module({
imports: [
- NestjsQueryTypeOrmModule.forFeature([
+ TypeOrmModule.forFeature([
PublicDomainEntity,
WorkspaceEntity,
ApplicationEntity,
diff --git a/packages/twenty-server/src/engine/core-modules/workspace-invitation/workspace-invitation.module.ts b/packages/twenty-server/src/engine/core-modules/workspace-invitation/workspace-invitation.module.ts
index 45bf522f4a9..7eaa8e67099 100644
--- a/packages/twenty-server/src/engine/core-modules/workspace-invitation/workspace-invitation.module.ts
+++ b/packages/twenty-server/src/engine/core-modules/workspace-invitation/workspace-invitation.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 { AppTokenEntity } from 'src/engine/core-modules/app-token/app-token.entity';
import { WorkspaceDomainsModule } from 'src/engine/core-modules/domain/workspace-domains/workspace-domains.module';
@@ -11,18 +10,13 @@ import { ThrottlerModule } from 'src/engine/core-modules/throttler/throttler.mod
import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
import { WorkspaceInvitationService } from 'src/engine/core-modules/workspace-invitation/services/workspace-invitation.service';
import { WorkspaceInvitationResolver } from 'src/engine/core-modules/workspace-invitation/workspace-invitation.resolver';
-import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';
import { RoleValidationModule } from 'src/engine/metadata-modules/role-validation/role-validation.module';
@Module({
imports: [
WorkspaceDomainsModule,
- NestjsQueryTypeOrmModule.forFeature([
- AppTokenEntity,
- UserWorkspaceEntity,
- WorkspaceEntity,
- ]),
+ TypeOrmModule.forFeature([AppTokenEntity, UserWorkspaceEntity]),
RoleValidationModule,
FileModule,
OnboardingModule,