Skip to content

The open alternative to Salesforce, designed for AI.

Register business modules in ModulesModule instead of CoreEngineModule (#27445)

Félix Malfait8d7410bcbc24
diff --git a/packages/twenty-server/src/engine/api/graphql/graphql-config/graphql-config.service.ts b/packages/twenty-server/src/engine/api/graphql/graphql-config/graphql-config.service.ts
index aae4c3b0531..a989fe227ea 100644
--- a/packages/twenty-server/src/engine/api/graphql/graphql-config/graphql-config.service.ts
+++ b/packages/twenty-server/src/engine/api/graphql/graphql-config/graphql-config.service.ts
@@ -28,6 +28,7 @@ import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twent
import { type FlatWorkspace } from 'src/engine/core-modules/workspace/types/flat-workspace.type';
import { DataloaderService } from 'src/engine/dataloaders/dataloader.service';
import { renderApolloPlayground } from 'src/engine/utils/render-apollo-playground.util';
+import { ModulesModule } from 'src/modules/modules.module';
export interface GraphQLContext extends YogaDriverServerContext<'express'> {
user?: FlatAuthContextUser;
@@ -82,7 +83,7 @@ export class GraphQLConfigService implements GqlOptionsFactory<
const config: YogaDriverConfig = {
autoSchemaFile: true,
- include: [CoreEngineModule],
+ include: [CoreEngineModule, ModulesModule],
resolverSchemaScope: 'core',
buildSchemaOptions: {},
resolvers: { JSON: GraphQLJSON },
diff --git a/packages/twenty-server/src/engine/api/graphql/metadata.module-factory.ts b/packages/twenty-server/src/engine/api/graphql/metadata.module-factory.ts
index 730b3e94e7e..f5e5a3f24a5 100644
--- a/packages/twenty-server/src/engine/api/graphql/metadata.module-factory.ts
+++ b/packages/twenty-server/src/engine/api/graphql/metadata.module-factory.ts
@@ -22,6 +22,7 @@ import { type TwentyConfigService } from 'src/engine/core-modules/twenty-config/
import { type DataloaderService } from 'src/engine/dataloaders/dataloader.service';
import { renderApolloPlayground } from 'src/engine/utils/render-apollo-playground.util';
import { type WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
+import { ModulesModule } from 'src/modules/modules.module';
export const metadataModuleFactory = async (
twentyConfigService: TwentyConfigService,
@@ -35,7 +36,7 @@ export const metadataModuleFactory = async (
): Promise<YogaDriverConfig> => {
const config: YogaDriverConfig = {
autoSchemaFile: true,
- include: [MetadataGraphQLApiModule],
+ include: [MetadataGraphQLApiModule, ModulesModule],
resolverSchemaScope: 'metadata',
buildSchemaOptions: {
orphanedTypes: [ClientConfig],
diff --git a/packages/twenty-server/src/engine/core-modules/core-engine.module.ts b/packages/twenty-server/src/engine/core-modules/core-engine.module.ts
index 91e60060678..c797477c68e 100644
--- a/packages/twenty-server/src/engine/core-modules/core-engine.module.ts
+++ b/packages/twenty-server/src/engine/core-modules/core-engine.module.ts
@@ -33,7 +33,6 @@ import { DnsManagerModule } from 'src/engine/core-modules/dns-manager/dns-manage
import { DpaModule } from 'src/engine/core-modules/dpa/dpa.module';
import { EmailModule } from 'src/engine/core-modules/email/email.module';
import { EmailingDomainModule } from 'src/engine/core-modules/emailing-domain/emailing-domain.module';
-import { EmailingModule } from 'src/modules/emailing/emailing.module';
import { EnvironmentModule } from 'src/engine/core-modules/environment/environment.module';
import { ExceptionHandlerModule } from 'src/engine/core-modules/exception-handler/exception-handler.module';
import { exceptionHandlerModuleFactory } from 'src/engine/core-modules/exception-handler/exception-handler.module-factory';
@@ -51,8 +50,6 @@ import { LogicFunctionModule } from 'src/engine/core-modules/logic-function/logi
import { MessageQueueModule } from 'src/engine/core-modules/message-queue/message-queue.module';
import { messageQueueModuleFactory } from 'src/engine/core-modules/message-queue/message-queue.module-factory';
import { TimelineMessagingModule } from 'src/engine/core-modules/messaging/timeline-messaging.module';
-import { MessagingWebhooksModule } from 'src/modules/messaging-webhooks/messaging-webhooks.module';
-import { ConnectedAccountSyncWebhooksModule } from 'src/modules/connected-account-sync-webhooks/connected-account-sync-webhooks.module';
import { MetricsModule } from 'src/engine/core-modules/metrics/metrics.module';
import { MetricsService } from 'src/engine/core-modules/metrics/metrics.service';
import { OpenApiModule } from 'src/engine/core-modules/open-api/open-api.module';
@@ -80,12 +77,7 @@ import { SubscriptionsModule } from 'src/engine/subscriptions/subscriptions.modu
import { CodeInterpreterSessionCleanupModule } from 'src/engine/core-modules/code-interpreter/crons/code-interpreter-session-cleanup.module';
import { TrashCleanupModule } from 'src/engine/trash-cleanup/trash-cleanup.module';
import { WorkspaceEventEmitterModule } from 'src/engine/workspace-event-emitter/workspace-event-emitter.module';
-import { ChannelSyncModule } from 'src/modules/connected-account/channel-sync/channel-sync.module';
-import { CreateCalendarEventModule } from 'src/modules/calendar/calendar-event-creation-manager/create-calendar-event.module';
-import { CallRecordingModule } from 'src/modules/call-recording/call-recording.module';
-import { DashboardModule } from 'src/modules/dashboard/dashboard.module';
import { AiToolCallAnswerModule } from 'src/engine/metadata-modules/ai/ai-tool-call-answer/ai-tool-call-answer.module';
-import { SendEmailModule } from 'src/modules/messaging/message-outbound-manager/send-email.module';
import { ClientConfigModule } from './client-config/client-config.module';
import { EventLogsViewerModule } from './event-logs/event-logs-viewer.module';
import { FileApiModule } from './file/file-api.module';
@@ -98,8 +90,6 @@ import { FileApiModule } from './file/file-api.module';
AuthModule,
BillingModule,
BillingWebhookModule,
- MessagingWebhooksModule,
- ConnectedAccountSyncWebhooksModule,
UsageModule,
ClientConfigModule,
FeatureFlagModule,
@@ -125,7 +115,6 @@ import { FileApiModule } from './file/file-api.module';
WorkspaceSsoModule,
ApprovedAccessDomainModule,
EmailingDomainModule,
- EmailingModule,
PublicDomainModule,
CloudflareModule,
DnsManagerModule,
@@ -143,10 +132,6 @@ import { FileApiModule } from './file/file-api.module';
GeoMapModule,
SubscriptionsModule,
ImapSmtpCaldavModule,
- ChannelSyncModule,
- SendEmailModule,
- CreateCalendarEventModule,
- CallRecordingModule,
FileStorageModule.forRoot(),
LoggerModule.forRootAsync({
useFactory: loggerModuleFactory,
@@ -184,7 +169,6 @@ import { FileApiModule } from './file/file-api.module';
ImpersonationModule,
TrashCleanupModule,
CodeInterpreterSessionCleanupModule,
- DashboardModule,
EventLogsViewerModule,
PreInstalledAppsModule,
AppBillingModule,
diff --git a/packages/twenty-server/src/modules/modules.module.ts b/packages/twenty-server/src/modules/modules.module.ts
index 4c766548d03..afd2c582b02 100644
--- a/packages/twenty-server/src/modules/modules.module.ts
+++ b/packages/twenty-server/src/modules/modules.module.ts
@@ -1,5 +1,13 @@
import { Module } from '@nestjs/common';
+import { EmailingModule } from 'src/modules/emailing/emailing.module';
+import { MessagingWebhooksModule } from 'src/modules/messaging-webhooks/messaging-webhooks.module';
+import { ConnectedAccountSyncWebhooksModule } from 'src/modules/connected-account-sync-webhooks/connected-account-sync-webhooks.module';
+import { ChannelSyncModule } from 'src/modules/connected-account/channel-sync/channel-sync.module';
+import { CreateCalendarEventModule } from 'src/modules/calendar/calendar-event-creation-manager/create-calendar-event.module';
+import { CallRecordingModule } from 'src/modules/call-recording/call-recording.module';
+import { DashboardModule } from 'src/modules/dashboard/dashboard.module';
+import { SendEmailModule } from 'src/modules/messaging/message-outbound-manager/send-email.module';
import { CalendarModule } from 'src/modules/calendar/calendar.module';
import { ConnectedAccountModule } from 'src/modules/connected-account/connected-account.module';
import { MessagingModule } from 'src/modules/messaging/messaging.module';
@@ -15,8 +23,14 @@ import { WorkspaceMemberModule } from 'src/modules/workspace-member/workspace-me
OnboardingInviteSuggestionsModule,
WorkflowModule,
WorkspaceMemberModule,
+ EmailingModule,
+ MessagingWebhooksModule,
+ ConnectedAccountSyncWebhooksModule,
+ ChannelSyncModule,
+ CreateCalendarEventModule,
+ CallRecordingModule,
+ DashboardModule,
+ SendEmailModule,
],
- providers: [],
- exports: [],
})
export class ModulesModule {}
diff --git a/packages/twenty-server/src/queue-worker/queue-worker.module.ts b/packages/twenty-server/src/queue-worker/queue-worker.module.ts
index 8cd4b7b2453..3151c40f544 100644
--- a/packages/twenty-server/src/queue-worker/queue-worker.module.ts
+++ b/packages/twenty-server/src/queue-worker/queue-worker.module.ts
@@ -5,10 +5,12 @@ import { JobsModule } from 'src/engine/core-modules/message-queue/jobs.module';
import { MessageQueueModule } from 'src/engine/core-modules/message-queue/message-queue.module';
import { TwentyOrmModule } from 'src/engine/twenty-orm/twenty-orm.module';
import { WorkspaceEventEmitterModule } from 'src/engine/workspace-event-emitter/workspace-event-emitter.module';
+import { ModulesModule } from 'src/modules/modules.module';
@Module({
imports: [
CoreEngineModule,
+ ModulesModule,
MessageQueueModule.registerExplorer(),
WorkspaceEventEmitterModule,
JobsModule,