6430 Part 1: remove all raw queries from the messaging and calendar m…

…odules (#6572) Part 1 of #6430 - Remove all repositories which contained raw queries in `messaging` module - Replace them using `twentyORMManager`
twentyhq · Aug 13, 2024 · d1c278d · d1c278d
1 parent 40bbee8
commit d1c278d
Show file tree

Hide file tree

Showing 27 changed files with 378 additions and 1,114 deletions.
diff --git a/packages/twenty-server/src/engine/core-modules/auth/auth.module.ts b/packages/twenty-server/src/engine/core-modules/auth/auth.module.ts
@@ -30,7 +30,6 @@ import { WorkspaceManagerModule } from 'src/engine/workspace-manager/workspace-m
 import { CalendarChannelWorkspaceEntity } from 'src/modules/calendar/common/standard-objects/calendar-channel.workspace-entity';
 import { ConnectedAccountModule } from 'src/modules/connected-account/connected-account.module';
 import { ConnectedAccountWorkspaceEntity } from 'src/modules/connected-account/standard-objects/connected-account.workspace-entity';
-import { MessageChannelWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message-channel.workspace-entity';
 
 import { AuthResolver } from './auth.resolver';
 
@@ -51,7 +50,6 @@ import { JwtAuthStrategy } from './strategies/jwt.auth.strategy';
     ),
     ObjectMetadataRepositoryModule.forFeature([
       ConnectedAccountWorkspaceEntity,
-      MessageChannelWorkspaceEntity,
     ]),
     HttpModule,
     UserWorkspaceModule,

diff --git a/packages/twenty-server/src/engine/core-modules/auth/services/google-apis.service.ts b/packages/twenty-server/src/engine/core-modules/auth/services/google-apis.service.ts
@@ -23,8 +23,8 @@ import {
   ConnectedAccountProvider,
   ConnectedAccountWorkspaceEntity,
 } from 'src/modules/connected-account/standard-objects/connected-account.workspace-entity';
-import { MessageChannelRepository } from 'src/modules/messaging/common/repositories/message-channel.repository';
 import {
+  MessageChannelSyncStage,
   MessageChannelSyncStatus,
   MessageChannelType,
   MessageChannelVisibility,
@@ -47,8 +47,6 @@ export class GoogleAPIsService {
     private readonly environmentService: EnvironmentService,
     @InjectObjectMetadataRepository(ConnectedAccountWorkspaceEntity)
     private readonly connectedAccountRepository: ConnectedAccountRepository,
-    @InjectObjectMetadataRepository(MessageChannelWorkspaceEntity)
-    private readonly messageChannelRepository: MessageChannelRepository,
     private readonly accountsToReconnectService: AccountsToReconnectService,
   ) {}
 
@@ -88,6 +86,11 @@ export class GoogleAPIsService {
         'calendarChannel',
       );
 
+    const messageChannelRepository =
+      await this.twentyORMManager.getRepository<MessageChannelWorkspaceEntity>(
+        'messageChannel',
+      );
+
     const workspaceDataSource = await this.twentyORMManager.getDatasource();
 
     await workspaceDataSource.transaction(async (manager: EntityManager) => {
@@ -105,7 +108,7 @@ export class GoogleAPIsService {
           manager,
         );
 
-        await this.messageChannelRepository.create(
+        await messageChannelRepository.save(
           {
             id: v4(),
             connectedAccountId: newOrExistingConnectedAccountId,
@@ -115,7 +118,7 @@ export class GoogleAPIsService {
               messageVisibility || MessageChannelVisibility.SHARE_EVERYTHING,
             syncStatus: MessageChannelSyncStatus.ONGOING,
           },
-          workspaceId,
+          {},
           manager,
         );
 
@@ -159,20 +162,27 @@ export class GoogleAPIsService {
           newOrExistingConnectedAccountId,
         );
 
-        await this.messageChannelRepository.resetSync(
-          newOrExistingConnectedAccountId,
-          workspaceId,
+        await messageChannelRepository.update(
+          {
+            connectedAccountId: newOrExistingConnectedAccountId,
+          },
+          {
+            syncStage: MessageChannelSyncStage.FULL_MESSAGE_LIST_FETCH_PENDING,
+            syncStatus: null,
+            syncCursor: '',
+            syncStageStartedAt: null,
+          },
           manager,
         );
       }
     });
 
     if (this.environmentService.get('MESSAGING_PROVIDER_GMAIL_ENABLED')) {
-      const messageChannels =
-        await this.messageChannelRepository.getByConnectedAccountId(
-          newOrExistingConnectedAccountId,
-          workspaceId,
-        );
+      const messageChannels = await messageChannelRepository.find({
+        where: {
+          connectedAccountId: newOrExistingConnectedAccountId,
+        },
+      });
 
       for (const messageChannel of messageChannels) {
         await this.messageQueueService.add<MessagingMessageListFetchJobData>(

diff --git a/...ges/twenty-server/src/engine/object-metadata-repository/metadata-to-repository.mapping.ts b/...ges/twenty-server/src/engine/object-metadata-repository/metadata-to-repository.mapping.ts
@@ -1,10 +1,5 @@
 import { BlocklistRepository } from 'src/modules/blocklist/repositories/blocklist.repository';
 import { ConnectedAccountRepository } from 'src/modules/connected-account/repositories/connected-account.repository';
-import { MessageChannelMessageAssociationRepository } from 'src/modules/messaging/common/repositories/message-channel-message-association.repository';
-import { MessageChannelRepository } from 'src/modules/messaging/common/repositories/message-channel.repository';
-import { MessageParticipantRepository } from 'src/modules/messaging/common/repositories/message-participant.repository';
-import { MessageThreadRepository } from 'src/modules/messaging/common/repositories/message-thread.repository';
-import { MessageRepository } from 'src/modules/messaging/common/repositories/message.repository';
 import { AuditLogRepository } from 'src/modules/timeline/repositiories/audit-log.repository';
 import { TimelineActivityRepository } from 'src/modules/timeline/repositiories/timeline-activity.repository';
 import { WorkspaceMemberRepository } from 'src/modules/workspace-member/repositories/workspace-member.repository';
@@ -13,12 +8,6 @@ export const metadataToRepositoryMapping = {
   AuditLogWorkspaceEntity: AuditLogRepository,
   BlocklistWorkspaceEntity: BlocklistRepository,
   ConnectedAccountWorkspaceEntity: ConnectedAccountRepository,
-  MessageChannelMessageAssociationWorkspaceEntity:
-    MessageChannelMessageAssociationRepository,
-  MessageChannelWorkspaceEntity: MessageChannelRepository,
-  MessageWorkspaceEntity: MessageRepository,
-  MessageParticipantWorkspaceEntity: MessageParticipantRepository,
-  MessageThreadWorkspaceEntity: MessageThreadRepository,
   TimelineActivityWorkspaceEntity: TimelineActivityRepository,
   WorkspaceMemberWorkspaceEntity: WorkspaceMemberRepository,
 };
diff --git a/...ges/twenty-server/src/modules/contact-creation-manager/services/create-company.service.ts b/...ges/twenty-server/src/modules/contact-creation-manager/services/create-company.service.ts
@@ -157,7 +157,7 @@ export class CreateCompanyService {
     };
   }
 
-  private async createCompanyMap(companies: CompanyWorkspaceEntity[]) {
+  private createCompanyMap(companies: CompanyWorkspaceEntity[]) {
     return companies.reduce(
       (acc, company) => {
         if (!company.domainName) {

diff --git a/.../modules/messaging/blocklist-manager/jobs/messaging-blocklist-item-delete-messages.job.ts b/.../modules/messaging/blocklist-manager/jobs/messaging-blocklist-item-delete-messages.job.ts
@@ -1,15 +1,15 @@
 import { Logger, Scope } from '@nestjs/common';
 
+import { Any } from 'typeorm';
+
 import { Process } from 'src/engine/integrations/message-queue/decorators/process.decorator';
 import { Processor } from 'src/engine/integrations/message-queue/decorators/processor.decorator';
 import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
 import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator';
+import { TwentyORMManager } from 'src/engine/twenty-orm/twenty-orm.manager';
 import { BlocklistRepository } from 'src/modules/blocklist/repositories/blocklist.repository';
 import { BlocklistWorkspaceEntity } from 'src/modules/blocklist/standard-objects/blocklist.workspace-entity';
-import { MessageChannelMessageAssociationRepository } from 'src/modules/messaging/common/repositories/message-channel-message-association.repository';
-import { MessageChannelRepository } from 'src/modules/messaging/common/repositories/message-channel.repository';
 import { MessageChannelMessageAssociationWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message-channel-message-association.workspace-entity';
-import { MessageChannelWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message-channel.workspace-entity';
 import { MessagingMessageCleanerService } from 'src/modules/messaging/message-cleaner/services/messaging-message-cleaner.service';
 
 export type BlocklistItemDeleteMessagesJobData = {
@@ -25,15 +25,10 @@ export class BlocklistItemDeleteMessagesJob {
   private readonly logger = new Logger(BlocklistItemDeleteMessagesJob.name);
 
   constructor(
-    @InjectObjectMetadataRepository(MessageChannelWorkspaceEntity)
-    private readonly messageChannelRepository: MessageChannelRepository,
-    @InjectObjectMetadataRepository(
-      MessageChannelMessageAssociationWorkspaceEntity,
-    )
-    private readonly messageChannelMessageAssociationRepository: MessageChannelMessageAssociationRepository,
     @InjectObjectMetadataRepository(BlocklistWorkspaceEntity)
     private readonly blocklistRepository: BlocklistRepository,
     private readonly threadCleanerService: MessagingMessageCleanerService,
+    private readonly twentyORMManager: TwentyORMManager,
   ) {}
 
   @Process(BlocklistItemDeleteMessagesJob.name)
@@ -65,24 +60,26 @@ export class BlocklistItemDeleteMessagesJob {
       );
     }
 
-    const messageChannels =
-      await this.messageChannelRepository.getIdsByWorkspaceMemberId(
-        workspaceMemberId,
-        workspaceId,
+    const messageChannelMessageAssociationRepository =
+      await this.twentyORMManager.getRepository<MessageChannelMessageAssociationWorkspaceEntity>(
+        'messageChannelMessageAssociation',
       );
 
-    const messageChannelIds = messageChannels.map(({ id }) => id);
-
     const rolesToDelete: ('from' | 'to')[] = ['from', 'to'];
 
-    for (const messageChannelId of messageChannelIds) {
-      await this.messageChannelMessageAssociationRepository.deleteByMessageParticipantHandleAndMessageChannelIdAndRoles(
-        handle,
-        messageChannelId,
-        rolesToDelete,
-        workspaceId,
-      );
-    }
+    await messageChannelMessageAssociationRepository.delete({
+      messageChannel: {
+        connectedAccount: {
+          accountOwnerId: workspaceMemberId,
+        },
+      },
+      message: {
+        messageParticipants: {
+          handle,
+          role: Any(rolesToDelete),
+        },
+      },
+    });
 
     await this.threadCleanerService.cleanWorkspaceThreads(workspaceId);
 

diff --git a/...-server/src/modules/messaging/blocklist-manager/listeners/messaging-blocklist.listener.ts b/...-server/src/modules/messaging/blocklist-manager/listeners/messaging-blocklist.listener.ts
@@ -8,14 +8,14 @@ import { InjectMessageQueue } from 'src/engine/integrations/message-queue/decora
 import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
 import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
 import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator';
+import { TwentyORMManager } from 'src/engine/twenty-orm/twenty-orm.manager';
 import { BlocklistWorkspaceEntity } from 'src/modules/blocklist/standard-objects/blocklist.workspace-entity';
 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 {
   BlocklistItemDeleteMessagesJob,
   BlocklistItemDeleteMessagesJobData,
 } from 'src/modules/messaging/blocklist-manager/jobs/messaging-blocklist-item-delete-messages.job';
-import { MessageChannelRepository } from 'src/modules/messaging/common/repositories/message-channel.repository';
 import { MessagingChannelSyncStatusService } from 'src/modules/messaging/common/services/messaging-channel-sync-status.service';
 import { MessageChannelWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message-channel.workspace-entity';
 
@@ -27,8 +27,7 @@ export class MessagingBlocklistListener {
     @InjectObjectMetadataRepository(ConnectedAccountWorkspaceEntity)
     private readonly connectedAccountRepository: ConnectedAccountRepository,
     private readonly messagingChannelSyncStatusService: MessagingChannelSyncStatusService,
-    @InjectObjectMetadataRepository(MessageChannelWorkspaceEntity)
-    private readonly messageChannelRepository: MessageChannelRepository,
+    private readonly twentyORMManager: TwentyORMManager,
   ) {}
 
   @OnEvent('blocklist.created')
@@ -61,14 +60,19 @@ export class MessagingBlocklistListener {
       return;
     }
 
-    const messageChannel =
-      await this.messageChannelRepository.getByConnectedAccountId(
-        connectedAccount[0].id,
-        workspaceId,
+    const messageChannelRepository =
+      await this.twentyORMManager.getRepository<MessageChannelWorkspaceEntity>(
+        'messageChannel',
       );
 
+    const messageChannel = await messageChannelRepository.findOneOrFail({
+      where: {
+        connectedAccountId: connectedAccount[0].id,
+      },
+    });
+
     await this.messagingChannelSyncStatusService.resetAndScheduleFullMessageListFetch(
-      messageChannel[0].id,
+      messageChannel.id,
       workspaceId,
     );
   }
@@ -98,14 +102,19 @@ export class MessagingBlocklistListener {
       return;
     }
 
-    const messageChannel =
-      await this.messageChannelRepository.getByConnectedAccountId(
-        connectedAccount[0].id,
-        workspaceId,
+    const messageChannelRepository =
+      await this.twentyORMManager.getRepository<MessageChannelWorkspaceEntity>(
+        'messageChannel',
       );
 
+    const messageChannel = await messageChannelRepository.findOneOrFail({
+      where: {
+        connectedAccountId: connectedAccount[0].id,
+      },
+    });
+
     await this.messagingChannelSyncStatusService.resetAndScheduleFullMessageListFetch(
-      messageChannel[0].id,
+      messageChannel.id,
       workspaceId,
     );
   }

diff --git a/packages/twenty-server/src/modules/messaging/common/messaging-common.module.ts b/packages/twenty-server/src/modules/messaging/common/messaging-common.module.ts
@@ -2,22 +2,13 @@ import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 
 import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
-import { ObjectMetadataRepositoryModule } from 'src/engine/object-metadata-repository/object-metadata-repository.module';
 import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/workspace-datasource.module';
 import { ConnectedAccountModule } from 'src/modules/connected-account/connected-account.module';
 import { MessagingChannelSyncStatusService } from 'src/modules/messaging/common/services/messaging-channel-sync-status.service';
-import { MessageParticipantWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message-participant.workspace-entity';
-import { MessageThreadWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message-thread.workspace-entity';
-import { MessageWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message.workspace-entity';
 
 @Module({
   imports: [
     WorkspaceDataSourceModule,
-    ObjectMetadataRepositoryModule.forFeature([
-      MessageParticipantWorkspaceEntity,
-      MessageWorkspaceEntity,
-      MessageThreadWorkspaceEntity,
-    ]),
     TypeOrmModule.forFeature([FeatureFlagEntity], 'core'),
     ConnectedAccountModule,
   ],

diff --git a/...ver/src/modules/messaging/common/query-hooks/message/can-access-message-thread.service.ts b/...ver/src/modules/messaging/common/query-hooks/message/can-access-message-thread.service.ts
@@ -1,37 +1,44 @@
 import { ForbiddenException } from '@nestjs/common';
 
 import groupBy from 'lodash.groupby';
+import { Any } from 'typeorm';
 
 import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator';
+import { TwentyORMManager } from 'src/engine/twenty-orm/twenty-orm.manager';
 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/common/repositories/message-channel.repository';
 import { MessageChannelWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message-channel.workspace-entity';
 import { WorkspaceMemberRepository } from 'src/modules/workspace-member/repositories/workspace-member.repository';
 import { WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';
 import { isDefined } from 'src/utils/is-defined';
 
 export class CanAccessMessageThreadService {
   constructor(
-    @InjectObjectMetadataRepository(MessageChannelWorkspaceEntity)
-    private readonly messageChannelService: MessageChannelRepository,
     @InjectObjectMetadataRepository(ConnectedAccountWorkspaceEntity)
     private readonly connectedAccountRepository: ConnectedAccountRepository,
     @InjectObjectMetadataRepository(WorkspaceMemberWorkspaceEntity)
     private readonly workspaceMemberRepository: WorkspaceMemberRepository,
+    private readonly twentyORMManager: TwentyORMManager,
   ) {}
 
   public async canAccessMessageThread(
     userId: string,
     workspaceId: string,
     messageChannelMessageAssociations: any[],
   ) {
-    const messageChannels = await this.messageChannelService.getByIds(
-      messageChannelMessageAssociations.map(
-        (association) => association.messageChannelId,
-      ),
-      workspaceId,
-    );
+    const messageChannelRepository =
+      await this.twentyORMManager.getRepository<MessageChannelWorkspaceEntity>(
+        'messageChannel',
+      );
+    const messageChannels = await messageChannelRepository.find({
+      where: {
+        id: Any(
+          messageChannelMessageAssociations.map(
+            (association) => association.messageChannelId,
+          ),
+        ),
+      },
+    });
 
     const messageChannelsGroupByVisibility = groupBy(
       messageChannels,

diff --git a/...ges/twenty-server/src/modules/messaging/common/query-hooks/messaging-query-hook.module.ts b/...ges/twenty-server/src/modules/messaging/common/query-hooks/messaging-query-hook.module.ts
@@ -1,19 +1,15 @@
 import { Module } from '@nestjs/common';
 
 import { ObjectMetadataRepositoryModule } from 'src/engine/object-metadata-repository/object-metadata-repository.module';
-import { WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';
 import { ConnectedAccountWorkspaceEntity } from 'src/modules/connected-account/standard-objects/connected-account.workspace-entity';
 import { CanAccessMessageThreadService } from 'src/modules/messaging/common/query-hooks/message/can-access-message-thread.service';
 import { MessageFindManyPreQueryHook } from 'src/modules/messaging/common/query-hooks/message/message-find-many.pre-query.hook';
 import { MessageFindOnePreQueryHook } from 'src/modules/messaging/common/query-hooks/message/message-find-one.pre-query-hook';
-import { MessageChannelMessageAssociationWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message-channel-message-association.workspace-entity';
-import { MessageChannelWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message-channel.workspace-entity';
+import { WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';
 
 @Module({
   imports: [
     ObjectMetadataRepositoryModule.forFeature([
-      MessageChannelMessageAssociationWorkspaceEntity,
-      MessageChannelWorkspaceEntity,
       ConnectedAccountWorkspaceEntity,
       WorkspaceMemberWorkspaceEntity,
     ]),