messaging cleanup (#19124)

2026-03-30 19:51:00 +05:30
parent 30bdc24bf8
commit 2fccd29ec6
10 changed files with 444 additions and 5 deletions
@@ -2,17 +2,25 @@ import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';

 import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';
+import { CalendarChannelDataAccessModule } from 'src/engine/metadata-modules/calendar-channel/data-access/calendar-channel-data-access.module';
+import { ConnectedAccountDataAccessModule } from 'src/engine/metadata-modules/connected-account/data-access/connected-account-data-access.module';
 import { ConnectedAccountMetadataService } from 'src/engine/metadata-modules/connected-account/connected-account-metadata.service';
 import { ConnectedAccountEntity } from 'src/engine/metadata-modules/connected-account/entities/connected-account.entity';
 import { ConnectedAccountGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/connected-account/interceptors/connected-account-graphql-api-exception.interceptor';
 import { ConnectedAccountResolver } from 'src/engine/metadata-modules/connected-account/resolvers/connected-account.resolver';
+import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';
+import { MessageChannelDataAccessModule } from 'src/engine/metadata-modules/message-channel/data-access/message-channel-data-access.module';
 import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';

@Module({
  imports: [
    TypeOrmModule.forFeature([ConnectedAccountEntity]),
-    PermissionsModule,
+    CalendarChannelDataAccessModule,
+    ConnectedAccountDataAccessModule,
    FeatureFlagModule,
+    WorkspaceManyOrAllFlatEntityMapsCacheModule,
+    MessageChannelDataAccessModule,
+    PermissionsModule,
  ],
  providers: [
    ConnectedAccountMetadataService,
@@ -1,20 +1,38 @@
-import { Injectable } from '@nestjs/common';
+import { Injectable, Logger } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';

+import { STANDARD_OBJECTS } from 'twenty-shared/metadata';
 import { In, Repository } from 'typeorm';

+import { DatabaseEventAction } from 'src/engine/api/graphql/graphql-query-runner/enums/database-event-action';
 import {
  ConnectedAccountException,
  ConnectedAccountExceptionCode,
 } from 'src/engine/metadata-modules/connected-account/connected-account.exception';
 import { ConnectedAccountDTO } from 'src/engine/metadata-modules/connected-account/dtos/connected-account.dto';
 import { ConnectedAccountEntity } from 'src/engine/metadata-modules/connected-account/entities/connected-account.entity';
+import { CalendarChannelDataAccessService } from 'src/engine/metadata-modules/calendar-channel/data-access/services/calendar-channel-data-access.service';
+import { MessageChannelDataAccessService } from 'src/engine/metadata-modules/message-channel/data-access/services/message-channel-data-access.service';
+import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
+import { findFlatEntityByUniversalIdentifierOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-universal-identifier-or-throw.util';
+import { ConnectedAccountDataAccessService } from 'src/engine/metadata-modules/connected-account/data-access/services/connected-account-data-access.service';
+import { GlobalWorkspaceOrmManager } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-orm.manager';
+import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';
+import { WorkspaceEventEmitter } from 'src/engine/workspace-event-emitter/workspace-event-emitter';

@Injectable()
 export class ConnectedAccountMetadataService {
+  private readonly logger = new Logger(ConnectedAccountMetadataService.name);
+
  constructor(
    @InjectRepository(ConnectedAccountEntity)
    private readonly repository: Repository<ConnectedAccountEntity>,
+    private readonly connectedAccountDataAccessService: ConnectedAccountDataAccessService,
+    private readonly calendarChannelDataAccessService: CalendarChannelDataAccessService,
+    private readonly messageChannelDataAccessService: MessageChannelDataAccessService,
+    private readonly globalWorkspaceOrmManager: GlobalWorkspaceOrmManager,
+    private readonly workspaceEventEmitter: WorkspaceEventEmitter,
+    private readonly workspaceManyOrAllFlatEntityMapsCacheService: WorkspaceManyOrAllFlatEntityMapsCacheService,
  ) {}

  async findAll(workspaceId: string): Promise<ConnectedAccountDTO[]> {
@@ -141,7 +159,86 @@ export class ConnectedAccountMetadataService {
      where: { id, workspaceId },
    });

-    await this.repository.delete({ id, workspaceId });
+    const authContext = buildSystemAuthContext(workspaceId);
+
+    const [messageChannels, calendarChannels] = await Promise.all([
+      this.globalWorkspaceOrmManager.executeInWorkspaceContext(
+        async () =>
+          this.messageChannelDataAccessService.find(workspaceId, {
+            connectedAccountId: id,
+          }),
+        authContext,
+      ),
+      this.globalWorkspaceOrmManager.executeInWorkspaceContext(
+        async () =>
+          this.calendarChannelDataAccessService.find(workspaceId, {
+            connectedAccountId: id,
+          }),
+        authContext,
+      ),
+    ]);
+
+    this.logger.log(
+      `WorkspaceId: ${workspaceId} Deleting connected account ${id} with ${messageChannels.length} message channel(s) and ${calendarChannels.length} calendar channel(s)`,
+    );
+
+    const { flatObjectMetadataMaps } =
+      await this.workspaceManyOrAllFlatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(
+        {
+          workspaceId,
+          flatMapsKeys: ['flatObjectMetadataMaps'],
+        },
+      );
+
+    if (messageChannels.length > 0) {
+      const flatMessageChannelMetadata =
+        findFlatEntityByUniversalIdentifierOrThrow({
+          flatEntityMaps: flatObjectMetadataMaps,
+          universalIdentifier:
+            STANDARD_OBJECTS.messageChannel.universalIdentifier,
+        });
+
+      this.workspaceEventEmitter.emitDatabaseBatchEvent({
+        objectMetadataNameSingular: 'messageChannel',
+        action: DatabaseEventAction.DESTROYED,
+        objectMetadata: flatMessageChannelMetadata,
+        events: messageChannels.map((messageChannel) => ({
+          recordId: messageChannel.id,
+          properties: {
+            before: messageChannel,
+          },
+        })),
+        workspaceId,
+      });
+    }
+
+    if (calendarChannels.length > 0) {
+      const flatCalendarChannelMetadata =
+        findFlatEntityByUniversalIdentifierOrThrow({
+          flatEntityMaps: flatObjectMetadataMaps,
+          universalIdentifier:
+            STANDARD_OBJECTS.calendarChannel.universalIdentifier,
+        });
+
+      this.workspaceEventEmitter.emitDatabaseBatchEvent({
+        objectMetadataNameSingular: 'calendarChannel',
+        action: DatabaseEventAction.DESTROYED,
+        objectMetadata: flatCalendarChannelMetadata,
+        events: calendarChannels.map((calendarChannel) => ({
+          recordId: calendarChannel.id,
+          properties: {
+            before: calendarChannel,
+          },
+        })),
+        workspaceId,
+      });
+    }
+
+    await this.globalWorkspaceOrmManager.executeInWorkspaceContext(async () => {
+      await this.connectedAccountDataAccessService.delete(workspaceId, {
+        id,
+      });
+    }, authContext);

    return connectedAccount;
  }