6658 workflows add a first twenty piece email sender (#6965)

packages/twenty-emails/src/emails/workflow-action.email.tsx

@@ -0,0 +1,29 @@
+import { BaseEmail } from 'src/components/BaseEmail';
+import { Title } from 'src/components/Title';
+import { CallToAction } from 'src/components/CallToAction';
+
+type WorkflowActionEmailProps = {
+  dangerousHTML?: string;
+  title?: string;
+  callToAction?: {
+    value: string;
+    href: string;
+  };
+};
+export const WorkflowActionEmail = ({
+  dangerousHTML,
+  title,
+  callToAction,
+}: WorkflowActionEmailProps) => {
+  return (
+    <BaseEmail>
+      {title && <Title value={title} />}
+      {dangerousHTML && (
+        <div dangerouslySetInnerHTML={{ __html: dangerousHTML }} />
+      )}
+      {callToAction && (
+        <CallToAction value={callToAction.value} href={callToAction.href} />
+      )}
+    </BaseEmail>
+  );
+};

packages/twenty-emails/src/index.ts

@@ -3,3 +3,4 @@ export * from './emails/delete-inactive-workspaces.email';
 export * from './emails/password-reset-link.email';
 export * from './emails/password-update-notify.email';
 export * from './emails/send-invite-link.email';
+export * from './emails/workflow-action.email';

packages/twenty-front/src/modules/workflow/constants/Actions.ts

@@ -8,7 +8,7 @@ export const ACTIONS: Array<{
 }> = [
   {
     label: 'Serverless Function',
-    type: 'CODE_ACTION',
+    type: 'CODE',
     icon: IconSettingsAutomation,
   },
 ];

packages/twenty-front/src/modules/workflow/types/Workflow.ts

@@ -13,7 +13,7 @@ export type WorkflowCodeSettingsType = WorkflowBaseSettingsType & {
   serverlessFunctionId: string;
 };
 
-export type WorkflowActionType = 'CODE_ACTION';
+export type WorkflowActionType = 'CODE';
 
 type CommonWorkflowAction = {
   id: string;
@@ -22,7 +22,7 @@ type CommonWorkflowAction = {
 };
 
 type WorkflowCodeAction = CommonWorkflowAction & {
-  type: 'CODE_ACTION';
+  type: 'CODE';
   settings: WorkflowCodeSettingsType;
 };
 

packages/twenty-front/src/modules/workflow/utils/__tests__/addCreateStepNodes.test.ts

@@ -14,7 +14,7 @@ describe('addCreateStepNodes', () => {
       {
         id: 'step1',
         name: 'Step 1',
-        type: 'CODE_ACTION',
+        type: 'CODE',
         valid: true,
         settings: {
           errorHandlingOptions: {
@@ -27,7 +27,7 @@ describe('addCreateStepNodes', () => {
       {
         id: 'step2',
         name: 'Step 2',
-        type: 'CODE_ACTION',
+        type: 'CODE',
         valid: true,
         settings: {
           errorHandlingOptions: {

packages/twenty-front/src/modules/workflow/utils/__tests__/generateWorkflowDiagram.test.ts

@@ -35,7 +35,7 @@ describe('generateWorkflowDiagram', () => {
       {
         id: 'step1',
         name: 'Step 1',
-        type: 'CODE_ACTION',
+        type: 'CODE',
         valid: true,
         settings: {
           errorHandlingOptions: {
@@ -48,7 +48,7 @@ describe('generateWorkflowDiagram', () => {
       {
         id: 'step2',
         name: 'Step 2',
-        type: 'CODE_ACTION',
+        type: 'CODE',
         valid: true,
         settings: {
           errorHandlingOptions: {
@@ -88,7 +88,7 @@ describe('generateWorkflowDiagram', () => {
       {
         id: 'step1',
         name: 'Step 1',
-        type: 'CODE_ACTION',
+        type: 'CODE',
         valid: true,
         settings: {
           errorHandlingOptions: {
@@ -101,7 +101,7 @@ describe('generateWorkflowDiagram', () => {
       {
         id: 'step2',
         name: 'Step 2',
-        type: 'CODE_ACTION',
+        type: 'CODE',
         valid: true,
         settings: {
           errorHandlingOptions: {

packages/twenty-front/src/modules/workflow/utils/__tests__/getWorkflowVersionDiagram.test.ts

@@ -60,7 +60,7 @@ describe('getWorkflowVersionDiagram', () => {
             },
             serverlessFunctionId: 'a5434be2-c10b-465c-acec-46492782a997',
           },
-          type: 'CODE_ACTION',
+          type: 'CODE',
           valid: true,
         },
       ],

packages/twenty-front/src/modules/workflow/utils/__tests__/insertStep.test.ts

@@ -27,7 +27,7 @@ describe('insertStep', () => {
         },
         serverlessFunctionId: 'a5434be2-c10b-465c-acec-46492782a997',
       },
-      type: 'CODE_ACTION',
+      type: 'CODE',
       valid: true,
     };
 
@@ -65,7 +65,7 @@ describe('insertStep', () => {
         },
         serverlessFunctionId: 'a5434be2-c10b-465c-acec-46492782a997',
       },
-      type: 'CODE_ACTION',
+      type: 'CODE',
       valid: true,
     };
 
@@ -97,7 +97,7 @@ describe('insertStep', () => {
             },
             serverlessFunctionId: 'a5434be2-c10b-465c-acec-46492782a997',
           },
-          type: 'CODE_ACTION',
+          type: 'CODE',
           valid: true,
         },
         {
@@ -110,7 +110,7 @@ describe('insertStep', () => {
             },
             serverlessFunctionId: 'a5434be2-c10b-465c-acec-46492782a997',
           },
-          type: 'CODE_ACTION',
+          type: 'CODE',
           valid: true,
         },
       ],
@@ -131,7 +131,7 @@ describe('insertStep', () => {
         },
         serverlessFunctionId: 'a5434be2-c10b-465c-acec-46492782a997',
       },
-      type: 'CODE_ACTION',
+      type: 'CODE',
       valid: true,
     };
 
@@ -167,7 +167,7 @@ describe('insertStep', () => {
             },
             serverlessFunctionId: 'a5434be2-c10b-465c-acec-46492782a997',
           },
-          type: 'CODE_ACTION',
+          type: 'CODE',
           valid: true,
         },
         {
@@ -180,7 +180,7 @@ describe('insertStep', () => {
             },
             serverlessFunctionId: 'a5434be2-c10b-465c-acec-46492782a997',
           },
-          type: 'CODE_ACTION',
+          type: 'CODE',
           valid: true,
         },
       ],
@@ -201,7 +201,7 @@ describe('insertStep', () => {
         },
         serverlessFunctionId: 'a5434be2-c10b-465c-acec-46492782a997',
       },
-      type: 'CODE_ACTION',
+      type: 'CODE',
       valid: true,
     };
 

packages/twenty-front/src/modules/workflow/utils/__tests__/replaceStep.test.ts

@@ -13,7 +13,7 @@ describe('replaceStep', () => {
         },
         serverlessFunctionId: 'first',
       },
-      type: 'CODE_ACTION',
+      type: 'CODE',
       valid: true,
     } satisfies WorkflowStep;
     const workflowVersionInitial = {
@@ -59,7 +59,7 @@ describe('replaceStep', () => {
         },
         serverlessFunctionId: 'a5434be2-c10b-465c-acec-46492782a997',
       },
-      type: 'CODE_ACTION',
+      type: 'CODE',
       valid: true,
     };
     const workflowVersionInitial = {
@@ -79,7 +79,7 @@ describe('replaceStep', () => {
             },
             serverlessFunctionId: 'a5434be2-c10b-465c-acec-46492782a997',
           },
-          type: 'CODE_ACTION',
+          type: 'CODE',
           valid: true,
         },
         stepToBeReplaced,
@@ -93,7 +93,7 @@ describe('replaceStep', () => {
             },
             serverlessFunctionId: 'a5434be2-c10b-465c-acec-46492782a997',
           },
-          type: 'CODE_ACTION',
+          type: 'CODE',
           valid: true,
         },
       ],

packages/twenty-front/src/modules/workflow/utils/generateWorkflowDiagram.ts

@@ -50,13 +50,6 @@ export const generateWorkflowDiagram = ({
       },
     });
 
-    // Recursively generate flow for the next action if it exists
-    if (step.type !== 'CODE_ACTION') {
-      // processNode(action.nextAction, nodeId, xPos + 150, yPos + 100);
-
-      throw new Error('Other types as code actions are not supported yet.');
-    }
-
     return nodeId;
   };
 

packages/twenty-front/src/modules/workflow/utils/getStepDefaultDefinition.ts

@@ -7,11 +7,11 @@ export const getStepDefaultDefinition = (
   const newStepId = v4();
 
   switch (type) {
-    case 'CODE_ACTION': {
+    case 'CODE': {
       return {
         id: newStepId,
         name: 'Code',
-        type: 'CODE_ACTION',
+        type: 'CODE',
         valid: false,
         settings: {
           serverlessFunctionId: '',

packages/twenty-server/package.json

@@ -29,6 +29,7 @@
     "cache-manager-redis-yet": "^4.1.2",
     "class-validator": "patch:class-validator@0.14.0#./patches/class-validator+0.14.0.patch",
     "graphql-middleware": "^6.1.35",
+    "handlebars": "^4.7.8",
     "jsdom": "~22.1.0",
     "jwt-decode": "^4.0.0",
     "langchain": "^0.2.6",

packages/twenty-server/src/app.module.ts

@@ -18,15 +18,14 @@ import { GraphQLConfigModule } from 'src/engine/api/graphql/graphql-config/graph
 import { GraphQLConfigService } from 'src/engine/api/graphql/graphql-config/graphql-config.service';
 import { MetadataGraphQLApiModule } from 'src/engine/api/graphql/metadata-graphql-api.module';
 import { RestApiModule } from 'src/engine/api/rest/rest-api.module';
-import { MessageQueueDriverType } from 'src/engine/integrations/message-queue/interfaces';
+import { MessageQueueDriverType } from 'src/engine/core-modules/message-queue/interfaces';
-import { MessageQueueModule } from 'src/engine/integrations/message-queue/message-queue.module';
+import { MessageQueueModule } from 'src/engine/core-modules/message-queue/message-queue.module';
 import { WorkspaceMetadataVersionModule } from 'src/engine/metadata-modules/workspace-metadata-version/workspace-metadata-version.module';
 import { GraphQLHydrateRequestFromTokenMiddleware } from 'src/engine/middlewares/graphql-hydrate-request-from-token.middleware';
 import { TwentyORMModule } from 'src/engine/twenty-orm/twenty-orm.module';
 import { ModulesModule } from 'src/modules/modules.module';
 
 import { CoreEngineModule } from './engine/core-modules/core-engine.module';
-import { IntegrationsModule } from './engine/integrations/integrations.module';
 
 @Module({
   imports: [
@@ -47,8 +46,6 @@ import { IntegrationsModule } from './engine/integrations/integrations.module';
       useClass: GraphQLConfigService,
     }),
     TwentyORMModule,
-    // Integrations module, contains all the integrations with other services
-    IntegrationsModule,
     // Core engine module, contains all the core modules
     CoreEngineModule,
     // Modules module, contains all business logic modules

packages/twenty-server/src/command/command.ts

@@ -1,7 +1,7 @@
 import { CommandFactory } from 'nest-commander';
 
-import { ExceptionHandlerService } from 'src/engine/integrations/exception-handler/exception-handler.service';
+import { ExceptionHandlerService } from 'src/engine/core-modules/exception-handler/exception-handler.service';
-import { LoggerService } from 'src/engine/integrations/logger/logger.service';
+import { LoggerService } from 'src/engine/core-modules/logger/logger.service';
 import { shouldFilterException } from 'src/engine/utils/global-exception-handler.util';
 
 import { CommandModule } from './command.module';

packages/twenty-server/src/database/commands/data-seed-demo-workspace/crons/start-data-seed-demo-workspace.cron.command.ts

@@ -2,9 +2,9 @@ import { Command, CommandRunner } from 'nest-commander';
 
 import { dataSeedDemoWorkspaceCronPattern } from 'src/database/commands/data-seed-demo-workspace/crons/data-seed-demo-workspace-cron-pattern';
 import { DataSeedDemoWorkspaceJob } from 'src/database/commands/data-seed-demo-workspace/jobs/data-seed-demo-workspace.job';
-import { InjectMessageQueue } from 'src/engine/integrations/message-queue/decorators/message-queue.decorator';
+import { InjectMessageQueue } from 'src/engine/core-modules/message-queue/decorators/message-queue.decorator';
-import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
+import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
-import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
+import { MessageQueueService } from 'src/engine/core-modules/message-queue/services/message-queue.service';
 
 @Command({
   name: 'workspace-seed-demo:cron:start',

packages/twenty-server/src/database/commands/data-seed-demo-workspace/crons/stop-data-seed-demo-workspace.cron.command.ts

@@ -2,9 +2,9 @@ import { Command, CommandRunner } from 'nest-commander';
 
 import { dataSeedDemoWorkspaceCronPattern } from 'src/database/commands/data-seed-demo-workspace/crons/data-seed-demo-workspace-cron-pattern';
 import { DataSeedDemoWorkspaceJob } from 'src/database/commands/data-seed-demo-workspace/jobs/data-seed-demo-workspace.job';
-import { InjectMessageQueue } from 'src/engine/integrations/message-queue/decorators/message-queue.decorator';
+import { InjectMessageQueue } from 'src/engine/core-modules/message-queue/decorators/message-queue.decorator';
-import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
+import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
-import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
+import { MessageQueueService } from 'src/engine/core-modules/message-queue/services/message-queue.service';
 
 @Command({
   name: 'workspace-seed-demo:cron:stop',

packages/twenty-server/src/database/commands/data-seed-demo-workspace/data-seed-demo-workspace.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
 
-import { EnvironmentModule } from 'src/engine/integrations/environment/environment.module';
+import { EnvironmentModule } from 'src/engine/core-modules/environment/environment.module';
 import { WorkspaceManagerModule } from 'src/engine/workspace-manager/workspace-manager.module';
 import { DataSeedDemoWorkspaceService } from 'src/database/commands/data-seed-demo-workspace/services/data-seed-demo-workspace.service';
 

packages/twenty-server/src/database/commands/data-seed-demo-workspace/jobs/data-seed-demo-workspace.job.ts

@@ -1,7 +1,7 @@
 import { DataSeedDemoWorkspaceService } from 'src/database/commands/data-seed-demo-workspace/services/data-seed-demo-workspace.service';
-import { Processor } from 'src/engine/integrations/message-queue/decorators/processor.decorator';
+import { Processor } from 'src/engine/core-modules/message-queue/decorators/processor.decorator';
-import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
+import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
-import { Process } from 'src/engine/integrations/message-queue/decorators/process.decorator';
+import { Process } from 'src/engine/core-modules/message-queue/decorators/process.decorator';
 
 @Processor(MessageQueue.cronQueue)
 export class DataSeedDemoWorkspaceJob {

packages/twenty-server/src/database/commands/data-seed-demo-workspace/services/data-seed-demo-workspace.service.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@nestjs/common';
 
-import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
 import { WorkspaceManagerService } from 'src/engine/workspace-manager/workspace-manager.service';
 import {
   deleteCoreSchema,

packages/twenty-server/src/database/commands/data-seed-dev-workspace.command.ts

@@ -32,9 +32,9 @@ import { rawDataSource } from 'src/database/typeorm/raw/raw.datasource';
 import { TypeORMService } from 'src/database/typeorm/typeorm.service';
 import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
 import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
-import { CacheStorageService } from 'src/engine/integrations/cache-storage/cache-storage.service';
+import { CacheStorageService } from 'src/engine/core-modules/cache-storage/cache-storage.service';
-import { InjectCacheStorage } from 'src/engine/integrations/cache-storage/decorators/cache-storage.decorator';
+import { InjectCacheStorage } from 'src/engine/core-modules/cache-storage/decorators/cache-storage.decorator';
-import { CacheStorageNamespace } from 'src/engine/integrations/cache-storage/types/cache-storage-namespace.enum';
+import { CacheStorageNamespace } from 'src/engine/core-modules/cache-storage/types/cache-storage-namespace.enum';
 import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
 import { FieldMetadataService } from 'src/engine/metadata-modules/field-metadata/field-metadata.service';
 import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';

packages/twenty-server/src/database/commands/upgrade-version/0-24/0-24-upgrade-version.module.ts

@@ -8,7 +8,7 @@ import { TypeORMModule } from 'src/database/typeorm/typeorm.module';
 import { KeyValuePair } from 'src/engine/core-modules/key-value-pair/key-value-pair.entity';
 import { OnboardingModule } from 'src/engine/core-modules/onboarding/onboarding.module';
 import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
-import { FileStorageModule } from 'src/engine/integrations/file-storage/file-storage.module';
+import { FileStorageModule } from 'src/engine/core-modules/file-storage/file-storage.module';
 import { DataSourceModule } from 'src/engine/metadata-modules/data-source/data-source.module';
 import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { FieldMetadataModule } from 'src/engine/metadata-modules/field-metadata/field-metadata.module';

packages/twenty-server/src/database/typeorm/typeorm.module.ts

@@ -2,7 +2,7 @@ import { Module } from '@nestjs/common';
 import { TypeOrmModule, TypeOrmModuleOptions } from '@nestjs/typeorm';
 
 import { typeORMCoreModuleOptions } from 'src/database/typeorm/core/core.datasource';
-import { EnvironmentModule } from 'src/engine/integrations/environment/environment.module';
+import { EnvironmentModule } from 'src/engine/core-modules/environment/environment.module';
 
 import { TypeORMService } from './typeorm.service';
 

packages/twenty-server/src/database/typeorm/typeorm.service.ts

@@ -2,7 +2,7 @@ import { Injectable, OnModuleDestroy, OnModuleInit } from '@nestjs/common';
 
 import { DataSource } from 'typeorm';
 
-import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
 import { DataSourceEntity } from 'src/engine/metadata-modules/data-source/data-source.entity';
 import { User } from 'src/engine/core-modules/user/user.entity';
 import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';

packages/twenty-server/src/engine/api/graphql/graphql-config/graphql-config.service.ts

@@ -20,9 +20,9 @@ import { CoreEngineModule } from 'src/engine/core-modules/core-engine.module';
 import { useGraphQLErrorHandlerHook } from 'src/engine/core-modules/graphql/hooks/use-graphql-error-handler.hook';
 import { User } from 'src/engine/core-modules/user/user.entity';
 import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
-import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
-import { ExceptionHandlerService } from 'src/engine/integrations/exception-handler/exception-handler.service';
+import { ExceptionHandlerService } from 'src/engine/core-modules/exception-handler/exception-handler.service';
-import { useSentryTracing } from 'src/engine/integrations/exception-handler/hooks/use-sentry-tracing';
+import { useSentryTracing } from 'src/engine/core-modules/exception-handler/hooks/use-sentry-tracing';
 import { handleExceptionAndConvertToGraphQLError } from 'src/engine/utils/global-exception-handler.util';
 import { renderApolloPlayground } from 'src/engine/utils/render-apollo-playground.util';
 

packages/twenty-server/src/engine/api/graphql/metadata-graphql-api.module.ts

@@ -7,9 +7,9 @@ import { GraphQLConfigModule } from 'src/engine/api/graphql/graphql-config/graph
 import { metadataModuleFactory } from 'src/engine/api/graphql/metadata.module-factory';
 import { DataloaderModule } from 'src/engine/dataloaders/dataloader.module';
 import { DataloaderService } from 'src/engine/dataloaders/dataloader.service';
-import { CacheStorageNamespace } from 'src/engine/integrations/cache-storage/types/cache-storage-namespace.enum';
+import { CacheStorageNamespace } from 'src/engine/core-modules/cache-storage/types/cache-storage-namespace.enum';
-import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
-import { ExceptionHandlerService } from 'src/engine/integrations/exception-handler/exception-handler.service';
+import { ExceptionHandlerService } from 'src/engine/core-modules/exception-handler/exception-handler.service';
 import { MetadataEngineModule } from 'src/engine/metadata-modules/metadata-engine.module';
 import { WorkspaceMigrationModule } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.module';
 import { WorkspaceMigrationRunnerModule } from 'src/engine/workspace-manager/workspace-migration-runner/workspace-migration-runner.module';

packages/twenty-server/src/engine/api/graphql/metadata.module-factory.ts

@@ -6,9 +6,9 @@ import { useThrottler } from 'src/engine/api/graphql/graphql-config/hooks/use-th
 import { MetadataGraphQLApiModule } from 'src/engine/api/graphql/metadata-graphql-api.module';
 import { useGraphQLErrorHandlerHook } from 'src/engine/core-modules/graphql/hooks/use-graphql-error-handler.hook';
 import { DataloaderService } from 'src/engine/dataloaders/dataloader.service';
-import { CacheStorageService } from 'src/engine/integrations/cache-storage/cache-storage.service';
+import { CacheStorageService } from 'src/engine/core-modules/cache-storage/cache-storage.service';
-import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
-import { ExceptionHandlerService } from 'src/engine/integrations/exception-handler/exception-handler.service';
+import { ExceptionHandlerService } from 'src/engine/core-modules/exception-handler/exception-handler.service';
 import { renderApolloPlayground } from 'src/engine/utils/render-apollo-playground.util';
 
 export const metadataModuleFactory = async (

packages/twenty-server/src/engine/api/graphql/workspace-query-runner/commands/0-20-record-position-backfill.command.ts

@@ -4,9 +4,9 @@ import {
   RecordPositionBackfillJob,
   RecordPositionBackfillJobData,
 } from 'src/engine/api/graphql/workspace-query-runner/jobs/record-position-backfill.job';
-import { InjectMessageQueue } from 'src/engine/integrations/message-queue/decorators/message-queue.decorator';
+import { InjectMessageQueue } from 'src/engine/core-modules/message-queue/decorators/message-queue.decorator';
-import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
+import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
-import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
+import { MessageQueueService } from 'src/engine/core-modules/message-queue/services/message-queue.service';
 
 export type RecordPositionBackfillCommandOptions = {
   workspaceId: string;

packages/twenty-server/src/engine/api/graphql/workspace-query-runner/jobs/call-webhook-jobs.job.ts

@@ -8,11 +8,11 @@ import {
   CallWebhookJob,
   CallWebhookJobData,
 } from 'src/engine/api/graphql/workspace-query-runner/jobs/call-webhook.job';
-import { InjectMessageQueue } from 'src/engine/integrations/message-queue/decorators/message-queue.decorator';
+import { InjectMessageQueue } from 'src/engine/core-modules/message-queue/decorators/message-queue.decorator';
-import { Process } from 'src/engine/integrations/message-queue/decorators/process.decorator';
+import { Process } from 'src/engine/core-modules/message-queue/decorators/process.decorator';
-import { Processor } from 'src/engine/integrations/message-queue/decorators/processor.decorator';
+import { Processor } from 'src/engine/core-modules/message-queue/decorators/processor.decorator';
-import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
+import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
-import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
+import { MessageQueueService } from 'src/engine/core-modules/message-queue/services/message-queue.service';
 import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
 import { WebhookWorkspaceEntity } from 'src/modules/webhook/standard-objects/webhook.workspace-entity';
 

packages/twenty-server/src/engine/api/graphql/workspace-query-runner/jobs/call-webhook.job.ts

@@ -1,9 +1,9 @@
 import { HttpService } from '@nestjs/axios';
 import { Logger } from '@nestjs/common';
 
-import { Process } from 'src/engine/integrations/message-queue/decorators/process.decorator';
+import { Process } from 'src/engine/core-modules/message-queue/decorators/process.decorator';
-import { Processor } from 'src/engine/integrations/message-queue/decorators/processor.decorator';
+import { Processor } from 'src/engine/core-modules/message-queue/decorators/processor.decorator';
-import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
+import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
 
 export type CallWebhookJobData = {
   targetUrl: string;

packages/twenty-server/src/engine/api/graphql/workspace-query-runner/jobs/record-position-backfill.job.ts

@@ -1,7 +1,7 @@
 import { RecordPositionBackfillService } from 'src/engine/api/graphql/workspace-query-runner/services/record-position-backfill-service';
-import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
+import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
-import { Processor } from 'src/engine/integrations/message-queue/decorators/processor.decorator';
+import { Processor } from 'src/engine/core-modules/message-queue/decorators/processor.decorator';
-import { Process } from 'src/engine/integrations/message-queue/decorators/process.decorator';
+import { Process } from 'src/engine/core-modules/message-queue/decorators/process.decorator';
 
 export type RecordPositionBackfillJobData = {
   workspaceId: string;

packages/twenty-server/src/engine/api/graphql/workspace-query-runner/listeners/entity-events-to-db.listener.ts

@@ -1,13 +1,13 @@
 import { Injectable } from '@nestjs/common';
 import { OnEvent } from '@nestjs/event-emitter';
 
-import { ObjectRecordCreateEvent } from 'src/engine/integrations/event-emitter/types/object-record-create.event';
+import { ObjectRecordCreateEvent } from 'src/engine/core-modules/event-emitter/types/object-record-create.event';
-import { ObjectRecordUpdateEvent } from 'src/engine/integrations/event-emitter/types/object-record-update.event';
+import { ObjectRecordUpdateEvent } from 'src/engine/core-modules/event-emitter/types/object-record-update.event';
-import { ObjectRecordBaseEvent } from 'src/engine/integrations/event-emitter/types/object-record.base.event';
+import { ObjectRecordBaseEvent } from 'src/engine/core-modules/event-emitter/types/object-record.base.event';
-import { objectRecordChangedValues } from 'src/engine/integrations/event-emitter/utils/object-record-changed-values';
+import { objectRecordChangedValues } from 'src/engine/core-modules/event-emitter/utils/object-record-changed-values';
-import { InjectMessageQueue } from 'src/engine/integrations/message-queue/decorators/message-queue.decorator';
+import { InjectMessageQueue } from 'src/engine/core-modules/message-queue/decorators/message-queue.decorator';
-import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
+import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
-import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
+import { MessageQueueService } from 'src/engine/core-modules/message-queue/services/message-queue.service';
 import { WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/workspace-event.type';
 import { CreateAuditLogFromInternalEvent } from 'src/modules/timeline/jobs/create-audit-log-from-internal-event';
 import { UpsertTimelineActivityFromInternalEvent } from 'src/modules/timeline/jobs/upsert-timeline-activity-from-internal-event.job';

packages/twenty-server/src/engine/api/graphql/workspace-query-runner/listeners/telemetry.listener.ts

@@ -2,8 +2,8 @@ import { Injectable } from '@nestjs/common';
 import { OnEvent } from '@nestjs/event-emitter';
 
 import { AnalyticsService } from 'src/engine/core-modules/analytics/analytics.service';
-import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
-import { ObjectRecordCreateEvent } from 'src/engine/integrations/event-emitter/types/object-record-create.event';
+import { ObjectRecordCreateEvent } from 'src/engine/core-modules/event-emitter/types/object-record-create.event';
 import { WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/workspace-event.type';
 
 @Injectable()

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

@@ -1,7 +1,7 @@
 import { Injectable, Logger } from '@nestjs/common';
 
 import isEmpty from 'lodash.isempty';
-import { DataSource } from 'typeorm';
+import { DataSource, In } from 'typeorm';
 
 import {
   Record as IRecord,
@@ -45,13 +45,13 @@ import {
 import { DuplicateService } from 'src/engine/core-modules/duplicate/duplicate.service';
 import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
 import { FeatureFlagService } from 'src/engine/core-modules/feature-flag/services/feature-flag.service';
-import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
-import { ObjectRecordCreateEvent } from 'src/engine/integrations/event-emitter/types/object-record-create.event';
+import { ObjectRecordCreateEvent } from 'src/engine/core-modules/event-emitter/types/object-record-create.event';
-import { ObjectRecordDeleteEvent } from 'src/engine/integrations/event-emitter/types/object-record-delete.event';
+import { ObjectRecordDeleteEvent } from 'src/engine/core-modules/event-emitter/types/object-record-delete.event';
-import { ObjectRecordUpdateEvent } from 'src/engine/integrations/event-emitter/types/object-record-update.event';
+import { ObjectRecordUpdateEvent } from 'src/engine/core-modules/event-emitter/types/object-record-update.event';
-import { InjectMessageQueue } from 'src/engine/integrations/message-queue/decorators/message-queue.decorator';
+import { InjectMessageQueue } from 'src/engine/core-modules/message-queue/decorators/message-queue.decorator';
-import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
+import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
-import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
+import { MessageQueueService } from 'src/engine/core-modules/message-queue/services/message-queue.service';
 import { assertMutationNotOnRemoteObject } from 'src/engine/metadata-modules/object-metadata/utils/assert-mutation-not-on-remote-object.util';
 import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
 import { computeObjectTargetTable } from 'src/engine/utils/compute-object-target-table.util';
@@ -505,7 +505,7 @@ export class WorkspaceQueryRunnerService {
     args.filter?.id?.in?.forEach((id) => assertIsValidUuid(id));
 
     const existingRecords = await repository.find({
-      where: { id: { in: args.filter?.id?.in } },
+      where: { id: In(args.filter?.id?.in) },
     });
     const mappedRecords = new Map(
       existingRecords.map((record) => [record.id, record]),
@@ -625,6 +625,19 @@ export class WorkspaceQueryRunnerService {
       });
     }
 
+    const repository =
+      await this.twentyORMGlobalManager.getRepositoryForWorkspace(
+        authContext.workspace.id,
+        objectMetadataItem.nameSingular,
+      );
+
+    const existingRecords = await repository.find({
+      where: { id: In(args.filter?.id?.in) },
+    });
+    const mappedRecords = new Map(
+      existingRecords.map((record) => [record.id, record]),
+    );
+
     const result = await this.execute(query, authContext.workspace.id);
 
     const parsedResults = (
@@ -644,17 +657,21 @@ export class WorkspaceQueryRunnerService {
 
     this.workspaceEventEmitter.emit(
       `${objectMetadataItem.nameSingular}.deleted`,
-      parsedResults.map(
+      parsedResults.map((record) => {
-        (record) =>
+        const existingRecord = mappedRecords.get(record.id);
-          ({
+
-            userId: authContext.user?.id,
+        return {
-            recordId: record.id,
+          userId: authContext.user?.id,
-            objectMetadata: objectMetadataItem,
+          recordId: record.id,
-            properties: {
+          objectMetadata: objectMetadataItem,
-              before: this.removeNestedProperties(record),
+          properties: {
-            },
+            before: this.removeNestedProperties({
-          }) satisfies ObjectRecordDeleteEvent<any>,
+              ...existingRecord,
-      ),
+              ...record,
+            }),
+          },
+        } satisfies ObjectRecordDeleteEvent<any>;
+      }),
       authContext.workspace.id,
     );
 

packages/twenty-server/src/engine/api/rest/core/query-builder/core-query-builder.factory.ts

@@ -19,7 +19,7 @@ import { parseCoreBatchPath } from 'src/engine/api/rest/core/query-builder/utils
 import { parseCorePath } from 'src/engine/api/rest/core/query-builder/utils/path-parsers/parse-core-path.utils';
 import { Query } from 'src/engine/api/rest/core/types/query.type';
 import { TokenService } from 'src/engine/core-modules/auth/services/token.service';
-import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
 import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
 import { ObjectMetadataService } from 'src/engine/metadata-modules/object-metadata/object-metadata.service';
 

packages/twenty-server/src/engine/api/rest/rest-api.service.ts

@@ -6,7 +6,7 @@ import { AxiosResponse } from 'axios';
 
 import { Query } from 'src/engine/api/rest/core/types/query.type';
 import { getServerUrl } from 'src/utils/get-server-url';
-import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
 import { RestApiException } from 'src/engine/api/rest/errors/RestApiException';
 
 export enum GraphqlApiType {

packages/twenty-server/src/engine/core-modules/ai-sql-query/ai-sql-query.module.ts

@@ -7,9 +7,9 @@ import { AISQLQueryResolver } from 'src/engine/core-modules/ai-sql-query/ai-sql-
 import { AISQLQueryService } from 'src/engine/core-modules/ai-sql-query/ai-sql-query.service';
 import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
 import { WorkspaceQueryRunnerModule } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-runner.module';
-import { LLMChatModelModule } from 'src/engine/integrations/llm-chat-model/llm-chat-model.module';
+import { LLMChatModelModule } from 'src/engine/core-modules/llm-chat-model/llm-chat-model.module';
-import { EnvironmentModule } from 'src/engine/integrations/environment/environment.module';
+import { EnvironmentModule } from 'src/engine/core-modules/environment/environment.module';
-import { LLMTracingModule } from 'src/engine/integrations/llm-tracing/llm-tracing.module';
+import { LLMTracingModule } from 'src/engine/core-modules/llm-tracing/llm-tracing.module';
 import { ObjectMetadataModule } from 'src/engine/metadata-modules/object-metadata/object-metadata.module';
 import { WorkspaceSyncMetadataModule } from 'src/engine/workspace-manager/workspace-sync-metadata/workspace-sync-metadata.module';
 @Module({

packages/twenty-server/src/engine/core-modules/ai-sql-query/ai-sql-query.service.ts

@@ -11,8 +11,8 @@ import { zodToJsonSchema } from 'zod-to-json-schema';
 import { WorkspaceQueryRunnerService } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-runner.service';
 import { sqlGenerationPromptTemplate } from 'src/engine/core-modules/ai-sql-query/ai-sql-query.prompt-templates';
 import { AISQLQueryResult } from 'src/engine/core-modules/ai-sql-query/dtos/ai-sql-query-result.dto';
-import { LLMChatModelService } from 'src/engine/integrations/llm-chat-model/llm-chat-model.service';
+import { LLMChatModelService } from 'src/engine/core-modules/llm-chat-model/llm-chat-model.service';
-import { LLMTracingService } from 'src/engine/integrations/llm-tracing/llm-tracing.service';
+import { LLMTracingService } from 'src/engine/core-modules/llm-tracing/llm-tracing.service';
 import { DEFAULT_LABEL_IDENTIFIER_FIELD_NAME } from 'src/engine/metadata-modules/object-metadata/object-metadata.constants';
 import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
 import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';

packages/twenty-server/src/engine/core-modules/analytics/analytics.resolver.spec.ts

@@ -1,7 +1,7 @@
 import { Test, TestingModule } from '@nestjs/testing';
 import { HttpService } from '@nestjs/axios';
 
-import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
 
 import { AnalyticsResolver } from './analytics.resolver';
 import { AnalyticsService } from './analytics.service';

packages/twenty-server/src/engine/core-modules/analytics/analytics.resolver.ts

@@ -8,7 +8,7 @@ import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorat
 import { AuthUser } from 'src/engine/decorators/auth/auth-user.decorator';
 import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 import { User } from 'src/engine/core-modules/user/user.entity';
-import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
 
 import { AnalyticsService } from './analytics.service';
 import { Analytics } from './analytics.entity';

packages/twenty-server/src/engine/core-modules/analytics/analytics.service.spec.ts

@@ -1,7 +1,7 @@
 import { Test, TestingModule } from '@nestjs/testing';
 import { HttpService } from '@nestjs/axios';
 
-import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
 
 import { AnalyticsService } from './analytics.service';
 

packages/twenty-server/src/engine/core-modules/analytics/analytics.service.ts

@@ -1,7 +1,7 @@
 import { Injectable, Logger } from '@nestjs/common';
 import { HttpService } from '@nestjs/axios';
 
-import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
 
 type CreateEventInput = {
   type: string;

packages/twenty-server/src/engine/core-modules/auth/auth.resolver.spec.ts

@@ -6,7 +6,7 @@ import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 import { UserService } from 'src/engine/core-modules/user/services/user.service';
 import { UserWorkspaceService } from 'src/engine/core-modules/user-workspace/user-workspace.service';
 import { User } from 'src/engine/core-modules/user/user.entity';
-import { CaptchaGuard } from 'src/engine/integrations/captcha/captcha.guard';
+import { CaptchaGuard } from 'src/engine/core-modules/captcha/captcha.guard';
 
 import { AuthResolver } from './auth.resolver';
 

packages/twenty-server/src/engine/core-modules/auth/auth.resolver.ts

@@ -22,7 +22,7 @@ import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 import { AuthUser } from 'src/engine/decorators/auth/auth-user.decorator';
 import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
 import { JwtAuthGuard } from 'src/engine/guards/jwt.auth.guard';
-import { CaptchaGuard } from 'src/engine/integrations/captcha/captcha.guard';
+import { CaptchaGuard } from 'src/engine/core-modules/captcha/captcha.guard';
 
 import { ChallengeInput } from './dto/challenge.input';
 import { ImpersonateInput } from './dto/impersonate.input';

packages/twenty-server/src/engine/core-modules/auth/controllers/google-apis-auth.controller.ts

@@ -20,7 +20,7 @@ import { GoogleAPIsService } from 'src/engine/core-modules/auth/services/google-
 import { TokenService } from 'src/engine/core-modules/auth/services/token.service';
 import { GoogleAPIsRequest } from 'src/engine/core-modules/auth/types/google-api-request.type';
 import { OnboardingService } from 'src/engine/core-modules/onboarding/onboarding.service';
-import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
 
 @Controller('auth/google-apis')
 @UseFilters(AuthRestApiExceptionFilter)

packages/twenty-server/src/engine/core-modules/auth/guards/google-apis-oauth-exchange-code-for-token.guard.ts

@@ -7,7 +7,7 @@ import {
 } from 'src/engine/core-modules/auth/auth.exception';
 import { GoogleAPIsOauthExchangeCodeForTokenStrategy } from 'src/engine/core-modules/auth/strategies/google-apis-oauth-exchange-code-for-token.auth.strategy';
 import { setRequestExtraParams } from 'src/engine/core-modules/auth/utils/google-apis-set-request-extra-params.util';
-import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
 
 @Injectable()
 export class GoogleAPIsOauthExchangeCodeForTokenGuard extends AuthGuard(

packages/twenty-server/src/engine/core-modules/auth/guards/google-apis-oauth-request-code.guard.ts

@@ -7,7 +7,7 @@ import {
 } from 'src/engine/core-modules/auth/auth.exception';
 import { GoogleAPIsOauthRequestCodeStrategy } from 'src/engine/core-modules/auth/strategies/google-apis-oauth-request-code.auth.strategy';
 import { setRequestExtraParams } from 'src/engine/core-modules/auth/utils/google-apis-set-request-extra-params.util';
-import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
 
 @Injectable()
 export class GoogleAPIsOauthRequestCodeGuard extends AuthGuard('google-apis') {

packages/twenty-server/src/engine/core-modules/auth/guards/google-provider-enabled.guard.ts

@@ -7,7 +7,7 @@ import {
   AuthExceptionCode,
 } from 'src/engine/core-modules/auth/auth.exception';
 import { GoogleStrategy } from 'src/engine/core-modules/auth/strategies/google.auth.strategy';
-import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
 
 @Injectable()
 export class GoogleProviderEnabledGuard implements CanActivate {

packages/twenty-server/src/engine/core-modules/auth/guards/microsoft-provider-enabled.guard.ts

@@ -7,7 +7,7 @@ import {
   AuthExceptionCode,
 } from 'src/engine/core-modules/auth/auth.exception';
 import { MicrosoftStrategy } from 'src/engine/core-modules/auth/strategies/microsoft.auth.strategy';
-import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
 
 @Injectable()
 export class MicrosoftProviderEnabledGuard implements CanActivate {

packages/twenty-server/src/engine/core-modules/auth/services/auth.service.spec.ts

@@ -5,8 +5,8 @@ import { UserService } from 'src/engine/core-modules/user/services/user.service'
 import { WorkspaceManagerService } from 'src/engine/workspace-manager/workspace-manager.service';
 import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 import { User } from 'src/engine/core-modules/user/user.entity';
-import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
-import { EmailService } from 'src/engine/integrations/email/email.service';
+import { EmailService } from 'src/engine/core-modules/email/email.service';
 import { SignInUpService } from 'src/engine/core-modules/auth/services/sign-in-up.service';
 import { AppToken } from 'src/engine/core-modules/app-token/app-token.entity';
 

packages/twenty-server/src/engine/core-modules/auth/services/auth.service.ts

@@ -9,7 +9,7 @@ import ms from 'ms';
 import { PasswordUpdateNotifyEmail } from 'twenty-emails';
 import { Repository } from 'typeorm';
 
-import { NodeEnvironment } from 'src/engine/integrations/environment/interfaces/node-environment.interface';
+import { NodeEnvironment } from 'src/engine/core-modules/environment/interfaces/node-environment.interface';
 
 import {
   AppToken,
@@ -36,8 +36,8 @@ import { WorkspaceMember } from 'src/engine/core-modules/user/dtos/workspace-mem
 import { UserService } from 'src/engine/core-modules/user/services/user.service';
 import { User } from 'src/engine/core-modules/user/user.entity';
 import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
-import { EmailService } from 'src/engine/integrations/email/email.service';
+import { EmailService } from 'src/engine/core-modules/email/email.service';
-import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
 
 import { TokenService } from './token.service';
 

packages/twenty-server/src/engine/core-modules/auth/services/google-apis.service.ts

@@ -3,10 +3,10 @@ import { Injectable } from '@nestjs/common';
 import { EntityManager } from 'typeorm';
 import { v4 } from 'uuid';
 
-import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
-import { InjectMessageQueue } from 'src/engine/integrations/message-queue/decorators/message-queue.decorator';
+import { InjectMessageQueue } from 'src/engine/core-modules/message-queue/decorators/message-queue.decorator';
-import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
+import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
-import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
+import { MessageQueueService } from 'src/engine/core-modules/message-queue/services/message-queue.service';
 import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator';
 import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
 import {

packages/twenty-server/src/engine/core-modules/auth/services/sign-in-up.service.spec.ts

@@ -8,7 +8,7 @@ import { OnboardingService } from 'src/engine/core-modules/onboarding/onboarding
 import { UserWorkspaceService } from 'src/engine/core-modules/user-workspace/user-workspace.service';
 import { User } from 'src/engine/core-modules/user/user.entity';
 import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
-import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
 
 describe('SignInUpService', () => {
   let service: SignInUpService;

packages/twenty-server/src/engine/core-modules/auth/services/sign-in-up.service.ts

@@ -25,7 +25,7 @@ import {
   Workspace,
   WorkspaceActivationStatus,
 } from 'src/engine/core-modules/workspace/workspace.entity';
-import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
 import { getImageBufferFromUrl } from 'src/utils/image';
 
 export type SignInUpServiceInput = {

packages/twenty-server/src/engine/core-modules/auth/services/token.service.spec.ts

@@ -14,8 +14,8 @@ import { JwtAuthStrategy } from 'src/engine/core-modules/auth/strategies/jwt.aut
 import { JwtWrapperService } from 'src/engine/core-modules/jwt/services/jwt-wrapper.service';
 import { User } from 'src/engine/core-modules/user/user.entity';
 import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
-import { EmailService } from 'src/engine/integrations/email/email.service';
+import { EmailService } from 'src/engine/core-modules/email/email.service';
-import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
 import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
 
 import { TokenService } from './token.service';

packages/twenty-server/src/engine/core-modules/auth/services/token.service.ts

@@ -42,8 +42,8 @@ import {
   Workspace,
   WorkspaceActivationStatus,
 } from 'src/engine/core-modules/workspace/workspace.entity';
-import { EmailService } from 'src/engine/integrations/email/email.service';
+import { EmailService } from 'src/engine/core-modules/email/email.service';
-import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
 import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
 import { WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';
 

packages/twenty-server/src/engine/core-modules/auth/strategies/google-apis-oauth-common.auth.strategy.ts

@@ -3,7 +3,7 @@ import { PassportStrategy } from '@nestjs/passport';
 
 import { Strategy } from 'passport-google-oauth20';
 
-import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
 
 export type GoogleAPIScopeConfig = {
   isCalendarEnabled?: boolean;

packages/twenty-server/src/engine/core-modules/auth/strategies/google-apis-oauth-exchange-code-for-token.auth.strategy.ts

@@ -4,7 +4,7 @@ import { VerifyCallback } from 'passport-google-oauth20';
 
 import { GoogleAPIsOauthCommonStrategy } from 'src/engine/core-modules/auth/strategies/google-apis-oauth-common.auth.strategy';
 import { GoogleAPIsRequest } from 'src/engine/core-modules/auth/types/google-api-request.type';
-import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
 
 export type GoogleAPIScopeConfig = {
   isCalendarEnabled?: boolean;

packages/twenty-server/src/engine/core-modules/auth/strategies/google-apis-oauth-request-code.auth.strategy.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@nestjs/common';
 
 import { GoogleAPIsOauthCommonStrategy } from 'src/engine/core-modules/auth/strategies/google-apis-oauth-common.auth.strategy';
-import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
 
 export type GoogleAPIScopeConfig = {
   isCalendarEnabled?: boolean;

packages/twenty-server/src/engine/core-modules/auth/strategies/google.auth.strategy.ts

@@ -4,7 +4,7 @@ import { PassportStrategy } from '@nestjs/passport';
 import { Request } from 'express';
 import { Strategy, VerifyCallback } from 'passport-google-oauth20';
 
-import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
 
 export type GoogleRequest = Omit<
   Request,

packages/twenty-server/src/engine/core-modules/auth/strategies/jwt.auth.strategy.ts

@@ -13,7 +13,7 @@ import {
 import { AuthContext } from 'src/engine/core-modules/auth/types/auth-context.type';
 import { User } from 'src/engine/core-modules/user/user.entity';
 import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
-import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
 import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
 import { ApiKeyWorkspaceEntity } from 'src/modules/api-key/standard-objects/api-key.workspace-entity';
 

packages/twenty-server/src/engine/core-modules/auth/strategies/microsoft.auth.strategy.ts

@@ -8,7 +8,7 @@ import {
   AuthException,
   AuthExceptionCode,
 } from 'src/engine/core-modules/auth/auth.exception';
-import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
 
 export type MicrosoftRequest = Omit<
   Request,

packages/twenty-server/src/engine/core-modules/billing/jobs/update-subscription.job.ts

@@ -3,9 +3,9 @@ import { Logger, Scope } from '@nestjs/common';
 import { BillingSubscriptionService } from 'src/engine/core-modules/billing/services/billing-subscription.service';
 import { StripeService } from 'src/engine/core-modules/billing/stripe/stripe.service';
 import { UserWorkspaceService } from 'src/engine/core-modules/user-workspace/user-workspace.service';
-import { Process } from 'src/engine/integrations/message-queue/decorators/process.decorator';
+import { Process } from 'src/engine/core-modules/message-queue/decorators/process.decorator';
-import { Processor } from 'src/engine/integrations/message-queue/decorators/processor.decorator';
+import { Processor } from 'src/engine/core-modules/message-queue/decorators/processor.decorator';
-import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
+import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
 export type UpdateSubscriptionJobData = { workspaceId: string };
 
 @Processor({

packages/twenty-server/src/engine/core-modules/billing/listeners/billing-workspace-member.listener.ts

@@ -5,11 +5,11 @@ import {
   UpdateSubscriptionJob,
   UpdateSubscriptionJobData,
 } from 'src/engine/core-modules/billing/jobs/update-subscription.job';
-import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
-import { ObjectRecordCreateEvent } from 'src/engine/integrations/event-emitter/types/object-record-create.event';
+import { ObjectRecordCreateEvent } from 'src/engine/core-modules/event-emitter/types/object-record-create.event';
-import { InjectMessageQueue } from 'src/engine/integrations/message-queue/decorators/message-queue.decorator';
+import { InjectMessageQueue } from 'src/engine/core-modules/message-queue/decorators/message-queue.decorator';
-import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
+import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
-import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
+import { MessageQueueService } from 'src/engine/core-modules/message-queue/services/message-queue.service';
 import { WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/workspace-event.type';
 import { WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';
 

packages/twenty-server/src/engine/core-modules/billing/services/billing-portal.workspace-service.ts

@@ -9,7 +9,7 @@ import { StripeService } from 'src/engine/core-modules/billing/stripe/stripe.ser
 import { UserWorkspaceService } from 'src/engine/core-modules/user-workspace/user-workspace.service';
 import { User } from 'src/engine/core-modules/user/user.entity';
 import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
-import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
 import { assert } from 'src/utils/assert';
 
 export enum WebhookEvent {

packages/twenty-server/src/engine/core-modules/billing/services/billing-subscription.service.ts

@@ -18,7 +18,7 @@ import { StripeService } from 'src/engine/core-modules/billing/stripe/stripe.ser
 import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
 import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
 import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
-import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
 
 @Injectable()
 export class BillingSubscriptionService {

packages/twenty-server/src/engine/core-modules/billing/services/billing.service.ts

@@ -6,7 +6,7 @@ import { SubscriptionStatus } from 'src/engine/core-modules/billing/entities/bil
 import { BillingSubscriptionService } from 'src/engine/core-modules/billing/services/billing-subscription.service';
 import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
 import { FeatureFlagService } from 'src/engine/core-modules/feature-flag/services/feature-flag.service';
-import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
 
 @Injectable()
 export class BillingService {

packages/twenty-server/src/engine/core-modules/billing/stripe/stripe.service.ts

@@ -7,7 +7,7 @@ import { AvailableProduct } from 'src/engine/core-modules/billing/interfaces/ava
 import { ProductPriceEntity } from 'src/engine/core-modules/billing/dto/product-price.entity';
 import { BillingSubscriptionItem } from 'src/engine/core-modules/billing/entities/billing-subscription-item.entity';
 import { User } from 'src/engine/core-modules/user/user.entity';
-import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
 
 @Injectable()
 export class StripeService {

packages/twenty-server/src/engine/core-modules/cache-storage/cache-storage.module-factory.ts

@@ -2,8 +2,8 @@ import { CacheModuleOptions } from '@nestjs/common';
 
 import { redisStore } from 'cache-manager-redis-yet';
 
-import { CacheStorageType } from 'src/engine/integrations/cache-storage/types/cache-storage-type.enum';
+import { CacheStorageType } from 'src/engine/core-modules/cache-storage/types/cache-storage-type.enum';
-import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
 
 export const cacheStorageModuleFactory = (
   environmentService: EnvironmentService,

packages/twenty-server/src/engine/core-modules/cache-storage/cache-storage.module.ts

@@ -2,10 +2,10 @@ import { Module, Global, Inject, OnModuleDestroy } from '@nestjs/common';
 import { CacheModule, CACHE_MANAGER, Cache } from '@nestjs/cache-manager';
 import { ConfigModule } from '@nestjs/config';
 
-import { CacheStorageService } from 'src/engine/integrations/cache-storage/cache-storage.service';
+import { CacheStorageService } from 'src/engine/core-modules/cache-storage/cache-storage.service';
-import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
-import { cacheStorageModuleFactory } from 'src/engine/integrations/cache-storage/cache-storage.module-factory';
+import { cacheStorageModuleFactory } from 'src/engine/core-modules/cache-storage/cache-storage.module-factory';
-import { CacheStorageNamespace } from 'src/engine/integrations/cache-storage/types/cache-storage-namespace.enum';
+import { CacheStorageNamespace } from 'src/engine/core-modules/cache-storage/types/cache-storage-namespace.enum';
 
 @Global()
 @Module({

packages/twenty-server/src/engine/core-modules/cache-storage/cache-storage.service.ts

@@ -3,7 +3,7 @@ import { CACHE_MANAGER, Cache } from '@nestjs/cache-manager';
 
 import { RedisCache } from 'cache-manager-redis-yet';
 
-import { CacheStorageNamespace } from 'src/engine/integrations/cache-storage/types/cache-storage-namespace.enum';
+import { CacheStorageNamespace } from 'src/engine/core-modules/cache-storage/types/cache-storage-namespace.enum';
 
 @Injectable()
 export class CacheStorageService {

packages/twenty-server/src/engine/core-modules/cache-storage/decorators/cache-storage.decorator.ts

@@ -1,6 +1,6 @@
 import { Inject } from '@nestjs/common';
 
-import { CacheStorageNamespace } from 'src/engine/integrations/cache-storage/types/cache-storage-namespace.enum';
+import { CacheStorageNamespace } from 'src/engine/core-modules/cache-storage/types/cache-storage-namespace.enum';
 
 export const InjectCacheStorage = (
   cacheStorageNamespace: CacheStorageNamespace,

packages/twenty-server/src/engine/core-modules/captcha/captcha.guard.ts

@@ -6,7 +6,7 @@ import {
 } from '@nestjs/common';
 import { GqlExecutionContext } from '@nestjs/graphql';
 
-import { CaptchaService } from 'src/engine/integrations/captcha/captcha.service';
+import { CaptchaService } from 'src/engine/core-modules/captcha/captcha.service';
 
 @Injectable()
 export class CaptchaGuard implements CanActivate {

packages/twenty-server/src/engine/core-modules/captcha/captcha.module-factory.ts

@@ -1,8 +1,8 @@
 import {
   CaptchaDriverOptions,
   CaptchaModuleOptions,
-} from 'src/engine/integrations/captcha/interfaces';
+} from 'src/engine/core-modules/captcha/interfaces';
-import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
 
 export const captchaModuleFactory = (
   environmentService: EnvironmentService,

packages/twenty-server/src/engine/core-modules/captcha/captcha.module.ts

@@ -1,13 +1,13 @@
 import { DynamicModule, Global } from '@nestjs/common';
 
-import { CAPTCHA_DRIVER } from 'src/engine/integrations/captcha/captcha.constants';
+import { CAPTCHA_DRIVER } from 'src/engine/core-modules/captcha/captcha.constants';
-import { CaptchaService } from 'src/engine/integrations/captcha/captcha.service';
+import { CaptchaService } from 'src/engine/core-modules/captcha/captcha.service';
-import { GoogleRecaptchaDriver } from 'src/engine/integrations/captcha/drivers/google-recaptcha.driver';
+import { GoogleRecaptchaDriver } from 'src/engine/core-modules/captcha/drivers/google-recaptcha.driver';
-import { TurnstileDriver } from 'src/engine/integrations/captcha/drivers/turnstile.driver';
+import { TurnstileDriver } from 'src/engine/core-modules/captcha/drivers/turnstile.driver';
 import {
   CaptchaDriverType,
   CaptchaModuleAsyncOptions,
-} from 'src/engine/integrations/captcha/interfaces';
+} from 'src/engine/core-modules/captcha/interfaces';
 
 @Global()
 export class CaptchaModule {

packages/twenty-server/src/engine/core-modules/captcha/captcha.service.ts

@@ -1,9 +1,9 @@
 import { Inject, Injectable } from '@nestjs/common';
 
-import { CaptchaDriver } from 'src/engine/integrations/captcha/drivers/interfaces/captcha-driver.interface';
+import { CaptchaDriver } from 'src/engine/core-modules/captcha/drivers/interfaces/captcha-driver.interface';
 
-import { CAPTCHA_DRIVER } from 'src/engine/integrations/captcha/captcha.constants';
+import { CAPTCHA_DRIVER } from 'src/engine/core-modules/captcha/captcha.constants';
-import { CaptchaValidateResult } from 'src/engine/integrations/captcha/interfaces';
+import { CaptchaValidateResult } from 'src/engine/core-modules/captcha/interfaces';
 
 @Injectable()
 export class CaptchaService implements CaptchaDriver {

packages/twenty-server/src/engine/core-modules/captcha/drivers/google-recaptcha.driver.ts

@@ -1,12 +1,12 @@
 import axios, { AxiosInstance } from 'axios';
 
-import { CaptchaDriver } from 'src/engine/integrations/captcha/drivers/interfaces/captcha-driver.interface';
+import { CaptchaDriver } from 'src/engine/core-modules/captcha/drivers/interfaces/captcha-driver.interface';
-import { CaptchaServerResponse } from 'src/engine/integrations/captcha/drivers/interfaces/captcha-server-response';
+import { CaptchaServerResponse } from 'src/engine/core-modules/captcha/drivers/interfaces/captcha-server-response';
 
 import {
   CaptchaDriverOptions,
   CaptchaValidateResult,
-} from 'src/engine/integrations/captcha/interfaces';
+} from 'src/engine/core-modules/captcha/interfaces';
 
 export class GoogleRecaptchaDriver implements CaptchaDriver {
   private readonly siteKey: string;

packages/twenty-server/src/engine/core-modules/captcha/drivers/interfaces/captcha-driver.interface.ts

@@ -1,4 +1,4 @@
-import { CaptchaValidateResult } from 'src/engine/integrations/captcha/interfaces';
+import { CaptchaValidateResult } from 'src/engine/core-modules/captcha/interfaces';
 
 export interface CaptchaDriver {
   validate(token: string): Promise<CaptchaValidateResult>;

packages/twenty-server/src/engine/core-modules/captcha/drivers/turnstile.driver.ts

@@ -1,12 +1,12 @@
 import axios, { AxiosInstance } from 'axios';
 
-import { CaptchaDriver } from 'src/engine/integrations/captcha/drivers/interfaces/captcha-driver.interface';
+import { CaptchaDriver } from 'src/engine/core-modules/captcha/drivers/interfaces/captcha-driver.interface';
-import { CaptchaServerResponse } from 'src/engine/integrations/captcha/drivers/interfaces/captcha-server-response';
+import { CaptchaServerResponse } from 'src/engine/core-modules/captcha/drivers/interfaces/captcha-server-response';
 
 import {
   CaptchaDriverOptions,
   CaptchaValidateResult,
-} from 'src/engine/integrations/captcha/interfaces';
+} from 'src/engine/core-modules/captcha/interfaces';
 
 export class TurnstileDriver implements CaptchaDriver {
   private readonly siteKey: string;

packages/twenty-server/src/engine/core-modules/captcha/interfaces/index.ts

@@ -0,0 +1 @@
+export * from 'src/engine/core-modules/captcha/interfaces/captcha.interface';

packages/twenty-server/src/engine/core-modules/client-config/client-config.entity.ts

@@ -1,6 +1,6 @@
 import { Field, ObjectType } from '@nestjs/graphql';
 
-import { CaptchaDriverType } from 'src/engine/integrations/captcha/interfaces';
+import { CaptchaDriverType } from 'src/engine/core-modules/captcha/interfaces';
 
 @ObjectType()
 class AuthProviders {

packages/twenty-server/src/engine/core-modules/client-config/client-config.resolver.spec.ts

@@ -1,6 +1,6 @@
 import { Test, TestingModule } from '@nestjs/testing';
 
-import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
 
 import { ClientConfigResolver } from './client-config.resolver';
 

packages/twenty-server/src/engine/core-modules/client-config/client-config.resolver.ts

@@ -1,6 +1,6 @@
 import { Resolver, Query } from '@nestjs/graphql';
 
-import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
 
 import { ClientConfig } from './client-config.entity';
 

packages/twenty-server/src/engine/core-modules/core-engine.module.ts

@@ -1,4 +1,6 @@
 import { Module } from '@nestjs/common';
+import { HttpAdapterHost } from '@nestjs/core';
+import { EventEmitterModule } from '@nestjs/event-emitter';
 
 import { ActorModule } from 'src/engine/core-modules/actor/actor.module';
 import { AISQLQueryModule } from 'src/engine/core-modules/ai-sql-query/ai-sql-query.module';
@@ -15,10 +17,32 @@ import { UserModule } from 'src/engine/core-modules/user/user.module';
 import { WorkflowTriggerApiModule } from 'src/engine/core-modules/workflow/workflow-trigger-api.module';
 import { WorkspaceModule } from 'src/engine/core-modules/workspace/workspace.module';
 import { WorkspaceEventEmitterModule } from 'src/engine/workspace-event-emitter/workspace-event-emitter.module';
+import { EnvironmentModule } from 'src/engine/core-modules/environment/environment.module';
+import { FileStorageModule } from 'src/engine/core-modules/file-storage/file-storage.module';
+import { fileStorageModuleFactory } from 'src/engine/core-modules/file-storage/file-storage.module-factory';
+import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
+import { LoggerModule } from 'src/engine/core-modules/logger/logger.module';
+import { loggerModuleFactory } from 'src/engine/core-modules/logger/logger.module-factory';
+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 { ExceptionHandlerModule } from 'src/engine/core-modules/exception-handler/exception-handler.module';
+import { exceptionHandlerModuleFactory } from 'src/engine/core-modules/exception-handler/exception-handler.module-factory';
+import { EmailModule } from 'src/engine/core-modules/email/email.module';
+import { emailModuleFactory } from 'src/engine/core-modules/email/email.module-factory';
+import { CaptchaModule } from 'src/engine/core-modules/captcha/captcha.module';
+import { captchaModuleFactory } from 'src/engine/core-modules/captcha/captcha.module-factory';
+import { CacheStorageModule } from 'src/engine/core-modules/cache-storage/cache-storage.module';
+import { LLMChatModelModule } from 'src/engine/core-modules/llm-chat-model/llm-chat-model.module';
+import { llmChatModelModuleFactory } from 'src/engine/core-modules/llm-chat-model/llm-chat-model.module-factory';
+import { LLMTracingModule } from 'src/engine/core-modules/llm-tracing/llm-tracing.module';
+import { llmTracingModuleFactory } from 'src/engine/core-modules/llm-tracing/llm-tracing.module-factory';
+import { ServerlessModule } from 'src/engine/core-modules/serverless/serverless.module';
+import { serverlessModuleFactory } from 'src/engine/core-modules/serverless/serverless-module.factory';
+import { FileStorageService } from 'src/engine/core-modules/file-storage/file-storage.service';
 
-import { AnalyticsModule } from './analytics/analytics.module';
-import { ClientConfigModule } from './client-config/client-config.module';
 import { FileModule } from './file/file.module';
+import { ClientConfigModule } from './client-config/client-config.module';
+import { AnalyticsModule } from './analytics/analytics.module';
 
 @Module({
   imports: [
@@ -40,6 +64,47 @@ import { FileModule } from './file/file.module';
     WorkflowTriggerApiModule,
     WorkspaceEventEmitterModule,
     ActorModule,
+    EnvironmentModule.forRoot({}),
+    FileStorageModule.forRootAsync({
+      useFactory: fileStorageModuleFactory,
+      inject: [EnvironmentService],
+    }),
+    LoggerModule.forRootAsync({
+      useFactory: loggerModuleFactory,
+      inject: [EnvironmentService],
+    }),
+    MessageQueueModule.registerAsync({
+      useFactory: messageQueueModuleFactory,
+      inject: [EnvironmentService],
+    }),
+    ExceptionHandlerModule.forRootAsync({
+      useFactory: exceptionHandlerModuleFactory,
+      inject: [EnvironmentService, HttpAdapterHost],
+    }),
+    EmailModule.forRoot({
+      useFactory: emailModuleFactory,
+      inject: [EnvironmentService],
+    }),
+    CaptchaModule.forRoot({
+      useFactory: captchaModuleFactory,
+      inject: [EnvironmentService],
+    }),
+    EventEmitterModule.forRoot({
+      wildcard: true,
+    }),
+    CacheStorageModule,
+    LLMChatModelModule.forRoot({
+      useFactory: llmChatModelModuleFactory,
+      inject: [EnvironmentService],
+    }),
+    LLMTracingModule.forRoot({
+      useFactory: llmTracingModuleFactory,
+      inject: [EnvironmentService],
+    }),
+    ServerlessModule.forRootAsync({
+      useFactory: serverlessModuleFactory,
+      inject: [EnvironmentService, FileStorageService],
+    }),
   ],
   exports: [
     AnalyticsModule,

packages/twenty-server/src/engine/core-modules/email/drivers/logger.driver.ts

@@ -2,7 +2,7 @@ import { Logger } from '@nestjs/common';
 
 import { SendMailOptions } from 'nodemailer';
 
-import { EmailDriver } from 'src/engine/integrations/email/drivers/interfaces/email-driver.interface';
+import { EmailDriver } from 'src/engine/core-modules/email/drivers/interfaces/email-driver.interface';
 
 export class LoggerDriver implements EmailDriver {
   private readonly logger = new Logger(LoggerDriver.name);

packages/twenty-server/src/engine/core-modules/email/drivers/smtp.driver.ts

@@ -3,7 +3,7 @@ import { Logger } from '@nestjs/common';
 import { createTransport, Transporter, SendMailOptions } from 'nodemailer';
 import SMTPConnection from 'nodemailer/lib/smtp-connection';
 
-import { EmailDriver } from 'src/engine/integrations/email/drivers/interfaces/email-driver.interface';
+import { EmailDriver } from 'src/engine/core-modules/email/drivers/interfaces/email-driver.interface';
 
 export class SmtpDriver implements EmailDriver {
   private readonly logger = new Logger(SmtpDriver.name);

packages/twenty-server/src/engine/core-modules/email/email-sender.job.ts

@@ -1,9 +1,9 @@
 import { SendMailOptions } from 'nodemailer';
 
-import { EmailSenderService } from 'src/engine/integrations/email/email-sender.service';
+import { EmailSenderService } from 'src/engine/core-modules/email/email-sender.service';
-import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
+import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
-import { Processor } from 'src/engine/integrations/message-queue/decorators/processor.decorator';
+import { Processor } from 'src/engine/core-modules/message-queue/decorators/processor.decorator';
-import { Process } from 'src/engine/integrations/message-queue/decorators/process.decorator';
+import { Process } from 'src/engine/core-modules/message-queue/decorators/process.decorator';
 
 @Processor(MessageQueue.emailQueue)
 export class EmailSenderJob {

packages/twenty-server/src/engine/core-modules/email/email-sender.service.ts

@@ -2,9 +2,9 @@ import { Inject, Injectable } from '@nestjs/common';
 
 import { SendMailOptions } from 'nodemailer';
 
-import { EmailDriver } from 'src/engine/integrations/email/drivers/interfaces/email-driver.interface';
+import { EmailDriver } from 'src/engine/core-modules/email/drivers/interfaces/email-driver.interface';
 
-import { EMAIL_DRIVER } from 'src/engine/integrations/email/email.constants';
+import { EMAIL_DRIVER } from 'src/engine/core-modules/email/email.constants';
 
 @Injectable()
 export class EmailSenderService implements EmailDriver {

packages/twenty-server/src/engine/core-modules/email/email.module-factory.ts

@@ -1,9 +1,9 @@
 import {
   EmailDriver,
   EmailModuleOptions,
-} from 'src/engine/integrations/email/interfaces/email.interface';
+} from 'src/engine/core-modules/email/interfaces/email.interface';
 
-import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
+import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
 
 export const emailModuleFactory = (
   environmentService: EnvironmentService,

packages/twenty-server/src/engine/core-modules/email/email.module.ts

@@ -1,12 +1,12 @@
 import { DynamicModule, Global } from '@nestjs/common';
 
-import { EmailModuleAsyncOptions } from 'src/engine/integrations/email/interfaces/email.interface';
+import { EmailModuleAsyncOptions } from 'src/engine/core-modules/email/interfaces/email.interface';
 
-import { EMAIL_DRIVER } from 'src/engine/integrations/email/email.constants';
+import { EMAIL_DRIVER } from 'src/engine/core-modules/email/email.constants';
-import { LoggerDriver } from 'src/engine/integrations/email/drivers/logger.driver';
+import { LoggerDriver } from 'src/engine/core-modules/email/drivers/logger.driver';
-import { SmtpDriver } from 'src/engine/integrations/email/drivers/smtp.driver';
+import { SmtpDriver } from 'src/engine/core-modules/email/drivers/smtp.driver';
-import { EmailService } from 'src/engine/integrations/email/email.service';
+import { EmailService } from 'src/engine/core-modules/email/email.service';
-import { EmailSenderService } from 'src/engine/integrations/email/email-sender.service';
+import { EmailSenderService } from 'src/engine/core-modules/email/email-sender.service';
 
 @Global()
 export class EmailModule {

packages/twenty-server/src/engine/core-modules/email/email.service.ts

@@ -2,10 +2,10 @@ import { Injectable } from '@nestjs/common';
 
 import { SendMailOptions } from 'nodemailer';
 
-import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
+import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
-import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
+import { MessageQueueService } from 'src/engine/core-modules/message-queue/services/message-queue.service';
-import { EmailSenderJob } from 'src/engine/integrations/email/email-sender.job';
+import { EmailSenderJob } from 'src/engine/core-modules/email/email-sender.job';
-import { InjectMessageQueue } from 'src/engine/integrations/message-queue/decorators/message-queue.decorator';
+import { InjectMessageQueue } from 'src/engine/core-modules/message-queue/decorators/message-queue.decorator';
 
 @Injectable()
 export class EmailService {

packages/twenty-server/src/engine/core-modules/environment/decorators/__tests__/cast-to-log-level-array.decorator.spec.ts

@@ -1,6 +1,6 @@
 import { plainToClass } from 'class-transformer';
 
-import { CastToLogLevelArray } from 'src/engine/integrations/environment/decorators/cast-to-log-level-array.decorator';
+import { CastToLogLevelArray } from 'src/engine/core-modules/environment/decorators/cast-to-log-level-array.decorator';
 
 class TestClass {
   @CastToLogLevelArray()

packages/twenty-server/src/engine/core-modules/environment/decorators/__tests__/cast-to-positive-number.decorator.spec.ts

@@ -1,6 +1,6 @@
 import { plainToClass } from 'class-transformer';
 
-import { CastToPositiveNumber } from 'src/engine/integrations/environment/decorators/cast-to-positive-number.decorator';
+import { CastToPositiveNumber } from 'src/engine/core-modules/environment/decorators/cast-to-positive-number.decorator';
 
 class TestClass {
   @CastToPositiveNumber()