[FIX] Checks the list of agents if at least one is online (#22584)

Co-authored-by: Diego Sampaio <[email protected]>
RocketChat · Jul 7, 2021 · af73448 · af73448
1 parent 8de118a
commit af73448
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/app/livechat/server/lib/QueueManager.js b/app/livechat/server/lib/QueueManager.js
@@ -62,7 +62,7 @@ export const QueueManager = {
 		};
 
 		let defaultAgent;
-		if (servedBy && Users.findOneOnlineAgentByUsername(servedBy.username)) {
+		if (servedBy && Users.findOneOnlineAgentByUserList(servedBy.username)) {
 			defaultAgent = { agentId: servedBy._id, username: servedBy.username };
 		}
 

diff --git a/app/livechat/server/lib/RoutingManager.js b/app/livechat/server/lib/RoutingManager.js
@@ -45,7 +45,7 @@ export const RoutingManager = {
 
 	async delegateInquiry(inquiry, agent, options = {}) {
 		const { department, rid } = inquiry;
-		if (!agent || (agent.username && !Users.findOneOnlineAgentByUsername(agent.username) && !allowAgentSkipQueue(agent))) {
+		if (!agent || (agent.username && !Users.findOneOnlineAgentByUserList(agent.username) && !allowAgentSkipQueue(agent))) {
 			agent = await this.getNextAgent(department);
 		}
 

diff --git a/app/livechat/server/lib/routing/External.js b/app/livechat/server/lib/routing/External.js
@@ -35,7 +35,7 @@ class ExternalQueue {
 				});
 
 				if (result && result.data && result.data.username) {
-					const agent = Users.findOneOnlineAgentByUsername(result.data.username);
+					const agent = Users.findOneOnlineAgentByUserList(result.data.username);
 
 					if (agent) {
 						return {

diff --git a/app/models/server/models/LivechatDepartmentAgents.js b/app/models/server/models/LivechatDepartmentAgents.js
@@ -104,7 +104,7 @@ export class LivechatDepartmentAgents extends Base {
 			return false;
 		}
 
-		const onlineUser = Users.findOneOnlineAgentByUsername(_.pluck(agents, 'username'));
+		const onlineUser = Users.findOneOnlineAgentByUserList(_.pluck(agents, 'username'));
 
 		return Boolean(onlineUser);
 	}

diff --git a/app/models/server/models/Users.js b/app/models/server/models/Users.js
@@ -135,7 +135,11 @@ export class Users extends Base {
 		return this.findOne(query);
 	}
 
-	findOneOnlineAgentByUsername(username, options) { // TODO:: Create class Agent
+	findOneOnlineAgentByUserList(userList, options) { // TODO:: Create class Agent
+		const username = {
+			$in: [].concat(userList),
+		};
+
 		const query = queryStatusAgentOnline({ username });
 
 		return this.findOne(query, options);