chore: Make room closing process more sequential (RocketChat#31435)

parampavar · Jan 12, 2024 · dd2967c · dd2967c
1 parent 3021180
commit dd2967c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/apps/meteor/app/livechat/server/api/v1/room.ts b/apps/meteor/app/livechat/server/api/v1/room.ts
@@ -416,6 +416,10 @@ API.v1.addRoute(
 				throw new Error('error-invalid-room');
 			}
 
+			if (!room.open) {
+				throw new Error('room-closed');
+			}
+
 			if (!(await Omnichannel.isWithinMACLimit(room))) {
 				throw new Error('error-mac-limit-reached');
 			}

diff --git a/apps/meteor/app/livechat/server/lib/LivechatTyped.ts b/apps/meteor/app/livechat/server/lib/LivechatTyped.ts
@@ -290,11 +290,17 @@ class LivechatClass {
 
 		this.logger.debug(`Updating DB for room ${room._id} with close data`);
 
-		await Promise.all([
-			LivechatRooms.closeRoomById(rid, closeData),
-			LivechatInquiry.removeByRoomId(rid),
-			Subscriptions.removeByRoomId(rid),
-		]);
+		const removedInquiry = await LivechatInquiry.removeByRoomId(rid);
+		if (removedInquiry && removedInquiry.deletedCount !== 1) {
+			throw new Error('Error removing inquiry');
+		}
+
+		const updatedRoom = await LivechatRooms.closeRoomById(rid, closeData);
+		if (!updatedRoom || updatedRoom.modifiedCount !== 1) {
+			throw new Error('Error closing room');
+		}
+
+		await Subscriptions.removeByRoomId(rid);
 
 		this.logger.debug(`DB updated for room ${room._id}`);