Skip to content

Commit 19fe12a

Browse files
committed
chore: remove unused code
1 parent 07c0bb0 commit 19fe12a

File tree

5 files changed

+2
-137
lines changed

5 files changed

+2
-137
lines changed

constants/roles.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const ROLES = {
44
APPOWNER: "app_owner",
55
MEMBER: "member",
66
ARCHIVED: "archived",
7-
IN_DISCORD: "inDiscord",
7+
INDISCORD: "in_discord",
88
};
99

1010
module.exports = ROLES;

controllers/users.js

Lines changed: 1 addition & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,10 @@ const { logType } = require("../constants/logs");
88

99
const logger = require("../utils/logger");
1010
const obfuscate = require("../utils/obfuscate");
11-
const { getPaginationLink, getUsernamesFromPRs, mapDiscordMembersDataAndSyncRole } = 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");
15-
const { IN_DISCORD } = require("../constants/roles");
16-
const jwt = require("jsonwebtoken");
1715

1816
const verifyUser = async (req, res) => {
1917
const userId = req.userData.id;
@@ -467,55 +465,6 @@ const filterUsers = async (req, res) => {
467465
return res.boom.serverUnavailable("Something went wrong please contact admin");
468466
}
469467
};
470-
const DISCORD_BASE_URL = "https://89d4-49-36-233-201.ngrok.io";
471-
const syncInDiscordRole = async (req, res) => {
472-
try {
473-
const authToken = jwt.sign({}, config.get("botToken.botPrivateKey"), {
474-
algorithm: "RS256",
475-
});
476-
477-
const response = await fetch(`${DISCORD_BASE_URL}/discord-members`, {
478-
headers: {
479-
"Content-Type": "application/json",
480-
Authorization: `Bearer ${authToken}`,
481-
},
482-
});
483-
const discordMembers = await response.json();
484-
485-
const allUsers = await userQuery.getAllUsers();
486-
mapDiscordMembersDataAndSyncRole(allUsers, discordMembers);
487-
488-
return res.json({ message: "Synced with discord members " });
489-
} catch (error) {
490-
logger.error(`Error while fetching all users: ${error}`);
491-
return res.boom.serverUnavailable("Something went wrong please contact admin");
492-
}
493-
};
494-
495-
const fetchVerifiedUsers = async (req, res) => {
496-
try {
497-
const verifiedUsers = await userQuery.fetchUsersWhereFieldNotNull("discordId");
498-
return res.json(verifiedUsers);
499-
} catch (error) {
500-
logger.error(`Error while fetching all users: ${error}`);
501-
return res.boom.serverUnavailable("Something went wrong please contact admin");
502-
}
503-
};
504-
505-
const fetchInDiscordUsers = async (req, res) => {
506-
try {
507-
const usersInDiscord = await userQuery.fetchUsersWithRole(IN_DISCORD);
508-
509-
return res.json({
510-
message: "Users found successfully!",
511-
users: usersInDiscord,
512-
count: usersInDiscord.length,
513-
});
514-
} catch (error) {
515-
logger.error(`Error while fetching all users: ${error}`);
516-
return res.boom.serverUnavailable("Something went wrong please contact admin");
517-
}
518-
};
519468

520469
module.exports = {
521470
verifyUser,
@@ -536,7 +485,4 @@ module.exports = {
536485
addDefaultArchivedRole,
537486
getUserSkills,
538487
filterUsers,
539-
fetchInDiscordUsers,
540-
syncInDiscordRole,
541-
fetchVerifiedUsers,
542488
};

models/users.js

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -414,22 +414,6 @@ const getUsersBasedOnFilter = async (query) => {
414414
const filteredUserDocs = userDocs.filter((doc) => !doc.roles?.archived);
415415
return filteredUserDocs;
416416
}
417-
return [];
418-
};
419-
const getAllUsers = async () => {
420-
try {
421-
const usersRef = await userModel.get();
422-
return usersRef;
423-
} catch (err) {
424-
logger.error("Error retrieving users data with roles of inDiscord", err);
425-
throw err;
426-
}
427-
};
428-
const fetchUsersWithRole = async (role) => {
429-
try {
430-
// console.log(role);
431-
const snapshot = await userModel.where(`roles.${role}`, "==", true).get();
432-
const onlyMembers = [];
433417

434418
const roleQuery = query.role;
435419
const verifiedQuery = query.verified;
@@ -447,7 +431,6 @@ const fetchUsersWithRole = async (role) => {
447431
return filteredUsers;
448432
}
449433
if (verifiedQuery) {
450-
console.log(typeof verifiedQuery);
451434
const filteredUsers = [];
452435
const snapshot = await userModel.orderBy("discordId").get();
453436
snapshot.forEach((doc) => {
@@ -477,7 +460,4 @@ module.exports = {
477460
getRdsUserInfoByGitHubUsername,
478461
fetchUsers,
479462
getUsersBasedOnFilter,
480-
fetchUsersWithRole,
481-
fetchUsersWhereFieldNotNull,
482-
getAllUsers,
483463
};

routes/users.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@ router.get("/self", authenticate, users.getSelfDetails);
1616
router.get("/isUsernameAvailable/:username", authenticate, users.getUsernameAvailabilty);
1717
router.get("/chaincode", authenticate, users.generateChaincode);
1818
router.get("/search", userValidator.validateUserQueryParams, users.filterUsers);
19-
router.get("/inDiscord", authenticate, users.fetchInDiscordUsers);
20-
router.post("/syncInDiscord", authenticate, users.syncInDiscordRole);
21-
router.get("/verified", authenticate, users.fetchVerifiedUsers);
2219
router.get("/:username", users.getUser);
2320
router.get("/:userId/intro", authenticate, authorizeRoles([SUPERUSER]), users.getUserIntro);
2421
router.put("/self/intro", authenticate, userValidator.validateJoinData, users.addUserIntro);

test/unit/utils/users.test.js

Lines changed: 0 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
const chai = require("chai");
22
const { expect } = chai;
33

4-
const sinon = require("sinon");
5-
64
const usersUtils = require("../../../utils/users");
75
const cleanDb = require("../../utils/cleanDb");
86
const addUser = require("../../utils/addUser");
@@ -67,60 +65,4 @@ describe("users", function () {
6765
expect(participantUserId).to.include(userId);
6866
});
6967
});
70-
71-
describe("mapDiscordMembersDataAndSyncRole", function () {
72-
it("should update roles and joined_discord fields for users with matching Discord IDs", function () {
73-
const allUsers = [
74-
{
75-
data: () => ({ roles: { archived: false }, discordId: "123" }),
76-
ref: { update: sinon.spy() },
77-
},
78-
];
79-
const discordMembers = [
80-
{
81-
user: { id: "123" },
82-
joined_at: "2022-05-01T00:00:00.000Z",
83-
},
84-
];
85-
86-
usersUtils.mapDiscordMembersDataAndSyncRole(allUsers, discordMembers);
87-
88-
sinon.assert.calledWithExactly(allUsers[0].ref.update, {
89-
roles: { archived: false, inDiscord: true },
90-
joined_discord: discordMembers[0].joined_at,
91-
});
92-
});
93-
94-
it("should update roles field to inDiscord: false for users with no matching Discord ID", function () {
95-
const allUsers = [
96-
{
97-
data: () => ({ roles: { archived: false }, discordId: "123" }),
98-
ref: { update: sinon.spy() },
99-
},
100-
];
101-
const discordMembers = [];
102-
103-
usersUtils.mapDiscordMembersDataAndSyncRole(allUsers, discordMembers);
104-
105-
sinon.assert.calledWithExactly(allUsers[0].ref.update, {
106-
roles: { archived: false, inDiscord: false },
107-
});
108-
});
109-
110-
it("should update roles field to inDiscord: false for users with archived roles", function () {
111-
const allUsers = [
112-
{
113-
data: () => ({ roles: { archived: true }, discordId: "123" }),
114-
ref: { update: () => sinon.spy() },
115-
},
116-
];
117-
const discordMembers = [];
118-
119-
usersUtils.mapDiscordMembersDataAndSyncRole(allUsers, discordMembers);
120-
121-
expect(allUsers[0].ref.update).to.have.been.calledWith({
122-
roles: { archived: true, inDiscord: false },
123-
});
124-
});
125-
});
12668
});

0 commit comments

Comments
 (0)