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

* feat: task orderBy updatedAt, desc order

* test: fix failing tests

* test: add test for order

Author: prakashchoudhary07

models/tasks.js

@@ -159,7 +159,7 @@ const fetchPaginatedTasks = async ({
         }
       }
     } else {
-      initialQuery = tasksModel.orderBy("title");
+      initialQuery = tasksModel.orderBy("updatedAt", "desc");
       if (status) {
         initialQuery = initialQuery.where("status", "==", status);
       }

test/integration/tasks.test.js

@@ -24,6 +24,40 @@ const superUser = userData[4];
 
 let jwt, superUserJwt;
 
+const taskData = [
+  {
+    title: "Test task",
+    type: "feature",
+    endsOn: 1234,
+    startedOn: 4567,
+    status: "IN_PROGRESS",
+    percentCompleted: 10,
+    participants: [],
+    assignee: appOwner.username,
+    completionAward: { [DINERO]: 3, [NEELAM]: 300 },
+    lossRate: { [DINERO]: 1 },
+    isNoteworthy: true,
+    isCollapsed: true,
+  },
+  {
+    title: "Test task",
+    purpose: "To Test mocha",
+    featureUrl: "<testUrl>",
+    type: "group",
+    links: ["test1"],
+    endsOn: 1234,
+    startedOn: 54321,
+    status: "completed",
+    percentCompleted: 10,
+    dependsOn: ["d12", "d23"],
+    participants: [appOwner.username],
+    completionAward: { [DINERO]: 3, [NEELAM]: 300 },
+    lossRate: { [DINERO]: 1 },
+    isNoteworthy: false,
+    assignee: appOwner.username,
+  },
+];
+
 describe("Tasks", function () {
   let taskId1, taskId;
 
@@ -33,40 +67,6 @@ describe("Tasks", function () {
     jwt = authService.generateAuthToken({ userId });
     superUserJwt = authService.generateAuthToken({ userId: superUserId });
 
-    const taskData = [
-      {
-        title: "Test task",
-        type: "feature",
-        endsOn: 1234,
-        startedOn: 4567,
-        status: "IN_PROGRESS",
-        percentCompleted: 10,
-        participants: [],
-        assignee: appOwner.username,
-        completionAward: { [DINERO]: 3, [NEELAM]: 300 },
-        lossRate: { [DINERO]: 1 },
-        isNoteworthy: true,
-        isCollapsed: true,
-      },
-      {
-        title: "Test task",
-        purpose: "To Test mocha",
-        featureUrl: "<testUrl>",
-        type: "group",
-        links: ["test1"],
-        endsOn: 1234,
-        startedOn: 54321,
-        status: "completed",
-        percentCompleted: 10,
-        dependsOn: ["d12", "d23"],
-        participants: [appOwner.username],
-        completionAward: { [DINERO]: 3, [NEELAM]: 300 },
-        lossRate: { [DINERO]: 1 },
-        isNoteworthy: false,
-        assignee: appOwner.username,
-      },
-    ];
-
     // Add the active task
     taskId = (await tasks.updateTask(taskData[0])).taskId;
     taskId1 = taskId;
@@ -184,6 +184,11 @@ describe("Tasks", function () {
   });
 
   describe("GET /tasks", function () {
+    before(async function () {
+      await tasks.updateTask({ ...taskData[0], createdAt: 1621717694, updatedAt: 1700680830 });
+      await tasks.updateTask({ ...taskData[1], createdAt: 1621717694, updatedAt: 1700775753 });
+    });
+
     it("Should get all the list of tasks", function (done) {
       chai
         .request(app)
@@ -348,7 +353,6 @@ describe("Tasks", function () {
           if (err) {
             return done(err);
           }
-
           expect(res).to.have.status(200);
           expect(res.body).to.be.a("object");
           expect(res.body.message).to.equal("Tasks returned successfully!");
@@ -409,7 +413,7 @@ describe("Tasks", function () {
           matchingTasks.forEach((task) => {
             expect(task.title.toLowerCase()).to.include(searchTerm.toLowerCase());
           });
-          expect(matchingTasks).to.have.length(4);
+          expect(matchingTasks).to.have.length(6);
 
           return done();
         });
@@ -448,6 +452,26 @@ describe("Tasks", function () {
           return done();
         });
     });
+    it("Should get paginated tasks ordered by updatedAt in desc order ", function (done) {
+      chai
+        .request(app)
+        .get("/tasks?dev=true&size=5&page=0")
+        .end((err, res) => {
+          if (err) {
+            return done(err);
+          }
+          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");
+          const tasks = res.body.tasks;
+          // Check if Tasks are returned in desc order of updatedAt field
+          for (let i = 0; i < tasks.length - 1; i++) {
+            expect(tasks[+i].updatedAt).to.be.greaterThanOrEqual(tasks[i + 1].updatedAt);
+          }
+          return done();
+        });
+    });
   });
 
   describe("GET /tasks/:id/details", function () {