Replace 'COMPLETED' with 'DONE' in Backend from 'updateTaskStatus' Function (#1657)

* changes status completd to done

* change error message and fix test

* change in title of test

* added feature flag in controller

* test under feature flag

* minor changes

* comment out assignTask function in middleware

* minor change

* minor change

* use fixture data in test

* change comment message for assign task

* change fixture file

* removed commented code

Author: shubhamsinghbundela

controllers/tasks.js

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

test/fixtures/tasks/tasks1.js

@@ -0,0 +1,25 @@
+const { DINERO, NEELAM } = require("../../../constants/wallets");
+const userData = require("../user/user")();
+const appOwner = userData[3];
+/**
+ * Sample tasks for tests
+ * @return  {object}
+ */
+
+module.exports = () => {
+  return [
+    {
+      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,
+    },
+  ];
+};

test/integration/tasks.test.js

@@ -15,6 +15,7 @@ const tasksData = require("../fixtures/tasks/tasks")();
 const { DINERO, NEELAM } = require("../../constants/wallets");
 const cleanDb = require("../utils/cleanDb");
 const { TASK_STATUS } = require("../../constants/tasks");
+const updateTaskStatus = require("../fixtures/tasks/tasks1")();
 chai.use(chaiHttp);
 
 const appOwner = userData[3];
@@ -836,6 +837,30 @@ describe("Tasks", function () {
           return done();
         });
     });
+
+    it("Should update the task status for given self taskid under feature flag", function (done) {
+      chai
+        .request(app)
+        .patch(`/tasks/self/${taskId1}?userStatusFlag=true`)
+        .set("cookie", `${cookieName}=${jwt}`)
+        .send({ status: "DONE", percentCompleted: 100 })
+        .end((err, res) => {
+          if (err) {
+            return done(err);
+          }
+          expect(res).to.have.status(200);
+          expect(res.body.taskLog).to.have.property("type");
+          expect(res.body.taskLog).to.have.property("id");
+          expect(res.body.taskLog.body).to.be.a("object");
+          expect(res.body.taskLog.meta).to.be.a("object");
+          expect(res.body.message).to.equal("Task updated successfully!");
+
+          expect(res.body.taskLog.body.new.status).to.equal("DONE");
+          expect(res.body.taskLog.body.new.percentCompleted).to.equal(100);
+          return done();
+        });
+    });
+
     it("Should return fail response if task data has non-acceptable status value to update the task status for given self taskid", function (done) {
       chai
         .request(app)
@@ -945,6 +970,18 @@ 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
@@ -957,6 +994,18 @@ 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",
@@ -981,6 +1030,18 @@ 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 DONE and newpercent is less than 100 under feature flag", async function () {
+      taskId = (await tasks.updateTask(updateTaskStatus[0])).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 () {