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

Dev to main sync

Author: iamitprakash

controllers/extensionRequests.js

@@ -290,7 +290,6 @@ const getSelfExtensionRequests = async (req, res) => {
  */
 const updateExtensionRequest = async (req, res) => {
   try {
-    const { dev = "false" } = req.query;
     const extensionRequest = await extensionRequestsQuery.fetchExtensionRequest(req.params.id);
     if (!extensionRequest.extensionRequestData) {
       return res.boom.notFound("Extension Request not found");
@@ -305,34 +304,32 @@ const updateExtensionRequest = async (req, res) => {
 
     const promises = [extensionRequestsQuery.updateExtensionRequest(req.body, req.params.id)];
     // If flag is present, then only create log for change in ETA/reason by SU
-    if (dev === "true") {
-      let body = {};
-      // Check if reason has been changed
-      if (req.body.reason && req.body.reason !== extensionRequest.extensionRequestData.reason) {
-        body = { ...body, oldReason: extensionRequest.extensionRequestData.reason, newReason: req.body.reason };
-      }
-      // Check if newEndsOn has been changed
-      if (req.body.newEndsOn && req.body.newEndsOn !== extensionRequest.extensionRequestData.newEndsOn) {
-        body = { ...body, oldEndsOn: extensionRequest.extensionRequestData.newEndsOn, newEndsOn: req.body.newEndsOn };
-      }
-      // Check if title has been changed
-      if (req.body.title && req.body.title !== extensionRequest.extensionRequestData.title) {
-        body = { ...body, oldTitle: extensionRequest.extensionRequestData.title, newTitle: req.body.title };
-      }
+    let body = {};
+    // Check if reason has been changed
+    if (req.body.reason && req.body.reason !== extensionRequest.extensionRequestData.reason) {
+      body = { ...body, oldReason: extensionRequest.extensionRequestData.reason, newReason: req.body.reason };
+    }
+    // Check if newEndsOn has been changed
+    if (req.body.newEndsOn && req.body.newEndsOn !== extensionRequest.extensionRequestData.newEndsOn) {
+      body = { ...body, oldEndsOn: extensionRequest.extensionRequestData.newEndsOn, newEndsOn: req.body.newEndsOn };
+    }
+    // Check if title has been changed
+    if (req.body.title && req.body.title !== extensionRequest.extensionRequestData.title) {
+      body = { ...body, oldTitle: extensionRequest.extensionRequestData.title, newTitle: req.body.title };
+    }
 
-      // Validate if there's any update that actually happened, then only create the log
-      if (Object.keys(body).length > 0) {
-        const extensionLog = {
-          type: "extensionRequests",
-          meta: {
-            extensionRequestId: req.params.id,
-            taskId: extensionRequest.extensionRequestData.taskId,
-            userId: req.userData.id,
-          },
-          body,
-        };
-        promises.push(addLog(extensionLog.type, extensionLog.meta, extensionLog.body));
-      }
+    // Validate if there's any update that actually happened, then only create the log
+    if (Object.keys(body).length > 0) {
+      const extensionLog = {
+        type: "extensionRequests",
+        meta: {
+          extensionRequestId: req.params.id,
+          taskId: extensionRequest.extensionRequestData.taskId,
+          userId: req.userData.id,
+        },
+        body,
+      };
+      promises.push(addLog(extensionLog.type, extensionLog.meta, extensionLog.body));
     }
     await Promise.all(promises);
 
@@ -351,7 +348,6 @@ const updateExtensionRequest = async (req, res) => {
  */
 const updateExtensionRequestStatus = async (req, res) => {
   try {
-    const { dev = "false" } = req.query;
     const extensionRequest = await extensionRequestsQuery.fetchExtensionRequest(req.params.id);
     if (!extensionRequest.extensionRequestData) {
       return res.boom.notFound("Extension Request not found");
@@ -361,7 +357,7 @@ const updateExtensionRequestStatus = async (req, res) => {
     const extensionLog = {
       type: "extensionRequests",
       meta: {
-        ...(dev === "true" && { extensionRequestId: req.params.id }), // if flag is present, add extensionRequestId
+        extensionRequestId: req.params.id,
         taskId: extensionRequest.extensionRequestData.taskId,
         username: req.userData.username,
         userId: req.userData.id,

models/logs.js

@@ -36,17 +36,16 @@ const addLog = async (type, meta, body) => {
  */
 const fetchLogs = async (query, param) => {
   try {
-    const { dev, ...remainingQuery } = query;
     let call = logsModel.where("type", "==", param);
-    Object.keys(remainingQuery).forEach((key) => {
+    Object.keys(query).forEach((key) => {
       // eslint-disable-next-line security/detect-object-injection
       if (key !== "limit" && key !== "lastDocId") {
         // eslint-disable-next-line security/detect-object-injection
-        call = call.where(key, "==", remainingQuery[key]);
+        call = call.where(key, "==", query[key]);
       }
     });
 
-    const { limit, lastDocId, userId } = remainingQuery;
+    const { limit, lastDocId, userId } = query;
     let lastDoc;
     const limitDocuments = Number(limit);
 
@@ -80,7 +79,7 @@ const fetchLogs = async (query, param) => {
     });
 
     // If dev flag is presend and extensionRequest logs are requested, populate userId
-    if (dev === "true" && param === "extensionRequests") {
+    if (param === "extensionRequests") {
       const userIdNameMap = {};
       for await (const log of logs) {
         if (log.meta.userId) {

test/integration/extensionRequests.test.js

@@ -825,10 +825,10 @@ describe("Extension Requests", function () {
         });
     });
 
-    it("Extension request log should contain extensionRequestId upon approving request in dev mode", function (done) {
+    it("Extension request log should contain extensionRequestId upon approving", function (done) {
       chai
         .request(app)
-        .patch(`/extension-requests/${extensionRequestId3}/status?dev=true`)
+        .patch(`/extension-requests/${extensionRequestId3}/status`)
         .set("cookie", `${cookieName}=${superUserJwt}`)
         .send({
           status: "APPROVED",
@@ -861,10 +861,10 @@ describe("Extension Requests", function () {
           return null;
         });
     });
-    it("Extension request log should contain extensionRequestId upon denying request in dev mode", function (done) {
+    it("Extension request log should contain extensionRequestId upon denying request", function (done) {
       chai
         .request(app)
-        .patch(`/extension-requests/${extensionRequestId4}/status?dev=true`)
+        .patch(`/extension-requests/${extensionRequestId4}/status`)
         .set("cookie", `${cookieName}=${superUserJwt}`)
         .send({
           status: "DENIED",
@@ -898,13 +898,13 @@ describe("Extension Requests", function () {
         });
     });
   });
-  describe("PATCH /extension-requests/:id?dev=true", function () {
+  describe("Updating extension request detail", function () {
     it("Should create a log when SU changes the extension request's title", async function () {
       const newTitle = "new-title";
-      const oldTitle = "change ETA"; // from above
+      const oldTitle = "change ETA";
       await chai
         .request(app)
-        .patch(`/extension-requests/${extensionRequestId5}/?dev=true`)
+        .patch(`/extension-requests/${extensionRequestId5}`)
         .set("cookie", `${cookieName}=${superUserJwt}`)
         .send({
           title: newTitle,
@@ -924,7 +924,7 @@ describe("Extension Requests", function () {
       const suETA = 4444; // from above
       await chai
         .request(app)
-        .patch(`/extension-requests/${extensionRequestId5}/?dev=true`)
+        .patch(`/extension-requests/${extensionRequestId5}`)
         .set("cookie", `${cookieName}=${superUserJwt}`)
         .send({
           newEndsOn: suETA,
@@ -944,7 +944,7 @@ describe("Extension Requests", function () {
       const oldReason = "family event"; // from above
       await chai
         .request(app)
-        .patch(`/extension-requests/${extensionRequestId5}/?dev=true`)
+        .patch(`/extension-requests/${extensionRequestId5}`)
         .set("cookie", `${cookieName}=${superUserJwt}`)
         .send({
           reason: newReason,