Merge branch 'develop' of https://github.com/Real-Dev-Squad/website-backend into feat/cpllapsed-task

Author: sahsisunny

controllers/users.js

@@ -73,13 +73,13 @@ const getUsers = async (req, res) => {
     if (qualifiers?.filterBy) {
       const allPRs = await getFilteredPRsOrIssues(qualifiers);
 
-      const filteredUsernames = getUsernamesFromPRs(allPRs);
+      const usernames = getUsernamesFromPRs(allPRs);
 
-      const { filterdUsersWithDetails } = await userQuery.fetchUsers(filteredUsernames);
+      const { users } = await userQuery.fetchUsers(usernames);
 
       return res.json({
         message: "Users returned successfully!",
-        users: filterdUsersWithDetails,
+        users,
       });
     }
 

models/users.js

@@ -182,7 +182,7 @@ const fetchPaginatedUsers = async (query) => {
 const fetchUsers = async (usernames = []) => {
   try {
     const dbQuery = userModel;
-    const filterdUsersWithDetails = [];
+    const users = [];
 
     const groups = [];
     for (let i = 0; i < usernames.length; i += BATCH_SIZE_IN_CLAUSE) {
@@ -198,7 +198,7 @@ const fetchUsers = async (usernames = []) => {
 
     snapshots.forEach((snapshot) => {
       snapshot.forEach((doc) => {
-        filterdUsersWithDetails.push({
+        users.push({
           id: doc.id,
           ...doc.data(),
           phone: undefined,
@@ -210,7 +210,7 @@ const fetchUsers = async (usernames = []) => {
     });
 
     return {
-      filterdUsersWithDetails,
+      users,
     };
   } catch (err) {
     logger.error("Error retrieving user data", err);