Fixing Task Reassignment Status Update Issue (#1351)

* adds the logic to modify the user status of old assignee

* Adds integration test

* Consolidated Multi-Line Variable Declarations into Single Line

Author: heyrandhir

controllers/tasks.js

@@ -256,7 +256,12 @@ const updateTask = async (req, res) => {
     }
     await tasks.updateTask(req.body, req.params.id);
     if (isUserStatusEnabled && req.body.assignee) {
+      // New Assignee Status Update
       await updateUserStatusOnTaskUpdate(req.body.assignee);
+      // Old Assignee Status Update if available
+      if (task.taskData.assigneeId) {
+        await updateStatusOnTaskCompletion(task.taskData.assigneeId);
+      }
     }
 
     return res.status(204).send();

test/integration/taskBasedStatusUpdate.test.js

@@ -537,4 +537,59 @@ describe("Task Based Status Updates", function () {
       );
     });
   });
+
+  describe("PATCH Update User Status on Task Assignment by SuperUser", function () {
+    let userId1, user2Name, superUserId, superUserJwt, taskArr;
+    const reqBody = {};
+
+    beforeEach(async function () {
+      userId1 = await addUser(userData[6]);
+      superUserId = await addUser(userData[4]);
+      superUserJwt = authService.generateAuthToken({ userId: superUserId });
+      await addUser(userData[0]);
+      user2Name = userData[0].username;
+      taskArr = allTasks();
+      const sampleTask1 = taskArr[0];
+      sampleTask1.assignee = userId1;
+      sampleTask1.createdBy = superUserId;
+      await firestore.collection("tasks").doc("taskid123").set(sampleTask1);
+      const statusData = generateStatusDataForState(userId1, userState.ACTIVE);
+      await firestore.collection("usersStatus").doc("userStatusDoc001").set(statusData);
+    });
+
+    afterEach(async function () {
+      await cleanDb();
+    });
+
+    it("Update the old assignee status to IDLE on task reassignment if no tasks is in progress in their name", async function () {
+      reqBody.assignee = user2Name;
+      const res = await chai
+        .request(app)
+        .patch(`/tasks/taskid123?userStatusFlag=true`)
+        .set("cookie", `${cookieName}=${superUserJwt}`)
+        .send(reqBody);
+      expect(res.status).to.equal(204);
+      const userStatus002Data = (await userStatusModel.doc("userStatusDoc001").get()).data();
+      expect(userStatus002Data).to.have.keys(["userId", "currentStatus"]);
+      expect(userStatus002Data.currentStatus.state).to.equal(userState.IDLE);
+    });
+
+    it("Should maintain the old assignee status to ACTIVE on task reassignment if another task is in progress in their name", async function () {
+      const sampleTask2 = taskArr[1];
+      sampleTask2.assignee = userId1;
+      sampleTask2.createdBy = superUserId;
+      await firestore.collection("tasks").doc("taskid234").set(sampleTask2);
+
+      reqBody.assignee = user2Name;
+      const res = await chai
+        .request(app)
+        .patch(`/tasks/taskid123?userStatusFlag=true`)
+        .set("cookie", `${cookieName}=${superUserJwt}`)
+        .send(reqBody);
+      expect(res.status).to.equal(204);
+      const userStatus002Data = (await userStatusModel.doc("userStatusDoc001").get()).data();
+      expect(userStatus002Data).to.have.keys(["userId", "currentStatus"]);
+      expect(userStatus002Data.currentStatus.state).to.equal(userState.ACTIVE);
+    });
+  });
 });

utils/tasks.js

@@ -6,26 +6,33 @@ const fromFirestoreData = async (task) => {
     return task;
   }
 
-  let { createdBy, assignee, participants, type } = task;
+  let { createdBy, assignee: assigneeId, participants, type } = task;
+  let assigneeName;
 
   if (createdBy) {
     createdBy = await getUsername(createdBy);
   }
 
-  if (assignee) {
-    assignee = await getUsername(assignee);
+  if (assigneeId) {
+    assigneeName = await getUsername(assigneeId);
   }
 
   if (type === TASK_TYPE.GROUP) {
     participants = await getParticipantUsernames(participants);
   }
 
-  return {
+  const updatedTask = {
     ...task,
     createdBy,
-    assignee,
     participants,
   };
+
+  if (assigneeName || assigneeId) {
+    updatedTask.assignee = assigneeName;
+    updatedTask.assigneeId = assigneeId;
+  }
+
+  return updatedTask;
 };
 
 const toFirestoreData = async (task) => {