From 5bfaa7f733c243b71bb8665a9689bf40e5a6f143 Mon Sep 17 00:00:00 2001
From: adriano <adriano08andra@hotmail.com>
Date: Mon, 29 Jan 2024 14:17:42 -0300
Subject: [PATCH] fix: Resolve duplicated display of users on online/offline
 dashboard

---
 backend/src/controllers/ReportController.ts       |  2 +-
 .../UserServices/ListUserParamiterService.ts      | 15 +++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/backend/src/controllers/ReportController.ts b/backend/src/controllers/ReportController.ts
index 10580be..f2c042f 100644
--- a/backend/src/controllers/ReportController.ts
+++ b/backend/src/controllers/ReportController.ts
@@ -66,7 +66,7 @@ export const reportUserService = async (req: Request, res: Response): Promise<Re
 
   // let usersProfile = await ListUserParamiterService({ profile: 'user' })
   let usersProfile = await ListUserParamiterService({
-    profile: "user",
+    profiles: ["user", "supervisor"],
     raw: true
   });
 
diff --git a/backend/src/services/UserServices/ListUserParamiterService.ts b/backend/src/services/UserServices/ListUserParamiterService.ts
index fc7bd32..0b0c1af 100644
--- a/backend/src/services/UserServices/ListUserParamiterService.ts
+++ b/backend/src/services/UserServices/ListUserParamiterService.ts
@@ -2,15 +2,17 @@ import { Op, Sequelize } from "sequelize";
 import Queue from "../../models/Queue";
 import User from "../../models/User";
 import UserQueue from "../../models/UserQueue";
+import { List } from "whatsapp-web.js"
 
 interface Request {
   userId?: string | number;
   profile?: string;
+  profiles?: Array<string>;
   raw?: boolean;
-  userIds?: string | number
+  userIds?: string | number;
 }
 
-const ListUser = async ({ profile, userId, raw, userIds }: Request): Promise<User[]> => {
+const ListUser = async ({ profile, userId, raw, userIds, profiles }: Request): Promise<User[]> => {
   let where_clause = {};
 
   if (userId && profile) {
@@ -29,6 +31,10 @@ const ListUser = async ({ profile, userId, raw, userIds }: Request): Promise<Use
     where_clause = {
       id: { [Op.in]: userIds }
     };
+  } else if (profiles) {
+    where_clause = {
+      profile: { [Op.in]: profiles }
+    };
   }
 
   const users = await User.findAll({
@@ -38,9 +44,10 @@ const ListUser = async ({ profile, userId, raw, userIds }: Request): Promise<Use
 
     include: [
       { model: Queue, as: "queues", attributes: ["id", "name", "color"] }
-    ], 
+    ],
 
-    order: [["id", "ASC"]]
+    order: [["id", "ASC"]],
+    group: ["User.id"]
   });
 
   return users;