feat(backend) alteração no metodo que retorna usuarios para retornar por profile

backend/src/services/UserServices/ListUserParamiterService.ts

@@ -1,4 +1,3 @@
-
 import { Op, Sequelize } from "sequelize";
 import Queue from "../../models/Queue";
 import User from "../../models/User";
@@ -7,65 +6,54 @@ import UserQueue from "../../models/UserQueue";
 interface Request {
   userId?: string | number;
   profile?: string;
+  raw?: boolean;
 }
 
-
+const ListUser = async ({ profile, userId, raw }: Request): Promise<User[]> => {
-const ListUser = async ({ profile, userId }: Request): Promise<User[]> => {
+  let where_clause = {};
-
-  let where_clause = {}
 
   if (userId && profile) {
     where_clause = {
-      [Op.and]: [
+      [Op.and]: [{ userId: userId }, { profile: profile }]
-        { userId: userId },
+    };
-        { profile: profile }
+  } else if (userId) {
-      ]
-    }
-  }
-  else if (userId) {
     where_clause = {
-      [Op.and]: [
+      [Op.and]: [{ userId: userId }]
-        { userId: userId },
+    };
-      ]
+  } else if (profile) {
-    }
-  }
-  else if (profile) {
     where_clause = {
       profile: profile
-    }
+    };
   }
 
-
+  const queryOptions: any = {
-  const users = await User.findAll({
     where: where_clause,
-    raw: true,
+    raw,
-    attributes: ['id', 'name', 'email'],
+    attributes: ["id", "name", "email"],
+    order: [["id", "ASC"]]
+  };
 
+  if (!raw) {
+    queryOptions.include = [
+      { model: Queue, as: "queues", attributes: ["id", "name", "color"] }
+    ];
+  }
 
-    // include: [
+  const users = await User.findAll(queryOptions);
-    //   {
-    //     model: UserQueue,
-    //     separate: true,
 
-    //     attributes: ['id',],
+  // const users = await User.findAll({
+  //   where: where_clause,
+  //   raw,
+  //   attributes: ['id', 'name', 'email'],
 
-    //     order: [
+  //   include: [
-    //       ['createdAt', 'ASC']
+  //     { model: Queue, as: "queues", attributes: ["id", "name", "color"] }
-    //     ]
+  //   ],
-    //   },
-    // ], 
-
-
-
-    order: [["id", "ASC"]],
-  })
 
+  //   order: [["id", "ASC"]],
+  // })
 
   return users;
 };
 
 export default ListUser;
-
-
-
-