onlyavailable

RocketChat · Oct 12, 2023 · 5edfd7d · 5edfd7d
1 parent e04128c
commit 5edfd7d
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/apps/meteor/app/livechat/imports/server/rest/users.ts b/apps/meteor/app/livechat/imports/server/rest/users.ts
@@ -35,9 +35,11 @@ API.v1.addRoute(
 					return API.v1.unauthorized();
 				}
 
+				const { onlyAvailable } = this.queryParams;
 				return API.v1.success(
 					await findAgents({
 						text,
+						onlyAvailable,
 						pagination: {
 							offset,
 							count,

diff --git a/apps/meteor/app/livechat/server/api/lib/users.ts b/apps/meteor/app/livechat/server/api/lib/users.ts
@@ -10,10 +10,12 @@ import { escapeRegExp } from '@rocket.chat/string-helpers';
 async function findUsers({
 	role,
 	text,
+	onlyAvailable = false,
 	pagination: { offset, count, sort },
 }: {
 	role: IRole['_id'];
 	text?: string;
+	onlyAvailable?: boolean;
 	pagination: { offset: number; count: number; sort: any };
 }): Promise<{ users: ILivechatAgent[]; count: number; offset: number; total: number }> {
 	const query = {};
@@ -24,6 +26,12 @@ async function findUsers({
 		});
 	}
 
+	if (onlyAvailable) {
+		Object.assign(query, {
+			statusLivechat: 'available',
+		});
+	}
+
 	const [
 		{
 			sortedResults,
@@ -52,14 +60,17 @@ async function findUsers({
 }
 export async function findAgents({
 	text,
+	onlyAvailable = false,
 	pagination: { offset, count, sort },
 }: {
 	text?: string;
+	onlyAvailable: boolean;
 	pagination: { offset: number; count: number; sort: any };
 }): Promise<ReturnType<typeof findUsers>> {
 	return findUsers({
 		role: 'livechat-agent',
 		text,
+		onlyAvailable,
 		pagination: {
 			offset,
 			count,

diff --git a/packages/rest-typings/src/v1/omnichannel.ts b/packages/rest-typings/src/v1/omnichannel.ts
@@ -749,7 +749,7 @@ const LivechatDepartmentsByUnitIdSchema = {
 
 export const isLivechatDepartmentsByUnitIdProps = ajv.compile<LivechatDepartmentsByUnitIdProps>(LivechatDepartmentsByUnitIdSchema);
 
-type LivechatUsersManagerGETProps = PaginatedRequest<{ text?: string; fields?: string }>;
+type LivechatUsersManagerGETProps = PaginatedRequest<{ text?: string; fields?: string; onlyAvailable?: boolean }>;
 
 const LivechatUsersManagerGETSchema = {
 	type: 'object',
@@ -758,6 +758,10 @@ const LivechatUsersManagerGETSchema = {
 			type: 'string',
 			nullable: true,
 		},
+		onlyAvailable: {
+			type: 'string',
+			nullable: true,
+		},
 		count: {
 			type: 'number',
 			nullable: true,
@@ -3386,7 +3390,7 @@ export type OmnichannelEndpoints = {
 	};
 
 	'/v1/livechat/users/agent': {
-		GET: (params: PaginatedRequest<{ text?: string }>) => PaginatedResult<{
+		GET: (params: PaginatedRequest<{ text?: string; onlyAvailable?: boolean }>) => PaginatedResult<{
 			users: (ILivechatAgent & { departments: string[] })[];
 		}>;
 		POST: (params: LivechatUsersManagerPOSTProps) => { success: boolean };