Added support for done completed status in get tasks API, (#2036)

* Added support for done completed status in get tasks API,
Added support for completed status in update API

* fixed test case

* Added newline space

* Added spaceing

* Fixed test case failing issue

* Added line breaks

* Remove unwanted code

---------

Co-authored-by: Shubham Sharma <[email protected]>
Co-authored-by: Sunny Sahsi <[email protected]>

Author: 3 people

controllers/tasks.js

@@ -134,11 +134,11 @@ const fetchPaginatedTasks = async (query) => {
 
 const fetchTasks = async (req, res) => {
   try {
-    const { dev, status, page, size, prev, next, q: queryString, assignee, title } = req.query;
+    const { dev, status, page, size, prev, next, q: queryString, assignee, title, userFeatureFlag } = req.query;
     const transformedQuery = transformQuery(dev, status, size, page, assignee, title);
 
     if (dev) {
-      const paginatedTasks = await fetchPaginatedTasks({ ...transformedQuery, prev, next });
+      const paginatedTasks = await fetchPaginatedTasks({ ...transformedQuery, prev, next, userFeatureFlag });
       return res.json({
         message: "Tasks returned successfully!",
         ...paginatedTasks,

middlewares/validators/tasks.js

@@ -192,6 +192,7 @@ const getTasksValidator = async (req, res, next) => {
         }
         return value;
       }, "Invalid query format"),
+    userFeatureFlag: joi.string().optional(),
   });
 
   try {

models/tasks.js

@@ -147,6 +147,7 @@ const fetchPaginatedTasks = async ({
   dev = false,
   assignee,
   title,
+  userFeatureFlag,
 }) => {
   try {
     let initialQuery = tasksModel;
@@ -196,7 +197,11 @@ const fetchPaginatedTasks = async ({
        */
       title = undefined;
     } else if (status) {
-      initialQuery = initialQuery.where("status", "==", status);
+      if (userFeatureFlag === "true" && [DONE, COMPLETED].includes(status)) {
+        initialQuery = initialQuery.where("status", "in", [DONE, COMPLETED]);
+      } else {
+        initialQuery = initialQuery.where("status", "==", status);
+      }
     }
 
     if (title) {

test/integration/tasks.test.js

@@ -207,6 +207,13 @@ describe("Tasks", function () {
       taskId3 = (await tasks.updateTask({ ...taskData[1], createdAt: 1621717694, updatedAt: 1700775753 })).taskId;
     });
 
+    after(async function () {
+      await tasks.updateTask(
+        { ...taskData[1], createdAt: 1621717694, updatedAt: 1700775753, dependsOn: [], status: "IN_PROGRESS" },
+        taskId2
+      );
+    });
+
     it("Should get all the list of tasks", function (done) {
       chai
         .request(app)
@@ -274,7 +281,7 @@ describe("Tasks", function () {
     it("Should get all tasks filtered with status ,assignee, title when passed to GET /tasks", function (done) {
       chai
         .request(app)
-        .get(`/tasks?status=${TASK_STATUS.IN_PROGRESS}&dev=true&assignee=sagar&title=Test`)
+        .get(`/tasks?status=${TASK_STATUS.IN_PROGRESS}&userFeatureFlag=true&dev=true&assignee=sagar&title=Test`)
         .end((err, res) => {
           if (err) {
             return done(err);
@@ -494,6 +501,31 @@ describe("Tasks", function () {
           return done();
         });
     });
+
+    it("Should get tasks with COMPLETED status task when fetching task of status Done", async function () {
+      await tasks.updateTask(
+        {
+          status: "COMPLETED",
+        },
+        taskId2
+      );
+      const res = await chai.request(app).get(`/tasks?dev=true&status=DONE&userFeatureFlag=true`);
+
+      expect(res).to.have.status(200);
+      expect(res.body).to.be.a("object");
+      expect(res.body.message).to.equal("Tasks returned successfully!");
+      expect(res.body.tasks).to.be.a("array");
+      expect(res.body).to.have.property("next");
+      expect(res.body).to.have.property("prev");
+      const tasksData = res.body.tasks ?? [];
+      let countCompletedTask = 0;
+      tasksData.forEach((task, i) => {
+        if (task.status === "COMPLETED") {
+          countCompletedTask += 1;
+        }
+      });
+      expect(countCompletedTask).to.be.not.equal(0);
+    });
   });
 
   describe("GET /tasks/:id/details", function () {

utils/tasks.js

@@ -147,6 +147,7 @@ const transformTasksUsersQuery = (queries) => {
   }
   return { dateGap: transformedDateGap, status: transformedStatus, size: transformedSize, weekdayList, dateList };
 };
+
 module.exports = {
   fromFirestoreData,
   toFirestoreData,