4746 create created listener on blocklist for calendar (#5046)
Follows #5031. Closes #4746
This commit is contained in:
@ -11,16 +11,16 @@ import { ThreadCleanerService } from 'src/modules/messaging/services/thread-clea
|
||||
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';
|
||||
|
||||
export type DeleteMessagesFromHandleJobData = {
|
||||
export type BlocklistItemDeleteMessagesJobData = {
|
||||
workspaceId: string;
|
||||
blocklistItemId: string;
|
||||
};
|
||||
|
||||
@Injectable()
|
||||
export class DeleteMessagesFromHandleJob
|
||||
implements MessageQueueJob<DeleteMessagesFromHandleJobData>
|
||||
export class BlocklistItemDeleteMessagesJob
|
||||
implements MessageQueueJob<BlocklistItemDeleteMessagesJobData>
|
||||
{
|
||||
private readonly logger = new Logger(DeleteMessagesFromHandleJob.name);
|
||||
private readonly logger = new Logger(BlocklistItemDeleteMessagesJob.name);
|
||||
|
||||
constructor(
|
||||
@InjectObjectMetadataRepository(MessageChannelObjectMetadata)
|
||||
@ -34,7 +34,7 @@ export class DeleteMessagesFromHandleJob
|
||||
private readonly threadCleanerService: ThreadCleanerService,
|
||||
) {}
|
||||
|
||||
async handle(data: DeleteMessagesFromHandleJobData): Promise<void> {
|
||||
async handle(data: BlocklistItemDeleteMessagesJobData): Promise<void> {
|
||||
const { workspaceId, blocklistItemId } = data;
|
||||
|
||||
const blocklistItem = await this.blocklistRepository.getById(
|
||||
@ -64,9 +64,12 @@ export class DeleteMessagesFromHandleJob
|
||||
|
||||
const messageChannelIds = messageChannels.map(({ id }) => id);
|
||||
|
||||
await this.messageChannelMessageAssociationRepository.deleteByMessageParticipantHandleAndMessageChannelIds(
|
||||
const rolesToDelete: ('from' | 'to')[] = ['from', 'to'];
|
||||
|
||||
await this.messageChannelMessageAssociationRepository.deleteByMessageParticipantHandleAndMessageChannelIdsAndRoles(
|
||||
handle,
|
||||
messageChannelIds,
|
||||
rolesToDelete,
|
||||
workspaceId,
|
||||
);
|
||||
|
||||
@ -6,9 +6,9 @@ import { MessageQueue } from 'src/engine/integrations/message-queue/message-queu
|
||||
import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
|
||||
import { BlocklistObjectMetadata } from 'src/modules/connected-account/standard-objects/blocklist.object-metadata';
|
||||
import {
|
||||
DeleteMessagesFromHandleJobData,
|
||||
DeleteMessagesFromHandleJob,
|
||||
} from 'src/modules/messaging/jobs/delete-messages-from-handle.job';
|
||||
BlocklistItemDeleteMessagesJobData,
|
||||
BlocklistItemDeleteMessagesJob,
|
||||
} from 'src/modules/messaging/jobs/blocklist-item-delete-messages.job';
|
||||
|
||||
@Injectable()
|
||||
export class MessagingBlocklistListener {
|
||||
@ -21,8 +21,8 @@ export class MessagingBlocklistListener {
|
||||
handleCreatedEvent(
|
||||
payload: ObjectRecordCreateEvent<BlocklistObjectMetadata>,
|
||||
) {
|
||||
this.messageQueueService.add<DeleteMessagesFromHandleJobData>(
|
||||
DeleteMessagesFromHandleJob.name,
|
||||
this.messageQueueService.add<BlocklistItemDeleteMessagesJobData>(
|
||||
BlocklistItemDeleteMessagesJob.name,
|
||||
{
|
||||
workspaceId: payload.workspaceId,
|
||||
blocklistItemId: payload.recordId,
|
||||
|
||||
@ -67,9 +67,10 @@ export class MessageChannelMessageAssociationRepository {
|
||||
);
|
||||
}
|
||||
|
||||
public async deleteByMessageParticipantHandleAndMessageChannelIds(
|
||||
public async deleteByMessageParticipantHandleAndMessageChannelIdsAndRoles(
|
||||
messageParticipantHandle: string,
|
||||
messageChannelIds: string[],
|
||||
rolesToDelete: ('from' | 'to' | 'cc' | 'bcc')[],
|
||||
workspaceId: string,
|
||||
transactionManager?: EntityManager,
|
||||
) {
|
||||
@ -83,7 +84,7 @@ export class MessageChannelMessageAssociationRepository {
|
||||
JOIN ${dataSourceSchema}."message" ON "messageChannelMessageAssociation"."messageId" = ${dataSourceSchema}."message"."id"
|
||||
JOIN ${dataSourceSchema}."messageParticipant" "messageParticipant" ON ${dataSourceSchema}."message"."id" = "messageParticipant"."messageId"
|
||||
WHERE "messageParticipant"."handle" = $1 AND "messageParticipant"."role"= ANY($2) AND "messageChannelMessageAssociation"."messageChannelId" = ANY($3)`,
|
||||
[messageParticipantHandle, ['from', 'to'], messageChannelIds],
|
||||
[messageParticipantHandle, rolesToDelete, messageChannelIds],
|
||||
workspaceId,
|
||||
transactionManager,
|
||||
);
|
||||
|
||||
@ -7,7 +7,7 @@ import { ParticipantWithMessageId } from 'src/modules/messaging/types/gmail-mess
|
||||
import { PersonRepository } from 'src/modules/person/repositories/person.repository';
|
||||
import { PersonObjectMetadata } from 'src/modules/person/standard-objects/person.object-metadata';
|
||||
import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
|
||||
import { getFlattenedValuesAndValuesStringForBatchRawQuery } from 'src/modules/calendar/utils/getFlattenedValuesAndValuesStringForBatchRawQuery.util';
|
||||
import { getFlattenedValuesAndValuesStringForBatchRawQuery } from 'src/modules/calendar/utils/get-flattened-values-and-values-string-for-batch-raw-query.util';
|
||||
import { MessageParticipantRepository } from 'src/modules/messaging/repositories/message-participant.repository';
|
||||
import { MessageParticipantObjectMetadata } from 'src/modules/messaging/standard-objects/message-participant.object-metadata';
|
||||
import { AddPersonIdAndWorkspaceMemberIdService } from 'src/modules/calendar-messaging-participant/services/add-person-id-and-workspace-member-id/add-person-id-and-workspace-member-id.service';
|
||||
|
||||
Reference in New Issue
Block a user