Remove message thread id from mcma and update scripts (#6500)

- Remove `messageThreadId` from `messageChannelMessageAssociation` - Update thread merging - Update all queries which were dependent on this field - Update some raw queries by using `twentyORM` instead --------- Co-authored-by: Weiko <[email protected]>
twentyhq · Aug 6, 2024 · 018b822 · 018b822
1 parent 48d0a36
commit 018b822
Show file tree

Hide file tree

Showing 14 changed files with 170 additions and 564 deletions.
diff --git a/...wenty-server/src/database/typeorm-seeds/workspace/message-channel-message-associations.ts b/...wenty-server/src/database/typeorm-seeds/workspace/message-channel-message-associations.ts
@@ -2,7 +2,6 @@ import { EntityManager } from 'typeorm';
 
 import { DEV_SEED_MESSAGE_CHANNEL_IDS } from 'src/database/typeorm-seeds/workspace/message-channels';
 import { DEV_SEED_MESSAGE_IDS } from 'src/database/typeorm-seeds/workspace/messages';
-import { DEV_SEED_MESSAGE_THREAD_IDS } from 'src/database/typeorm-seeds/workspace/message-threads';
 
 const tableName = 'messageChannelMessageAssociation';
 
@@ -25,7 +24,6 @@ export const seedMessageChannelMessageAssociation = async (
       'updatedAt',
       'deletedAt',
       'messageThreadExternalId',
-      'messageThreadId',
       'messageExternalId',
       'messageId',
       'messageChannelId',
@@ -38,7 +36,6 @@ export const seedMessageChannelMessageAssociation = async (
         updatedAt: new Date(),
         deletedAt: null,
         messageThreadExternalId: null,
-        messageThreadId: DEV_SEED_MESSAGE_THREAD_IDS.MESSAGE_THREAD_1,
         messageExternalId: null,
         messageId: DEV_SEED_MESSAGE_IDS.MESSAGE_1,
         messageChannelId: DEV_SEED_MESSAGE_CHANNEL_IDS.TIM,
@@ -49,7 +46,6 @@ export const seedMessageChannelMessageAssociation = async (
         updatedAt: new Date(),
         deletedAt: null,
         messageThreadExternalId: null,
-        messageThreadId: DEV_SEED_MESSAGE_THREAD_IDS.MESSAGE_THREAD_2,
         messageExternalId: null,
         messageId: DEV_SEED_MESSAGE_IDS.MESSAGE_2,
         messageChannelId: DEV_SEED_MESSAGE_CHANNEL_IDS.TIM,
@@ -60,7 +56,6 @@ export const seedMessageChannelMessageAssociation = async (
         updatedAt: new Date(),
         deletedAt: null,
         messageThreadExternalId: null,
-        messageThreadId: DEV_SEED_MESSAGE_THREAD_IDS.MESSAGE_THREAD_1,
         messageExternalId: null,
         messageId: DEV_SEED_MESSAGE_IDS.MESSAGE_3,
         messageChannelId: DEV_SEED_MESSAGE_CHANNEL_IDS.TIM,

diff --git a/...engine/workspace-manager/workspace-migration-runner/workspace-migration-runner.service.ts b/...engine/workspace-manager/workspace-migration-runner/workspace-migration-runner.service.ts
@@ -205,7 +205,20 @@ export class WorkspaceMigrationRunnerService {
           );
           break;
         case WorkspaceMigrationIndexActionType.DROP:
-          await queryRunner.dropIndex(`${schemaName}.${tableName}`, index.name);
+          try {
+            await queryRunner.dropIndex(
+              `${schemaName}.${tableName}`,
+              index.name,
+            );
+          } catch (error) {
+            // Ignore error if index does not exist
+            if (
+              error.message ===
+              `Supplied index ${index.name} was not found in table ${schemaName}.${tableName}`
+            ) {
+              continue;
+            }
+          }
           break;
         default:
           throw new Error(`Migration index action not supported`);

diff --git a/...rver/src/modules/messaging/common/query-hooks/message/message-find-many.pre-query.hook.ts b/...rver/src/modules/messaging/common/query-hooks/message/message-find-many.pre-query.hook.ts
@@ -4,20 +4,16 @@ import { WorkspaceQueryHookInstance } from 'src/engine/api/graphql/workspace-que
 import { FindManyResolverArgs } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
 
 import { WorkspaceQueryHook } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/decorators/workspace-query-hook.decorator';
-import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator';
+import { AuthContext } from 'src/engine/core-modules/auth/types/auth-context.type';
+import { TwentyORMManager } from 'src/engine/twenty-orm/twenty-orm.manager';
 import { CanAccessMessageThreadService } from 'src/modules/messaging/common/query-hooks/message/can-access-message-thread.service';
-import { MessageChannelMessageAssociationRepository } from 'src/modules/messaging/common/repositories/message-channel-message-association.repository';
 import { MessageChannelMessageAssociationWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message-channel-message-association.workspace-entity';
-import { AuthContext } from 'src/engine/core-modules/auth/types/auth-context.type';
 
 @WorkspaceQueryHook(`message.findMany`)
 export class MessageFindManyPreQueryHook implements WorkspaceQueryHookInstance {
   constructor(
-    @InjectObjectMetadataRepository(
-      MessageChannelMessageAssociationWorkspaceEntity,
-    )
-    private readonly messageChannelMessageAssociationService: MessageChannelMessageAssociationRepository,
     private readonly canAccessMessageThreadService: CanAccessMessageThreadService,
+    private readonly twentyORMManager: TwentyORMManager,
   ) {}
 
   async execute(
@@ -33,12 +29,20 @@ export class MessageFindManyPreQueryHook implements WorkspaceQueryHookInstance {
       throw new BadRequestException('User id is required');
     }
 
-    const messageChannelMessageAssociations =
-      await this.messageChannelMessageAssociationService.getByMessageThreadId(
-        payload?.filter?.messageThreadId?.eq,
-        authContext.workspace.id,
+    const messageChannelMessageAssociationRepository =
+      await this.twentyORMManager.getRepository<MessageChannelMessageAssociationWorkspaceEntity>(
+        'messageChannelMessageAssociation',
       );
 
+    const messageChannelMessageAssociations =
+      await messageChannelMessageAssociationRepository.find({
+        where: {
+          message: {
+            messageThreadId: payload.filter.messageThreadId.eq,
+          },
+        },
+      });
+
     if (messageChannelMessageAssociations.length === 0) {
       throw new NotFoundException();
     }

diff --git a/...erver/src/modules/messaging/common/query-hooks/message/message-find-one.pre-query-hook.ts b/...erver/src/modules/messaging/common/query-hooks/message/message-find-one.pre-query-hook.ts
@@ -5,20 +5,16 @@ import { WorkspaceQueryHookInstance } from 'src/engine/api/graphql/workspace-que
 import { FindOneResolverArgs } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
 
 import { WorkspaceQueryHook } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/decorators/workspace-query-hook.decorator';
-import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator';
+import { AuthContext } from 'src/engine/core-modules/auth/types/auth-context.type';
+import { TwentyORMManager } from 'src/engine/twenty-orm/twenty-orm.manager';
 import { CanAccessMessageThreadService } from 'src/modules/messaging/common/query-hooks/message/can-access-message-thread.service';
-import { MessageChannelMessageAssociationRepository } from 'src/modules/messaging/common/repositories/message-channel-message-association.repository';
 import { MessageChannelMessageAssociationWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message-channel-message-association.workspace-entity';
-import { AuthContext } from 'src/engine/core-modules/auth/types/auth-context.type';
 
 @WorkspaceQueryHook(`message.findOne`)
 export class MessageFindOnePreQueryHook implements WorkspaceQueryHookInstance {
   constructor(
-    @InjectObjectMetadataRepository(
-      MessageChannelMessageAssociationWorkspaceEntity,
-    )
-    private readonly messageChannelMessageAssociationService: MessageChannelMessageAssociationRepository,
     private readonly canAccessMessageThreadService: CanAccessMessageThreadService,
+    private readonly twentyORMManager: TwentyORMManager,
   ) {}
 
   async execute(
@@ -30,12 +26,18 @@ export class MessageFindOnePreQueryHook implements WorkspaceQueryHookInstance {
       throw new NotFoundException('User id is required');
     }
 
-    const messageChannelMessageAssociations =
-      await this.messageChannelMessageAssociationService.getByMessageIds(
-        [payload?.filter?.id?.eq],
-        authContext.workspace.id,
+    const messageChannelMessageAssociationRepository =
+      await this.twentyORMManager.getRepository<MessageChannelMessageAssociationWorkspaceEntity>(
+        'messageChannelMessageAssociation',
       );
 
+    const messageChannelMessageAssociations =
+      await messageChannelMessageAssociationRepository.find({
+        where: {
+          messageId: payload?.filter?.id?.eq,
+        },
+      });
+
     if (messageChannelMessageAssociations.length === 0) {
       throw new NotFoundException();
     }

diff --git a/...c/modules/messaging/common/repositories/message-channel-message-association.repository.ts b/...c/modules/messaging/common/repositories/message-channel-message-association.repository.ts
@@ -3,69 +3,13 @@ import { Injectable } from '@nestjs/common';
 import { EntityManager } from 'typeorm';
 
 import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
-import { MessageChannelMessageAssociationWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message-channel-message-association.workspace-entity';
 
 @Injectable()
 export class MessageChannelMessageAssociationRepository {
   constructor(
     private readonly workspaceDataSourceService: WorkspaceDataSourceService,
   ) {}
 
-  public async getByMessageExternalIdsAndMessageChannelId(
-    messageExternalIds: string[],
-    messageChannelId: string,
-    workspaceId: string,
-    transactionManager?: EntityManager,
-  ): Promise<MessageChannelMessageAssociationWorkspaceEntity[]> {
-    const dataSourceSchema =
-      this.workspaceDataSourceService.getSchemaName(workspaceId);
-
-    return await this.workspaceDataSourceService.executeRawQuery(
-      `SELECT * FROM ${dataSourceSchema}."messageChannelMessageAssociation"
-    WHERE "messageExternalId" = ANY($1) AND "messageChannelId" = $2`,
-      [messageExternalIds, messageChannelId],
-      workspaceId,
-      transactionManager,
-    );
-  }
-
-  public async countByMessageExternalIdsAndMessageChannelId(
-    messageExternalIds: string[],
-    messageChannelId: string,
-    workspaceId: string,
-    transactionManager?: EntityManager,
-  ): Promise<number> {
-    const dataSourceSchema =
-      this.workspaceDataSourceService.getSchemaName(workspaceId);
-
-    const result = await this.workspaceDataSourceService.executeRawQuery(
-      `SELECT COUNT(*) FROM ${dataSourceSchema}."messageChannelMessageAssociation"
-    WHERE "messageExternalId" = ANY($1) AND "messageChannelId" = $2`,
-      [messageExternalIds, messageChannelId],
-      workspaceId,
-      transactionManager,
-    );
-
-    return result[0]?.count;
-  }
-
-  public async deleteByMessageExternalIdsAndMessageChannelId(
-    messageExternalIds: string[],
-    messageChannelId: string,
-    workspaceId: string,
-    transactionManager?: EntityManager,
-  ) {
-    const dataSourceSchema =
-      this.workspaceDataSourceService.getSchemaName(workspaceId);
-
-    await this.workspaceDataSourceService.executeRawQuery(
-      `DELETE FROM ${dataSourceSchema}."messageChannelMessageAssociation" WHERE "messageExternalId" = ANY($1) AND "messageChannelId" = $2`,
-      [messageExternalIds, messageChannelId],
-      workspaceId,
-      transactionManager,
-    );
-  }
-
   public async deleteByMessageParticipantHandleAndMessageChannelIdAndRoles(
     messageParticipantHandle: string,
     messageChannelId: string,
@@ -125,43 +69,6 @@ export class MessageChannelMessageAssociationRepository {
     );
   }
 
-  public async getByMessageChannelIds(
-    messageChannelIds: string[],
-    workspaceId: string,
-    transactionManager?: EntityManager,
-  ): Promise<MessageChannelMessageAssociationWorkspaceEntity[]> {
-    const dataSourceSchema =
-      this.workspaceDataSourceService.getSchemaName(workspaceId);
-
-    return await this.workspaceDataSourceService.executeRawQuery(
-      `SELECT * FROM ${dataSourceSchema}."messageChannelMessageAssociation"
-    WHERE "messageChannelId" = ANY($1)`,
-      [messageChannelIds],
-      workspaceId,
-      transactionManager,
-    );
-  }
-
-  public async deleteByMessageChannelIds(
-    messageChannelIds: string[],
-    workspaceId: string,
-    transactionManager?: EntityManager,
-  ) {
-    if (messageChannelIds.length === 0) {
-      return;
-    }
-
-    const dataSourceSchema =
-      this.workspaceDataSourceService.getSchemaName(workspaceId);
-
-    await this.workspaceDataSourceService.executeRawQuery(
-      `DELETE FROM ${dataSourceSchema}."messageChannelMessageAssociation" WHERE "messageChannelId" = ANY($1)`,
-      [messageChannelIds],
-      workspaceId,
-      transactionManager,
-    );
-  }
-
   public async deleteByIds(
     ids: string[],
     workspaceId: string,
@@ -177,103 +84,4 @@ export class MessageChannelMessageAssociationRepository {
       transactionManager,
     );
   }
-
-  public async getByMessageThreadExternalIds(
-    messageThreadExternalIds: string[],
-    workspaceId: string,
-    transactionManager?: EntityManager,
-  ): Promise<MessageChannelMessageAssociationWorkspaceEntity[]> {
-    const dataSourceSchema =
-      this.workspaceDataSourceService.getSchemaName(workspaceId);
-
-    return await this.workspaceDataSourceService.executeRawQuery(
-      `SELECT * FROM ${dataSourceSchema}."messageChannelMessageAssociation"
-    WHERE "messageThreadExternalId" = ANY($1)`,
-      [messageThreadExternalIds],
-      workspaceId,
-      transactionManager,
-    );
-  }
-
-  public async getFirstByMessageThreadExternalId(
-    messageThreadExternalId: string,
-    workspaceId: string,
-    transactionManager?: EntityManager,
-  ): Promise<MessageChannelMessageAssociationWorkspaceEntity | null> {
-    const existingMessageChannelMessageAssociations =
-      await this.getByMessageThreadExternalIds(
-        [messageThreadExternalId],
-        workspaceId,
-        transactionManager,
-      );
-
-    if (
-      !existingMessageChannelMessageAssociations ||
-      existingMessageChannelMessageAssociations.length === 0
-    ) {
-      return null;
-    }
-
-    return existingMessageChannelMessageAssociations[0];
-  }
-
-  public async getByMessageIds(
-    messageIds: string[],
-    workspaceId: string,
-    transactionManager?: EntityManager,
-  ): Promise<MessageChannelMessageAssociationWorkspaceEntity[]> {
-    const dataSourceSchema =
-      this.workspaceDataSourceService.getSchemaName(workspaceId);
-
-    return await this.workspaceDataSourceService.executeRawQuery(
-      `SELECT * FROM ${dataSourceSchema}."messageChannelMessageAssociation"
-    WHERE "messageId" = ANY($1)`,
-      [messageIds],
-      workspaceId,
-      transactionManager,
-    );
-  }
-
-  public async getByMessageThreadId(
-    messageThreadId: string,
-    workspaceId: string,
-    transactionManager?: EntityManager,
-  ): Promise<MessageChannelMessageAssociationWorkspaceEntity[]> {
-    const dataSourceSchema =
-      this.workspaceDataSourceService.getSchemaName(workspaceId);
-
-    return await this.workspaceDataSourceService.executeRawQuery(
-      `SELECT * FROM ${dataSourceSchema}."messageChannelMessageAssociation"
-    WHERE "messageThreadId" = $1`,
-      [messageThreadId],
-      workspaceId,
-      transactionManager,
-    );
-  }
-
-  public async insert(
-    messageChannelId: string,
-    messageId: string,
-    messageExternalId: string,
-    messageThreadId: string,
-    messageThreadExternalId: string,
-    workspaceId: string,
-    transactionManager?: EntityManager,
-  ): Promise<void> {
-    const dataSourceSchema =
-      this.workspaceDataSourceService.getSchemaName(workspaceId);
-
-    await this.workspaceDataSourceService.executeRawQuery(
-      `INSERT INTO ${dataSourceSchema}."messageChannelMessageAssociation" ("messageChannelId", "messageId", "messageExternalId", "messageThreadId", "messageThreadExternalId") VALUES ($1, $2, $3, $4, $5)`,
-      [
-        messageChannelId,
-        messageId,
-        messageExternalId,
-        messageThreadId,
-        messageThreadExternalId,
-      ],
-      workspaceId,
-      transactionManager,
-    );
-  }
 }