saveAnalyticsDataByRoomId -> getAnalyticsUpdateQueryByRoomId

RocketChat · Aug 2, 2024 · 1679cbe · 1679cbe
1 parent 71d88ab
commit 1679cbe
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 34 deletions.
diff --git a/apps/meteor/app/livechat/server/hooks/saveAnalyticsData.ts b/apps/meteor/app/livechat/server/hooks/saveAnalyticsData.ts
@@ -71,7 +71,13 @@ callbacks.add(
 		}
 
 		const analyticsData = getAnalyticsData(room, new Date());
-		await LivechatRooms.saveAnalyticsDataByRoomId(room, message, analyticsData);
+		const updater = await LivechatRooms.getAnalyticsUpdateQueryByRoomId(room, message, analyticsData);
+
+		if (updater.hasChanges()) {
+			await updater.persist({
+				_id: room._id,
+			});
+		}
 
 		return message;
 	},

diff --git a/apps/meteor/server/models/raw/LivechatRooms.ts b/apps/meteor/server/models/raw/LivechatRooms.ts
@@ -2046,15 +2046,14 @@ export class LivechatRoomsRaw extends BaseRaw<IOmnichannelRoom> implements ILive
 		room: IOmnichannelRoom,
 		message: IMessage,
 		analyticsData: Record<string, string | number | Date> | undefined,
+		updater: Updater<IOmnichannelRoom> = this.getUpdater(),
 	) {
-		const updater = this.getAnalyticsUpdateQuery(analyticsData);
-
 		// livechat analytics : update last message timestamps
 		const visitorLastQuery = room.metrics?.v ? room.metrics.v.lq : room.ts;
 		const agentLastReply = room.metrics?.servedBy ? room.metrics.servedBy.lr : room.ts;
 
 		if (visitorLastQuery > agentLastReply) {
-			updater.set('metrics.servedBy.lr', message.ts);
+			return this.getAnalyticsUpdateQuery(analyticsData, updater).set('metrics.servedBy.lr', message.ts);
 		}
 
 		return updater;
@@ -2064,52 +2063,31 @@ export class LivechatRoomsRaw extends BaseRaw<IOmnichannelRoom> implements ILive
 		room: IOmnichannelRoom,
 		message: IMessage,
 		analyticsData: Record<string, string | number | Date> | undefined,
+		updater: Updater<IOmnichannelRoom> = this.getUpdater(),
 	) {
-		const updater = this.getAnalyticsUpdateQuery(analyticsData);
-
 		// livechat analytics : update last message timestamps
 		const visitorLastQuery = room.metrics?.v ? room.metrics.v.lq : room.ts;
 		const agentLastReply = room.metrics?.servedBy ? room.metrics.servedBy.lr : room.ts;
 
 		// update visitor timestamp, only if its new inquiry and not continuing message
 		if (agentLastReply >= visitorLastQuery) {
-			updater.set('metrics.v.lq', message.ts);
+			return this.getAnalyticsUpdateQuery(analyticsData).set('metrics.v.lq', message.ts);
 		}
 
 		return updater;
 	}
 
-	private getAnalyticsUpdateQueryByRoomId(
+	async getAnalyticsUpdateQueryByRoomId(
 		room: IOmnichannelRoom,
 		message: IMessage,
 		analyticsData: Record<string, string | number | Date> | undefined,
+		updater: Updater<IOmnichannelRoom> = this.getUpdater(),
 	) {
 		return isMessageFromVisitor(message)
-			? this.getAnalyticsUpdateQueryBySentByVisitor(room, message, analyticsData)
-			: this.getAnalyticsUpdateQueryBySentByAgent(room, message, analyticsData);
-	}
-
-	async saveAnalyticsDataByRoomId(
-		room: IOmnichannelRoom,
-		message: IMessage,
-		analyticsData?: Record<string, string | number | Date>,
-	): Promise<void> {
-		const updater = this.getAnalyticsUpdateQueryByRoomId(room, message, analyticsData);
-		return updater.persist({ _id: room._id });
+			? this.getAnalyticsUpdateQueryBySentByVisitor(room, message, analyticsData, updater)
+			: this.getAnalyticsUpdateQueryBySentByAgent(room, message, analyticsData, updater);
 	}
 
-	// saveAnalyticsDataByRoomIdAndLastMessageFromVisitor(
-	// 	room: IOmnichannelRoom,
-	// 	message: IMessage,
-	// 	analyticsData: Record<string, string | number | Date>,
-	// ) {
-	// 	const updater = this.getAnalyticsUpdateQueryByRoomId(room, message, analyticsData);
-
-	// 	updater.set('v.lastMessageTs', message.ts);
-
-	// 	return updater.persist({ _id: room._id });
-	// }
-
 	getTotalConversationsBetweenDate(t: 'l', date: { gte: Date; lt: Date }, { departmentId }: { departmentId?: string } = {}) {
 		const query: Filter<IOmnichannelRoom> = {
 			t,

diff --git a/packages/model-typings/src/models/ILivechatRoomsModel.ts b/packages/model-typings/src/models/ILivechatRoomsModel.ts
@@ -9,6 +9,7 @@ import type {
 import type { FindCursor, UpdateResult, AggregationCursor, Document, FindOptions, DeleteResult, Filter } from 'mongodb';
 
 import type { FindPaginated } from '..';
+import type { Updater } from '../updater';
 import type { IBaseModel } from './IBaseModel';
 
 type Period = {
@@ -208,11 +209,12 @@ export interface ILivechatRoomsModel extends IBaseModel<IOmnichannelRoom> {
 	setResponseByRoomId(roomId: string, responseBy: IOmnichannelRoom['responseBy']): Promise<UpdateResult>;
 	setNotResponseByRoomId(roomId: string): Promise<UpdateResult>;
 	setAgentLastMessageTs(roomId: string): Promise<UpdateResult>;
-	saveAnalyticsDataByRoomId(
+	getAnalyticsUpdateQueryByRoomId(
 		room: IOmnichannelRoom,
 		message: IMessage,
-		analyticsData?: Record<string, string | number | Date>,
-	): Promise<void>; // Promise<UpdateResult>;
+		analyticsData: Record<string, string | number | Date> | undefined,
+		updater?: Updater<IOmnichannelRoom>,
+	): Promise<Updater<IOmnichannelRoom>>;
 	getTotalConversationsBetweenDate(t: 'l', date: { gte: Date; lt: Date }, data?: { departmentId: string }): Promise<number>;
 	getAnalyticsMetricsBetweenDate(
 		t: 'l',