Revert "Replace 'COMPLETED' with 'DONE' in Backend from 'updateTaskStatus' Function (#1644)" (#1652)

This reverts commit b66cc29.

Author: vinit717

controllers/tasks.js

@@ -312,7 +312,7 @@ const updateTaskStatus = async (req, res, next) => {
   try {
     let userStatusUpdate;
     const taskId = req.params.id;
-    const { userStatusFlag } = req.query;
+    const { dev } = req.query;
     const { id: userId, username } = req.userData;
     const task = await tasks.fetchSelfTask(taskId, userId);
 
@@ -321,28 +321,12 @@ 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.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) &&
       task.taskData.percentCompleted !== 100
@@ -383,8 +367,8 @@ const updateTaskStatus = async (req, res, next) => {
     ]);
     taskLog.id = taskLogResult.id;
 
-    if (userStatusFlag) {
-      if (req.body.percentCompleted === 100 && req.body.status === "DONE") {
+    if (dev) {
+      if (req.body.percentCompleted === 100) {
         return next();
       }
     }

test/integration/tasks.test.js

@@ -945,18 +945,6 @@ describe("Tasks", function () {
       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 () {
-      taskId = (await tasks.updateTask({ ...taskData, status: "REVIEW", assignee: appOwner.username })).taskId;
-      const res = await chai
-        .request(app)
-        .patch(`/tasks/self/${taskId}?userStatusFlag=true`)
-        .set("cookie", `${cookieName}=${jwt}`)
-        .send({ ...taskStatusData, status: "DONE" });
-
-      expect(res).to.have.status(400);
-      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
@@ -969,18 +957,6 @@ describe("Tasks", function () {
       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 () {
-      taskId = (await tasks.updateTask({ ...taskData, status: "REVIEW", assignee: appOwner.username })).taskId;
-      const res = await chai
-        .request(app)
-        .patch(`/tasks/self/${taskId}?userStatusFlag=true`)
-        .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 done yet");
-    });
-
     it("Should give 400 if status is COMPLETED and newpercent is less than 100", async function () {
       const taskData = {
         title: "Test task",
@@ -1005,31 +981,6 @@ describe("Tasks", function () {
       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 COMPLETED and newpercent is less than 100 under feature flag", async function () {
-      const taskData = {
-        title: "Test task",
-        type: "feature",
-        endsOn: 1234,
-        startedOn: 4567,
-        status: "DONE",
-        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}?userStatusFlag=true`)
-        .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 DONE");
-    });
   });
 
   describe("GET /tasks/overdue", function () {