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

dev to main sync

Author: prakashchoudhary07

controllers/tasks.js

@@ -312,7 +312,6 @@ const updateTaskStatus = async (req, res, next) => {
   try {
     let userStatusUpdate;
     const taskId = req.params.id;
-    const { userStatusFlag } = req.query;
     const { id: userId, username } = req.userData;
     const task = await tasks.fetchSelfTask(taskId, userId);
 
@@ -321,34 +320,18 @@ const updateTaskStatus = async (req, res, next) => {
     if (task.taskData.status === TASK_STATUS.VERIFIED || req.body.status === TASK_STATUS.MERGED)
       return res.boom.forbidden("Status cannot be updated. Please contact admin.");
 
-    if (userStatusFlag) {
-      if (task.taskData.status === TASK_STATUS.DONE && req.body.percentCompleted < 100) {
-        if (req.body.status === TASK_STATUS.DONE || !req.body.status) {
-          return res.boom.badRequest("Task percentCompleted can't updated as status is DONE");
-        }
-      }
-
-      if (
-        (req.body.status === TASK_STATUS.DONE || req.body.status === TASK_STATUS.VERIFIED) &&
-        task.taskData.percentCompleted !== 100
-      ) {
-        if (req.body.percentCompleted !== 100) {
-          return res.boom.badRequest("Status cannot be updated. Task is not done yet");
-        }
+    if (task.taskData.status === TASK_STATUS.DONE && req.body.percentCompleted < 100) {
+      if (req.body.status === TASK_STATUS.DONE || !req.body.status) {
+        return res.boom.badRequest("Task percentCompleted can't updated as status is DONE");
       }
     }
 
-    if (task.taskData.status === TASK_STATUS.COMPLETED && req.body.percentCompleted < 100) {
-      if (req.body.status === TASK_STATUS.COMPLETED || !req.body.status) {
-        return res.boom.badRequest("Task percentCompleted can't updated as status is COMPLETED");
-      }
-    }
     if (
-      (req.body.status === TASK_STATUS.COMPLETED || req.body.status === TASK_STATUS.VERIFIED) &&
+      (req.body.status === TASK_STATUS.DONE || req.body.status === TASK_STATUS.VERIFIED) &&
       task.taskData.percentCompleted !== 100
     ) {
       if (req.body.percentCompleted !== 100) {
-        return res.boom.badRequest("Status cannot be updated. Task is not completed yet");
+        return res.boom.badRequest("Status cannot be updated. Task is not done yet");
       }
     }
 
@@ -443,6 +426,16 @@ const assignTask = async (req, res) => {
   }
 };
 
+const updateStatus = async (req, res) => {
+  try {
+    const response = await tasks.updateTaskStatus();
+    return res.status(200).json(response);
+  } catch (error) {
+    logger.error("Error in migration scripts", error);
+    return res.boom.badImplementation(INTERNAL_SERVER_ERROR);
+  }
+};
+
 module.exports = {
   addNewTask,
   fetchTasks,
@@ -453,4 +446,5 @@ module.exports = {
   updateTaskStatus,
   overdueTasks,
   assignTask,
+  updateStatus,
 };

models/tasks.js

@@ -3,10 +3,14 @@ const tasksModel = firestore.collection("tasks");
 const ItemModel = firestore.collection("itemTags");
 const dependencyModel = firestore.collection("taskDependencies");
 const userUtils = require("../utils/users");
+const { updateTaskStatusToDone } = require("../services/tasks");
+const { chunks } = require("../utils/array");
+const { DOCUMENT_WRITE_SIZE } = require("../constants/constants");
 const { fromFirestoreData, toFirestoreData, buildTasks } = require("../utils/tasks");
 const { TASK_TYPE, TASK_STATUS, TASK_STATUS_OLD, TASK_SIZE } = require("../constants/tasks");
 const { IN_PROGRESS, NEEDS_REVIEW, IN_REVIEW, ASSIGNED, BLOCKED, SMOKE_TESTING, COMPLETED, SANITY_CHECK } = TASK_STATUS;
 const { OLD_ACTIVE, OLD_BLOCKED, OLD_PENDING, OLD_COMPLETED } = TASK_STATUS_OLD;
+const { INTERNAL_SERVER_ERROR } = require("../constants/errorMessages");
 
 /**
  * Adds and Updates tasks
@@ -575,6 +579,62 @@ const getOverdueTasks = async (days = 0) => {
   }
 };
 
+const updateTaskStatus = async () => {
+  try {
+    const snapshot = await tasksModel.where("status", "==", "COMPLETED").get();
+    const tasksStatusCompleted = [];
+    let summary = {
+      totalTasks: snapshot.size,
+      totalUpdatedStatus: 0,
+      totalOperationsFailed: 0,
+      updatedTaskDetails: [],
+      failedTaskDetails: [],
+    };
+
+    if (snapshot.size === 0) {
+      return summary;
+    }
+
+    snapshot.forEach((task) => {
+      const id = task.id;
+      const taskData = task.data();
+      tasksStatusCompleted.push({ ...taskData, id });
+    });
+    const taskStatusCompletedChunks = chunks(tasksStatusCompleted, DOCUMENT_WRITE_SIZE);
+
+    const updatedTasksPromises = await Promise.all(
+      taskStatusCompletedChunks.map(async (tasks) => {
+        const res = await updateTaskStatusToDone(tasks);
+        return {
+          totalUpdatedStatus: res.totalUpdatedStatus,
+          totalOperationsFailed: res.totalOperationsFailed,
+          updatedTaskDetails: res.updatedTaskDetails,
+          failedTaskDetails: res.failedTaskDetails,
+        };
+      })
+    );
+
+    updatedTasksPromises.forEach((res) => {
+      summary = {
+        ...summary,
+        totalUpdatedStatus: (summary.totalUpdatedStatus += res.totalUpdatedStatus),
+        totalOperationsFailed: (summary.totalOperationsFailed += res.totalOperationsFailed),
+        updatedTaskDetails: [...summary.updatedTaskDetails, ...res.updatedTaskDetails],
+        failedTaskDetails: [...summary.failedTaskDetails, ...res.failedTaskDetails],
+      };
+    });
+
+    if (summary.totalOperationsFailed === summary.totalTasks) {
+      throw Error(INTERNAL_SERVER_ERROR);
+    }
+
+    return summary;
+  } catch (error) {
+    logger.error(`Error in updating task status:  ${error}`);
+    throw error;
+  }
+};
+
 module.exports = {
   updateTask,
   fetchTasks,
@@ -591,4 +651,5 @@ module.exports = {
   fetchPaginatedTasks,
   getBuiltTasks,
   getOverdueTasks,
+  updateTaskStatus,
 };

routes/taskRequests.js

@@ -7,8 +7,8 @@ const taskRequests = require("../controllers/tasksRequests");
 const { validateUser } = require("../middlewares/taskRequests");
 const validators = require("../middlewares/validators/task-requests");
 
-router.get("/", authenticate, authorizeRoles([SUPERUSER]), validators.getTaskRequests, taskRequests.fetchTaskRequests);
-router.get("/:id", authenticate, authorizeRoles([SUPERUSER]), taskRequests.fetchTaskRequestById);
+router.get("/", authenticate, taskRequests.fetchTaskRequests);
+router.get("/:id", authenticate, taskRequests.fetchTaskRequestById);
 router.post("/addOrUpdate", authenticate, validateUser, taskRequests.addOrUpdate);
 router.patch("/approve", authenticate, authorizeRoles([SUPERUSER]), validateUser, taskRequests.approveTaskRequest);
 router.post("/", authenticate, validators.postTaskRequests, taskRequests.addTaskRequests);

routes/tasks.js

@@ -40,4 +40,6 @@ router.patch(
 );
 router.patch("/assign/self", authenticate, invalidateCache({ invalidationKeys: [ALL_TASKS] }), tasks.assignTask);
 
+router.post("/migration", authenticate, authorizeRoles([SUPERUSER]), tasks.updateStatus);
+
 module.exports = router;

services/tasks.js

@@ -0,0 +1,31 @@
+const firestore = require("../utils/firestore");
+const tasksModel = firestore.collection("tasks");
+const updateTaskStatusToDone = async (tasksData) => {
+  const batch = firestore.batch();
+  const tasksBatch = [];
+  const summary = {
+    totalUpdatedStatus: 0,
+    totalOperationsFailed: 0,
+    updatedTaskDetails: [],
+    failedTaskDetails: [],
+  };
+  tasksData.forEach((task) => {
+    const updateTaskData = { ...task, status: "DONE" };
+    batch.update(tasksModel.doc(task.id), updateTaskData);
+    tasksBatch.push(task.id);
+  });
+  try {
+    await batch.commit();
+    summary.totalUpdatedStatus += tasksData.length;
+    summary.updatedTaskDetails = [...tasksBatch];
+    return { ...summary };
+  } catch (err) {
+    logger.error("Firebase batch Operation Failed!");
+    summary.totalOperationsFailed += tasksData.length;
+    summary.failedTaskDetails = [...tasksBatch];
+    return { ...summary };
+  }
+};
+module.exports = {
+  updateTaskStatusToDone,
+};

test/integration/taskRequests.test.js

@@ -119,7 +119,7 @@ describe("Task Requests", function () {
         await taskRequestsModel.addOrUpdate(taskId, userId);
       });
 
-      it("should return 401 unauthorized user response", function (done) {
+      it("should be successful when the user is not a super user", function (done) {
         chai
           .request(app)
           .get("/taskRequests")
@@ -129,7 +129,7 @@ describe("Task Requests", function () {
               return done(err);
             }
 
-            expect(res).to.have.status(401);
+            expect(res).to.have.status(200);
             return done();
           });
       });
@@ -196,7 +196,7 @@ describe("Task Requests", function () {
         await taskRequestsModel.addOrUpdate(taskId, userId);
       });
 
-      it("should return 401 status code", function (done) {
+      it("should be successful when the user is not a super user", function (done) {
         chai
           .request(app)
           .get(`/taskRequests/taskrequstid`)
@@ -206,7 +206,7 @@ describe("Task Requests", function () {
               return done(err);
             }
 
-            expect(res).to.have.status(401);
+            expect(res).to.have.status(200);
             return done();
           });
       });

test/integration/tasks.test.js

@@ -3,6 +3,7 @@ const sinon = require("sinon");
 const { expect } = chai;
 const chaiHttp = require("chai-http");
 
+const firestore = require("../../utils/firestore");
 const app = require("../../server");
 const tasks = require("../../models/tasks");
 const authService = require("../../services/authService");
@@ -958,19 +959,7 @@ describe("Tasks", function () {
       expect(res.body.message).to.be.equal("Status cannot be updated. Please contact admin.");
     });
 
-    it("Should give 400 if percentCompleted is not 100 and new status is COMPLETED ", async function () {
-      taskId = (await tasks.updateTask({ ...taskData, status: "REVIEW", assignee: appOwner.username })).taskId;
-      const res = await chai
-        .request(app)
-        .patch(`/tasks/self/${taskId}`)
-        .set("cookie", `${cookieName}=${jwt}`)
-        .send({ ...taskStatusData, status: "COMPLETED" });
-
-      expect(res).to.have.status(400);
-      expect(res.body.message).to.be.equal("Status cannot be updated. Task is not completed yet");
-    });
-
-    it("Should give 400 if percentCompleted is not 100 and new status is DONE under feature flag ", async function () {
+    it("Should give 400 if percentCompleted is not 100 and new status is DONE", async function () {
       taskId = (await tasks.updateTask({ ...taskData, status: "REVIEW", assignee: appOwner.username })).taskId;
       const res = await chai
         .request(app)
@@ -982,19 +971,7 @@ describe("Tasks", function () {
       expect(res.body.message).to.be.equal("Status cannot be updated. Task is not done yet");
     });
 
-    it("Should give 400 if percentCompleted is not 100 and new status is VERIFIED ", async function () {
-      taskId = (await tasks.updateTask({ ...taskData, status: "REVIEW", assignee: appOwner.username })).taskId;
-      const res = await chai
-        .request(app)
-        .patch(`/tasks/self/${taskId}`)
-        .set("cookie", `${cookieName}=${jwt}`)
-        .send({ ...taskStatusData, status: "VERIFIED" });
-
-      expect(res).to.have.status(400);
-      expect(res.body.message).to.be.equal("Status cannot be updated. Task is not completed yet");
-    });
-
-    it("Should give 400 if percentCompleted is not 100 and new status is VERIFIED under feature flag", async function () {
+    it("Should give 400 if percentCompleted is not 100 and new status is VERIFIED", async function () {
       taskId = (await tasks.updateTask({ ...taskData, status: "REVIEW", assignee: appOwner.username })).taskId;
       const res = await chai
         .request(app)
@@ -1006,32 +983,7 @@ describe("Tasks", function () {
       expect(res.body.message).to.be.equal("Status cannot be updated. Task is not done yet");
     });
 
-    it("Should give 400 if status is COMPLETED and newpercent is less than 100", async function () {
-      const taskData = {
-        title: "Test task",
-        type: "feature",
-        endsOn: 1234,
-        startedOn: 4567,
-        status: "COMPLETED",
-        percentCompleted: 100,
-        participants: [],
-        assignee: appOwner.username,
-        completionAward: { [DINERO]: 3, [NEELAM]: 300 },
-        lossRate: { [DINERO]: 1 },
-        isNoteworthy: true,
-      };
-      taskId = (await tasks.updateTask(taskData)).taskId;
-      const res = await chai
-        .request(app)
-        .patch(`/tasks/self/${taskId}`)
-        .set("cookie", `${cookieName}=${jwt}`)
-        .send({ percentCompleted: 80 });
-
-      expect(res).to.have.status(400);
-      expect(res.body.message).to.be.equal("Task percentCompleted can't updated as status is COMPLETED");
-    });
-
-    it("Should give 400 if status is DONE and newpercent is less than 100 under feature flag", async function () {
+    it("Should give 400 if status is DONE and newpercent is less than 100", async function () {
       taskId = (await tasks.updateTask(updateTaskStatus[0])).taskId;
       const res = await chai
         .request(app)
@@ -1070,4 +1022,51 @@ describe("Tasks", function () {
       expect(res.body.message).to.be.equal("No overdue tasks found");
     });
   });
+
+  describe("POST /tasks/migration", function () {
+    it("Should update status COMPLETED to DONE successful", async function () {
+      const taskData1 = { status: "COMPLETED" };
+      await firestore.collection("tasks").doc("updateTaskStatus1").set(taskData1);
+      const res = await chai.request(app).post("/tasks/migration").set("cookie", `${cookieName}=${superUserJwt}`);
+      expect(res).to.have.status(200);
+      expect(res.body.totalTasks).to.be.equal(1);
+      expect(res.body.totalUpdatedStatus).to.be.equal(1);
+      expect(res.body.updatedTaskDetails).to.deep.equal(["updateTaskStatus1"]);
+      expect(res.body.totalOperationsFailed).to.be.equal(0);
+      expect(res.body.failedTaskDetails).to.deep.equal([]);
+    });
+
+    it("Should not update if not found any COMPLETED task status ", async function () {
+      const res = await chai.request(app).post("/tasks/migration").set("cookie", `${cookieName}=${superUserJwt}`);
+      expect(res).to.have.status(200);
+      expect(res.body.totalTasks).to.be.equal(0);
+      expect(res.body.totalUpdatedStatus).to.be.equal(0);
+      expect(res.body.updatedTaskDetails).to.deep.equal([]);
+      expect(res.body.totalOperationsFailed).to.be.equal(0);
+      expect(res.body.failedTaskDetails).to.deep.equal([]);
+    });
+
+    it("should throw an error if firestore batch operations fail", async function () {
+      const stub = sinon.stub(firestore, "batch");
+      stub.returns({
+        update: function () {},
+        commit: function () {
+          throw new Error("Firestore batch commit failed!");
+        },
+      });
+      const taskData1 = { status: "COMPLETED" };
+      await firestore.collection("tasks").doc("updateTaskStatus1").set(taskData1);
+      const res = await chai.request(app).post("/tasks/migration").set("cookie", `${cookieName}=${superUserJwt}`);
+      expect(res.status).to.equal(500);
+      const response = res.body;
+      expect(response.message).to.be.equal("An internal server error occurred");
+    });
+
+    it("Should return 401 if not super_user", async function () {
+      const nonSuperUserId = await addUser(appOwner);
+      const nonSuperUserJwt = authService.generateAuthToken({ userId: nonSuperUserId });
+      const res = await chai.request(app).post("/tasks/migration").set("cookie", `${cookieName}=${nonSuperUserJwt}`);
+      expect(res).to.have.status(401);
+    });
+  });
 });