refactor: remove external deps from omni models (#34502)

RocketChat · Dec 24, 2024 · cc381e1 · cc381e1
1 parent 1fedb4f
commit cc381e1
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 14 deletions.
diff --git a/apps/meteor/app/livechat/server/lib/analytics/departments.ts b/apps/meteor/app/livechat/server/lib/analytics/departments.ts
@@ -1,5 +1,7 @@
 import { LivechatRooms, Messages } from '@rocket.chat/models';
 
+import { settings } from '../../../../settings/server';
+
 type Params = {
 	start: Date;
 	end: Date;
@@ -139,9 +141,25 @@ export const findAllNumberOfAbandonedRoomsAsync = async ({ start, end, departmen
 	if (!start || !end) {
 		throw new Error('"start" and "end" must be provided');
 	}
-	const total = await (await LivechatRooms.findAllNumberOfAbandonedRooms({ start, end, departmentId, onlyCount: true })).toArray();
+	const total = await (
+		await LivechatRooms.findAllNumberOfAbandonedRooms({
+			start,
+			end,
+			departmentId,
+			inactivityTimeout: settings.get('Livechat_visitor_inactivity_timeout'),
+			onlyCount: true,
+		})
+	).toArray();
 	return {
-		departments: await (await LivechatRooms.findAllNumberOfAbandonedRooms({ start, end, departmentId, options })).toArray(),
+		departments: await (
+			await LivechatRooms.findAllNumberOfAbandonedRooms({
+				start,
+				end,
+				departmentId,
+				inactivityTimeout: settings.get('Livechat_visitor_inactivity_timeout'),
+				options,
+			})
+		).toArray(),
 		total: total.length ? total[0].total : 0,
 	};
 };
@@ -155,11 +173,20 @@ export const findPercentageOfAbandonedRoomsAsync = async ({ start, end, departme
 			start,
 			end,
 			departmentId,
+			inactivityTimeout: settings.get('Livechat_visitor_inactivity_timeout'),
 			onlyCount: true,
 		})
 	).toArray();
 	return {
-		departments: await (await LivechatRooms.findPercentageOfAbandonedRooms({ start, end, departmentId, options })).toArray(),
+		departments: await (
+			await LivechatRooms.findPercentageOfAbandonedRooms({
+				start,
+				end,
+				departmentId,
+				inactivityTimeout: settings.get('Livechat_visitor_inactivity_timeout'),
+				options,
+			})
+		).toArray(),
 		total: total.length ? total[0].total : 0,
 	};
 };
diff --git a/apps/meteor/app/livechat/server/lib/departmentsLib.ts b/apps/meteor/app/livechat/server/lib/departmentsLib.ts
@@ -126,6 +126,10 @@ export async function saveDepartment(
 		await updateDepartmentAgents(departmentDB._id, departmentAgents, departmentDB.enabled);
 	}
 
+	if (department?.enabled !== departmentData.enabled) {
+		void notifyOnLivechatDepartmentAgentChangedByDepartmentId(departmentDB._id, department ? 'updated' : 'inserted');
+	}
+
 	// Disable event
 	if (department?.enabled && !departmentDB?.enabled) {
 		await callbacks.run('livechat.afterDepartmentDisabled', departmentDB);

diff --git a/apps/meteor/server/models/raw/LivechatDepartment.ts b/apps/meteor/server/models/raw/LivechatDepartment.ts
@@ -17,7 +17,6 @@ import type {
 } from 'mongodb';
 
 import { BaseRaw } from './BaseRaw';
-import { notifyOnLivechatDepartmentAgentChangedByDepartmentId } from '../../../app/lib/server/lib/notifyListener';
 
 export class LivechatDepartmentRaw extends BaseRaw<ILivechatDepartment> implements ILivechatDepartmentModel {
 	constructor(db: Db, trash?: Collection<RocketChatRecordDeleted<ILivechatDepartment>>) {
@@ -260,7 +259,6 @@ export class LivechatDepartmentRaw extends BaseRaw<ILivechatDepartment> implemen
 
 		if (current?.enabled !== data.enabled) {
 			await LivechatDepartmentAgents.setDepartmentEnabledByDepartmentId(_id, data.enabled);
-			void notifyOnLivechatDepartmentAgentChangedByDepartmentId(_id, current ? 'updated' : 'inserted');
 		}
 
 		const latestDept = await this.findOneById(_id);

diff --git a/apps/meteor/server/models/raw/LivechatRooms.ts b/apps/meteor/server/models/raw/LivechatRooms.ts
@@ -33,7 +33,6 @@ import type {
 } from 'mongodb';
 
 import { BaseRaw } from './BaseRaw';
-import { getValue } from '../../../app/settings/server/raw';
 import { readSecondaryPreferred } from '../../database/readSecondaryPreferred';
 
 /**
@@ -220,11 +219,13 @@ export class LivechatRoomsRaw extends BaseRaw<IOmnichannelRoom> implements ILive
 		start,
 		end,
 		departmentId,
+		inactivityTimeout,
 		onlyCount = false,
 		options = {},
 	}: {
 		start: Date;
 		end: Date;
+		inactivityTimeout: number;
 		departmentId?: string;
 		onlyCount?: boolean;
 		options?: { offset?: number; count?: number; sort?: { [k: string]: number } };
@@ -233,7 +234,7 @@ export class LivechatRoomsRaw extends BaseRaw<IOmnichannelRoom> implements ILive
 			$match: {
 				't': 'l',
 				'metrics.visitorInactivity': {
-					$gte: await getValue('Livechat_visitor_inactivity_timeout'),
+					$gte: inactivityTimeout,
 				},
 				'ts': { $gte: new Date(start) },
 				'closedAt': { $lte: new Date(end) },
@@ -275,12 +276,14 @@ export class LivechatRoomsRaw extends BaseRaw<IOmnichannelRoom> implements ILive
 	async findPercentageOfAbandonedRooms({
 		start,
 		end,
+		inactivityTimeout,
 		departmentId,
 		onlyCount = false,
 		options = {},
 	}: {
 		start: Date;
 		end: Date;
+		inactivityTimeout: number;
 		departmentId?: string;
 		onlyCount?: boolean;
 		options?: { offset?: number; count?: number; sort?: { [k: string]: number } };
@@ -305,8 +308,7 @@ export class LivechatRoomsRaw extends BaseRaw<IOmnichannelRoom> implements ILive
 								$and: [
 									{ $ifNull: ['$metrics.visitorInactivity', false] },
 									{
-										// TODO: move these calls to outside model
-										$gte: ['$metrics.visitorInactivity', await getValue('Livechat_visitor_inactivity_timeout')],
+										$gte: ['$metrics.visitorInactivity', inactivityTimeout],
 									},
 								],
 							},

diff --git a/apps/meteor/server/models/raw/LivechatVisitors.ts b/apps/meteor/server/models/raw/LivechatVisitors.ts
@@ -20,7 +20,6 @@ import type {
 import { ObjectId } from 'mongodb';
 
 import { BaseRaw } from './BaseRaw';
-import { notifyOnSettingChanged } from '../../../app/lib/server/lib/notifyListener';
 
 export class LivechatVisitorsRaw extends BaseRaw<ILivechatVisitor> implements ILivechatVisitorsModel {
 	constructor(db: Db, trash?: Collection<RocketChatRecordDeleted<ILivechatVisitor>>) {
@@ -130,8 +129,6 @@ export class LivechatVisitorsRaw extends BaseRaw<ILivechatVisitor> implements IL
 			throw new Error("Can't find Livechat_guest_count setting");
 		}
 
-		void notifyOnSettingChanged(livechatCount.value);
-
 		return `guest-${livechatCount.value.value}`;
 	}
 

diff --git a/packages/model-typings/src/models/ILivechatRoomsModel.ts b/packages/model-typings/src/models/ILivechatRoomsModel.ts
@@ -38,9 +38,13 @@ export interface ILivechatRoomsModel extends IBaseModel<IOmnichannelRoom> {
 
 	getQueueMetrics(params: { departmentId: any; agentId: any; includeOfflineAgents: any; options?: any }): any;
 
-	findAllNumberOfAbandonedRooms(params: Period & WithDepartment & WithOnlyCount & WithOptions): Promise<any>;
+	findAllNumberOfAbandonedRooms(
+		params: Period & WithDepartment & WithOnlyCount & WithOptions & { inactivityTimeout: number },
+	): Promise<any>;
 
-	findPercentageOfAbandonedRooms(params: Period & WithDepartment & WithOnlyCount & WithOptions): Promise<any>;
+	findPercentageOfAbandonedRooms(
+		params: Period & WithDepartment & WithOnlyCount & WithOptions & { inactivityTimeout: number },
+	): Promise<any>;
 
 	findAllAverageOfChatDurationTime(params: Period & WithDepartment & WithOnlyCount & WithOptions): any;