Merge pull request #2283 from Real-Dev-Squad/develop

Dev to Main Sync

constants/logs.ts

@@ -10,6 +10,9 @@ export const logType = {
   TASKS_MISSED_UPDATES_ERRORS: "TASKS_MISSED_UPDATES_ERRORS",
   DISCORD_INVITES: "DISCORD_INVITES",
   EXTERNAL_SERVICE: "EXTERNAL_SERVICE",
+  ADD_UNVERIFIED_ROLE: "ADD_UNVERIFIED_ROLE",
+  REMOVE_ROLE_FROM_USER_SUCCESS: "REMOVE_ROLE_FROM_USER_SUCCESS",
+  REMOVE_ROLE_FROM_USER_FAILED: "REMOVE_ROLE_FROM_USER_FAILED",
   EXTENSION_REQUESTS: "extensionRequests",
   TASK: "task",
   TASK_REQUESTS: "taskRequests",

controllers/awsAccess.ts

@@ -21,6 +21,12 @@ export const addUserToAWSGroup = async (req, res) => {
       if (awsUserId === null){
         // We need to create the user in AWS before and then fetch its Id
         userCreationResponse = await createUser(userInfoData.user.username, userInfoData.user.email);
+
+        if (userCreationResponse.conflict){
+          return res.status(400).json({
+            error: `Username or Email is already being used, please use another email / username for creating account in AWS`
+          })
+        }
         awsUserId = userCreationResponse.UserId;
       }
 

controllers/extensionRequests.js

@@ -74,7 +74,7 @@ const createTaskExtensionRequest = async (req, res) => {
       type: "extensionRequests",
       meta: {
         taskId: extensionBody.taskId,
-        createdBy: req.userData.id,
+        userId: req.userData.id,
       },
       body: {
         extensionRequestId: extensionRequest.id,

controllers/extensionRequestsv2.ts

@@ -84,7 +84,7 @@ export const createTaskExtensionRequest = async (req: ExtensionRequestRequest, r
         taskId,
         requestId: extensionRequest.id,
         action: LOG_ACTION.CREATE,
-        createdBy: requestedBy,
+        userId: requestedBy,
         createdAt: Date.now(),
       },
       body: extensionBody,

controllers/external-accounts.js

@@ -4,7 +4,7 @@ const { getDiscordMembers } = require("../services/discordService");
 const { addOrUpdate, getUsersByRole, updateUsersInBatch } = require("../models/users");
 const { retrieveDiscordUsers, fetchUsersForKeyValues } = require("../services/dataAccessLayer");
 const { EXTERNAL_ACCOUNTS_POST_ACTIONS } = require("../constants/external-accounts");
-const discordServices = require("../services/discordService");
+const removeDiscordRoleUtils = require("../utils/removeDiscordRoleFromUser");
 const config = require("config");
 const logger = require("../utils/logger");
 const { markUnDoneTasksOfArchivedUsersBacklog } = require("../models/tasks");
@@ -71,14 +71,16 @@ const linkExternalAccount = async (req, res) => {
       userId
     );
 
-    try {
-      const unverifiedRoleId = config.get("discordUnverifiedRoleId");
-      await discordServices.removeRoleFromUser(unverifiedRoleId, attributes.discordId, req.userData);
-    } catch (error) {
-      logger.error(`Error getting external account data: ${error}`);
-      return res.boom.internal("Role Deletion failed. Please contact admin.", {
-        message: "Role Deletion failed. Please contact admin.",
-      });
+    const unverifiedRoleId = config.get("discordUnverifiedRoleId");
+    const unverifiedRoleRemovalResponse = await removeDiscordRoleUtils.removeDiscordRoleFromUser(
+      req.userData,
+      attributes.discordId,
+      unverifiedRoleId
+    );
+
+    if (!unverifiedRoleRemovalResponse.success) {
+      const message = `User details updated but ${unverifiedRoleRemovalResponse.message}. Please contact admin`;
+      return res.boom.internal(message, { message });
     }
 
     return res.status(204).json({ message: "Your discord profile has been linked successfully" });

controllers/invites.ts

@@ -32,7 +32,7 @@ export const createInviteLink = async (req: InviteBodyRequest, res: CustomRespon
       type: logType.DISCORD_INVITES,
       meta: {
         action: "create",
-        createdBy: logType.EXTERNAL_SERVICE,
+        userId: logType.EXTERNAL_SERVICE,
         createdAt: Date.now(),
       },
       body: {

controllers/logs.js

@@ -67,12 +67,27 @@ const fetchAllLogs = async (req, res) => {
       prev: prevUrl,
     });
   } catch (err) {
+    if (err.statusCode) {
+      return res.status(err.statusCode).json({ error: err.message });
+    }
     logger.error(ERROR_WHILE_FETCHING_LOGS, err);
     return res.boom.badImplementation(ERROR_WHILE_FETCHING_LOGS);
   }
 };
 
+const updateLogs = async (req, res) => {
+  try {
+    const response = await logsQuery.updateLogs();
+    return res.json({
+      response,
+    });
+  } catch (error) {
+    return res.boom.serverUnavailable(SOMETHING_WENT_WRONG);
+  }
+};
+
 module.exports = {
   fetchLogs,
   fetchAllLogs,
+  updateLogs,
 };

controllers/oooRequests.ts

@@ -41,7 +41,7 @@ export const createOooRequestController = async (req: OooRequestCreateRequest, r
       meta: {
         requestId: requestResult.id,
         action: LOG_ACTION.CREATE,
-        createdBy: userId,
+        userId: userId,
         createdAt: Date.now(),
       },
       body: requestResult,
@@ -84,7 +84,7 @@ export const updateOooRequestController = async (req: UpdateRequest, res: Custom
       meta: {
         requestId: requestId,
         action: LOG_ACTION.UPDATE,
-        createdBy: userId,
+        userId: userId,
         createdAt: Date.now(),
       },
       body: requestResult,

controllers/taskRequestsv2.ts

@@ -92,7 +92,7 @@ export const createTaskRequestController = async (req: TaskRequestRequest, res:
         meta: {
           taskRequestId: updatedRequest.id,
           action: "update",
-          createdBy: req.userData.id,
+          userId: req.userData.id,
           createdAt: Date.now(),
           lastModifiedBy: req.userData.id,
           lastModifiedAt: Date.now(),
@@ -150,7 +150,7 @@ export const createTaskRequestController = async (req: TaskRequestRequest, res:
       meta: {
         taskRequestId: newTaskRequest.id,
         action: "create",
-        createdBy: req.userData.id,
+        userId: req.userData.id,
         createdAt: Date.now(),
         lastModifiedBy: req.userData.id,
         lastModifiedAt: Date.now(),

controllers/tasks.js

@@ -13,6 +13,7 @@ const { updateUserStatusOnTaskUpdate, updateStatusOnTaskCompletion } = require("
 const dataAccess = require("../services/dataAccessLayer");
 const { parseSearchQuery } = require("../utils/tasks");
 const { addTaskCreatedAtAndUpdatedAtFields } = require("../services/tasks");
+const tasksService = require("../services/tasks");
 const { RQLQueryParser } = require("../utils/RQLParser");
 const { getMissedProgressUpdatesUsers } = require("../models/discordactions");
 const { logType } = require("../constants/logs");
@@ -134,7 +135,19 @@ const fetchPaginatedTasks = async (query) => {
 
 const fetchTasks = async (req, res) => {
   try {
-    const { status, page, size, prev, next, q: queryString, assignee, title, userFeatureFlag } = req.query;
+    const {
+      status,
+      page,
+      size,
+      prev,
+      next,
+      q: queryString,
+      assignee,
+      title,
+      userFeatureFlag,
+      orphaned,
+      dev,
+    } = req.query;
     const transformedQuery = transformQuery(status, size, page, assignee, title);
 
     if (queryString !== undefined) {
@@ -159,6 +172,28 @@ const fetchTasks = async (req, res) => {
       });
     }
 
+    const isOrphaned = orphaned === "true";
+    const isDev = dev === "true";
+    if (isOrphaned) {
+      if (!isDev) {
+        return res.boom.notFound("Route not found");
+      }
+      try {
+        const orphanedTasks = await tasksService.fetchOrphanedTasks();
+        if (!orphanedTasks || orphanedTasks.length === 0) {
+          return res.sendStatus(204);
+        }
+        const tasksWithRdsAssigneeInfo = await fetchTasksWithRdsAssigneeInfo(orphanedTasks);
+        return res.status(200).json({
+          message: "Orphan tasks fetched successfully",
+          data: tasksWithRdsAssigneeInfo,
+        });
+      } catch (error) {
+        logger.error("Error in getting tasks which were orphaned", error);
+        return res.boom.badImplementation(INTERNAL_SERVER_ERROR);
+      }
+    }
+
     const paginatedTasks = await fetchPaginatedTasks({ ...transformedQuery, prev, next, userFeatureFlag });
     return res.json({
       message: "Tasks returned successfully!",

controllers/tasksRequests.js

@@ -104,7 +104,7 @@ const addTaskRequests = async (req, res) => {
       meta: {
         taskRequestId: newTaskRequest.id,
         action: "create",
-        createdBy: req.userData.id,
+        userId: req.userData.id,
         createdAt: Date.now(),
         lastModifiedBy: req.userData.id,
         lastModifiedAt: Date.now(),
@@ -206,7 +206,7 @@ const updateTaskRequests = async (req, res) => {
         taskRequestId: taskRequestId,
         action: "update",
         subAction: action,
-        createdBy: req.userData.id,
+        userId: req.userData.id,
         createdAt: Date.now(),
         lastModifiedBy: req.userData.id,
         lastModifiedAt: Date.now(),

controllers/users.js

@@ -1,6 +1,10 @@
 const chaincodeQuery = require("../models/chaincodes");
 const userQuery = require("../models/users");
 const profileDiffsQuery = require("../models/profileDiffs");
+const firestore = require("../utils/firestore");
+const memberRoleModel = firestore.collection("member-group-roles");
+const logsModel = firestore.collection("logs");
+const admin = require("firebase-admin");
 const logsQuery = require("../models/logs");
 const imageService = require("../services/imageService");
 const { profileDiffStatus } = require("../constants/profileDiff");
@@ -30,6 +34,7 @@ const { addLog } = require("../models/logs");
 const { getUserStatus } = require("../models/userStatus");
 const config = require("config");
 const { generateUniqueUsername } = require("../services/users");
+const userService = require("../services/users");
 const discordDeveloperRoleId = config.get("discordDeveloperRoleId");
 
 const verifyUser = async (req, res) => {
@@ -191,6 +196,30 @@ const getUsers = async (req, res) => {
       }
     }
 
+    const isDeparted = req.query.departed === "true";
+
+    if (isDeparted) {
+      if (!dev) {
+        return res.boom.notFound("Route not found");
+      }
+      try {
+        const result = await dataAccess.retrieveUsers({ query: req.query });
+        const departedUsers = await userService.getUsersWithIncompleteTasks(result.users);
+        if (departedUsers.length === 0) return res.status(204).send();
+        return res.json({
+          message: "Users with abandoned tasks fetched successfully",
+          users: departedUsers,
+          links: {
+            next: result.nextId ? getPaginationLink(req.query, "next", result.nextId) : "",
+            prev: result.prevId ? getPaginationLink(req.query, "prev", result.prevId) : "",
+          },
+        });
+      } catch (error) {
+        logger.error("Error when fetching users who abandoned tasks:", error);
+        return res.boom.badImplementation(INTERNAL_SERVER_ERROR);
+      }
+    }
+
     if (transformedQuery?.filterBy === OVERDUE_TASKS) {
       try {
         const tasksData = await getOverdueTasks(days);
@@ -595,7 +624,7 @@ const markUnverified = async (req, res) => {
     const unverifiedRoleId = config.get("discordUnverifiedRoleId");
     const usersToApplyUnverifiedRole = [];
     const addRolePromises = [];
-    const discordDeveloperRoleId = config.get("discordDeveloperRoleId");
+    const batchPromises = [];
 
     allRdsLoggedInUsers.forEach((user) => {
       rdsUserMap[user.discordId] = true;
@@ -611,11 +640,40 @@ const markUnverified = async (req, res) => {
       }
     });
 
+    const batchSize = 500;
+    const batches = Array.from({ length: Math.ceil(usersToApplyUnverifiedRole.length / batchSize) }, (_, index) =>
+      usersToApplyUnverifiedRole.slice(index * batchSize, index * batchSize + batchSize)
+    );
+
+    batches.forEach((batch) => {
+      const firestoreBatch = firestore.batch();
+
+      batch.forEach((id) => {
+        const memberRoleRef = memberRoleModel.doc(id);
+        const logRef = logsModel.doc();
+
+        firestoreBatch.set(memberRoleRef, {
+          roleid: unverifiedRoleId,
+          userid: id,
+          date: admin.firestore.Timestamp.fromDate(new Date()),
+        });
+
+        firestoreBatch.set(logRef, {
+          type: logType.ADD_UNVERIFIED_ROLE,
+          meta: { roleid: unverifiedRoleId, userid: id },
+          body: { message: "Unverified role added successfully" },
+          timestamp: admin.firestore.Timestamp.fromDate(new Date()),
+        });
+      });
+
+      batchPromises.push(firestoreBatch.commit());
+    });
+
     usersToApplyUnverifiedRole.forEach((id) => {
       addRolePromises.push(addRoleToUser(id, unverifiedRoleId));
     });
 
-    await Promise.all(addRolePromises);
+    await Promise.all([...addRolePromises, ...batchPromises]);
     return res.json({ message: "ROLES APPLIED SUCCESSFULLY" });
   } catch (err) {
     logger.error(err);
@@ -653,8 +711,14 @@ const getUserImageForVerification = async (req, res) => {
 const updateUser = async (req, res) => {
   try {
     const { id: profileDiffId, message } = req.body;
-
-    const profileDiffData = await profileDiffsQuery.fetchProfileDiff(profileDiffId);
+    const devFeatureFlag = req.query.dev;
+    let profileDiffData;
+    if (devFeatureFlag === "true") {
+      profileDiffData = await profileDiffsQuery.fetchProfileDiffUnobfuscated(profileDiffId);
+    } else {
+      profileDiffData = await profileDiffsQuery.fetchProfileDiff(profileDiffId);
+    }
+    Object.freeze(profileDiffData);
     if (!profileDiffData) return res.boom.notFound("Profile Diff doesn't exist");
 
     const { approval, timestamp, userId, ...profileDiff } = profileDiffData;

middlewares/validators/tasks.js

@@ -193,6 +193,7 @@ const getTasksValidator = async (req, res, next) => {
         return value;
       }, "Invalid query format"),
     userFeatureFlag: joi.string().optional(),
+    orphaned: joi.boolean().optional(),
   });
 
   try {

middlewares/validators/user.js

@@ -200,6 +200,7 @@ async function getUsers(req, res, next) {
       filterBy: joi.string().optional(),
       days: joi.string().optional(),
       dev: joi.string().optional(),
+      departed: joi.string().optional(),
       roles: joi.optional().custom((value, helpers) => {
         if (value !== "member") {
           return helpers.message("only member role is supported");

models/discordactions.js

@@ -158,7 +158,7 @@ const updateGroupRole = async (roleData, docId) => {
  *
  * @param options { Object }: Data of the new role
  * @param options.rolename String : name of the role
- * @param options.roleId String : id of the role
+ * @param options.roleid String : id of the role
  * @returns {Promise<discordRoleModel|Object>}
  */