Add activity to room

RocketChat · Sep 11, 2023 · 4eed56d · 4eed56d
1 parent 1f867ea
commit 4eed56d
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 8 deletions.
diff --git a/apps/meteor/app/livechat/server/hooks/markRoomResponded.ts b/apps/meteor/app/livechat/server/hooks/markRoomResponded.ts
@@ -20,18 +20,22 @@ callbacks.add(
 		if (message.token) {
 			return message;
 		}
-		if (room.responseBy) {
-			await LivechatRooms.setAgentLastMessageTs(room._id);
-		}
 
-		// Return MMMM-YY from moment
+		// Return YYYY-MM from moment
 		const monthYear = moment().format('YYYY-MM');
 		if (!(await LivechatVisitors.isVisitorActiveOnPeriod(room.v._id, monthYear))) {
-			await LivechatVisitors.markVisitorActiveForPeriod(room.v._id, monthYear);
+			await Promise.all([
+				LivechatVisitors.markVisitorActiveForPeriod(room.v._id, monthYear),
+				LivechatRooms.markVisitorActiveForPeriod(room._id, monthYear),
+			]);
+		}
+
+		if (room.responseBy) {
+			await LivechatRooms.setAgentLastMessageTs(room._id);
 		}
 
 		// check if room is yet awaiting for response
-		if (!(typeof room.t !== 'undefined' && room.t === 'l' && room.waitingResponse)) {
+		if (!room.waitingResponse) {
 			return message;
 		}
 

diff --git a/apps/meteor/server/models/raw/LivechatRooms.ts b/apps/meteor/server/models/raw/LivechatRooms.ts
@@ -2452,6 +2452,23 @@ export class LivechatRoomsRaw extends BaseRaw<IOmnichannelRoom> implements ILive
 		return this.updateOne(query, update);
 	}
 
+	markVisitorActiveForPeriod(rid: string, period: string): Promise<UpdateResult> {
+		const query = {
+			_id: rid,
+		};
+
+		const update = {
+			$push: {
+				'v.activity': {
+					$each: [period],
+					$slice: -12,
+				},
+			},
+		};
+
+		return this.updateOne(query, update);
+	}
+
 	async unsetAllPredictedVisitorAbandonment(): Promise<void> {
 		throw new Error('Method not implemented.');
 	}

diff --git a/apps/meteor/server/models/raw/LivechatVisitors.ts b/apps/meteor/server/models/raw/LivechatVisitors.ts
@@ -32,7 +32,7 @@ export class LivechatVisitorsRaw extends BaseRaw<ILivechatVisitor> implements IL
 			{ key: { username: 1 } },
 			{ key: { 'contactMananger.username': 1 }, sparse: true },
 			{ key: { 'livechatData.$**': 1 } },
-			{ key: { activity: 1 } },
+			{ key: { activity: 1 }, partialFilterExpression: { activity: { $exists: true } } },
 		];
 	}
 

diff --git a/packages/core-typings/src/IRoom.ts b/packages/core-typings/src/IRoom.ts
@@ -151,7 +151,11 @@ export enum OmnichannelSourceType {
 
 export interface IOmnichannelGenericRoom extends Omit<IRoom, 'default' | 'featured' | 'broadcast' | ''> {
 	t: 'l' | 'v';
-	v: Pick<ILivechatVisitor, '_id' | 'username' | 'status' | 'name' | 'token'> & { lastMessageTs?: Date; phone?: string };
+	v: Pick<ILivechatVisitor, '_id' | 'username' | 'status' | 'name' | 'token'> & {
+		lastMessageTs?: Date;
+		phone?: string;
+		activity?: string[];
+	};
 	email?: {
 		// Data used when the room is created from an email, via email Integration.
 		inbox: string;

diff --git a/packages/model-typings/src/models/ILivechatRoomsModel.ts b/packages/model-typings/src/models/ILivechatRoomsModel.ts
@@ -234,4 +234,5 @@ export interface ILivechatRoomsModel extends IBaseModel<IOmnichannelRoom> {
 	setVisitorInactivityInSecondsById(roomId: string, visitorInactivity: any): Promise<UpdateResult>;
 	changeVisitorByRoomId(roomId: string, visitor: { _id: string; username: string; token: string }): Promise<UpdateResult>;
 	unarchiveOneById(roomId: string): Promise<UpdateResult>;
+	markVisitorActiveForPeriod(rid: string, period: string): Promise<UpdateResult>;
 }