From 7eb2bc9a16c5b2ce44f00a1a4d6410f4f27fd570 Mon Sep 17 00:00:00 2001 From: Hemachandar <132386067+hmacr@users.noreply.github.com> Date: Fri, 7 Feb 2025 19:01:46 +0530 Subject: [PATCH] Unsubscribe from document updates when a user is removed from a document (#8349) * Unsubscribe from document updates when a user is removed from a document * dummy default --- .../DocumentSubscriptionProcessor.ts | 72 +++++++++++++++++++ .../processors/DocumentUserAddedProcessor.ts | 31 -------- 2 files changed, 72 insertions(+), 31 deletions(-) create mode 100644 server/queues/processors/DocumentSubscriptionProcessor.ts delete mode 100644 server/queues/processors/DocumentUserAddedProcessor.ts diff --git a/server/queues/processors/DocumentSubscriptionProcessor.ts b/server/queues/processors/DocumentSubscriptionProcessor.ts new file mode 100644 index 0000000000..02e826272a --- /dev/null +++ b/server/queues/processors/DocumentSubscriptionProcessor.ts @@ -0,0 +1,72 @@ +import { Transaction } from "sequelize"; +import subscriptionCreator from "@server/commands/subscriptionCreator"; +import { createContext } from "@server/context"; +import { Subscription, User } from "@server/models"; +import { sequelize } from "@server/storage/database"; +import { DocumentUserEvent, Event } from "@server/types"; +import BaseProcessor from "./BaseProcessor"; + +export default class DocumentSubscriptionProcessor extends BaseProcessor { + static applicableEvents: Event["name"][] = [ + "documents.add_user", + "documents.remove_user", + ]; + + async perform(event: DocumentUserEvent) { + const user = await User.findByPk(event.userId); + if (!user) { + return; + } + + switch (event.name) { + case "documents.add_user": { + return this.addUser(event, user); + } + + case "documents.remove_user": { + return this.removeUser(event, user); + } + + default: + } + } + + private async addUser(event: DocumentUserEvent, user: User) { + await sequelize.transaction(async (transaction) => { + await subscriptionCreator({ + ctx: createContext({ + user, + authType: event.authType, + ip: event.ip, + transaction, + }), + documentId: event.documentId, + event: "documents.update", + resubscribe: false, + }); + }); + } + + private async removeUser(event: DocumentUserEvent, user: User) { + await sequelize.transaction(async (transaction) => { + const subscription = await Subscription.findOne({ + where: { + userId: user.id, + documentId: event.documentId, + event: "documents.update", + }, + transaction, + lock: Transaction.LOCK.UPDATE, + }); + + await subscription?.destroyWithCtx( + createContext({ + user, + authType: event.authType, + ip: event.ip, + transaction, + }) + ); + }); + } +} diff --git a/server/queues/processors/DocumentUserAddedProcessor.ts b/server/queues/processors/DocumentUserAddedProcessor.ts deleted file mode 100644 index d93f059670..0000000000 --- a/server/queues/processors/DocumentUserAddedProcessor.ts +++ /dev/null @@ -1,31 +0,0 @@ -import subscriptionCreator from "@server/commands/subscriptionCreator"; -import { createContext } from "@server/context"; -import { User } from "@server/models"; -import { sequelize } from "@server/storage/database"; -import { DocumentUserEvent, Event } from "@server/types"; -import BaseProcessor from "./BaseProcessor"; - -export default class DocumentUserAddedProcessor extends BaseProcessor { - static applicableEvents: Event["name"][] = ["documents.add_user"]; - - async perform(event: DocumentUserEvent) { - const user = await User.findByPk(event.userId); - if (!user) { - return; - } - - await sequelize.transaction(async (transaction) => { - await subscriptionCreator({ - ctx: createContext({ - user, - authType: event.authType, - ip: event.ip, - transaction, - }), - documentId: event.documentId, - event: "documents.update", - resubscribe: false, - }); - }); - } -}