[FIX] Business Units endpoints not filtering by Unit type (#26713)

Co-authored-by: murtaza98 <murtaza.patrawala@rocket.chat>

apps/meteor/app/livechat/server/roomAccessValidator.compatibility.js

@@ -51,6 +51,9 @@ export const validators = [
 				{
 					...(departmentIds && departmentIds.length > 0 && { department: { $in: departmentIds } }),
 				},
+				{
+					department: { $exists: false }, // No department == public queue
+				},
 			],
 		};
 

apps/meteor/ee/app/license/server/getStatistics.ts

@@ -57,10 +57,12 @@ export async function getStatistics(): Promise<ENTERPRISE_STATISTICS> {
 
 	// Number of business units
 	statsPms.push(
-		LivechatUnit.col.count().then((count) => {
-			statistics.businessUnits = count;
-			return true;
-		}),
+		LivechatUnit.find({ type: 'u' })
+			.count()
+			.then((count) => {
+				statistics.businessUnits = count;
+				return true;
+			}),
 	);
 
 	await Promise.all(statsPms).catch(log);

apps/meteor/ee/app/livechat-enterprise/server/api/lib/units.ts

@@ -30,8 +30,7 @@ export async function findUnits({
 
 	const query = { ...(text && { $or: [{ name: filter }] }) };
 
-	// TODO need to enfore type IOmnichannelBusinessUnit on LivechatUnit model, so don't need to use generic everywhere
-	const { cursor, totalCount } = LivechatUnit.findPaginated<IOmnichannelBusinessUnit>(query, {
+	const { cursor, totalCount } = LivechatUnit.findPaginatedUnits(query, {
 		sort: sort || { name: 1 },
 		skip: offset,
 		limit: count,

apps/meteor/ee/app/models/server/raw/LivechatRooms.js

@@ -13,6 +13,7 @@ const applyRestrictions = (method) =>
 overwriteClassOnLicense('livechat-enterprise', LivechatRoomsRaw, {
 	find: applyRestrictions('find'),
 	update: applyRestrictions('update'),
+	findPaginated: applyRestrictions('findPaginated'),
 	remove: applyRestrictions('remove'),
 	updateDepartmentAncestorsById(originalFn, _id, departmentAncestors) {
 		const query = {

apps/meteor/ee/server/models/raw/LivechatUnit.ts

@@ -1,5 +1,15 @@
-import type { ILivechatUnitModel } from '@rocket.chat/model-typings';
+import type { IOmnichannelBusinessUnit } from '@rocket.chat/core-typings';
+import type { FindPaginated, ILivechatUnitModel } from '@rocket.chat/model-typings';
+import type { FindOptions, Filter, FindCursor } from 'mongodb';
 
 import { LivechatDepartmentRaw } from '../../../../server/models/raw/LivechatDepartment';
 
-export class LivechatUnitRaw extends LivechatDepartmentRaw implements ILivechatUnitModel {}
+export class LivechatUnitRaw extends LivechatDepartmentRaw implements ILivechatUnitModel {
+	findPaginatedUnits(
+		query: Filter<IOmnichannelBusinessUnit>,
+		options?: FindOptions<IOmnichannelBusinessUnit>,
+	): FindPaginated<FindCursor<IOmnichannelBusinessUnit>> {
+		// @ts-expect-error - This extend from LivechatDepartment messes up with the types
+		return super.findPaginated({ ...query, type: 'u' }, options);
+	}
+}

packages/model-typings/src/models/ILivechatUnitModel.ts

@@ -1,6 +1,14 @@
+import type { IOmnichannelBusinessUnit } from '@rocket.chat/core-typings';
+import type { FindOptions, Filter, FindCursor } from 'mongodb';
+
+import type { FindPaginated } from './IBaseModel';
 import type { ILivechatDepartmentModel } from './ILivechatDepartmentModel';
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface ILivechatUnitModel extends ILivechatDepartmentModel {
 	//
+	findPaginatedUnits(
+		query: Filter<IOmnichannelBusinessUnit>,
+		options?: FindOptions<IOmnichannelBusinessUnit>,
+	): FindPaginated<FindCursor<IOmnichannelBusinessUnit>>;
 }