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

Dev to Main sync

Author: ankushdharkar

config/custom-environment-variables.js

@@ -73,6 +73,10 @@ module.exports = {
     botPublicKey: "BOT_PUBLIC_KEY",
   },
 
+  cronJobHandler: {
+    publicKey: "CRON_JOB_PUBLIC_KEY",
+  },
+
   rdsServerlessBot: {
     rdsServerLessPrivateKey: "RDS_SERVERLESS_PRIVATE_KEY",
     ttl: "RDS_SERVERLESS_TTL",

config/default.js

@@ -48,8 +48,7 @@ module.exports = {
         authRedirection: "/goto",
       },
       goalAPI: {
-        baseUrl: "https://goal-api.realdevsquad.com",
-        secretKey: "<goalSecretKey>",
+        baseUrl: "https://goals-api.realdevsquad.com",
         cookieName: `goals-session-${NODE_ENV}`,
       },
     },

config/development.js

@@ -24,7 +24,7 @@ module.exports = {
     },
 
     goalAPI: {
-      baseUrl: "https://backend-goals-production.up.railway.app",
+      baseUrl: "https://staging-goals-api.realdevsquad.com",
       secretKey: "123456789",
     },
   },

config/production.js

@@ -9,4 +9,10 @@ module.exports = {
   userToken: {
     cookieName: "rds-session",
   },
+
+  services: {
+    goalAPI: {
+      baseUrl: "https://goals-api.realdevsquad.com",
+    },
+  },
 };

config/staging.js

@@ -18,7 +18,7 @@ module.exports = {
       baseUrl: "https://staging-api.realdevsquad.com",
     },
     goalAPI: {
-      baseUrl: "https://backend-goals-production.up.railway.app",
+      baseUrl: "https://staging-goals-api.realdevsquad.com",
       secretKey: "123456789",
     },
   },

constants/taskRequests.ts

@@ -4,6 +4,11 @@ const TASK_REQUEST_STATUS = {
   PENDING: "PENDING",
   DENIED: "DENIED",
 };
+
+const TASK_REQUEST_ACTIONS = {
+  APPROVE: "approve",
+  REJECT: "reject",
+};
 const TASK_REQUEST_ERROR_MESSAGE = {
   INVALID_PREV: "Invalid 'prev' value",
   INVALID_NEXT: "Invalid 'next' value",
@@ -34,6 +39,7 @@ const TASK_REQUEST_SORT_VALUES = {
 const MIGRATION_TYPE = {
   ADD_NEW_FIELDS: "add-new-fields",
   REMOVE_OLD_FIELDS: "remove-redundant-fields",
+  ADD_COUNT_CREATED: "add-count-created-time"
 };
 
 module.exports = {
@@ -44,5 +50,6 @@ module.exports = {
   TASK_REQUEST_SORT_KEYS,
   TASK_REQUEST_ERROR_MESSAGE,
   TASK_REQUEST_SORT_VALUES,
-  MIGRATION_TYPE
-};
+  MIGRATION_TYPE,
+  TASK_REQUEST_ACTIONS,
+};

controllers/cloudflareCache.js

@@ -81,21 +81,21 @@ const fetchPurgedCacheMetadata = async (req, res) => {
       const { timestamp } = latestCacheMetadata;
       return res.json({
         message: "Purged cache metadata returned successfully!",
-        count: logs.length,
+        remainingCount: MAX_CACHE_PURGE_COUNT - logs.length,
         timeLastCleared: timestamp._seconds,
       });
     } else if ((await logsQuery.fetchLastAddedCacheLog(id)).length !== 0) {
       const lastLog = await logsQuery.fetchLastAddedCacheLog(id);
       const { timestamp } = lastLog[0];
       return res.json({
         message: "Purged cache metadata returned successfully!",
-        count: 0,
+        remainingCount: MAX_CACHE_PURGE_COUNT,
         timeLastCleared: timestamp._seconds,
       });
     } else {
       return res.json({
         message: "No cache is cleared yet",
-        count: 0,
+        remainingCount: MAX_CACHE_PURGE_COUNT,
       });
     }
   } catch (error) {

controllers/discordactions.js

@@ -4,7 +4,7 @@ const config = require("config");
 const jwt = require("jsonwebtoken");
 const discordRolesModel = require("../models/discordactions");
 const discordServices = require("../services/discordService");
-const { fetchAllUsers } = require("../models/users");
+const { fetchAllUsers, fetchUser } = require("../models/users");
 const discordDeveloperRoleId = config.get("discordDeveloperRoleId");
 const discordMavenRoleId = config.get("discordMavenRoleId");
 
@@ -23,9 +23,9 @@ const createGroupRole = async (req, res) => {
   try {
     const rolename = `group-${req.body.rolename}`;
 
-    const { wasSuccess } = await discordRolesModel.isGroupRoleExists(rolename);
+    const { roleExists } = await discordRolesModel.isGroupRoleExists({ rolename });
 
-    if (!wasSuccess) {
+    if (roleExists) {
       return res.status(400).json({
         message: "Role already exists!",
       });
@@ -109,6 +109,15 @@ const addGroupRoleToMember = async (req, res) => {
       ...req.body,
       date: admin.firestore.Timestamp.fromDate(new Date()),
     };
+    const roleExistsPromise = discordRolesModel.isGroupRoleExists({
+      roleid: memberGroupRole.roleid,
+    });
+    const userDataPromise = fetchUser({ discordId: memberGroupRole.userid });
+    const [{ roleExists }, userData] = await Promise.all([roleExistsPromise, userDataPromise]);
+
+    if (!roleExists || req.userData.id !== userData.user.id) {
+      res.boom.forbidden("Permission denied. Cannot add the role.");
+    }
 
     const { roleData, wasSuccess } = await discordRolesModel.addGroupRoleToMember(memberGroupRole);
 
@@ -146,6 +155,17 @@ const addGroupRoleToMember = async (req, res) => {
 const deleteRole = async (req, res) => {
   try {
     const { roleid, userid } = req.body;
+
+    const roleExistsPromise = discordRolesModel.isGroupRoleExists({
+      roleid,
+    });
+    const userDataPromise = fetchUser({ discordId: userid });
+    const [{ roleExists }, userData] = await Promise.all([roleExistsPromise, userDataPromise]);
+
+    if (!roleExists || req.userData.id !== userData.user.id) {
+      res.boom.forbidden("Permission denied. Cannot delete the role.");
+    }
+
     const { wasSuccess } = await discordRolesModel.removeMemberGroup(roleid, userid);
     if (wasSuccess) {
       return res.status(200).json({ message: "Role deleted successfully" });

controllers/tasksRequests.js

@@ -1,5 +1,5 @@
 const { INTERNAL_SERVER_ERROR, SOMETHING_WENT_WRONG } = require("../constants/errorMessages");
-const { TASK_REQUEST_TYPE, MIGRATION_TYPE } = require("../constants/taskRequests");
+const { TASK_REQUEST_TYPE, MIGRATION_TYPE, TASK_REQUEST_ACTIONS } = require("../constants/taskRequests");
 const { addLog } = require("../models/logs");
 const taskRequestsModel = require("../models/taskRequests");
 const tasksModel = require("../models/tasks.js");
@@ -97,7 +97,7 @@ const addTaskRequests = async (req, res) => {
         break;
       }
     }
-    const newTaskRequest = await taskRequestsModel.createRequest(taskRequestData, req.userData.username);
+    const newTaskRequest = await taskRequestsModel.createRequest(taskRequestData, req.userData.id);
 
     if (newTaskRequest.isCreationRequestApproved) {
       return res.boom.conflict("Task exists for the given issue.");
@@ -111,9 +111,9 @@ const addTaskRequests = async (req, res) => {
       meta: {
         taskRequestId: newTaskRequest.id,
         action: "create",
-        createdBy: req.userData.username,
+        createdBy: req.userData.id,
         createdAt: Date.now(),
-        lastModifiedBy: req.userData.username,
+        lastModifiedBy: req.userData.id,
         lastModifiedAt: Date.now(),
       },
       body: newTaskRequest.taskRequest,
@@ -169,45 +169,62 @@ const addOrUpdate = async (req, res) => {
   }
 };
 
-const approveTaskRequest = async (req, res) => {
+const updateTaskRequests = async (req, res) => {
   try {
     const { taskRequestId, user } = req.body;
     if (!taskRequestId) {
       return res.boom.badRequest("taskRequestId not provided");
     }
 
-    const response = await taskRequestsModel.approveTaskRequest(taskRequestId, user);
+    const { action = TASK_REQUEST_ACTIONS.APPROVE } = req.query;
 
-    if (response.taskRequestNotFound) {
+    let updateTaskRequestResponse = {};
+    switch (action) {
+      case TASK_REQUEST_ACTIONS.APPROVE: {
+        updateTaskRequestResponse = await taskRequestsModel.approveTaskRequest(taskRequestId, user, req.userData.id);
+        break;
+      }
+      case TASK_REQUEST_ACTIONS.REJECT: {
+        updateTaskRequestResponse = await taskRequestsModel.rejectTaskRequest(taskRequestId, req.userData.id);
+        break;
+      }
+      default: {
+        return res.boom.badRequest("Unknown action");
+      }
+    }
+
+    if (updateTaskRequestResponse.taskRequestNotFound) {
       return res.boom.badRequest("Task request not found.");
     }
-    if (response.isUserInvalid) {
+    if (updateTaskRequestResponse.isUserInvalid) {
       return res.boom.badRequest("User request not available.");
     }
-    if (response.isTaskRequestInvalid) {
+    if (updateTaskRequestResponse.isTaskRequestInvalid) {
       return res.boom.badRequest("Task request was previously approved or rejected.");
     }
 
-    await updateUserStatusOnTaskUpdate(user.username);
+    if (action && action === TASK_REQUEST_ACTIONS.APPROVE) {
+      await updateUserStatusOnTaskUpdate(user.username);
+    }
 
     const taskRequestLog = {
       type: "taskRequests",
       meta: {
         taskRequestId: taskRequestId,
         action: "update",
-        subAction: "approve",
-        createdBy: req.userData.username,
+        subAction: action,
+        createdBy: req.userData.id,
         createdAt: Date.now(),
-        lastModifiedBy: req.userData.username,
+        lastModifiedBy: req.userData.id,
         lastModifiedAt: Date.now(),
       },
-      body: response.taskRequest,
+      body: updateTaskRequestResponse.taskRequest,
     };
     await addLog(taskRequestLog.type, taskRequestLog.meta, taskRequestLog.body);
 
     return res.status(200).json({
-      message: `Task successfully assigned to user ${response.approvedTo}`,
-      taskRequest: response.taskRequest,
+      message: `Task updated successfully.`,
+      taskRequest: updateTaskRequestResponse?.taskRequest,
     });
   } catch (err) {
     logger.error("Error while approving task request", err);
@@ -228,6 +245,10 @@ const migrateTaskRequests = async (req, res) => {
         responseData = await taskRequestsModel.removeOldField();
         break;
       }
+      case MIGRATION_TYPE.ADD_COUNT_CREATED: {
+        responseData = await taskRequestsModel.addUsersCountAndCreatedAt();
+        break;
+      }
       default: {
         return res.boom.badRequest("Unknown action");
       }
@@ -239,7 +260,7 @@ const migrateTaskRequests = async (req, res) => {
   }
 };
 module.exports = {
-  approveTaskRequest,
+  updateTaskRequests,
   addOrUpdate,
   fetchTaskRequests,
   fetchTaskRequestById,

middlewares/taskRequests.js

@@ -1,12 +1,17 @@
 const { SOMETHING_WENT_WRONG } = require("../constants/errorMessages");
 const dataAccess = require("../services/dataAccessLayer");
+const { TASK_REQUEST_ACTIONS } = require("../constants/taskRequests");
 /**
  * Validates user id for task request
  *
  * @param userId { string }: user id of the user
  */
 async function validateUser(req, res, next) {
   try {
+    const { action } = req.query;
+    if (action === TASK_REQUEST_ACTIONS.REJECT) {
+      return next();
+    }
     const { userId } = req.body;
 
     if (!userId) {