From b4bde9ceac9ed6de3ce85487fc3d7e170e02ba2c Mon Sep 17 00:00:00 2001 From: Kristina Date: Tue, 19 Nov 2024 19:30:24 +0400 Subject: [PATCH] Fix unfinished meetings (#7198) Signed-off-by: Kristina Fefelova --- server-plugins/love-resources/src/index.ts | 5 ++++- server/middleware/src/domainTx.ts | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/server-plugins/love-resources/src/index.ts b/server-plugins/love-resources/src/index.ts index f9eb5305cc..94437f848c 100644 --- a/server-plugins/love-resources/src/index.ts +++ b/server-plugins/love-resources/src/index.ts @@ -259,7 +259,10 @@ async function finishMeetingMinutes ( ): Promise { const res: Tx[] = [] const roomInfos = await control.queryFind(control.ctx, love.class.RoomInfo, {}) - const roomInfo = roomInfos.find((ri) => ri.persons.includes(info.person)) + const roomInfo = + tx._class === core.class.TxRemoveDoc + ? roomInfos.find((it) => it.room === info.room) + : roomInfos.find((ri) => ri.persons.includes(info.person)) if (roomInfo === undefined) { return res diff --git a/server/middleware/src/domainTx.ts b/server/middleware/src/domainTx.ts index 66d339760e..e155e4e085 100644 --- a/server/middleware/src/domainTx.ts +++ b/server/middleware/src/domainTx.ts @@ -83,15 +83,15 @@ export class DomainTxMiddleware extends BaseMiddleware implements Middleware { if (toDelete.length > 0) { const deleteByDomain = groupByArray(toDelete, (it) => this.context.hierarchy.getDomain(it.objectClass)) - for (const [d, docs] of deleteByDomain.entries()) { + for (const [domain, domainTxes] of deleteByDomain.entries()) { const todel = await ctx.with( 'adapter-load', {}, () => adapter.load( ctx, - d, - docs.map((it) => it._id) + domain, + domainTxes.map((it) => it.objectId) ), { count: toDelete.length } )