Skip to content

Commit 99b60e2

Browse files
committed
fix: getUsernameFromPRs to return users in orders
1 parent 81be084 commit 99b60e2

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

controllers/users.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const { logType } = require("../constants/logs");
88
const { fetch } = require("../utils/fetch");
99
const logger = require("../utils/logger");
1010
const obfuscate = require("../utils/obfuscate");
11-
const { getPaginationLink, getFilteredUsernames } = require("../utils/users");
11+
const { getPaginationLink, getUsernamesFromPRs } = require("../utils/users");
1212
const { getQualifiers } = require("../utils/helper");
1313
const { SOMETHING_WENT_WRONG, INTERNAL_SERVER_ERROR } = require("../constants/errorMessages");
1414
const { getFilteredPRsOrIssues } = require("../utils/pullRequests");
@@ -73,7 +73,7 @@ const getUsers = async (req, res) => {
7373
if (qualifiers?.filterBy) {
7474
const allPRs = await getFilteredPRsOrIssues(qualifiers);
7575

76-
const filteredUsernames = getFilteredUsernames(allPRs);
76+
const filteredUsernames = getUsernamesFromPRs(allPRs);
7777

7878
const { filterdUsersWithDetails } = await userQuery.fetchUsers(filteredUsernames);
7979

utils/users.js

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -121,14 +121,18 @@ function getPaginationLink(query, cursor, documentId) {
121121
* @param allUsers {Array} - list of total users from firebase
122122
*
123123
*/
124-
function getFilteredUsernames(allPRs) {
125-
const uniqueUsersInOrder = new Set();
124+
function getUsernamesFromPRs(allPRs) {
125+
const uniqueUsernamesSet = new Set();
126+
const usernames = [];
126127

127-
allPRs?.forEach((element) => {
128-
uniqueUsersInOrder.add(element.username);
128+
allPRs?.forEach((pr) => {
129+
if (!uniqueUsernamesSet.has(pr.username)) {
130+
uniqueUsernamesSet.add(pr.username);
131+
usernames.push(pr.username);
132+
}
129133
});
130134

131-
return Array.from(uniqueUsersInOrder);
135+
return usernames;
132136
}
133137

134138
module.exports = {
@@ -138,5 +142,5 @@ module.exports = {
138142
getParticipantUsernames,
139143
getLowestLevelSkill,
140144
getPaginationLink,
141-
getFilteredUsernames,
145+
getUsernamesFromPRs,
142146
};

0 commit comments

Comments
 (0)