Skip to content

The open alternative to Salesforce, designed for AI.

Provide each server service from a single module (#27441)

Félix Malfaite55899506ef8
diff --git a/packages/twenty-server/src/database/commands/database-command.module.ts b/packages/twenty-server/src/database/commands/database-command.module.ts
index ffd658bde29..bb34d62f875 100644
--- a/packages/twenty-server/src/database/commands/database-command.module.ts
+++ b/packages/twenty-server/src/database/commands/database-command.module.ts
@@ -17,7 +17,6 @@ import { UpgradeVersionCommandModule } from 'src/database/commands/upgrade-versi
import { WorkspaceExportModule } from 'src/database/commands/workspace-export/workspace-export.module';
import { TypeORMModule } from 'src/database/typeorm/typeorm.module';
import { ApiKeyModule } from 'src/engine/core-modules/api-key/api-key.module';
-import { GenerateApiKeyCommand } from 'src/engine/core-modules/api-key/commands/generate-api-key.command';
import { ApplicationInstallModule } from 'src/engine/core-modules/application/application-install/application-install.module';
import { MarketplaceModule } from 'src/engine/core-modules/application/application-marketplace/marketplace.module';
import { StaleRegistrationCleanupModule } from 'src/engine/core-modules/application/application-oauth/stale-registration-cleanup/stale-registration-cleanup.module';
@@ -124,7 +123,6 @@ import { WorkflowCoreConsistencyModule } from 'src/modules/workflow/workflow-cor
ListOrphanedWorkspaceEntitiesCommand,
EnterpriseKeyValidationCronCommand,
RotateSigningKeysCronCommand,
- GenerateApiKeyCommand,
UpgradeStatusCommand,
RebuildApplicationDefaultDepsCommand,
InstallPreInstalledAppsCommand,
diff --git a/packages/twenty-server/src/engine/api/mcp/mcp.module.ts b/packages/twenty-server/src/engine/api/mcp/mcp.module.ts
index 01c65622c85..00e753f5694 100644
--- a/packages/twenty-server/src/engine/api/mcp/mcp.module.ts
+++ b/packages/twenty-server/src/engine/api/mcp/mcp.module.ts
@@ -1,7 +1,6 @@
import { Module } from '@nestjs/common';
import { McpCoreController } from 'src/engine/api/mcp/controllers/mcp-core.controller';
-import { McpAuthGuard } from 'src/engine/api/mcp/guards/mcp-auth.guard';
import { McpInstructionBuilderService } from 'src/engine/api/mcp/services/mcp-instruction-builder.service';
import { McpProtocolService } from 'src/engine/api/mcp/services/mcp-protocol.service';
import { McpToolExecutorService } from 'src/engine/api/mcp/services/mcp-tool-executor.service';
@@ -33,7 +32,6 @@ import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache
exports: [McpProtocolService],
providers: [
JwtAuthGuard,
- McpAuthGuard,
McpInstructionBuilderService,
McpProtocolService,
McpToolExecutorService,
diff --git a/packages/twenty-server/src/engine/core-modules/api-key/api-key.module.ts b/packages/twenty-server/src/engine/core-modules/api-key/api-key.module.ts
index 557e393787b..9f1112f0a5a 100644
--- a/packages/twenty-server/src/engine/core-modules/api-key/api-key.module.ts
+++ b/packages/twenty-server/src/engine/core-modules/api-key/api-key.module.ts
@@ -4,7 +4,6 @@ import { TypeOrmModule } from '@nestjs/typeorm';
import { ApiKeyEntity } from 'src/engine/core-modules/api-key/api-key.entity';
import { ApiKeyResolver } from 'src/engine/core-modules/api-key/api-key.resolver';
import { GenerateApiKeyCommand } from 'src/engine/core-modules/api-key/commands/generate-api-key.command';
-import { ApiKeyRoleService } from 'src/engine/core-modules/api-key/services/api-key-role.service';
import { ApiKeyService } from 'src/engine/core-modules/api-key/services/api-key.service';
import { WorkspaceApiKeyMapCacheService } from 'src/engine/core-modules/api-key/services/workspace-api-key-map-cache.service';
import { TokenModule } from 'src/engine/core-modules/auth/token/token.module';
@@ -38,7 +37,6 @@ import { ApiKeyController } from './controllers/api-key.controller';
providers: [
ApiKeyService,
ApiKeyResolver,
- ApiKeyRoleService,
WorkspaceApiKeyMapCacheService,
GenerateApiKeyCommand,
provideWorkspaceScopedRepository(ApiKeyEntity),
@@ -46,11 +44,6 @@ import { ApiKeyController } from './controllers/api-key.controller';
provideWorkspaceScopedRepository(RoleTargetEntity),
],
controllers: [ApiKeyController],
- exports: [
- ApiKeyService,
- ApiKeyRoleService,
- TypeOrmModule,
- GenerateApiKeyCommand,
- ],
+ exports: [ApiKeyService, PermissionsModule, TypeOrmModule],
})
export class ApiKeyModule {}
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-development/application-development.module.ts b/packages/twenty-server/src/engine/core-modules/application/application-development/application-development.module.ts
index d498db12704..0985ff4d276 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application-development/application-development.module.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-development/application-development.module.ts
@@ -20,7 +20,6 @@ import { WorkspaceGraphqlSchemaSDLModule } from 'src/engine/api/graphql/workspac
import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';
import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';
import { provideWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/provide-workspace-scoped-repository';
-import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration/interceptors/workspace-migration-graphql-api-exception.interceptor';
import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';
@Module({
@@ -46,7 +45,6 @@ import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata
ApplicationExportResolver,
ApplicationSchemaResolver,
ApplicationFileUploadService,
- WorkspaceMigrationGraphqlApiExceptionInterceptor,
provideWorkspaceScopedRepository(FileEntity),
],
})
diff --git a/packages/twenty-server/src/engine/core-modules/application/connection-provider/connections/application-connections.module.ts b/packages/twenty-server/src/engine/core-modules/application/connection-provider/connections/application-connections.module.ts
index 4e4e0d07bc3..bef0f165780 100644
--- a/packages/twenty-server/src/engine/core-modules/application/connection-provider/connections/application-connections.module.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/connection-provider/connections/application-connections.module.ts
@@ -6,7 +6,6 @@ import { ApplicationConnectionsController } from 'src/engine/core-modules/applic
import { ApplicationConnectionsResolver } from 'src/engine/core-modules/application/connection-provider/connections/application-connections.resolver';
import { ApplicationConnectionAuthFailureService } from 'src/engine/core-modules/application/connection-provider/connections/services/application-connection-auth-failure.service';
import { ApplicationConnectionsListService } from 'src/engine/core-modules/application/connection-provider/connections/services/application-connections-list.service';
-import { ConnectionProviderGraphqlApiExceptionInterceptor } from 'src/engine/core-modules/application/connection-provider/interceptors/connection-provider-graphql-api-exception.interceptor';
import { TokenModule } from 'src/engine/core-modules/auth/token/token.module';
import { ConnectedAccountEntity } from 'src/engine/metadata-modules/connected-account/entities/connected-account.entity';
import { ConnectedAccountTokenEncryptionModule } from 'src/engine/metadata-modules/connected-account/services/connected-account-token-encryption.module';
@@ -38,7 +37,6 @@ import { RefreshTokensManagerModule } from 'src/modules/connected-account/refres
ApplicationConnectionAuthFailureService,
ApplicationConnectionsListService,
ApplicationConnectionsResolver,
- ConnectionProviderGraphqlApiExceptionInterceptor,
],
controllers: [ApplicationConnectionsController],
exports: [ApplicationConnectionsListService],
diff --git a/packages/twenty-server/src/engine/core-modules/auth/auth.module.ts b/packages/twenty-server/src/engine/core-modules/auth/auth.module.ts
index 5fdf4daca6c..d43f511fccc 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/auth.module.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/auth.module.ts
@@ -29,9 +29,6 @@ import { ResetPasswordService } from 'src/engine/core-modules/auth/services/rese
import { SignInUpService } from 'src/engine/core-modules/auth/services/sign-in-up.service';
import { UpdateConnectedAccountOnReconnectService } from 'src/engine/core-modules/auth/services/update-connected-account-on-reconnect.service';
import { SamlAuthStrategy } from 'src/engine/core-modules/auth/strategies/saml.auth.strategy';
-import { AccessTokenService } from 'src/engine/core-modules/auth/token/services/access-token.service';
-import { LoginTokenService } from 'src/engine/core-modules/auth/token/services/login-token.service';
-import { RefreshTokenService } from 'src/engine/core-modules/auth/token/services/refresh-token.service';
import { TransientTokenService } from 'src/engine/core-modules/auth/token/services/transient-token.service';
import { TokenModule } from 'src/engine/core-modules/auth/token/token.module';
import { BillingModule } from 'src/engine/core-modules/billing/billing.module';
@@ -66,7 +63,7 @@ import { ConnectedAccountTokenEncryptionModule } from 'src/engine/metadata-modul
import { MessageChannelEntity } from 'src/engine/metadata-modules/message-channel/entities/message-channel.entity';
import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';
import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';
-import { CalendarChannelSyncStatusService } from 'src/modules/calendar/common/services/calendar-channel-sync-status.service';
+import { CalendarCommonModule } from 'src/modules/calendar/common/calendar-common.module';
import { ConnectedAccountModule } from 'src/modules/connected-account/connected-account.module';
import { EmailAliasManagerModule } from 'src/modules/connected-account/email-alias-manager/email-alias-manager.module';
import { MessagingCommonModule } from 'src/modules/messaging/common/messaging-common.module';
@@ -76,7 +73,6 @@ import { MessagingFolderSyncManagerModule } from 'src/modules/messaging/message-
import { AuthResolver } from './auth.resolver';
import { AuthService } from './services/auth.service';
-import { JwtAuthStrategy } from './strategies/jwt.auth.strategy';
@Module({
imports: [
@@ -97,6 +93,7 @@ import { JwtAuthStrategy } from './strategies/jwt.auth.strategy';
]),
UserWorkspaceModule,
OnboardingModule,
+ CalendarCommonModule,
ConnectedAccountModule,
MessagingCommonModule,
OnboardingRecentMessagesImportModule,
@@ -140,19 +137,14 @@ import { JwtAuthStrategy } from './strategies/jwt.auth.strategy';
providers: [
SignInUpService,
AuthService,
- JwtAuthStrategy,
SamlAuthStrategy,
AuthResolver,
GoogleAPIsService,
GoogleApiScopesService,
GoogleApisServiceAvailabilityService,
MicrosoftAPIsService,
- AccessTokenService,
- RefreshTokenService,
- LoginTokenService,
ResetPasswordService,
// TODO: move these calendar, message and connected account services to business modules once they can hold controllers
- CalendarChannelSyncStatusService,
CreateMessageChannelService,
CreateCalendarChannelService,
CreateConnectedAccountService,
@@ -163,9 +155,7 @@ import { JwtAuthStrategy } from './strategies/jwt.auth.strategy';
AuthSsoService,
],
exports: [
- AccessTokenService,
- LoginTokenService,
- RefreshTokenService,
+ TokenModule,
CreateMessageChannelService,
CreateCalendarChannelService,
],
diff --git a/packages/twenty-server/src/engine/core-modules/file/file-api.module.ts b/packages/twenty-server/src/engine/core-modules/file/file-api.module.ts
index 668e79a75a7..cdeb1bb6ca9 100644
--- a/packages/twenty-server/src/engine/core-modules/file/file-api.module.ts
+++ b/packages/twenty-server/src/engine/core-modules/file/file-api.module.ts
@@ -4,7 +4,6 @@ import { CoreEntityCacheModule } from 'src/engine/core-entity-cache/core-entity-
import { TokenModule } from 'src/engine/core-modules/auth/token/token.module';
import { FileController } from 'src/engine/core-modules/file/controllers/file.controller';
import { FileModule } from 'src/engine/core-modules/file/file.module';
-import { FileByIdGuard } from 'src/engine/core-modules/file/guards/file-by-id.guard';
import { JwtModule } from 'src/engine/core-modules/jwt/jwt.module';
import { RecordExportModule } from 'src/engine/core-modules/record-export/record-export.module';
import { WorkspaceCacheStorageModule } from 'src/engine/workspace-cache-storage/workspace-cache-storage.module';
@@ -19,6 +18,5 @@ import { WorkspaceCacheStorageModule } from 'src/engine/workspace-cache-storage/
WorkspaceCacheStorageModule,
],
controllers: [FileController],
- providers: [FileByIdGuard],
})
export class FileApiModule {}
diff --git a/packages/twenty-server/src/engine/core-modules/file/file-upload/file-upload.module.ts b/packages/twenty-server/src/engine/core-modules/file/file-upload/file-upload.module.ts
index 668f1c663ca..b67b94c0c1b 100644
--- a/packages/twenty-server/src/engine/core-modules/file/file-upload/file-upload.module.ts
+++ b/packages/twenty-server/src/engine/core-modules/file/file-upload/file-upload.module.ts
@@ -6,7 +6,6 @@ import { FileEntity } from 'src/engine/core-modules/file/entities/file.entity';
import { FileUploadController } from 'src/engine/core-modules/file/file-upload/controllers/file-upload.controller';
import { PendingFileCleanupCronCommand } from 'src/engine/core-modules/file/file-upload/crons/commands/pending-file-cleanup.cron.command';
import { PendingFileCleanupCronJob } from 'src/engine/core-modules/file/file-upload/crons/jobs/pending-file-cleanup.cron.job';
-import { FileUploadTokenGuard } from 'src/engine/core-modules/file/file-upload/guards/file-upload-token.guard';
import { FileUploadResolver } from 'src/engine/core-modules/file/file-upload/resolvers/file-upload.resolver';
import { FileUploadCompletionService } from 'src/engine/core-modules/file/file-upload/services/file-upload-completion.service';
import { FileUploadService } from 'src/engine/core-modules/file/file-upload/services/file-upload.service';
@@ -36,7 +35,6 @@ import { provideWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspac
FileUploadTargetService,
FileUploadCompletionService,
FileUploadResolver,
- FileUploadTokenGuard,
PendingFileCleanupService,
PendingFileCleanupCronJob,
PendingFileCleanupCronCommand,
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/ai-agent-execution.module.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/ai-agent-execution.module.ts
index c5301d06dbc..1c194b273dd 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/ai-agent-execution.module.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/ai-agent-execution.module.ts
@@ -32,7 +32,6 @@ import { AgentChatThreadLifecycleModule } from 'src/engine/metadata-modules/ai/a
import { AgentChatThreadModule } from 'src/engine/metadata-modules/ai/ai-chat/agent-chat-thread.module';
import { AiBillingModule } from 'src/engine/metadata-modules/ai/ai-billing/ai-billing.module';
import { AgentHistoryModule } from 'src/engine/metadata-modules/ai/ai-history/ai-history.module';
-import { AiGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/ai/interceptors/ai-graphql-api-exception.interceptor';
import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';
import { UserRoleModule } from 'src/engine/metadata-modules/user-role/user-role.module';
import { provideWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/provide-workspace-scoped-repository';
@@ -68,7 +67,6 @@ import { provideWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspac
AgentRunCallerHandlerRegistryService,
AgentRunConversationService,
AgentRunSuspensionService,
- AiGraphqlApiExceptionInterceptor,
AgentMessagePartResolver,
AgentMessageResolver,
AgentRunResolver,
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-runs/ai-agent-runs.module.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-runs/ai-agent-runs.module.ts
index b31172ca51e..eb2f584d217 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-runs/ai-agent-runs.module.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-runs/ai-agent-runs.module.ts
@@ -6,7 +6,6 @@ import { AiAgentModule } from 'src/engine/metadata-modules/ai/ai-agent/ai-agent.
import { AgentRunsResolver } from 'src/engine/metadata-modules/ai/ai-agent-runs/resolvers/agent-runs.resolver';
import { AgentRunsService } from 'src/engine/metadata-modules/ai/ai-agent-runs/services/agent-runs.service';
import { AgentHistoryModule } from 'src/engine/metadata-modules/ai/ai-history/ai-history.module';
-import { AiGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/ai/interceptors/ai-graphql-api-exception.interceptor';
import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';
import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';
@@ -19,10 +18,6 @@ import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permi
PermissionsModule,
WorkspaceManyOrAllFlatEntityMapsCacheModule,
],
- providers: [
- AgentRunsResolver,
- AgentRunsService,
- AiGraphqlApiExceptionInterceptor,
- ],
+ providers: [AgentRunsResolver, AgentRunsService],
})
export class AiAgentRunsModule {}
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/ai-agent.module.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/ai-agent.module.ts
index 790f381438f..b36afb986ce 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/ai-agent.module.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/ai-agent.module.ts
@@ -2,11 +2,9 @@ import { Module } from '@nestjs/common';
import { TypeOrmModule } from '@nestjs/typeorm';
import { ApplicationModule } from 'src/engine/core-modules/application/application.module';
-import { AiGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/ai/interceptors/ai-graphql-api-exception.interceptor';
import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';
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 { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration/interceptors/workspace-migration-graphql-api-exception.interceptor';
import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspace-migration/workspace-migration.module';
import { AgentResolver } from './agent.resolver';
@@ -31,8 +29,6 @@ import { ApplicationRegistrationLookupModule } from 'src/engine/core-modules/app
providers: [
AgentResolver,
AgentService,
- WorkspaceMigrationGraphqlApiExceptionInterceptor,
- AiGraphqlApiExceptionInterceptor,
provideWorkspaceScopedRepository(AgentEntity),
],
exports: [AgentService, TypeOrmModule.forFeature([AgentEntity])],
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/ai-chat.module.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/ai-chat.module.ts
index dc582e9229c..88b45d1334b 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/ai-chat.module.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/ai-chat.module.ts
@@ -20,7 +20,6 @@ import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.ent
import { AiAgentExecutionModule } from 'src/engine/metadata-modules/ai/ai-agent-execution/ai-agent-execution.module';
import { MetricsModule } from 'src/engine/core-modules/metrics/metrics.module';
import { AiBillingModule } from 'src/engine/metadata-modules/ai/ai-billing/ai-billing.module';
-import { AiGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/ai/interceptors/ai-graphql-api-exception.interceptor';
import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';
import { SkillModule } from 'src/engine/metadata-modules/skill/skill.module';
import { provideWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/provide-workspace-scoped-repository';
@@ -88,7 +87,6 @@ import { SystemPromptBuilderService } from 'src/engine/metadata-modules/ai/ai-ch
MessagePruningService,
StreamAgentChatJob,
SystemPromptBuilderService,
- AiGraphqlApiExceptionInterceptor,
provideWorkspaceScopedRepository(FileEntity),
],
exports: [
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-tool-call-answer/ai-tool-call-answer.module.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-tool-call-answer/ai-tool-call-answer.module.ts
index 801026dad76..1b959887574 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-tool-call-answer/ai-tool-call-answer.module.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-tool-call-answer/ai-tool-call-answer.module.ts
@@ -7,7 +7,6 @@ import { AiChatModule } from 'src/engine/metadata-modules/ai/ai-chat/ai-chat.mod
import { AgentHistoryModule } from 'src/engine/metadata-modules/ai/ai-history/ai-history.module';
import { ToolCallAnswerResolver } from 'src/engine/metadata-modules/ai/ai-tool-call-answer/resolvers/tool-call-answer.resolver';
import { ToolCallAnswerService } from 'src/engine/metadata-modules/ai/ai-tool-call-answer/services/tool-call-answer.service';
-import { AiGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/ai/interceptors/ai-graphql-api-exception.interceptor';
import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';
// an answer resumes a chat here, or continues the suspended run its caller waits on
@@ -20,10 +19,6 @@ import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permi
PermissionsModule,
ToolProviderModule,
],
- providers: [
- ToolCallAnswerService,
- ToolCallAnswerResolver,
- AiGraphqlApiExceptionInterceptor,
- ],
+ providers: [ToolCallAnswerService, ToolCallAnswerResolver],
})
export class AiToolCallAnswerModule {}
diff --git a/packages/twenty-server/src/engine/metadata-modules/calendar-channel/calendar-channel-metadata.module.ts b/packages/twenty-server/src/engine/metadata-modules/calendar-channel/calendar-channel-metadata.module.ts
index a032e4495a9..079a30cf8c1 100644
--- a/packages/twenty-server/src/engine/metadata-modules/calendar-channel/calendar-channel-metadata.module.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/calendar-channel/calendar-channel-metadata.module.ts
@@ -3,7 +3,6 @@ import { TypeOrmModule } from '@nestjs/typeorm';
import { CalendarChannelMetadataService } from 'src/engine/metadata-modules/calendar-channel/calendar-channel-metadata.service';
import { CalendarChannelEntity } from 'src/engine/metadata-modules/calendar-channel/entities/calendar-channel.entity';
-import { CalendarChannelGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/calendar-channel/interceptors/calendar-channel-graphql-api-exception.interceptor';
import { CalendarChannelResolver } from 'src/engine/metadata-modules/calendar-channel/resolvers/calendar-channel.resolver';
import { ConnectedAccountMetadataModule } from 'src/engine/metadata-modules/connected-account/connected-account-metadata.module';
@@ -12,11 +11,7 @@ import { ConnectedAccountMetadataModule } from 'src/engine/metadata-modules/conn
TypeOrmModule.forFeature([CalendarChannelEntity]),
ConnectedAccountMetadataModule,
],
- providers: [
- CalendarChannelMetadataService,
- CalendarChannelResolver,
- CalendarChannelGraphqlApiExceptionInterceptor,
- ],
+ providers: [CalendarChannelMetadataService, CalendarChannelResolver],
exports: [CalendarChannelMetadataService],
})
export class CalendarChannelMetadataModule {}
diff --git a/packages/twenty-server/src/engine/metadata-modules/command-menu-item/command-menu-item.module.ts b/packages/twenty-server/src/engine/metadata-modules/command-menu-item/command-menu-item.module.ts
index 52e63cb99f4..b2731a79b76 100644
--- a/packages/twenty-server/src/engine/metadata-modules/command-menu-item/command-menu-item.module.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/command-menu-item/command-menu-item.module.ts
@@ -5,11 +5,9 @@ import { CoreWorkflowAccessModule } from 'src/engine/core-modules/workflow/core-
import { CommandMenuItemResolver } from 'src/engine/metadata-modules/command-menu-item/command-menu-item.resolver';
import { FrontComponentModule } from 'src/engine/metadata-modules/front-component/front-component.module';
import { CommandMenuItemService } from 'src/engine/metadata-modules/command-menu-item/command-menu-item.service';
-import { CommandMenuItemGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/command-menu-item/interceptors/command-menu-item-graphql-api-exception.interceptor';
import { FlatCommandMenuItemModule } from 'src/engine/metadata-modules/flat-command-menu-item/flat-command-menu-item.module';
import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';
import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';
-import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration/interceptors/workspace-migration-graphql-api-exception.interceptor';
import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspace-migration/workspace-migration.module';
import { ApplicationTranslationCatalogModule } from 'src/engine/metadata-modules/application-translation-catalog/application-translation-catalog.module';
@@ -24,12 +22,7 @@ import { ApplicationTranslationCatalogModule } from 'src/engine/metadata-modules
FrontComponentModule,
PermissionsModule,
],
- providers: [
- CommandMenuItemService,
- CommandMenuItemResolver,
- CommandMenuItemGraphqlApiExceptionInterceptor,
- WorkspaceMigrationGraphqlApiExceptionInterceptor,
- ],
+ providers: [CommandMenuItemService, CommandMenuItemResolver],
exports: [CommandMenuItemService],
})
export class CommandMenuItemModule {}
diff --git a/packages/twenty-server/src/engine/metadata-modules/connected-account/connected-account-metadata.module.ts b/packages/twenty-server/src/engine/metadata-modules/connected-account/connected-account-metadata.module.ts
index bdecf3e2184..f3e73481294 100644
--- a/packages/twenty-server/src/engine/metadata-modules/connected-account/connected-account-metadata.module.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/connected-account/connected-account-metadata.module.ts
@@ -6,7 +6,6 @@ import { AppOAuthRefreshModule } from 'src/engine/core-modules/application/conne
import { CalendarChannelEntity } from 'src/engine/metadata-modules/calendar-channel/entities/calendar-channel.entity';
import { ConnectedAccountMetadataService } from 'src/engine/metadata-modules/connected-account/connected-account-metadata.service';
import { ConnectedAccountEntity } from 'src/engine/metadata-modules/connected-account/entities/connected-account.entity';
-import { ConnectedAccountGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/connected-account/interceptors/connected-account-graphql-api-exception.interceptor';
import { ConnectedAccountResolver } from 'src/engine/metadata-modules/connected-account/resolvers/connected-account.resolver';
import { ConnectedAccountOwnershipTransferService } from 'src/engine/metadata-modules/connected-account/services/connected-account-ownership-transfer.service';
import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';
@@ -37,7 +36,6 @@ import { ApplicationRegistrationLookupModule } from 'src/engine/core-modules/app
ConnectedAccountMetadataService,
ConnectedAccountOwnershipTransferService,
ConnectedAccountResolver,
- ConnectedAccountGraphqlApiExceptionInterceptor,
],
exports: [
ConnectedAccountMetadataService,
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-tab/flat-page-layout-tab.module.ts b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-tab/flat-page-layout-tab.module.ts
deleted file mode 100644
index 8e75bd37fda..00000000000
--- a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-tab/flat-page-layout-tab.module.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { Module } from '@nestjs/common';
-
-import { WorkspaceFlatPageLayoutTabMapCacheService } from 'src/engine/metadata-modules/flat-page-layout-tab/services/workspace-flat-page-layout-tab-map-cache.service';
-
-@Module({
- providers: [WorkspaceFlatPageLayoutTabMapCacheService],
- exports: [WorkspaceFlatPageLayoutTabMapCacheService],
-})
-export class FlatPageLayoutTabModule {}
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/flat-page-layout-widget.module.ts b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/flat-page-layout-widget.module.ts
deleted file mode 100644
index 990dd46f6cd..00000000000
--- a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/flat-page-layout-widget.module.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { Module } from '@nestjs/common';
-
-import { FlatPageLayoutWidgetTypeValidatorService } from 'src/engine/metadata-modules/flat-page-layout-widget/services/flat-page-layout-widget-type-validator.service';
-import { WorkspaceFlatPageLayoutWidgetMapCacheService } from 'src/engine/metadata-modules/flat-page-layout-widget/services/workspace-flat-page-layout-widget-map-cache.service';
-
-@Module({
- providers: [
- WorkspaceFlatPageLayoutWidgetMapCacheService,
- FlatPageLayoutWidgetTypeValidatorService,
- ],
- exports: [
- WorkspaceFlatPageLayoutWidgetMapCacheService,
- FlatPageLayoutWidgetTypeValidatorService,
- ],
-})
-export class FlatPageLayoutWidgetModule {}
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout/flat-page-layout.module.ts b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout/flat-page-layout.module.ts
deleted file mode 100644
index f67bafd8655..00000000000
--- a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout/flat-page-layout.module.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { Module } from '@nestjs/common';
-
-import { WorkspaceFlatPageLayoutMapCacheService } from 'src/engine/metadata-modules/flat-page-layout/services/workspace-flat-page-layout-map-cache.service';
-
-@Module({
- providers: [WorkspaceFlatPageLayoutMapCacheService],
- exports: [WorkspaceFlatPageLayoutMapCacheService],
-})
-export class FlatPageLayoutModule {}
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-permission-flag/flat-permission-flag.module.ts b/packages/twenty-server/src/engine/metadata-modules/flat-permission-flag/flat-permission-flag.module.ts
deleted file mode 100644
index 4b16000c795..00000000000
--- a/packages/twenty-server/src/engine/metadata-modules/flat-permission-flag/flat-permission-flag.module.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { Module } from '@nestjs/common';
-
-import { WorkspaceFlatPermissionFlagMapCacheService } from 'src/engine/metadata-modules/flat-permission-flag/services/workspace-flat-permission-flag-map-cache.service';
-
-@Module({
- providers: [WorkspaceFlatPermissionFlagMapCacheService],
- exports: [WorkspaceFlatPermissionFlagMapCacheService],
-})
-export class FlatPermissionFlagModule {}
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-view/flat-view.module.ts b/packages/twenty-server/src/engine/metadata-modules/flat-view/flat-view.module.ts
deleted file mode 100644
index 55ca59f4a09..00000000000
--- a/packages/twenty-server/src/engine/metadata-modules/flat-view/flat-view.module.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { Module } from '@nestjs/common';
-
-import { WorkspaceFlatViewMapCacheService } from 'src/engine/metadata-modules/flat-view/services/workspace-flat-view-map-cache.service';
-
-@Module({
- providers: [WorkspaceFlatViewMapCacheService],
- exports: [WorkspaceFlatViewMapCacheService],
-})
-export class FlatViewModule {}
diff --git a/packages/twenty-server/src/engine/metadata-modules/front-component/front-component.module.ts b/packages/twenty-server/src/engine/metadata-modules/front-component/front-component.module.ts
index ec73ecf6d16..c573a66162b 100644
--- a/packages/twenty-server/src/engine/metadata-modules/front-component/front-component.module.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/front-component/front-component.module.ts
@@ -9,10 +9,8 @@ import { FrontComponentController } from 'src/engine/metadata-modules/front-comp
import { FrontComponentRestApiExceptionFilter } from 'src/engine/metadata-modules/front-component/filters/front-component-rest-api-exception.filter';
import { FrontComponentResolver } from 'src/engine/metadata-modules/front-component/front-component.resolver';
import { FrontComponentService } from 'src/engine/metadata-modules/front-component/front-component.service';
-import { FrontComponentGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/front-component/interceptors/front-component-graphql-api-exception.interceptor';
import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';
import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';
-import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration/interceptors/workspace-migration-graphql-api-exception.interceptor';
import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspace-migration/workspace-migration.module';
import { ApplicationLookupModule } from 'src/engine/core-modules/application/application-lookup/application-lookup.module';
import { ApplicationRegistrationLookupModule } from 'src/engine/core-modules/application/application-registration/application-registration-lookup/application-registration-lookup.module';
@@ -34,9 +32,7 @@ import { ApplicationRegistrationLookupModule } from 'src/engine/core-modules/app
providers: [
FrontComponentService,
FrontComponentResolver,
- FrontComponentGraphqlApiExceptionInterceptor,
FrontComponentRestApiExceptionFilter,
- WorkspaceMigrationGraphqlApiExceptionInterceptor,
],
exports: [FrontComponentService],
})
diff --git a/packages/twenty-server/src/engine/metadata-modules/message-channel/message-channel-metadata.module.ts b/packages/twenty-server/src/engine/metadata-modules/message-channel/message-channel-metadata.module.ts
index bbe772e47df..24d9cc93c17 100644
--- a/packages/twenty-server/src/engine/metadata-modules/message-channel/message-channel-metadata.module.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/message-channel/message-channel-metadata.module.ts
@@ -6,7 +6,6 @@ import { EmailingDomainModule } from 'src/engine/core-modules/emailing-domain/em
import { ConnectedAccountMetadataModule } from 'src/engine/metadata-modules/connected-account/connected-account-metadata.module';
import { ConnectedAccountEntity } from 'src/engine/metadata-modules/connected-account/entities/connected-account.entity';
import { MessageChannelEntity } from 'src/engine/metadata-modules/message-channel/entities/message-channel.entity';
-import { MessageChannelGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/message-channel/interceptors/message-channel-graphql-api-exception.interceptor';
import { MessageChannelMetadataService } from 'src/engine/metadata-modules/message-channel/message-channel-metadata.service';
import { ApplicationMessageChannelsResolver } from 'src/engine/metadata-modules/message-channel/resolvers/application-message-channels.resolver';
import { ApplicationMessageIngestionResolver } from 'src/engine/metadata-modules/message-channel/resolvers/application-message-ingestion.resolver';
@@ -38,7 +37,6 @@ import { provideWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspac
ApplicationMessageChannelsResolver,
ApplicationMessageIngestionService,
ApplicationMessageIngestionResolver,
- MessageChannelGraphqlApiExceptionInterceptor,
provideWorkspaceScopedRepository(MessageFolderEntity),
],
exports: [MessageChannelMetadataService],
diff --git a/packages/twenty-server/src/engine/metadata-modules/message-folder/message-folder-metadata.module.ts b/packages/twenty-server/src/engine/metadata-modules/message-folder/message-folder-metadata.module.ts
index e766daa7bf6..9591d4c5c00 100644
--- a/packages/twenty-server/src/engine/metadata-modules/message-folder/message-folder-metadata.module.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/message-folder/message-folder-metadata.module.ts
@@ -4,7 +4,6 @@ import { TypeOrmModule } from '@nestjs/typeorm';
import { ConnectedAccountMetadataModule } from 'src/engine/metadata-modules/connected-account/connected-account-metadata.module';
import { MessageChannelMetadataModule } from 'src/engine/metadata-modules/message-channel/message-channel-metadata.module';
import { MessageFolderEntity } from 'src/engine/metadata-modules/message-folder/entities/message-folder.entity';
-import { MessageFolderGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/message-folder/interceptors/message-folder-graphql-api-exception.interceptor';
import { MessageFolderMetadataService } from 'src/engine/metadata-modules/message-folder/message-folder-metadata.service';
import { MessageFolderResolver } from 'src/engine/metadata-modules/message-folder/resolvers/message-folder.resolver';
import { provideWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/provide-workspace-scoped-repository';
@@ -18,7 +17,6 @@ import { provideWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspac
providers: [
MessageFolderMetadataService,
MessageFolderResolver,
- MessageFolderGraphqlApiExceptionInterceptor,
provideWorkspaceScopedRepository(MessageFolderEntity),
],
exports: [MessageFolderMetadataService],
diff --git a/packages/twenty-server/src/engine/metadata-modules/navigation-menu-item/navigation-menu-item.module.ts b/packages/twenty-server/src/engine/metadata-modules/navigation-menu-item/navigation-menu-item.module.ts
index 5e593b3ce06..ae9e5e9ac1f 100644
--- a/packages/twenty-server/src/engine/metadata-modules/navigation-menu-item/navigation-menu-item.module.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/navigation-menu-item/navigation-menu-item.module.ts
@@ -4,7 +4,6 @@ import { ApplicationModule } from 'src/engine/core-modules/application/applicati
import { FileModule } from 'src/engine/core-modules/file/file.module';
import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';
import { FlatNavigationMenuItemModule } from 'src/engine/metadata-modules/flat-navigation-menu-item/flat-navigation-menu-item.module';
-import { NavigationMenuItemGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/navigation-menu-item/interceptors/navigation-menu-item-graphql-api-exception.interceptor';
import { NavigationMenuItemDeletionJob } from 'src/engine/metadata-modules/navigation-menu-item/jobs/navigation-menu-item-deletion.job';
import { NavigationMenuItemDeletionListener } from 'src/engine/metadata-modules/navigation-menu-item/listeners/navigation-menu-item-deletion.listener';
import { NavigationMenuItemResolver } from 'src/engine/metadata-modules/navigation-menu-item/navigation-menu-item.resolver';
@@ -14,7 +13,6 @@ import { NavigationMenuItemDeletionService } from 'src/engine/metadata-modules/n
import { NavigationMenuItemRecordIdentifierService } from 'src/engine/metadata-modules/navigation-menu-item/services/navigation-menu-item-record-identifier.service';
import { NavigationMenuItemToolWorkspaceService } from 'src/engine/metadata-modules/navigation-menu-item/tools/services/navigation-menu-item-tool.workspace-service';
import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';
-import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration/interceptors/workspace-migration-graphql-api-exception.interceptor';
import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspace-migration/workspace-migration.module';
import { ApplicationTranslationCatalogModule } from 'src/engine/metadata-modules/application-translation-catalog/application-translation-catalog.module';
@@ -36,8 +34,6 @@ import { ApplicationTranslationCatalogModule } from 'src/engine/metadata-modules
NavigationMenuItemDeletionJob,
NavigationMenuItemResolver,
NavigationMenuItemRecordIdentifierService,
- NavigationMenuItemGraphqlApiExceptionInterceptor,
- WorkspaceMigrationGraphqlApiExceptionInterceptor,
NavigationMenuItemToolWorkspaceService,
],
exports: [
diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/page-layout-tab.module.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/page-layout-tab.module.ts
index 5d7e6dcbbb2..3843e31cce6 100644
--- a/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/page-layout-tab.module.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/page-layout-tab.module.ts
@@ -3,12 +3,10 @@ import { Module } from '@nestjs/common';
import { ApplicationModule } from 'src/engine/core-modules/application/application.module';
import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';
-import { FlatPageLayoutTabModule } from 'src/engine/metadata-modules/flat-page-layout-tab/flat-page-layout-tab.module';
import { PageLayoutTabController } from 'src/engine/metadata-modules/page-layout-tab/controllers/page-layout-tab.controller';
import { PageLayoutTabResolver } from 'src/engine/metadata-modules/page-layout-tab/resolvers/page-layout-tab.resolver';
import { PageLayoutTabService } from 'src/engine/metadata-modules/page-layout-tab/services/page-layout-tab.service';
import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';
-import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration/interceptors/workspace-migration-graphql-api-exception.interceptor';
import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspace-migration/workspace-migration.module';
import { DashboardSyncModule } from 'src/modules/dashboard-sync/dashboard-sync.module';
@@ -18,16 +16,11 @@ import { DashboardSyncModule } from 'src/modules/dashboard-sync/dashboard-sync.m
PermissionsModule,
WorkspaceMigrationModule,
WorkspaceManyOrAllFlatEntityMapsCacheModule,
- FlatPageLayoutTabModule,
ApplicationModule,
DashboardSyncModule,
],
controllers: [PageLayoutTabController],
- providers: [
- PageLayoutTabService,
- PageLayoutTabResolver,
- WorkspaceMigrationGraphqlApiExceptionInterceptor,
- ],
+ providers: [PageLayoutTabService, PageLayoutTabResolver],
exports: [PageLayoutTabService],
})
export class PageLayoutTabModule {}
diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/page-layout-widget.module.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/page-layout-widget.module.ts
index 375925d42a4..b181f893672 100644
--- a/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/page-layout-widget.module.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/page-layout-widget.module.ts
@@ -3,12 +3,10 @@ import { Module } from '@nestjs/common';
import { ApplicationModule } from 'src/engine/core-modules/application/application.module';
import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';
-import { FlatPageLayoutWidgetModule } from 'src/engine/metadata-modules/flat-page-layout-widget/flat-page-layout-widget.module';
import { PageLayoutWidgetController } from 'src/engine/metadata-modules/page-layout-widget/controllers/page-layout-widget.controller';
import { PageLayoutWidgetResolver } from 'src/engine/metadata-modules/page-layout-widget/resolvers/page-layout-widget.resolver';
import { PageLayoutWidgetService } from 'src/engine/metadata-modules/page-layout-widget/services/page-layout-widget.service';
import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';
-import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration/interceptors/workspace-migration-graphql-api-exception.interceptor';
import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspace-migration/workspace-migration.module';
import { DashboardSyncModule } from 'src/modules/dashboard-sync/dashboard-sync.module';
@@ -18,16 +16,11 @@ import { DashboardSyncModule } from 'src/modules/dashboard-sync/dashboard-sync.m
PermissionsModule,
WorkspaceMigrationModule,
WorkspaceManyOrAllFlatEntityMapsCacheModule,
- FlatPageLayoutWidgetModule,
ApplicationModule,
DashboardSyncModule,
],
controllers: [PageLayoutWidgetController],
- providers: [
- PageLayoutWidgetService,
- PageLayoutWidgetResolver,
- WorkspaceMigrationGraphqlApiExceptionInterceptor,
- ],
+ providers: [PageLayoutWidgetService, PageLayoutWidgetResolver],
exports: [PageLayoutWidgetService],
})
export class PageLayoutWidgetModule {}
diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/page-layout.module.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout/page-layout.module.ts
index ff377950f02..2f168b72d29 100644
--- a/packages/twenty-server/src/engine/metadata-modules/page-layout/page-layout.module.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/page-layout/page-layout.module.ts
@@ -3,7 +3,6 @@ import { Module } from '@nestjs/common';
import { ApplicationModule } from 'src/engine/core-modules/application/application.module';
import { ApplicationTranslationCatalogModule } from 'src/engine/metadata-modules/application-translation-catalog/application-translation-catalog.module';
import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';
-import { FlatPageLayoutModule } from 'src/engine/metadata-modules/flat-page-layout/flat-page-layout.module';
import { PageLayoutController } from 'src/engine/metadata-modules/page-layout/controllers/page-layout.controller';
import { PageLayoutResolver } from 'src/engine/metadata-modules/page-layout/resolvers/page-layout.resolver';
import { PageLayoutDuplicationService } from 'src/engine/metadata-modules/page-layout/services/page-layout-duplication.service';
@@ -12,7 +11,6 @@ import { PageLayoutUpdateService } from 'src/engine/metadata-modules/page-layout
import { PageLayoutService } from 'src/engine/metadata-modules/page-layout/services/page-layout.service';
import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';
import { ViewModule } from 'src/engine/metadata-modules/view/view.module';
-import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration/interceptors/workspace-migration-graphql-api-exception.interceptor';
import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspace-migration/workspace-migration.module';
import { DashboardSyncModule } from 'src/modules/dashboard-sync/dashboard-sync.module';
@@ -22,7 +20,6 @@ import { DashboardSyncModule } from 'src/modules/dashboard-sync/dashboard-sync.m
WorkspaceMigrationModule,
WorkspaceManyOrAllFlatEntityMapsCacheModule,
ApplicationTranslationCatalogModule,
- FlatPageLayoutModule,
ApplicationModule,
DashboardSyncModule,
ViewModule,
@@ -34,7 +31,6 @@ import { DashboardSyncModule } from 'src/modules/dashboard-sync/dashboard-sync.m
PageLayoutResolver,
PageLayoutResetService,
PageLayoutUpdateService,
- WorkspaceMigrationGraphqlApiExceptionInterceptor,
],
exports: [PageLayoutService, PageLayoutDuplicationService],
})
diff --git a/packages/twenty-server/src/engine/metadata-modules/permission-flag/permission-flag.module.ts b/packages/twenty-server/src/engine/metadata-modules/permission-flag/permission-flag.module.ts
index 82efd5ccc3a..ebc6e3f3d7a 100644
--- a/packages/twenty-server/src/engine/metadata-modules/permission-flag/permission-flag.module.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/permission-flag/permission-flag.module.ts
@@ -1,17 +1,12 @@
import { Module } from '@nestjs/common';
import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';
-import { FlatPermissionFlagModule } from 'src/engine/metadata-modules/flat-permission-flag/flat-permission-flag.module';
import { PermissionFlagService } from 'src/engine/metadata-modules/permission-flag/permission-flag.service';
import { PermissionFlagResolver } from 'src/engine/metadata-modules/permission-flag/permission-flag.resolver';
import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';
@Module({
- imports: [
- WorkspaceManyOrAllFlatEntityMapsCacheModule,
- FlatPermissionFlagModule,
- PermissionsModule,
- ],
+ imports: [WorkspaceManyOrAllFlatEntityMapsCacheModule, PermissionsModule],
providers: [PermissionFlagService, PermissionFlagResolver],
exports: [PermissionFlagService],
})
diff --git a/packages/twenty-server/src/engine/metadata-modules/role/role.module.ts b/packages/twenty-server/src/engine/metadata-modules/role/role.module.ts
index 2e082cd6777..05319532cbf 100644
--- a/packages/twenty-server/src/engine/metadata-modules/role/role.module.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/role/role.module.ts
@@ -17,7 +17,6 @@ import { WorkspaceRoleIdsWithAllRecordsAccessCacheService } from 'src/engine/met
import { WorkspaceRolesPermissionsCacheService } from 'src/engine/metadata-modules/role/services/workspace-roles-permissions-cache.service';
import { RowLevelPermissionModule } from 'src/engine/metadata-modules/row-level-permission-predicate/row-level-permission.module';
import { UserRoleModule } from 'src/engine/metadata-modules/user-role/user-role.module';
-import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration/interceptors/workspace-migration-graphql-api-exception.interceptor';
import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspace-migration/workspace-migration.module';
@Module({
@@ -41,7 +40,6 @@ import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspace
RoleToolWorkspaceService,
WorkspaceFlatRoleMapCacheService,
WorkspaceFlatRoleTargetMapCacheService,
- WorkspaceMigrationGraphqlApiExceptionInterceptor,
WorkspaceRolesPermissionsCacheService,
WorkspaceRoleIdsWithAllRecordsAccessCacheService,
],
diff --git a/packages/twenty-server/src/engine/metadata-modules/settings-menu-item/settings-menu-item.module.ts b/packages/twenty-server/src/engine/metadata-modules/settings-menu-item/settings-menu-item.module.ts
index ad74cd00c4f..6d8a32f53ac 100644
--- a/packages/twenty-server/src/engine/metadata-modules/settings-menu-item/settings-menu-item.module.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/settings-menu-item/settings-menu-item.module.ts
@@ -2,13 +2,9 @@ import { Module } from '@nestjs/common';
import { ApplicationTranslationCatalogModule } from 'src/engine/metadata-modules/application-translation-catalog/application-translation-catalog.module';
import { SettingsMenuItemResolver } from 'src/engine/metadata-modules/settings-menu-item/settings-menu-item.resolver';
-import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration/interceptors/workspace-migration-graphql-api-exception.interceptor';
@Module({
imports: [ApplicationTranslationCatalogModule],
- providers: [
- SettingsMenuItemResolver,
- WorkspaceMigrationGraphqlApiExceptionInterceptor,
- ],
+ providers: [SettingsMenuItemResolver],
})
export class SettingsMenuItemModule {}
diff --git a/packages/twenty-server/src/engine/metadata-modules/skill/skill.module.ts b/packages/twenty-server/src/engine/metadata-modules/skill/skill.module.ts
index 2905ee1f1d9..a4c284a4175 100644
--- a/packages/twenty-server/src/engine/metadata-modules/skill/skill.module.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/skill/skill.module.ts
@@ -4,10 +4,8 @@ import { ApplicationModule } from 'src/engine/core-modules/application/applicati
import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';
import { FlatSkillModule } from 'src/engine/metadata-modules/flat-skill/flat-skill.module';
import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';
-import { SkillGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/skill/interceptors/skill-graphql-api-exception.interceptor';
import { SkillResolver } from 'src/engine/metadata-modules/skill/skill.resolver';
import { SkillService } from 'src/engine/metadata-modules/skill/skill.service';
-import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration/interceptors/workspace-migration-graphql-api-exception.interceptor';
import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspace-migration/workspace-migration.module';
import { ApplicationLookupModule } from 'src/engine/core-modules/application/application-lookup/application-lookup.module';
import { ApplicationRegistrationLookupModule } from 'src/engine/core-modules/application/application-registration/application-registration-lookup/application-registration-lookup.module';
@@ -22,12 +20,7 @@ import { ApplicationRegistrationLookupModule } from 'src/engine/core-modules/app
PermissionsModule,
FlatSkillModule,
],
- providers: [
- SkillService,
- SkillResolver,
- SkillGraphqlApiExceptionInterceptor,
- WorkspaceMigrationGraphqlApiExceptionInterceptor,
- ],
+ providers: [SkillService, SkillResolver],
exports: [SkillService],
})
export class SkillModule {}
diff --git a/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/timeline-activity-type.module.ts b/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/timeline-activity-type.module.ts
index ff369b2c1aa..60d4f50d700 100644
--- a/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/timeline-activity-type.module.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/timeline-activity-type.module.ts
@@ -6,8 +6,6 @@ import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata
import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';
import { TimelineActivityTypeResolver } from 'src/engine/metadata-modules/timeline-activity-type/timeline-activity-type.resolver';
import { TimelineActivityTypeService } from 'src/engine/metadata-modules/timeline-activity-type/timeline-activity-type.service';
-import { TimelineActivityTypeGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/timeline-activity-type/interceptors/timeline-activity-type-graphql-api-exception.interceptor';
-import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration/interceptors/workspace-migration-graphql-api-exception.interceptor';
import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspace-migration/workspace-migration.module';
@Module({
@@ -18,12 +16,7 @@ import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspace
PermissionsModule,
WorkspaceMigrationModule,
],
- providers: [
- TimelineActivityTypeService,
- TimelineActivityTypeResolver,
- TimelineActivityTypeGraphqlApiExceptionInterceptor,
- WorkspaceMigrationGraphqlApiExceptionInterceptor,
- ],
+ providers: [TimelineActivityTypeService, TimelineActivityTypeResolver],
exports: [TimelineActivityTypeService],
})
export class TimelineActivityTypeModule {}
diff --git a/packages/twenty-server/src/engine/metadata-modules/validation-rule/validation-rule.module.ts b/packages/twenty-server/src/engine/metadata-modules/validation-rule/validation-rule.module.ts
index 68a3668ea5b..e3646c178c2 100644
--- a/packages/twenty-server/src/engine/metadata-modules/validation-rule/validation-rule.module.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/validation-rule/validation-rule.module.ts
@@ -6,7 +6,6 @@ import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata
import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';
import { ValidationRuleResolver } from 'src/engine/metadata-modules/validation-rule/validation-rule.resolver';
import { ValidationRuleService } from 'src/engine/metadata-modules/validation-rule/validation-rule.service';
-import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration/interceptors/workspace-migration-graphql-api-exception.interceptor';
import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspace-migration/workspace-migration.module';
@Module({
@@ -17,11 +16,7 @@ import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspace
PermissionsModule,
WorkspaceMigrationModule,
],
- providers: [
- ValidationRuleService,
- ValidationRuleResolver,
- WorkspaceMigrationGraphqlApiExceptionInterceptor,
- ],
+ providers: [ValidationRuleService, ValidationRuleResolver],
exports: [ValidationRuleService],
})
export class ValidationRuleModule {}
diff --git a/packages/twenty-server/src/engine/metadata-modules/view/view.module.ts b/packages/twenty-server/src/engine/metadata-modules/view/view.module.ts
index 448961a3361..a2c5bcd779e 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view/view.module.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view/view.module.ts
@@ -5,7 +5,6 @@ import { ApplicationModule } from 'src/engine/core-modules/application/applicati
import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';
import { ApplicationTranslationCatalogModule } from 'src/engine/metadata-modules/application-translation-catalog/application-translation-catalog.module';
import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';
-import { FlatViewModule } from 'src/engine/metadata-modules/flat-view/flat-view.module';
import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';
import { ViewFieldGroupModule } from 'src/engine/metadata-modules/view-field-group/view-field-group.module';
import { ViewFieldModule } from 'src/engine/metadata-modules/view-field/view-field.module';
@@ -16,7 +15,6 @@ import { ViewController } from 'src/engine/metadata-modules/view/controllers/vie
import { ViewEntity } from 'src/engine/metadata-modules/view/entities/view.entity';
import { ViewResolver } from 'src/engine/metadata-modules/view/resolvers/view.resolver';
import { ViewQueryParamsService } from 'src/engine/metadata-modules/view/services/view-query-params.service';
-import { ViewService } from 'src/engine/metadata-modules/view/services/view.service';
import { ViewToolsFactory } from 'src/engine/metadata-modules/view/tools/view-tools.factory';
import { provideWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/provide-workspace-scoped-repository';
import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspace-migration/workspace-migration.module';
@@ -32,12 +30,10 @@ import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspace
ApplicationModule,
PermissionsModule,
WorkspaceMigrationModule,
- FlatViewModule,
WorkspaceManyOrAllFlatEntityMapsCacheModule,
],
controllers: [ViewController],
providers: [
- ViewService,
CompleteViewUpsertService,
ViewResolver,
ViewQueryParamsService,
@@ -46,7 +42,7 @@ import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspace
provideWorkspaceScopedRepository(ViewEntity),
],
exports: [
- ViewService,
+ ViewPermissionsModule,
ViewQueryParamsService,
ViewToolsFactory,
TypeOrmModule.forFeature([ViewEntity]),
diff --git a/packages/twenty-server/src/engine/metadata-modules/webhook/webhook.module.ts b/packages/twenty-server/src/engine/metadata-modules/webhook/webhook.module.ts
index 34f6d41e0ae..0491b8a7126 100644
--- a/packages/twenty-server/src/engine/metadata-modules/webhook/webhook.module.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/webhook/webhook.module.ts
@@ -5,12 +5,10 @@ import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata
import { FlatWebhookModule } from 'src/engine/metadata-modules/flat-webhook/flat-webhook.module';
import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';
import { WebhookController } from 'src/engine/metadata-modules/webhook/controllers/webhook.controller';
-import { WebhookGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/webhook/interceptors/webhook-graphql-api-exception.interceptor';
import { WebhookToolWorkspaceService } from 'src/engine/metadata-modules/webhook/tools/services/webhook-tool.workspace-service';
import { WebhookResolver } from 'src/engine/metadata-modules/webhook/webhook.resolver';
import { WebhookService } from 'src/engine/metadata-modules/webhook/webhook.service';
import { WorkspaceCacheStorageModule } from 'src/engine/workspace-cache-storage/workspace-cache-storage.module';
-import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration/interceptors/workspace-migration-graphql-api-exception.interceptor';
import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspace-migration/workspace-migration.module';
@Module({
@@ -24,13 +22,7 @@ import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspace
FlatWebhookModule,
],
controllers: [WebhookController],
- providers: [
- WebhookService,
- WebhookResolver,
- WebhookGraphqlApiExceptionInterceptor,
- WorkspaceMigrationGraphqlApiExceptionInterceptor,
- WebhookToolWorkspaceService,
- ],
+ providers: [WebhookService, WebhookResolver, WebhookToolWorkspaceService],
exports: [WebhookService, WebhookToolWorkspaceService],
})
export class WebhookModule {}
diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/calendar-event-import-manager.module.ts b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/calendar-event-import-manager.module.ts
index fe063f62e7f..0c42816b8b5 100644
--- a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/calendar-event-import-manager.module.ts
+++ b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/calendar-event-import-manager.module.ts
@@ -9,6 +9,7 @@ import { CalendarChannelEntity } from 'src/engine/metadata-modules/calendar-chan
import { ConnectedAccountEntity } from 'src/engine/metadata-modules/connected-account/entities/connected-account.entity';
import { provideWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/provide-workspace-scoped-repository';
import { CalendarEventCleanerModule } from 'src/modules/calendar/calendar-event-cleaner/calendar-event-cleaner.module';
+import { CalendarCommonModule } from 'src/modules/calendar/common/calendar-common.module';
import { CalendarTriggerEventListFetchCommand } from 'src/modules/calendar/calendar-event-import-manager/commands/calendar-trigger-event-list-fetch.command';
import { CalendarEventListFetchCronCommand } from 'src/modules/calendar/calendar-event-import-manager/crons/commands/calendar-event-list-fetch.cron.command';
import { CalendarEventsImportCronCommand } from 'src/modules/calendar/calendar-event-import-manager/crons/commands/calendar-import.cron.command';
@@ -32,7 +33,6 @@ import { CalendarGetCalendarEventsService } from 'src/modules/calendar/calendar-
import { CalendarImportEventsService } from 'src/modules/calendar/calendar-event-import-manager/services/calendar-import-events.service';
import { CalendarSaveEventsService } from 'src/modules/calendar/calendar-event-import-manager/services/calendar-save-events.service';
import { CalendarEventParticipantManagerModule } from 'src/modules/calendar/calendar-event-participant-manager/calendar-event-participant-manager.module';
-import { CalendarChannelSyncStatusService } from 'src/modules/calendar/common/services/calendar-channel-sync-status.service';
import { ConnectedAccountModule } from 'src/modules/connected-account/connected-account.module';
import { EmailAliasManagerModule } from 'src/modules/connected-account/email-alias-manager/email-alias-manager.module';
import { BlocklistRepository } from 'src/modules/blocklist/repositories/blocklist.repository';
@@ -47,6 +47,7 @@ import { BlocklistRepository } from 'src/modules/blocklist/repositories/blocklis
UserWorkspaceEntity,
]),
CalendarEventCleanerModule,
+ CalendarCommonModule,
GoogleCalendarDriverModule,
CalDavDriverModule,
MicrosoftCalendarDriverModule,
@@ -58,7 +59,6 @@ import { BlocklistRepository } from 'src/modules/blocklist/repositories/blocklis
providers: [
BlocklistRepository,
provideWorkspaceScopedRepository(CalendarChannelEntity),
- CalendarChannelSyncStatusService,
CalendarEventsImportService,
CalendarFetchEventsService,
CalendarEventImportErrorHandlerService,