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

Dev to Main Sync

Author: ankushdharkar

config/default.js

@@ -14,6 +14,7 @@ module.exports = {
   discordUnverifiedRoleId: "<discordUnverifiedRoleId>",
   discordDeveloperRoleId: "<discordDeveloperRoleId>",
   discordMavenRoleId: "<discordMavenRoleId>",
+  discordMissedUpdatesRoleId: "<discordMissedUpdatesRoleId>",
   githubApi: {
     baseUrl: "https://api.github.com",
     org: "Real-Dev-Squad",

config/production.js

@@ -6,6 +6,7 @@ module.exports = {
   discordUnverifiedRoleId: "1103047289330745386",
   discordDeveloperRoleId: "915490782939582485",
   discordMavenRoleId: "875564640438997043",
+  discordMissedUpdatesRoleId: "1183553844811153458",
   userToken: {
     cookieName: "rds-session",
   },

config/staging.js

@@ -6,6 +6,7 @@ module.exports = {
   discordUnverifiedRoleId: "1120875993771544687",
   discordDeveloperRoleId: "1121445071213056071",
   discordMavenRoleId: "1152361736456896586",
+  discordMissedUpdatesRoleId: "1184201657404362772",
   enableFileLogs: false,
   enableConsoleLogs: true,
 

constants/constants.ts

@@ -1,5 +1,15 @@
 const DOCUMENT_WRITE_SIZE = 500;
+const daysOfWeek = {
+  sun: 0,
+  mon: 1,
+  tue: 2,
+  wed: 3,
+  thu: 4,
+  fri: 5,
+  sat: 6,
+};
 
 module.exports = {
-    DOCUMENT_WRITE_SIZE,
+  DOCUMENT_WRITE_SIZE,
+  daysOfWeek,
 };

constants/tasks.ts

@@ -37,6 +37,24 @@ const MAPPED_TASK_STATUS = {
   UNASSIGNED: "AVAILABLE",
 };
 
+const COMPLETED_TASK_STATUS = {
+  VERIFIED: "VERIFIED",
+  DONE: "DONE",
+  COMPLETED: "COMPLETED",
+};
 const TASK_SIZE = 5;
 
-module.exports = { TASK_TYPE, TASK_STATUS, TASK_STATUS_OLD, MAPPED_TASK_STATUS, TASK_SIZE, DEFAULT_TASK_PRIORITY };
+const tasksUsersStatus = {
+  MISSED_UPDATES: "missed-updates",
+};
+
+module.exports = {
+  TASK_TYPE,
+  TASK_STATUS,
+  TASK_STATUS_OLD,
+  MAPPED_TASK_STATUS,
+  TASK_SIZE,
+  DEFAULT_TASK_PRIORITY,
+  COMPLETED_TASK_STATUS,
+  tasksUsersStatus,
+};

controllers/tasks.js

@@ -1,5 +1,5 @@
 const tasks = require("../models/tasks");
-const { TASK_STATUS, TASK_STATUS_OLD } = require("../constants/tasks");
+const { TASK_STATUS, TASK_STATUS_OLD, tasksUsersStatus } = require("../constants/tasks");
 const { addLog } = require("../models/logs");
 const { USER_STATUS } = require("../constants/users");
 const { addOrUpdate, getRdsUserInfoByGitHubUsername } = require("../models/users");
@@ -13,6 +13,9 @@ const { updateUserStatusOnTaskUpdate, updateStatusOnTaskCompletion } = require("
 const dataAccess = require("../services/dataAccessLayer");
 const { parseSearchQuery } = require("../utils/tasks");
 const { addTaskCreatedAtAndUpdatedAtFields } = require("../services/tasks");
+const { RQLQueryParser } = require("../utils/RQLParser");
+const { getMissedProgressUpdatesUsers } = require("../models/discordactions");
+const { daysOfWeek } = require("../constants/constants");
 /**
  * Creates new task
  *
@@ -475,6 +478,38 @@ const updateStatus = async (req, res) => {
   }
 };
 
+const getUsersHandler = async (req, res) => {
+  try {
+    const { size, cursor, q: queryString } = req.query;
+    const rqlParser = new RQLQueryParser(queryString);
+    const { "days-count": daysGap, weekday, date, status } = rqlParser.getFilterQueries();
+    if (!!status && status.length === 1 && status[0].value === tasksUsersStatus.MISSED_UPDATES) {
+      if (daysGap && daysGap > 1) {
+        return res.boom.badRequest("number of days gap provided cannot be greater than 1");
+      }
+      const response = await getMissedProgressUpdatesUsers({
+        cursor: cursor,
+        size: size && Number.parseInt(size),
+        excludedDates: date?.map((date) => Number.parseInt(date.value)),
+        excludedDays: weekday?.map((day) => daysOfWeek[day.value]),
+        dateGap: !!daysGap && daysGap.length === 1 ? Number.parseInt(daysGap[0].value) : null,
+      });
+
+      if (response.error) {
+        return res.boom.badRequest(response.message);
+      }
+      return res
+        .status(200)
+        .json({ message: "Discord details of users with status missed updates fetched successfully", data: response });
+    } else {
+      return res.boom.badRequest("Unknown type and query");
+    }
+  } catch (error) {
+    logger.error("Error in fetching users details of tasks", error);
+    return res.boom.badImplementation(INTERNAL_SERVER_ERROR);
+  }
+};
+
 module.exports = {
   addNewTask,
   fetchTasks,
@@ -486,4 +521,5 @@ module.exports = {
   overdueTasks,
   assignTask,
   updateStatus,
+  getUsersHandler,
 };

middlewares/validators/tasks.js

@@ -1,7 +1,10 @@
 const joi = require("joi");
+const { BadRequest } = require("http-errors");
 const { DINERO, NEELAM } = require("../../constants/wallets");
-const { TASK_STATUS, TASK_STATUS_OLD, MAPPED_TASK_STATUS } = require("../../constants/tasks");
-
+const { TASK_STATUS, TASK_STATUS_OLD, MAPPED_TASK_STATUS, tasksUsersStatus } = require("../../constants/tasks");
+const { RQLQueryParser } = require("../../utils/RQLParser");
+const { Operators } = require("../../typeDefinitions/rqlParser");
+const { daysOfWeek } = require("../../constants/constants");
 const TASK_STATUS_ENUM = Object.values(TASK_STATUS);
 const MAPPED_TASK_STATUS_ENUM = Object.keys(MAPPED_TASK_STATUS);
 
@@ -116,22 +119,30 @@ const updateTask = async (req, res, next) => {
 };
 
 const updateSelfTask = async (req, res, next) => {
+  const validStatus = [...TASK_STATUS_ENUM, ...Object.values(TASK_STATUS_OLD)].filter(
+    (item) => item !== TASK_STATUS.AVAILABLE
+  );
   const schema = joi
     .object()
     .strict()
     .keys({
       status: joi
         .string()
-        .valid(...TASK_STATUS_ENUM, ...Object.values(TASK_STATUS_OLD))
-        .optional(),
+        .valid(...validStatus)
+        .optional()
+        .error(new BadRequest(`The value for the 'status' field is invalid.`)),
       percentCompleted: joi.number().integer().min(0).max(100).optional(),
     });
   try {
     await schema.validateAsync(req.body);
     next();
   } catch (error) {
     logger.error(`Error validating updateSelfTask payload : ${error}`);
-    res.boom.badRequest(error.details[0].message);
+    if (error instanceof BadRequest) {
+      res.boom.badRequest(error.message);
+    } else {
+      res.boom.badRequest(error.details[0].message);
+    }
   }
 };
 
@@ -190,10 +201,68 @@ const getTasksValidator = async (req, res, next) => {
     res.boom.badRequest(error.details[0].message);
   }
 };
+const getUsersValidator = async (req, res, next) => {
+  const queryParamsSchema = joi.object().keys({
+    cursor: joi.string().optional(),
+    q: joi.string().optional(),
+    size: joi.number().integer().min(1).max(2013),
+  });
+  const filtersSchema = joi.object().keys({
+    status: joi
+      .array()
+      .items(
+        joi.object().keys({
+          value: joi.string().valid(...Object.values(tasksUsersStatus)),
+          operator: joi.string().valid(Operators.INCLUDE),
+        })
+      )
+      .required(),
+    "days-count": joi
+      .array()
+      .items(
+        joi.object().keys({
+          value: joi.number().integer().min(1).max(10),
+          operator: joi.string().valid(Operators.EXCLUDE),
+        })
+      )
+      .optional(),
+    weekday: joi
+      .array()
+      .items(
+        joi.object().keys({
+          value: joi.string().valid(...Object.keys(daysOfWeek)),
+          operator: joi.string().valid(Operators.EXCLUDE),
+        })
+      )
+      .optional(),
+    date: joi
+      .array()
+      .items(
+        joi.object().keys({
+          value: joi.date().timestamp(),
+          operator: joi.string().valid(Operators.EXCLUDE),
+        })
+      )
+      .optional(),
+  });
 
+  try {
+    const { q: queryString } = req.query;
+    const rqlQueryParser = new RQLQueryParser(queryString);
+    await Promise.all([
+      queryParamsSchema.validateAsync(req.query),
+      filtersSchema.validateAsync(rqlQueryParser.getFilterQueries()),
+    ]);
+    next();
+  } catch (error) {
+    logger.error(`Error validating get tasks for users query : ${error}`);
+    res.boom.badRequest(error.details[0].message);
+  }
+};
 module.exports = {
   createTask,
   updateTask,
   updateSelfTask,
   getTasksValidator,
+  getUsersValidator,
 };