Merge branch 'develop' into feat/logs-archive-details

Author: gauravsinhaweb

constants/errorMessages.js

@@ -6,5 +6,6 @@ module.exports = {
   DATA_ADDED_SUCCESSFULLY: "User Device Info added successfully!",
   USER_DATA_ALREADY_PRESENT: "The authentication document has already been created",
   BAD_REQUEST: "BAD_REQUEST",
+  INVALID_QUERY_PARAM: "Invalid Query Parameters Passed",
   FILE_TOO_LARGE: (size) => `File too large, max accepted size is ${size} MB`,
 };

controllers/auth.js

@@ -119,9 +119,27 @@ const updateAuthStatus = async (req, res) => {
   }
 };
 
+const fetchUserDeviceInfo = async (req, res) => {
+  try {
+    const deviceId = req.query.device_id;
+    const userDeviceInfoData = await QrCodeAuthModel.retrieveUserDeviceInfo(deviceId);
+    if (!userDeviceInfoData.userExists) {
+      return res.boom.notFound(`User with id ${deviceId} does not exist.`);
+    }
+    return res.json({
+      message: "Authentication document retrieved successfully.",
+      data: { ...userDeviceInfoData.data },
+    });
+  } catch (error) {
+    logger.error(`Error while fetching user: ${error}`);
+    return res.boom.badImplementation(SOMETHING_WENT_WRONG);
+  }
+};
+
 module.exports = {
   githubAuth,
   signout,
   storeUserDeviceInfo,
   updateAuthStatus,
+  fetchUserDeviceInfo,
 };

controllers/badges.js

@@ -2,7 +2,7 @@ const { ERROR_MESSAGES, SUCCESS_MESSAGES } = require("../constants/badges");
 const { CONTROLLERS: CONTROLLERS_ERROR_MESSAGES } = ERROR_MESSAGES;
 const { CONTROLLERS: CONTROLLERS_SUCCESS_MESSAGES } = SUCCESS_MESSAGES;
 const badgeQuery = require("../models/badges");
-const { fetchUser } = require("../models/users");
+const dataAccess = require("../services/dataAccessLayer");
 const imageService = require("../services/imageService");
 
 /**
@@ -76,7 +76,7 @@ async function postBadge(req, res) {
 async function postUserBadges(req, res) {
   try {
     const { badgeIds, userId } = req.body;
-    const { userExists } = await fetchUser({ userId });
+    const { userExists } = await dataAccess.retrieveUsers({ id: userId });
     if (!userExists) {
       throw Error(ERROR_MESSAGES.MISC.USER_ID_DOES_NOT_EXIST);
     }

controllers/cloudflareCache.js

@@ -1,9 +1,9 @@
 const logsQuery = require("../models/logs");
-const userQuery = require("../models/users");
 const cloudflare = require("../services/cloudflareService");
 const { logType } = require("../constants/logs");
 const { MAX_CACHE_PURGE_COUNT } = require("../constants/cloudflareCache");
 const { SOMETHING_WENT_WRONG } = require("../constants/errorMessages");
+const dataAccess = require("../services/dataAccessLayer");
 
 /**
  * Purges the Cache of Members Profile Page
@@ -21,7 +21,7 @@ const purgeCache = async (req, res) => {
     if (req.body.user) {
       if (roles.super_user) {
         const { user } = req.body;
-        const userDetails = await userQuery.fetchUser({ username: user });
+        const userDetails = await dataAccess.retrieveUsers({ username: user });
         if (!userDetails.userExists) {
           return res.boom.badRequest();
         }

controllers/contributions.js

@@ -1,7 +1,6 @@
 const contributionsService = require("../services/contributions");
-const { fetchUser } = require("../models/users");
 const { SOMETHING_WENT_WRONG } = require("../constants/errorMessages");
-
+const dataAccess = require("../services/dataAccessLayer");
 /**
  * Get the  contributions of the user
  * @param {Object} req - Express request object
@@ -10,8 +9,8 @@ const { SOMETHING_WENT_WRONG } = require("../constants/errorMessages");
 
 const getUserContributions = async (req, res) => {
   try {
-    const username = req.params.username;
-    const result = await fetchUser({ username: req.params.username });
+    const { username } = req.params;
+    const result = await dataAccess.retrieveUsers({ username: req.params.username });
     if (result.userExists) {
       const contributions = await contributionsService.getUserContributions(username);
       return res.json(contributions);

controllers/external-accounts.js

@@ -1,7 +1,8 @@
 const externalAccountsModel = require("../models/external-accounts");
 const { SOMETHING_WENT_WRONG, INTERNAL_SERVER_ERROR } = require("../constants/errorMessages");
 const { getDiscordMembers } = require("../services/discordService");
-const { getDiscordUsers, addOrUpdate } = require("../models/users");
+const { addOrUpdate } = require("../models/users");
+const { retrieveDiscordUsers } = require("../services/dataAccessLayer");
 const logger = require("../utils/logger");
 
 const addExternalAccountData = async (req, res) => {
@@ -51,9 +52,10 @@ const getExternalAccountData = async (req, res) => {
  */
 const syncExternalAccountData = async (req, res) => {
   try {
-    const [discordUserData, rdsUserData] = await Promise.all([getDiscordMembers(), getDiscordUsers()]);
+    const [discordUserData, rdsUserData] = await Promise.all([getDiscordMembers(), retrieveDiscordUsers()]);
     const rdsUserDataMap = {};
     const updateUserDataPromises = [];
+    const userUpdatedWithInDiscordFalse = [];
 
     rdsUserData.forEach((rdsUser) => {
       rdsUserDataMap[rdsUser.discordId] = {
@@ -62,25 +64,36 @@ const syncExternalAccountData = async (req, res) => {
       };
     });
 
-    discordUserData.forEach((discordUser) => {
-      const mappedRdsUser = rdsUserDataMap[discordUser.user.id];
-      if (mappedRdsUser) {
-        const userData = {
+    for (const rdsUser of rdsUserData) {
+      const discordUser = discordUserData.find((discordUser) => discordUser.user.id === rdsUser.discordId);
+
+      let userData = {};
+      if (rdsUser.roles?.in_discord && !discordUser) {
+        userData = {
+          roles: {
+            ...rdsUser.roles,
+            in_discord: false,
+          },
+        };
+        userUpdatedWithInDiscordFalse.push(rdsUser);
+      } else if (discordUser) {
+        userData = {
           discordJoinedAt: discordUser.joined_at,
           roles: {
-            ...mappedRdsUser.roles,
+            ...rdsUser.roles,
             in_discord: true,
           },
         };
-        updateUserDataPromises.push(addOrUpdate(userData, mappedRdsUser.id));
       }
-    });
+      updateUserDataPromises.push(addOrUpdate(userData, rdsUser.id));
+    }
 
     await Promise.all(updateUserDataPromises);
 
     return res.json({
       rdsUsers: rdsUserData.length,
       discordUsers: discordUserData.length,
+      userUpdatedWithInDiscordFalse: userUpdatedWithInDiscordFalse.length,
       message: "Data Sync Complete",
     });
   } catch (err) {

controllers/members.js

@@ -1,9 +1,8 @@
 const ROLES = require("../constants/roles");
 const members = require("../models/members");
 const tasks = require("../models/tasks");
-const { fetchUser } = require("../models/users");
 const { SOMETHING_WENT_WRONG } = require("../constants/errorMessages");
-
+const dataAccess = require("../services/dataAccessLayer");
 /**
  * Fetches the data about our members
  *
@@ -13,8 +12,7 @@ const { SOMETHING_WENT_WRONG } = require("../constants/errorMessages");
 
 const getMembers = async (req, res) => {
   try {
-    const allUsers = await members.fetchUsers(req.query);
-
+    const allUsers = await dataAccess.retrieveMembers(req.query);
     return res.json({
       message: allUsers.length ? "Members returned successfully!" : "No member found",
       members: allUsers,
@@ -34,7 +32,7 @@ const getMembers = async (req, res) => {
 
 const getIdleMembers = async (req, res) => {
   try {
-    const onlyMembers = await members.fetchUsersWithRole(ROLES.MEMBER);
+    const onlyMembers = await dataAccess.retrieveUsersWithRole(ROLES.MEMBER);
     const taskParticipants = await tasks.fetchActiveTaskMembers();
     const idleMembers = onlyMembers?.filter(({ id }) => !taskParticipants.has(id));
     const idleMemberUserNames = idleMembers?.map((member) => member.username);
@@ -59,7 +57,7 @@ const getIdleMembers = async (req, res) => {
 const moveToMembers = async (req, res) => {
   try {
     const { username } = req.params;
-    const result = await fetchUser({ username });
+    const result = await dataAccess.retrieveUsers({ username });
     if (result.userExists) {
       const successObject = await members.moveToMembers(result.user.id);
       if (successObject.isAlreadyMember) {

controllers/tasks.js

@@ -7,11 +7,10 @@ const { OLD_ACTIVE, OLD_BLOCKED, OLD_PENDING } = TASK_STATUS_OLD;
 const { IN_PROGRESS, BLOCKED, SMOKE_TESTING, ASSIGNED } = TASK_STATUS;
 const { INTERNAL_SERVER_ERROR, SOMETHING_WENT_WRONG } = require("../constants/errorMessages");
 const dependencyModel = require("../models/tasks");
-const userQuery = require("../models/users");
 const { transformQuery } = require("../utils/tasks");
 const { getPaginatedLink } = require("../utils/helper");
 const { updateUserStatusOnTaskUpdate, updateStatusOnTaskCompletion } = require("../models/userStatus");
-
+const dataAccess = require("../services/dataAccessLayer");
 /**
  * Creates new task
  *
@@ -250,7 +249,7 @@ const updateTask = async (req, res) => {
       return res.boom.notFound("Task not found");
     }
     if (req.body?.assignee) {
-      const user = await userQuery.fetchUser({ username: req.body.assignee });
+      const user = await dataAccess.retrieveUsers({ username: req.body.assignee });
       if (!user.userExists) {
         return res.boom.notFound("User doesn't exist");
       }

controllers/userStatus.js

@@ -1,8 +1,8 @@
 const { Forbidden, NotFound } = require("http-errors");
-const { fetchUser } = require("../models/users");
-const userStatusModel = require("../models/userStatus");
 const { getUserIdBasedOnRoute } = require("../utils/userStatus");
 const { INTERNAL_SERVER_ERROR } = require("../constants/errorMessages");
+const dataAccess = require("../services/dataAccessLayer");
+const userStatusModel = require("../models/userStatus");
 const { userState, CANCEL_OOO } = require("../constants/userStatus");
 
 /**
@@ -76,7 +76,7 @@ const getAllUserStatus = async (req, res) => {
     const activeUsers = [];
     for (const status of allUserStatus) {
       //  fetching users from users collection by userID in userStatus collection
-      const result = await fetchUser({ userId: status.userId });
+      const result = await dataAccess.retrieveUsers({ id: status.userId });
       if (!result.user?.roles?.archived) {
         status.full_name = `${result.user.first_name} ${result.user.last_name}`;
         status.picture = result.user.picture;

controllers/users.js

@@ -126,7 +126,6 @@ const getUser = async (req, res) => {
   try {
     const result = await dataAccess.retrieveUsers({ username: req.params.username });
     const user = result.user;
-
     if (result.userExists) {
       return res.json({
         message: "User returned successfully!",
@@ -230,7 +229,7 @@ const updateSelf = async (req, res) => {
   try {
     const { id: userId } = req.userData;
     if (req.body.username) {
-      const { user } = await userQuery.fetchUser({ userId });
+      const { user } = await dataAccess.retrieveUsers({ id: userId });
       if (!user.incompleteUserDetails) {
         return res.boom.forbidden("Cannot update username again");
       }
@@ -379,7 +378,7 @@ const updateUser = async (req, res) => {
 
     const { approval, timestamp, userId, ...profileDiff } = profileDiffData;
 
-    const user = await userQuery.fetchUser({ userId });
+    const user = await dataAccess.retrieveUsers({ id: userId });
     if (!user.userExists) return res.boom.notFound("User doesn't exist");
 
     await profileDiffsQuery.updateProfileDiff({ approval: profileDiffStatus.APPROVED }, profileDiffId);
@@ -568,7 +567,7 @@ const filterUsers = async (req, res) => {
 };
 
 const nonVerifiedDiscordUsers = async (req, res) => {
-  const data = await userQuery.getDiscordUsers();
+  const data = await dataAccess.retrieveDiscordUsers();
   return res.json(data);
 };
 
@@ -602,7 +601,7 @@ const removeTokens = async (req, res) => {
 
 const updateRoles = async (req, res) => {
   try {
-    const result = await userQuery.fetchUser({ userId: req.params.id });
+    const result = await dataAccess.retrieveUsers({ id: req.params.id });
     if (result?.userExists) {
       const dataToUpdate = req.body;
       const response = await getRoleToUpdate(result.user, dataToUpdate);