Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

5187 delete all emails and events from a blocklisted domain name #5190

Merged
merged 4 commits into from
Apr 26, 2024
Merged

5187 delete all emails and events from a blocklisted domain name #5190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f1aa50f
modify deleteByMessageParticipantHandleAndMessageChannelIdsAndRoles t…
bosiraphael Apr 26, 2024
bab9edc
Merge branch 'main' into 5187-delete-all-emails-and-events-from-a-blo…
bosiraphael Apr 26, 2024
e5a260e
messages deletion for domain is working
bosiraphael Apr 26, 2024
7e31c9b
events deletion for domain is working
bosiraphael Apr 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions ...server/src/modules/calendar/repositories/calendar-channel-event-association.repository.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,16 +179,25 @@ export class CalendarChannelEventAssociationRepository {
const dataSourceSchema =
this.workspaceDataSourceService.getSchemaName(workspaceId);

const isHandleDomain = calendarEventParticipantHandle.startsWith('@');

await this.workspaceDataSourceService.executeRawQuery(
`DELETE FROM ${dataSourceSchema}."calendarChannelEventAssociation"
WHERE "id" IN (
SELECT "calendarChannelEventAssociation"."id"
FROM ${dataSourceSchema}."calendarChannelEventAssociation" "calendarChannelEventAssociation"
JOIN ${dataSourceSchema}."calendarEvent" "calendarEvent" ON "calendarChannelEventAssociation"."calendarEventId" = "calendarEvent"."id"
JOIN ${dataSourceSchema}."calendarEventParticipant" "calendarEventParticipant" ON "calendarEvent"."id" = "calendarEventParticipant"."calendarEventId"
WHERE "calendarEventParticipant"."handle" = $1 AND "calendarChannelEventAssociation"."calendarChannelId" = ANY($2)
WHERE "calendarEventParticipant"."handle" ${
isHandleDomain ? 'ILIKE' : '='
} $1 AND "calendarChannelEventAssociation"."calendarChannelId" = ANY($2)
)`,
[calendarEventParticipantHandle, calendarChannelIds],
[
isHandleDomain
? `%${calendarEventParticipantHandle}`
: calendarEventParticipantHandle,
calendarChannelIds,
],
workspaceId,
transactionManager,
);
Expand Down
14 changes: 12 additions & 2 deletions ...rver/src/modules/messaging/repositories/message-channel-message-association.repository.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,14 +77,24 @@ export class MessageChannelMessageAssociationRepository {
const dataSourceSchema =
this.workspaceDataSourceService.getSchemaName(workspaceId);

const isHandleDomain = messageParticipantHandle.startsWith('@');

const messageChannelMessageAssociationIdsToDelete =
await this.workspaceDataSourceService.executeRawQuery(
`SELECT "messageChannelMessageAssociation".id
FROM ${dataSourceSchema}."messageChannelMessageAssociation" "messageChannelMessageAssociation"
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, rolesToDelete, messageChannelIds],
WHERE "messageParticipant"."handle" ${
isHandleDomain ? 'ILIKE' : '='
} $1 AND "messageParticipant"."role" = ANY($2) AND "messageChannelMessageAssociation"."messageChannelId" = ANY($3)`,
[
isHandleDomain
? `%${messageParticipantHandle}`
: messageParticipantHandle,
rolesToDelete,
messageChannelIds,
],
workspaceId,
transactionManager,
);
Expand Down
Loading