Split job modules (#5318)

## Context
JobsModule is hard to maintain because we provide all the jobs there,
including their dependencies. This PR aims to split jobs in dedicated
modules.

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

@@ -4,7 +4,6 @@ import { MessageQueueJob } from 'src/engine/integrations/message-queue/interface
 import { ObjectMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/object-metadata.interface';
 
 import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
-import { ObjectMetadataService } from 'src/engine/metadata-modules/object-metadata/object-metadata.service';
 import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
 import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
 import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
@@ -34,7 +33,6 @@ export class CallWebhookJobsJob
 
   constructor(
     private readonly workspaceDataSourceService: WorkspaceDataSourceService,
-    private readonly objectMetadataService: ObjectMetadataService,
     private readonly dataSourceService: DataSourceService,
     @Inject(MessageQueue.webhookQueue)
     private readonly messageQueueService: MessageQueueService,

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

@@ -0,0 +1,33 @@
+import { HttpModule } from '@nestjs/axios';
+import { Module } from '@nestjs/common';
+
+import { CallWebhookJobsJob } from 'src/engine/api/graphql/workspace-query-runner/jobs/call-webhook-jobs.job';
+import { CallWebhookJob } from 'src/engine/api/graphql/workspace-query-runner/jobs/call-webhook.job';
+import { RecordPositionBackfillJob } from 'src/engine/api/graphql/workspace-query-runner/jobs/record-position-backfill.job';
+import { RecordPositionBackfillModule } from 'src/engine/api/graphql/workspace-query-runner/services/record-position-backfill-module';
+import { DataSourceModule } from 'src/engine/metadata-modules/data-source/data-source.module';
+import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/workspace-datasource.module';
+
+@Module({
+  imports: [
+    WorkspaceDataSourceModule,
+    DataSourceModule,
+    RecordPositionBackfillModule,
+    HttpModule,
+  ],
+  providers: [
+    {
+      provide: CallWebhookJobsJob.name,
+      useClass: CallWebhookJobsJob,
+    },
+    {
+      provide: CallWebhookJob.name,
+      useClass: CallWebhookJob,
+    },
+    {
+      provide: RecordPositionBackfillJob.name,
+      useClass: RecordPositionBackfillJob,
+    },
+  ],
+})
+export class WorkspaceQueryRunnerJobModule {}

packages/twenty-server/src/engine/integrations/message-queue/drivers/sync.driver.ts

@@ -23,7 +23,7 @@ export class SyncDriver implements MessageQueueDriver {
     const jobClassName = getJobClassName(jobName);
     const job: MessageQueueJob<MessageQueueJobData> = this.jobsModuleRef.get(
       jobClassName,
-      { strict: true },
+      { strict: false },
     );
 
     await job.handle(data);

packages/twenty-server/src/engine/integrations/message-queue/jobs.module.ts

@@ -1,206 +1,65 @@
-import { HttpModule } from '@nestjs/axios';
 import { Module } from '@nestjs/common';
 import { ModuleRef } from '@nestjs/core';
-import { TypeOrmModule } from '@nestjs/typeorm';
 
 import { DataSeedDemoWorkspaceModule } from 'src/database/commands/data-seed-demo-workspace/data-seed-demo-workspace.module';
 import { DataSeedDemoWorkspaceJob } from 'src/database/commands/data-seed-demo-workspace/jobs/data-seed-demo-workspace.job';
 import { TypeORMModule } from 'src/database/typeorm/typeorm.module';
-import { CallWebhookJobsJob } from 'src/engine/api/graphql/workspace-query-runner/jobs/call-webhook-jobs.job';
+import { WorkspaceQueryRunnerJobModule } from 'src/engine/api/graphql/workspace-query-runner/jobs/workspace-query-runner-job.module';
-import { CallWebhookJob } from 'src/engine/api/graphql/workspace-query-runner/jobs/call-webhook.job';
-import { RecordPositionBackfillJob } from 'src/engine/api/graphql/workspace-query-runner/jobs/record-position-backfill.job';
-import { RecordPositionBackfillModule } from 'src/engine/api/graphql/workspace-query-runner/services/record-position-backfill-module';
-import { DeleteConnectedAccountAssociatedCalendarDataJob } from 'src/modules/calendar/jobs/delete-connected-account-associated-calendar-data.job';
-import { GoogleAPIRefreshAccessTokenModule } from 'src/modules/connected-account/services/google-api-refresh-access-token/google-api-refresh-access-token.module';
-import { MessageParticipantModule } from 'src/modules/messaging/services/message-participant/message-participant.module';
-import { ObjectMetadataRepositoryModule } from 'src/engine/object-metadata-repository/object-metadata-repository.module';
-import { ConnectedAccountObjectMetadata } from 'src/modules/connected-account/standard-objects/connected-account.object-metadata';
-import { CreateCompanyAndContactJob } from 'src/modules/connected-account/auto-companies-and-contacts-creation/jobs/create-company-and-contact.job';
-import { AuditLogObjectMetadata } from 'src/modules/timeline/standard-objects/audit-log.object-metadata';
 import { BillingModule } from 'src/engine/core-modules/billing/billing.module';
 import { UpdateSubscriptionJob } from 'src/engine/core-modules/billing/jobs/update-subscription.job';
 import { StripeModule } from 'src/engine/core-modules/billing/stripe/stripe.module';
-import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
 import { UserWorkspaceModule } from 'src/engine/core-modules/user-workspace/user-workspace.module';
 import { UserModule } from 'src/engine/core-modules/user/user.module';
 import { HandleWorkspaceMemberDeletedJob } from 'src/engine/core-modules/workspace/handle-workspace-member-deleted.job';
-import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 import { EmailSenderJob } from 'src/engine/integrations/email/email-sender.job';
-import { EnvironmentModule } from 'src/engine/integrations/environment/environment.module';
+import { EmailModule } from 'src/engine/integrations/email/email.module';
-import { DataSourceEntity } from 'src/engine/metadata-modules/data-source/data-source.entity';
 import { DataSourceModule } from 'src/engine/metadata-modules/data-source/data-source.module';
 import { ObjectMetadataModule } from 'src/engine/metadata-modules/object-metadata/object-metadata.module';
-import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/workspace-datasource.module';
 import { CleanInactiveWorkspaceJob } from 'src/engine/workspace-manager/workspace-cleaner/crons/clean-inactive-workspace.job';
-import { MatchParticipantJob } from 'src/modules/calendar-messaging-participant/jobs/match-participant.job';
+import { CalendarMessagingParticipantJobModule } from 'src/modules/calendar-messaging-participant/jobs/calendar-messaging-participant-job.module';
-import { UnmatchParticipantJob } from 'src/modules/calendar-messaging-participant/jobs/unmatch-participant.job';
+import { CalendarCronJobModule } from 'src/modules/calendar/crons/jobs/calendar-cron-job.module';
-import { GoogleCalendarSyncCronJob } from 'src/modules/calendar/crons/jobs/google-calendar-sync.cron.job';
+import { CalendarJobModule } from 'src/modules/calendar/jobs/calendar-job.module';
-import { CalendarCreateCompanyAndContactAfterSyncJob } from 'src/modules/calendar/jobs/calendar-create-company-and-contact-after-sync.job';
+import { AutoCompaniesAndContactsCreationJobModule } from 'src/modules/connected-account/auto-companies-and-contacts-creation/jobs/auto-companies-and-contacts-creation-job.module';
-import { GoogleCalendarSyncJob } from 'src/modules/calendar/jobs/google-calendar-sync.job';
+import { MessagingCronJobModule } from 'src/modules/messaging/crons/jobs/messaging-cron-job.module';
-import { CalendarEventCleanerModule } from 'src/modules/calendar/services/calendar-event-cleaner/calendar-event-cleaner.module';
+import { MessagingJobModule } from 'src/modules/messaging/jobs/messaging-job.module';
-import { CalendarEventParticipantModule } from 'src/modules/calendar/services/calendar-event-participant/calendar-event-participant.module';
+import { TimelineJobModule } from 'src/modules/timeline/jobs/timeline-job.module';
-import { GoogleCalendarSyncModule } from 'src/modules/calendar/services/google-calendar-sync/google-calendar-sync.module';
-import { WorkspaceGoogleCalendarSyncModule } from 'src/modules/calendar/services/workspace-google-calendar-sync/workspace-google-calendar-sync.module';
-import { AutoCompaniesAndContactsCreationModule } from 'src/modules/connected-account/auto-companies-and-contacts-creation/auto-companies-and-contacts-creation.module';
-import { GmailFetchMessagesFromCacheCronJob } from 'src/modules/messaging/crons/jobs/gmail-fetch-messages-from-cache.cron.job';
-import { GmailPartialSyncCronJob } from 'src/modules/messaging/crons/jobs/gmail-partial-sync.cron.job';
-import { BlocklistReimportMessagesJob } from 'src/modules/messaging/jobs/blocklist-reimport-messages.job';
-import { DeleteConnectedAccountAssociatedMessagingDataJob } from 'src/modules/messaging/jobs/delete-connected-account-associated-messaging-data.job';
-import { BlocklistItemDeleteMessagesJob } from 'src/modules/messaging/jobs/blocklist-item-delete-messages.job';
-import { GmailFullSyncJob } from 'src/modules/messaging/jobs/gmail-full-sync.job';
-import { GmailPartialSyncJob } from 'src/modules/messaging/jobs/gmail-partial-sync.job';
-import { MessagingCreateCompanyAndContactAfterSyncJob } from 'src/modules/messaging/jobs/messaging-create-company-and-contact-after-sync.job';
-import { GmailFetchMessageContentFromCacheModule } from 'src/modules/messaging/services/gmail-fetch-message-content-from-cache/gmail-fetch-message-content-from-cache.module';
-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';
-import { GmailFullSyncModule } from 'src/modules/messaging/services/gmail-full-sync/gmail-full-sync.module';
-import { GmailPartialSyncModule } from 'src/modules/messaging/services/gmail-partial-sync/gmail-partial-sync.module';
-import { ThreadCleanerModule } from 'src/modules/messaging/services/thread-cleaner/thread-cleaner.module';
-import { TimelineActivityModule } from 'src/modules/timeline/timeline-activity.module';
-import { MessageChannelMessageAssociationObjectMetadata } from 'src/modules/messaging/standard-objects/message-channel-message-association.object-metadata';
-import { MessageChannelObjectMetadata } from 'src/modules/messaging/standard-objects/message-channel.object-metadata';
-import { BlocklistItemDeleteCalendarEventsJob } from 'src/modules/calendar/jobs/blocklist-item-delete-calendar-events.job';
-import { BlocklistReimportCalendarEventsJob } from 'src/modules/calendar/jobs/blocklist-reimport-calendar-events.job';
 
 @Module({
   imports: [
-    BillingModule,
     DataSourceModule,
-    AutoCompaniesAndContactsCreationModule,
-    DataSeedDemoWorkspaceModule,
-    EnvironmentModule,
-    HttpModule,
-    GoogleCalendarSyncModule,
-    WorkspaceGoogleCalendarSyncModule,
     ObjectMetadataModule,
-    StripeModule,
-    ThreadCleanerModule,
-    CalendarEventCleanerModule,
     TypeORMModule,
-    TypeOrmModule.forFeature([Workspace, FeatureFlagEntity], 'core'),
-    TypeOrmModule.forFeature([DataSourceEntity], 'metadata'),
     UserModule,
+    EmailModule,
+    DataSeedDemoWorkspaceModule,
+    BillingModule,
     UserWorkspaceModule,
-    WorkspaceDataSourceModule,
+    StripeModule,
-    RecordPositionBackfillModule,
+    // JobsModules
-    GoogleAPIRefreshAccessTokenModule,
+    WorkspaceQueryRunnerJobModule,
-    MessageParticipantModule,
+    CalendarMessagingParticipantJobModule,
-    ObjectMetadataRepositoryModule.forFeature([
+    CalendarCronJobModule,
-      ConnectedAccountObjectMetadata,
+    CalendarJobModule,
-      MessageChannelObjectMetadata,
+    AutoCompaniesAndContactsCreationJobModule,
-      AuditLogObjectMetadata,
+    MessagingCronJobModule,
-      MessageChannelMessageAssociationObjectMetadata,
+    MessagingJobModule,
-    ]),
+    TimelineJobModule,
-    GmailFullSyncModule,
-    GmailFetchMessageContentFromCacheModule,
-    GmailPartialSyncModule,
-    CalendarEventParticipantModule,
-    TimelineActivityModule,
   ],
   providers: [
-    {
-      provide: GoogleCalendarSyncJob.name,
-      useClass: GoogleCalendarSyncJob,
-    },
-    {
-      provide: CallWebhookJobsJob.name,
-      useClass: CallWebhookJobsJob,
-    },
-    {
-      provide: CallWebhookJob.name,
-      useClass: CallWebhookJob,
-    },
     {
       provide: CleanInactiveWorkspaceJob.name,
       useClass: CleanInactiveWorkspaceJob,
     },
     { provide: EmailSenderJob.name, useClass: EmailSenderJob },
-    {
-      provide: GmailPartialSyncCronJob.name,
-      useClass: GmailPartialSyncCronJob,
-    },
-    {
-      provide: MatchParticipantJob.name,
-      useClass: MatchParticipantJob,
-    },
-    {
-      provide: UnmatchParticipantJob.name,
-      useClass: UnmatchParticipantJob,
-    },
-    {
-      provide: MessagingCreateCompanyAndContactAfterSyncJob.name,
-      useClass: MessagingCreateCompanyAndContactAfterSyncJob,
-    },
-    {
-      provide: CalendarCreateCompanyAndContactAfterSyncJob.name,
-      useClass: CalendarCreateCompanyAndContactAfterSyncJob,
-    },
     {
       provide: DataSeedDemoWorkspaceJob.name,
       useClass: DataSeedDemoWorkspaceJob,
     },
-    {
-      provide: DeleteConnectedAccountAssociatedMessagingDataJob.name,
-      useClass: DeleteConnectedAccountAssociatedMessagingDataJob,
-    },
-    {
-      provide: DeleteConnectedAccountAssociatedCalendarDataJob.name,
-      useClass: DeleteConnectedAccountAssociatedCalendarDataJob,
-    },
     { provide: UpdateSubscriptionJob.name, useClass: UpdateSubscriptionJob },
     {
       provide: HandleWorkspaceMemberDeletedJob.name,
       useClass: HandleWorkspaceMemberDeletedJob,
     },
-    {
-      provide: RecordPositionBackfillJob.name,
-      useClass: RecordPositionBackfillJob,
-    },
-    {
-      provide: CreateCompanyAndContactJob.name,
-      useClass: CreateCompanyAndContactJob,
-    },
-
-    {
-      provide: CreateAuditLogFromInternalEvent.name,
-      useClass: CreateAuditLogFromInternalEvent,
-    },
-    {
-      provide: UpsertTimelineActivityFromInternalEvent.name,
-      useClass: UpsertTimelineActivityFromInternalEvent,
-    },
-    {
-      provide: GmailFetchMessagesFromCacheCronJob.name,
-      useClass: GmailFetchMessagesFromCacheCronJob,
-    },
-    {
-      provide: GmailFullSyncJob.name,
-      useClass: GmailFullSyncJob,
-    },
-    {
-      provide: GmailPartialSyncJob.name,
-      useClass: GmailPartialSyncJob,
-    },
-    {
-      provide: GoogleCalendarSyncCronJob.name,
-      useClass: GoogleCalendarSyncCronJob,
-    },
-    {
-      provide: BlocklistItemDeleteMessagesJob.name,
-      useClass: BlocklistItemDeleteMessagesJob,
-    },
-    {
-      provide: BlocklistItemDeleteCalendarEventsJob.name,
-      useClass: BlocklistItemDeleteCalendarEventsJob,
-    },
-    {
-      provide: BlocklistReimportMessagesJob.name,
-      useClass: BlocklistReimportMessagesJob,
-    },
-    {
-      provide: BlocklistReimportCalendarEventsJob.name,
-      useClass: BlocklistReimportCalendarEventsJob,
-    },
   ],
 })
 export class JobsModule {

packages/twenty-server/src/modules/calendar-messaging-participant/jobs/calendar-messaging-participant-job.module.ts

@@ -0,0 +1,21 @@
+import { Module } from '@nestjs/common';
+
+import { MatchParticipantJob } from 'src/modules/calendar-messaging-participant/jobs/match-participant.job';
+import { UnmatchParticipantJob } from 'src/modules/calendar-messaging-participant/jobs/unmatch-participant.job';
+import { CalendarEventParticipantModule } from 'src/modules/calendar/services/calendar-event-participant/calendar-event-participant.module';
+import { MessageParticipantModule } from 'src/modules/messaging/services/message-participant/message-participant.module';
+
+@Module({
+  imports: [MessageParticipantModule, CalendarEventParticipantModule],
+  providers: [
+    {
+      provide: MatchParticipantJob.name,
+      useClass: MatchParticipantJob,
+    },
+    {
+      provide: UnmatchParticipantJob.name,
+      useClass: UnmatchParticipantJob,
+    },
+  ],
+})
+export class CalendarMessagingParticipantJobModule {}

packages/twenty-server/src/modules/calendar-messaging-participant/jobs/match-participant.job.ts

@@ -1,11 +1,7 @@
 import { Injectable } from '@nestjs/common';
-import { InjectRepository } from '@nestjs/typeorm';
-
-import { Repository } from 'typeorm';
 
 import { MessageQueueJob } from 'src/engine/integrations/message-queue/interfaces/message-queue-job.interface';
 
-import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
 import { CalendarEventParticipantService } from 'src/modules/calendar/services/calendar-event-participant/calendar-event-participant.service';
 import { MessageParticipantService } from 'src/modules/messaging/services/message-participant/message-participant.service';
 
@@ -23,8 +19,6 @@ export class MatchParticipantJob
   constructor(
     private readonly messageParticipantService: MessageParticipantService,
     private readonly calendarEventParticipantService: CalendarEventParticipantService,
-    @InjectRepository(FeatureFlagEntity, 'core')
-    private readonly featureFlagRepository: Repository<FeatureFlagEntity>,
   ) {}
 
   async handle(data: MatchParticipantJobData): Promise<void> {

packages/twenty-server/src/modules/calendar-messaging-participant/jobs/unmatch-participant.job.ts

@@ -1,11 +1,7 @@
 import { Injectable } from '@nestjs/common';
-import { InjectRepository } from '@nestjs/typeorm';
-
-import { Repository } from 'typeorm';
 
 import { MessageQueueJob } from 'src/engine/integrations/message-queue/interfaces/message-queue-job.interface';
 
-import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
 import { CalendarEventParticipantService } from 'src/modules/calendar/services/calendar-event-participant/calendar-event-participant.service';
 import { MessageParticipantService } from 'src/modules/messaging/services/message-participant/message-participant.service';
 
@@ -23,8 +19,6 @@ export class UnmatchParticipantJob
   constructor(
     private readonly messageParticipantService: MessageParticipantService,
     private readonly calendarEventParticipantService: CalendarEventParticipantService,
-    @InjectRepository(FeatureFlagEntity, 'core')
-    private readonly featureFlagRepository: Repository<FeatureFlagEntity>,
   ) {}
 
   async handle(data: UnmatchParticipantJobData): Promise<void> {

packages/twenty-server/src/modules/calendar/crons/jobs/calendar-cron-job.module.ts

@@ -0,0 +1,23 @@
+import { Module } from '@nestjs/common';
+import { TypeOrmModule } from '@nestjs/typeorm';
+
+import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+import { DataSourceEntity } from 'src/engine/metadata-modules/data-source/data-source.entity';
+import { GoogleCalendarSyncCronJob } from 'src/modules/calendar/crons/jobs/google-calendar-sync.cron.job';
+import { WorkspaceGoogleCalendarSyncModule } from 'src/modules/calendar/services/workspace-google-calendar-sync/workspace-google-calendar-sync.module';
+
+@Module({
+  imports: [
+    TypeOrmModule.forFeature([Workspace, FeatureFlagEntity], 'core'),
+    TypeOrmModule.forFeature([DataSourceEntity], 'metadata'),
+    WorkspaceGoogleCalendarSyncModule,
+  ],
+  providers: [
+    {
+      provide: GoogleCalendarSyncCronJob.name,
+      useClass: GoogleCalendarSyncCronJob,
+    },
+  ],
+})
+export class CalendarCronJobModule {}

packages/twenty-server/src/modules/calendar/crons/jobs/google-calendar-sync.cron.job.ts

@@ -5,7 +5,6 @@ import { Repository, In } from 'typeorm';
 
 import { MessageQueueJob } from 'src/engine/integrations/message-queue/interfaces/message-queue-job.interface';
 
-import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
 import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 import { DataSourceEntity } from 'src/engine/metadata-modules/data-source/data-source.entity';
 import { WorkspaceGoogleCalendarSyncService } from 'src/modules/calendar/services/workspace-google-calendar-sync/workspace-google-calendar-sync.service';
@@ -18,8 +17,6 @@ export class GoogleCalendarSyncCronJob implements MessageQueueJob<undefined> {
     private readonly workspaceRepository: Repository<Workspace>,
     @InjectRepository(DataSourceEntity, 'metadata')
     private readonly dataSourceRepository: Repository<DataSourceEntity>,
-    @InjectRepository(FeatureFlagEntity, 'core')
-    private readonly featureFlagRepository: Repository<FeatureFlagEntity>,
     private readonly workspaceGoogleCalendarSyncService: WorkspaceGoogleCalendarSyncService,
     private readonly environmentService: EnvironmentService,
   ) {}

packages/twenty-server/src/modules/calendar/jobs/calendar-job.module.ts

@@ -0,0 +1,57 @@
+import { Module } from '@nestjs/common';
+
+import { ObjectMetadataRepositoryModule } from 'src/engine/object-metadata-repository/object-metadata-repository.module';
+import { BlocklistItemDeleteCalendarEventsJob } from 'src/modules/calendar/jobs/blocklist-item-delete-calendar-events.job';
+import { BlocklistReimportCalendarEventsJob } from 'src/modules/calendar/jobs/blocklist-reimport-calendar-events.job';
+import { CalendarCreateCompanyAndContactAfterSyncJob } from 'src/modules/calendar/jobs/calendar-create-company-and-contact-after-sync.job';
+import { DeleteConnectedAccountAssociatedCalendarDataJob } from 'src/modules/calendar/jobs/delete-connected-account-associated-calendar-data.job';
+import { GoogleCalendarSyncJob } from 'src/modules/calendar/jobs/google-calendar-sync.job';
+import { CalendarEventCleanerModule } from 'src/modules/calendar/services/calendar-event-cleaner/calendar-event-cleaner.module';
+import { GoogleCalendarSyncModule } from 'src/modules/calendar/services/google-calendar-sync/google-calendar-sync.module';
+import { CalendarChannelEventAssociationObjectMetadata } from 'src/modules/calendar/standard-objects/calendar-channel-event-association.object-metadata';
+import { CalendarChannelObjectMetadata } from 'src/modules/calendar/standard-objects/calendar-channel.object-metadata';
+import { CalendarEventParticipantObjectMetadata } from 'src/modules/calendar/standard-objects/calendar-event-participant.object-metadata';
+import { AutoCompaniesAndContactsCreationModule } from 'src/modules/connected-account/auto-companies-and-contacts-creation/auto-companies-and-contacts-creation.module';
+import { GoogleAPIRefreshAccessTokenModule } from 'src/modules/connected-account/services/google-api-refresh-access-token/google-api-refresh-access-token.module';
+import { BlocklistObjectMetadata } from 'src/modules/connected-account/standard-objects/blocklist.object-metadata';
+import { ConnectedAccountObjectMetadata } from 'src/modules/connected-account/standard-objects/connected-account.object-metadata';
+
+@Module({
+  imports: [
+    ObjectMetadataRepositoryModule.forFeature([
+      CalendarChannelObjectMetadata,
+      CalendarChannelEventAssociationObjectMetadata,
+      CalendarEventParticipantObjectMetadata,
+      ConnectedAccountObjectMetadata,
+      BlocklistObjectMetadata,
+    ]),
+    CalendarEventCleanerModule,
+    AutoCompaniesAndContactsCreationModule,
+    GoogleCalendarSyncModule,
+    GoogleAPIRefreshAccessTokenModule,
+    GoogleCalendarSyncModule,
+  ],
+  providers: [
+    {
+      provide: BlocklistItemDeleteCalendarEventsJob.name,
+      useClass: BlocklistItemDeleteCalendarEventsJob,
+    },
+    {
+      provide: BlocklistReimportCalendarEventsJob.name,
+      useClass: BlocklistReimportCalendarEventsJob,
+    },
+    {
+      provide: GoogleCalendarSyncJob.name,
+      useClass: GoogleCalendarSyncJob,
+    },
+    {
+      provide: CalendarCreateCompanyAndContactAfterSyncJob.name,
+      useClass: CalendarCreateCompanyAndContactAfterSyncJob,
+    },
+    {
+      provide: DeleteConnectedAccountAssociatedCalendarDataJob.name,
+      useClass: DeleteConnectedAccountAssociatedCalendarDataJob,
+    },
+  ],
+})
+export class CalendarJobModule {}

packages/twenty-server/src/modules/connected-account/auto-companies-and-contacts-creation/jobs/auto-companies-and-contacts-creation-job.module.ts

@@ -0,0 +1,15 @@
+import { Module } from '@nestjs/common';
+
+import { AutoCompaniesAndContactsCreationModule } from 'src/modules/connected-account/auto-companies-and-contacts-creation/auto-companies-and-contacts-creation.module';
+import { CreateCompanyAndContactJob } from 'src/modules/connected-account/auto-companies-and-contacts-creation/jobs/create-company-and-contact.job';
+
+@Module({
+  imports: [AutoCompaniesAndContactsCreationModule],
+  providers: [
+    {
+      provide: CreateCompanyAndContactJob.name,
+      useClass: CreateCompanyAndContactJob,
+    },
+  ],
+})
+export class AutoCompaniesAndContactsCreationJobModule {}

packages/twenty-server/src/modules/messaging/crons/jobs/messaging-cron-job.module.ts

@@ -0,0 +1,31 @@
+import { Module } from '@nestjs/common';
+import { TypeOrmModule } from '@nestjs/typeorm';
+
+import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+import { DataSourceEntity } from 'src/engine/metadata-modules/data-source/data-source.entity';
+import { ObjectMetadataRepositoryModule } from 'src/engine/object-metadata-repository/object-metadata-repository.module';
+import { GmailFetchMessagesFromCacheCronJob } from 'src/modules/messaging/crons/jobs/gmail-fetch-messages-from-cache.cron.job';
+import { GmailPartialSyncCronJob } from 'src/modules/messaging/crons/jobs/gmail-partial-sync.cron.job';
+import { GmailFetchMessageContentFromCacheModule } from 'src/modules/messaging/services/gmail-fetch-message-content-from-cache/gmail-fetch-message-content-from-cache.module';
+import { MessageChannelObjectMetadata } from 'src/modules/messaging/standard-objects/message-channel.object-metadata';
+
+@Module({
+  imports: [
+    TypeOrmModule.forFeature([Workspace, FeatureFlagEntity], 'core'),
+    TypeOrmModule.forFeature([DataSourceEntity], 'metadata'),
+    ObjectMetadataRepositoryModule.forFeature([MessageChannelObjectMetadata]),
+    GmailFetchMessageContentFromCacheModule,
+  ],
+  providers: [
+    {
+      provide: GmailFetchMessagesFromCacheCronJob.name,
+      useClass: GmailFetchMessagesFromCacheCronJob,
+    },
+    {
+      provide: GmailPartialSyncCronJob.name,
+      useClass: GmailPartialSyncCronJob,
+    },
+  ],
+})
+export class MessagingCronJobModule {}

packages/twenty-server/src/modules/messaging/jobs/gmail-full-sync.job.ts

@@ -16,7 +16,7 @@ export class GmailFullSyncJob implements MessageQueueJob<GmailFullSyncJobData> {
 
   constructor(
     private readonly googleAPIsRefreshAccessTokenService: GoogleAPIRefreshAccessTokenService,
-    private readonly gmailFullSyncV2Service: GmailFullSyncService,
+    private readonly gmailFullSyncService: GmailFullSyncService,
   ) {}
 
   async handle(data: GmailFullSyncJobData): Promise<void> {
@@ -38,7 +38,7 @@ export class GmailFullSyncJob implements MessageQueueJob<GmailFullSyncJobData> {
       return;
     }
 
-    await this.gmailFullSyncV2Service.fetchConnectedAccountThreads(
+    await this.gmailFullSyncService.fetchConnectedAccountThreads(
       data.workspaceId,
       data.connectedAccountId,
     );

packages/twenty-server/src/modules/messaging/jobs/gmail-partial-sync.job.ts

@@ -18,7 +18,7 @@ export class GmailPartialSyncJob
 
   constructor(
     private readonly googleAPIsRefreshAccessTokenService: GoogleAPIRefreshAccessTokenService,
-    private readonly gmailPartialSyncV2Service: GmailPartialSyncV2Service,
+    private readonly gmailPartialSyncService: GmailPartialSyncV2Service,
   ) {}
 
   async handle(data: GmailPartialSyncJobData): Promise<void> {
@@ -40,7 +40,7 @@ export class GmailPartialSyncJob
       return;
     }
 
-    await this.gmailPartialSyncV2Service.fetchConnectedAccountThreads(
+    await this.gmailPartialSyncService.fetchConnectedAccountThreads(
       data.workspaceId,
       data.connectedAccountId,
     );

packages/twenty-server/src/modules/messaging/jobs/messaging-job.module.ts

@@ -0,0 +1,63 @@
+import { Module } from '@nestjs/common';
+
+import { ObjectMetadataRepositoryModule } from 'src/engine/object-metadata-repository/object-metadata-repository.module';
+import { AutoCompaniesAndContactsCreationModule } from 'src/modules/connected-account/auto-companies-and-contacts-creation/auto-companies-and-contacts-creation.module';
+import { GoogleAPIRefreshAccessTokenModule } from 'src/modules/connected-account/services/google-api-refresh-access-token/google-api-refresh-access-token.module';
+import { BlocklistObjectMetadata } from 'src/modules/connected-account/standard-objects/blocklist.object-metadata';
+import { ConnectedAccountObjectMetadata } from 'src/modules/connected-account/standard-objects/connected-account.object-metadata';
+import { BlocklistItemDeleteMessagesJob } from 'src/modules/messaging/jobs/blocklist-item-delete-messages.job';
+import { BlocklistReimportMessagesJob } from 'src/modules/messaging/jobs/blocklist-reimport-messages.job';
+import { DeleteConnectedAccountAssociatedMessagingDataJob } from 'src/modules/messaging/jobs/delete-connected-account-associated-messaging-data.job';
+import { GmailFullSyncJob } from 'src/modules/messaging/jobs/gmail-full-sync.job';
+import { GmailPartialSyncJob } from 'src/modules/messaging/jobs/gmail-partial-sync.job';
+import { MessagingCreateCompanyAndContactAfterSyncJob } from 'src/modules/messaging/jobs/messaging-create-company-and-contact-after-sync.job';
+import { GmailFullSyncModule } from 'src/modules/messaging/services/gmail-full-sync/gmail-full-sync.module';
+import { GmailPartialSyncModule } from 'src/modules/messaging/services/gmail-partial-sync/gmail-partial-sync.module';
+import { ThreadCleanerModule } from 'src/modules/messaging/services/thread-cleaner/thread-cleaner.module';
+import { MessageChannelMessageAssociationObjectMetadata } from 'src/modules/messaging/standard-objects/message-channel-message-association.object-metadata';
+import { MessageChannelObjectMetadata } from 'src/modules/messaging/standard-objects/message-channel.object-metadata';
+import { MessageParticipantObjectMetadata } from 'src/modules/messaging/standard-objects/message-participant.object-metadata';
+
+@Module({
+  imports: [
+    ObjectMetadataRepositoryModule.forFeature([
+      ConnectedAccountObjectMetadata,
+      MessageChannelObjectMetadata,
+      MessageParticipantObjectMetadata,
+      MessageChannelMessageAssociationObjectMetadata,
+      BlocklistObjectMetadata,
+    ]),
+    GmailFullSyncModule,
+    GmailPartialSyncModule,
+    ThreadCleanerModule,
+    GoogleAPIRefreshAccessTokenModule,
+    AutoCompaniesAndContactsCreationModule,
+  ],
+  providers: [
+    {
+      provide: BlocklistReimportMessagesJob.name,
+      useClass: BlocklistReimportMessagesJob,
+    },
+    {
+      provide: BlocklistItemDeleteMessagesJob.name,
+      useClass: BlocklistItemDeleteMessagesJob,
+    },
+    {
+      provide: GmailFullSyncJob.name,
+      useClass: GmailFullSyncJob,
+    },
+    {
+      provide: GmailPartialSyncJob.name,
+      useClass: GmailPartialSyncJob,
+    },
+    {
+      provide: DeleteConnectedAccountAssociatedMessagingDataJob.name,
+      useClass: DeleteConnectedAccountAssociatedMessagingDataJob,
+    },
+    {
+      provide: MessagingCreateCompanyAndContactAfterSyncJob.name,
+      useClass: MessagingCreateCompanyAndContactAfterSyncJob,
+    },
+  ],
+})
+export class MessagingJobModule {}

packages/twenty-server/src/modules/timeline/jobs/timeline-job.module.ts

@@ -0,0 +1,29 @@
+import { Module } from '@nestjs/common';
+
+import { ObjectMetadataRepositoryModule } from 'src/engine/object-metadata-repository/object-metadata-repository.module';
+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';
+import { AuditLogObjectMetadata } from 'src/modules/timeline/standard-objects/audit-log.object-metadata';
+import { TimelineActivityModule } from 'src/modules/timeline/timeline-activity.module';
+import { WorkspaceMemberObjectMetadata } from 'src/modules/workspace-member/standard-objects/workspace-member.object-metadata';
+
+@Module({
+  imports: [
+    ObjectMetadataRepositoryModule.forFeature([
+      WorkspaceMemberObjectMetadata,
+      AuditLogObjectMetadata,
+    ]),
+    TimelineActivityModule,
+  ],
+  providers: [
+    {
+      provide: CreateAuditLogFromInternalEvent.name,
+      useClass: CreateAuditLogFromInternalEvent,
+    },
+    {
+      provide: UpsertTimelineActivityFromInternalEvent.name,
+      useClass: UpsertTimelineActivityFromInternalEvent,
+    },
+  ],
+})
+export class TimelineJobModule {}

packages/twenty-server/src/queue-worker/queue-worker.ts

@@ -36,7 +36,7 @@ async function bootstrap() {
         const jobClassName = getJobClassName(jobData.name);
         const job: MessageQueueJob<MessageQueueJobData> = app
           .select(JobsModule)
-          .get(jobClassName, { strict: true });
+          .get(jobClassName, { strict: false });
 
         try {
           await job.handle(jobData.data);