Rework messaging modules

packages/twenty-server/src/database/typeorm-seeds/core/feature-flags.ts

@@ -40,11 +40,6 @@ export const seedFeatureFlags = async (
         workspaceId: workspaceId,
         value: true,
       },
-      {
-        key: FeatureFlagKeys.IsGmailSyncV2Enabled,
-        workspaceId: workspaceId,
-        value: true,
-      },
       {
         key: FeatureFlagKeys.IsContactCreationForSentAndReceivedEmailsEnabled,
         workspaceId: workspaceId,

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

@@ -1,11 +1,9 @@
 import { Injectable, Inject } from '@nestjs/common';
-import { InjectRepository } from '@nestjs/typeorm';
 
-import { Repository, EntityManager } from 'typeorm';
+import { EntityManager } from 'typeorm';
 import { v4 } from 'uuid';
 
 import { TypeORMService } from 'src/database/typeorm/typeorm.service';
-import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
 import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
 import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
 import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
@@ -32,9 +30,9 @@ import {
   MessageChannelVisibility,
 } from 'src/modules/messaging/standard-objects/message-channel.workspace-entity';
 import {
-  GmailFullMessageListFetchJobData,
-  GmailFullMessageListFetchJob,
-} from 'src/modules/messaging/jobs/gmail-full-message-list-fetch.job';
+  GmailMessageListFetchJob,
+  GmailMessageListFetchJobData,
+} from 'src/modules/messaging/jobs/messaging-message-list-fetch.job';
 
 @Injectable()
 export class GoogleAPIsService {
@@ -46,8 +44,6 @@ export class GoogleAPIsService {
     @Inject(MessageQueue.calendarQueue)
     private readonly calendarQueueService: MessageQueueService,
     private readonly environmentService: EnvironmentService,
-    @InjectRepository(FeatureFlagEntity, 'core')
-    private readonly featureFlagRepository: Repository<FeatureFlagEntity>,
     @InjectObjectMetadataRepository(ConnectedAccountWorkspaceEntity)
     private readonly connectedAccountRepository: ConnectedAccountRepository,
     @InjectObjectMetadataRepository(MessageChannelWorkspaceEntity)
@@ -156,8 +152,8 @@ export class GoogleAPIsService {
     isCalendarEnabled: boolean,
   ) {
     if (this.environmentService.get('MESSAGING_PROVIDER_GMAIL_ENABLED')) {
-      await this.messageQueueService.add<GmailFullMessageListFetchJobData>(
-        GmailFullMessageListFetchJob.name,
+      await this.messageQueueService.add<GmailMessageListFetchJobData>(
+        GmailMessageListFetchJob.name,
         {
           workspaceId,
           connectedAccountId,

packages/twenty-server/src/engine/core-modules/feature-flag/feature-flag.entity.ts

@@ -21,7 +21,6 @@ export enum FeatureFlagKeys {
   IsAirtableIntegrationEnabled = 'IS_AIRTABLE_INTEGRATION_ENABLED',
   IsPostgreSQLIntegrationEnabled = 'IS_POSTGRESQL_INTEGRATION_ENABLED',
   IsStripeIntegrationEnabled = 'IS_STRIPE_INTEGRATION_ENABLED',
-  IsGmailSyncV2Enabled = 'IS_GMAIL_SYNC_V2_ENABLED',
   IsContactCreationForSentAndReceivedEmailsEnabled = 'IS_CONTACT_CREATION_FOR_SENT_AND_RECEIVED_EMAILS_ENABLED',
 }
 

packages/twenty-server/src/engine/object-metadata-repository/metadata-to-repository.mapping.ts

@@ -9,7 +9,7 @@ import { AuditLogRepository } from 'src/modules/timeline/repositiories/audit-log
 import { TimelineActivityRepository } from 'src/modules/timeline/repositiories/timeline-activity.repository';
 import { MessageChannelMessageAssociationRepository } from 'src/modules/messaging/repositories/message-channel-message-association.repository';
 import { MessageChannelRepository } from 'src/modules/messaging/repositories/message-channel.repository';
-import { MessageParticipantRepository } from 'src/modules/messaging/repositories/message-participant.repository';
+import { MessageParticipantRepository } from 'src/modules/messaging/message-participant/repositories/message-participant.repository';
 import { MessageThreadRepository } from 'src/modules/messaging/repositories/message-thread.repository';
 import { MessageRepository } from 'src/modules/messaging/repositories/message.repository';
 import { PersonRepository } from 'src/modules/person/repositories/person.repository';

packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/commands/add-standard-id.command.ts

@@ -58,7 +58,6 @@ export class AddStandardIdCommand extends CommandRunner {
             IS_AIRTABLE_INTEGRATION_ENABLED: true,
             IS_POSTGRESQL_INTEGRATION_ENABLED: true,
             IS_STRIPE_INTEGRATION_ENABLED: false,
-            IS_GMAIL_SYNC_V2_ENABLED: true,
             IS_CONTACT_CREATION_FOR_SENT_AND_RECEIVED_EMAILS_ENABLED: true,
           },
         );
@@ -74,7 +73,6 @@ export class AddStandardIdCommand extends CommandRunner {
           IS_AIRTABLE_INTEGRATION_ENABLED: true,
           IS_POSTGRESQL_INTEGRATION_ENABLED: true,
           IS_STRIPE_INTEGRATION_ENABLED: false,
-          IS_GMAIL_SYNC_V2_ENABLED: true,
           IS_CONTACT_CREATION_FOR_SENT_AND_RECEIVED_EMAILS_ENABLED: true,
         },
       );

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

@@ -3,7 +3,7 @@ import { Injectable } from '@nestjs/common';
 import { MessageQueueJob } from 'src/engine/integrations/message-queue/interfaces/message-queue-job.interface';
 
 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';
+import { MessageParticipantService } from 'src/modules/messaging/services/message-participant.service';
 
 export type MatchParticipantJobData = {
   workspaceId: string;

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

@@ -3,7 +3,7 @@ import { Injectable } from '@nestjs/common';
 import { MessageQueueJob } from 'src/engine/integrations/message-queue/interfaces/message-queue-job.interface';
 
 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';
+import { MessageParticipantService } from 'src/modules/messaging/services/message-participant.service';
 
 export type UnmatchParticipantJobData = {
   workspaceId: string;

packages/twenty-server/src/modules/calendar/services/calendar-event-cleaner/calendar-event-cleaner.service.ts

@@ -3,7 +3,7 @@ import { Injectable } from '@nestjs/common';
 import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator';
 import { CalendarEventRepository } from 'src/modules/calendar/repositories/calendar-event.repository';
 import { CalendarEventWorkspaceEntity } from 'src/modules/calendar/standard-objects/calendar-event.workspace-entity';
-import { deleteUsingPagination } from 'src/modules/messaging/services/thread-cleaner/utils/delete-using-pagination.util';
+import { deleteUsingPagination } from 'src/modules/messaging/utils/delete-using-pagination.util';
 
 @Injectable()
 export class CalendarEventCleanerService {

packages/twenty-server/src/modules/connected-account/auto-companies-and-contacts-creation/services/create-company-and-contact.service.ts

@@ -16,7 +16,7 @@ import { WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/sta
 import { getUniqueContactsAndHandles } from 'src/modules/connected-account/auto-companies-and-contacts-creation/utils/get-unique-contacts-and-handles.util';
 import { Contacts } from 'src/modules/connected-account/auto-companies-and-contacts-creation/types/contact.type';
 import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
-import { MessageParticipantService } from 'src/modules/messaging/services/message-participant/message-participant.service';
+import { MessageParticipantService } from 'src/modules/messaging/services/message-participant.service';
 import { CalendarEventParticipantService } from 'src/modules/calendar/services/calendar-event-participant/calendar-event-participant.service';
 import { filterOutContactsFromCompanyOrWorkspace } from 'src/modules/connected-account/auto-companies-and-contacts-creation/utils/filter-out-contacts-from-company-or-workspace.util';
 import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';

packages/twenty-server/src/modules/connected-account/services/google-api-refresh-access-token/google-api-refresh-access-token.service.ts

@@ -7,7 +7,7 @@ import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repos
 import { ConnectedAccountRepository } from 'src/modules/connected-account/repositories/connected-account.repository';
 import { ConnectedAccountWorkspaceEntity } from 'src/modules/connected-account/standard-objects/connected-account.workspace-entity';
 import { MessageChannelRepository } from 'src/modules/messaging/repositories/message-channel.repository';
-import { GmailErrorHandlingService } from 'src/modules/messaging/services/gmail-error-handling/gmail-error-handling.service';
+import { GmailErrorHandlingService } from 'src/modules/messaging/services/messaging-error-handling.service';
 import { MessageChannelWorkspaceEntity } from 'src/modules/messaging/standard-objects/message-channel.workspace-entity';
 
 @Injectable()

packages/twenty-server/src/modules/messaging/jobs/blocklist-item-delete-messages.job.ts → packages/twenty-server/src/modules/messaging/blocklist-manager/jobs/messaging-blocklist-item-delete-messages.job.ts

@@ -7,7 +7,7 @@ import { BlocklistRepository } from 'src/modules/connected-account/repositories/
 import { BlocklistWorkspaceEntity } from 'src/modules/connected-account/standard-objects/blocklist.workspace-entity';
 import { MessageChannelMessageAssociationRepository } from 'src/modules/messaging/repositories/message-channel-message-association.repository';
 import { MessageChannelRepository } from 'src/modules/messaging/repositories/message-channel.repository';
-import { ThreadCleanerService } from 'src/modules/messaging/services/thread-cleaner/thread-cleaner.service';
+import { ThreadCleanerService } from 'src/modules/messaging/services/thread-cleaner/messaging-thread-cleaner.service';
 import { MessageChannelMessageAssociationWorkspaceEntity } from 'src/modules/messaging/standard-objects/message-channel-message-association.workspace-entity';
 import { MessageChannelWorkspaceEntity } from 'src/modules/messaging/standard-objects/message-channel.workspace-entity';
 

packages/twenty-server/src/modules/messaging/jobs/blocklist-reimport-messages.job.ts → packages/twenty-server/src/modules/messaging/blocklist-manager/jobs/messaging-blocklist-reimport-messages.job.ts

@@ -5,7 +5,6 @@ import { MessageQueueJob } from 'src/engine/integrations/message-queue/interface
 import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator';
 import { ConnectedAccountRepository } from 'src/modules/connected-account/repositories/connected-account.repository';
 import { ConnectedAccountWorkspaceEntity } from 'src/modules/connected-account/standard-objects/connected-account.workspace-entity';
-import { GmailFullMessageListFetchService } from 'src/modules/messaging/services/gmail-full-message-list-fetch/gmail-full-message-list-fetch.service';
 
 export type BlocklistReimportMessagesJobData = {
   workspaceId: string;
@@ -22,7 +21,6 @@ export class BlocklistReimportMessagesJob
   constructor(
     @InjectObjectMetadataRepository(ConnectedAccountWorkspaceEntity)
     private readonly connectedAccountRepository: ConnectedAccountRepository,
-    private readonly gmailFullMessageListFetchService: GmailFullMessageListFetchService,
   ) {}
 
   async handle(data: BlocklistReimportMessagesJobData): Promise<void> {
@@ -46,11 +44,12 @@ export class BlocklistReimportMessagesJob
       return;
     }
 
-    await this.gmailFullMessageListFetchService.fetchConnectedAccountThreads(
-      workspaceId,
-      connectedAccount[0].id,
-      [handle],
-    );
+    // TODO: reimplement that
+    // await this.gmailMessageListFetchJob.fetchConnectedAccountThreads(
+    //   workspaceId,
+    //   connectedAccount[0].id,
+    //   [handle],
+    // );
 
     this.logger.log(
       `Reimporting messages from ${handle} in workspace ${workspaceId} for workspace member ${workspaceMemberId} done`,

packages/twenty-server/src/modules/messaging/listeners/messaging-blocklist.listener.ts → packages/twenty-server/src/modules/messaging/blocklist-manager/listeners/messaging-blocklist.listener.ts

@@ -9,11 +9,11 @@ import { BlocklistWorkspaceEntity } from 'src/modules/connected-account/standard
 import {
   BlocklistReimportMessagesJob,
   BlocklistReimportMessagesJobData,
-} from 'src/modules/messaging/jobs/blocklist-reimport-messages.job';
+} from 'src/modules/messaging/blocklist-manager/jobs/messaging-blocklist-reimport-messages.job';
 import {
   BlocklistItemDeleteMessagesJobData,
   BlocklistItemDeleteMessagesJob,
-} from 'src/modules/messaging/jobs/blocklist-item-delete-messages.job';
+} from 'src/modules/messaging/blocklist-manager/jobs/messaging-blocklist-item-delete-messages.job';
 import { ObjectRecordUpdateEvent } from 'src/engine/integrations/event-emitter/types/object-record-update.event';
 
 @Injectable()

packages/twenty-server/src/modules/messaging/blocklist-manager/messaging-blocklist-manager.module.ts

@@ -0,0 +1,8 @@
+import { Module } from '@nestjs/common';
+
+@Module({
+  imports: [],
+  providers: [],
+  exports: [],
+})
+export class MessagingBlocklistManagerModule {}

packages/twenty-server/src/modules/messaging/services/telemetry/messaging-telemetry.module.ts → packages/twenty-server/src/modules/messaging/common/messaging-common.module.ts

@@ -1,11 +1,11 @@
 import { Module } from '@nestjs/common';
 
 import { AnalyticsModule } from 'src/engine/core-modules/analytics/analytics.module';
-import { MessagingTelemetryService } from 'src/modules/messaging/services/telemetry/messaging-telemetry.service';
+import { MessagingTelemetryService } from 'src/modules/messaging/common/services/messaging-telemetry.service';
 
 @Module({
   imports: [AnalyticsModule],
   providers: [MessagingTelemetryService],
   exports: [MessagingTelemetryService],
 })
-export class MessagingTelemetryModule {}
+export class MessagingCommonModule {}

packages/twenty-server/src/modules/messaging/repositories/message-participant.repository.ts → packages/twenty-server/src/modules/messaging/common/repositories/message-participant.repository.ts

@@ -5,7 +5,7 @@ import { EntityManager } from 'typeorm';
 import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
 import { MessageParticipantWorkspaceEntity } from 'src/modules/messaging/standard-objects/message-participant.workspace-entity';
 import { ObjectRecord } from 'src/engine/workspace-manager/workspace-sync-metadata/types/object-record';
-import { ParticipantWithId } from 'src/modules/messaging/types/gmail-message';
+import { ParticipantWithId } from 'src/modules/messaging/driver/gmail/types/gmail-message';
 
 @Injectable()
 export class MessageParticipantRepository {