func: search roles and verified users

Author: bhtibrewal

constants/users.js

@@ -13,6 +13,7 @@ const USER_STATUS = {
 const ALLOWED_FILTER_PARAMS = {
   ITEM_TAG: ["levelId", "levelName", "levelValue", "tagId"],
   USER_STATE: ["state"],
+  ROLE: ["role"],
 };
 
 module.exports = { profileStatus, USER_STATUS, ALLOWED_FILTER_PARAMS };

controllers/users.js

@@ -473,7 +473,7 @@ const syncInDiscordRole = async (req, res) => {
     const authToken = jwt.sign({}, config.get("botToken.botPrivateKey"), {
       algorithm: "RS256",
     });
-    // console.log(authToken);
+
     const response = await fetch(`${DISCORD_BASE_URL}/discord-members`, {
       headers: {
         "Content-Type": "application/json",

middlewares/validators/user.js

@@ -172,6 +172,11 @@ async function validateUserQueryParams(req, res, next) {
           joi.array().items(joi.string().valid("IDLE", "OOO", "ACTIVE"))
         )
         .optional(),
+      role: joi
+        .alternatives()
+        .try(joi.string().valid("in_discord", "member"), joi.array().items(joi.string().valid("in_discord", "member")))
+        .optional(),
+      verified: joi.string().optional(),
     })
     .messages({
       "object.min": "Please provide at least one filter criteria",

test/unit/utils/users.test.js

@@ -1,6 +1,8 @@
 const chai = require("chai");
 const { expect } = chai;
 
+const sinon = require("sinon");
+
 const usersUtils = require("../../../utils/users");
 const cleanDb = require("../../utils/cleanDb");
 const addUser = require("../../utils/addUser");
@@ -65,4 +67,60 @@ describe("users", function () {
       expect(participantUserId).to.include(userId);
     });
   });
+
+  describe("mapDiscordMembersDataAndSyncRole", function () {
+    it("should update roles and joined_discord fields for users with matching Discord IDs", function () {
+      const allUsers = [
+        {
+          data: () => ({ roles: { archived: false }, discordId: "123" }),
+          ref: { update: sinon.spy() },
+        },
+      ];
+      const discordMembers = [
+        {
+          user: { id: "123" },
+          joined_at: "2022-05-01T00:00:00.000Z",
+        },
+      ];
+
+      usersUtils.mapDiscordMembersDataAndSyncRole(allUsers, discordMembers);
+
+      sinon.assert.calledWithExactly(allUsers[0].ref.update, {
+        roles: { archived: false, inDiscord: true },
+        joined_discord: discordMembers[0].joined_at,
+      });
+    });
+
+    it("should update roles field to inDiscord: false for users with no matching Discord ID", function () {
+      const allUsers = [
+        {
+          data: () => ({ roles: { archived: false }, discordId: "123" }),
+          ref: { update: sinon.spy() },
+        },
+      ];
+      const discordMembers = [];
+
+      usersUtils.mapDiscordMembersDataAndSyncRole(allUsers, discordMembers);
+
+      sinon.assert.calledWithExactly(allUsers[0].ref.update, {
+        roles: { archived: false, inDiscord: false },
+      });
+    });
+
+    it("should update roles field to inDiscord: false for users with archived roles", function () {
+      const allUsers = [
+        {
+          data: () => ({ roles: { archived: true }, discordId: "123" }),
+          ref: { update: () => sinon.spy() },
+        },
+      ];
+      const discordMembers = [];
+
+      usersUtils.mapDiscordMembersDataAndSyncRole(allUsers, discordMembers);
+
+      expect(allUsers[0].ref.update).to.have.been.calledWith({
+        roles: { archived: true, inDiscord: false },
+      });
+    });
+  });
 });

utils/users.js

@@ -154,7 +154,7 @@ function mapDiscordMembersDataAndSyncRole(allUsers, discordMembers) {
         const discordUserData = discordMembers.find((item) => item.user.id === user.discordId);
         if (discordUserData) {
           const roles = user.roles ? { ...user.roles, inDiscord: true } : { inDiscord: true };
-          doc.ref.update({ roles, joined_RDS: discordUserData.joined_at });
+          doc.ref.update({ roles, joined_discord: discordUserData.joined_at });
         } else {
           const roles = user.roles ? { ...user.roles, inDiscord: false } : { inDiscord: false };
           doc.ref.update({ roles });