[FIX] Unread Message count not displayed for new messages in Omni-Rooms

apps/meteor/app/lib/server/lib/notifyUsersOnMessage.js

@@ -1,6 +1,7 @@
 import moment from 'moment';
 import { escapeRegExp } from '@rocket.chat/string-helpers';
 import { Subscriptions as SubscriptionsRaw } from '@rocket.chat/models';
+import { isOmnichannelRoom } from '@rocket.chat/core-typings';
 
 import { Rooms, Subscriptions } from '../../../models/server';
 import { settings } from '../../../settings/server';
@@ -106,7 +107,8 @@ export async function updateUsersSubscriptions(message, room) {
 		}
 
 		// this shouldn't run only if has group mentions because it will already exclude mentioned users from the query
-		if (!toAll && !toHere && unreadCount === 'all_messages') {
+		// and this should always run if it's a omnichannel room
+		if (!toAll && !toHere && (unreadCount === 'all_messages' || isOmnichannelRoom(room))) {
 			await SubscriptionsRaw.incUnreadForRoomIdExcludingUserIds(room._id, [...userIds, message.u._id]);
 		}
 	}

apps/meteor/tests/data/livechat/department.ts

@@ -57,7 +57,10 @@ new Promise((resolve, reject) => {
 		});
 });
 
-export const createDepartmentWithAnOnlineAgent = async (): Promise<{department: ILivechatDepartment, agent: IUser}> => {
+export const createDepartmentWithAnOnlineAgent = async (): Promise<{department: ILivechatDepartment, agent: {
+	credentials: { 'X-Auth-Token': string; 'X-User-Id': string; };
+	user: IUser;
+}}> => {
 	const agent: IUser = await createUser();
 	const createdUserCredentials = await login(agent.username, password);
 	await createAgent(agent.username);
@@ -69,7 +72,10 @@ export const createDepartmentWithAnOnlineAgent = async (): Promise<{department:
 
 	return {
 		department,
-		agent,
+		agent: {
+			credentials: createdUserCredentials,
+			user: agent,
+		}
 	};
 };
 

apps/meteor/tests/data/subscriptions.ts

@@ -0,0 +1,15 @@
+import { ISubscription } from "@rocket.chat/core-typings";
+import { api, credentials, request } from "./api-data";
+
+export const getSubscriptionForRoom = async (roomId: string, overrideCredential?: { 'X-Auth-Token': string; 'X-User-Id': string; }): Promise<ISubscription> => {
+	const response = await request
+		.get(api('subscriptions.getOne'))
+		.set(overrideCredential || credentials)
+		.query({ roomId })
+		.expect('Content-Type', 'application/json')
+		.expect(200);
+
+	const { subscription } = response.body;
+
+	return subscription;
+}

apps/meteor/tests/end-to-end/api/livechat/00-rooms.ts

@@ -25,6 +25,7 @@ import { createDepartmentWithAnOnlineAgent } from '../../../data/livechat/depart
 import { sleep } from '../../../data/livechat/utils';
 import { IS_EE } from '../../../e2e/config/constants';
 import { createCustomField } from '../../../data/livechat/custom-fields';
+import { getSubscriptionForRoom } from '../../../data/subscriptions';
 
 describe('LIVECHAT - rooms', function () {
 	this.retries(0);
@@ -1446,4 +1447,30 @@ describe('LIVECHAT - rooms', function () {
 			expect(response.body.filters.find((f: IOmnichannelRoom['source']) => f.type === 'api')).to.not.be.undefined;
 		});
 	});
+
+	describe('it should mark room as unread when a new message is sent', () => {
+		let room: IOmnichannelRoom;
+		let visitor: ILivechatVisitor;
+		let totalMessagesSent = 0;
+		let departmentWithAgent: Awaited<ReturnType<typeof createDepartmentWithAnOnlineAgent>>;
+
+		before(async () => {
+			await updateSetting('Livechat_Routing_Method', 'Auto_Selection');
+
+			departmentWithAgent = await createDepartmentWithAnOnlineAgent();
+			visitor = await createVisitor(departmentWithAgent.department._id);
+			room = await createLivechatRoom(visitor.token);
+
+			await sendMessage(room._id, 'message 1', visitor.token);
+			await sendMessage(room._id, 'message 2', visitor.token);
+
+			// 1st message is for the room creation, so we need to add 1 to the total messages sent
+			totalMessagesSent = 3;
+		});
+
+		it("room's subscription should have correct unread count", async () => {
+			const { unread } = await getSubscriptionForRoom(room._id, departmentWithAgent.agent.credentials);
+			expect(unread).to.equal(totalMessagesSent);
+		});
+	});
 });