add filter queries

Author: RitikJaiswal75

controllers/users.js

@@ -496,8 +496,8 @@ const filterUsers = async (req, res) => {
 };
 
 const returnAllUsers = async (req, res) => {
-  const data = await userQuery.getAllUsers();
-  return data;
+  const data = await userQuery.getDiscordUsers();
+  return res.json(data);
 };
 
 module.exports = {

models/users.js

@@ -456,10 +456,18 @@ const getUsersBasedOnFilter = async (query) => {
  * @return {Promise<users>}
  */
 
-const getAllUsers = async () => {
+const getDiscordUsers = async () => {
   try {
     const usersRef = await userModel.where("roles.archived", "==", false).get();
-    return usersRef;
+    const users = [];
+    usersRef.forEach((user) => {
+      if (user.data()?.discordId && user.data().roles?.in_discord === false)
+        users.push({
+          id: user.id,
+          ...user.data(),
+        });
+    });
+    return users;
   } catch (err) {
     logger.error(`Error while fetching all users: ${err}`);
     throw err;
@@ -481,5 +489,5 @@ module.exports = {
   getRdsUserInfoByGitHubUsername,
   fetchUsers,
   getUsersBasedOnFilter,
-  getAllUsers,
+  getDiscordUsers,
 };