Updates user status on task update (#1628)

* fix : updates the user status when task is created

* chore : changes to before test helper to before each and adds after each in task requests test

Author: Ajeyakrishna-k

controllers/tasksRequests.js

@@ -2,6 +2,7 @@ const { INTERNAL_SERVER_ERROR, SOMETHING_WENT_WRONG } = require("../constants/er
 const { TASK_REQUEST_TYPE } = require("../constants/taskRequests");
 const taskRequestsModel = require("../models/taskRequests");
 const tasksModel = require("../models/tasks.js");
+const { updateUserStatusOnTaskUpdate } = require("../models/userStatus");
 const githubService = require("../services/githubService");
 const usersUtils = require("../utils/users");
 
@@ -167,6 +168,8 @@ const approveTaskRequest = async (req, res) => {
     if (response.isTaskRequestInvalid) {
       return res.boom.badRequest("Task request was previously approved or rejected.");
     }
+    await updateUserStatusOnTaskUpdate(user.username);
+
     return res.status(200).json({
       message: `Task successfully assigned to user ${response.approvedTo}`,
       taskRequest: response.taskRequest,

test/integration/taskRequests.test.js

@@ -20,6 +20,7 @@ const config = require("config");
 const { TASK_REQUEST_TYPE } = require("../../constants/taskRequests");
 const usersUtils = require("../../utils/users");
 const githubService = require("../../services/githubService");
+const { userState } = require("../../constants/userStatus");
 
 const cookieName = config.get("userToken.cookieName");
 
@@ -391,7 +392,7 @@ describe("Task Requests", function () {
     let activeUserId, oooUserId;
 
     describe("When the user is super user", function () {
-      before(async function () {
+      beforeEach(async function () {
         userId = await addUser(member);
         activeUserId = await addUser(activeMember);
         oooUserId = await addUser(member2);
@@ -407,6 +408,10 @@ describe("Task Requests", function () {
         await userStatusModel.updateUserStatus(oooUserId, { ...oooUserStatus });
         await taskRequestsModel.addOrUpdate(taskId, userId);
       });
+      afterEach(async function () {
+        sinon.restore();
+        await cleanDb();
+      });
 
       it("should match response for successfull approval", function (done) {
         sinon.stub(taskRequestsModel, "approveTaskRequest").resolves({ approvedTo: member.username });
@@ -518,6 +523,38 @@ describe("Task Requests", function () {
             return done();
           });
       });
+      describe("Checks the user status", function () {
+        it("Should change the user status to ACTIVE when request is successful", async function () {
+          sinon.stub(taskRequestsModel, "approveTaskRequest").resolves({ approvedTo: member.username });
+          const res = await chai
+            .request(app)
+            .patch("/taskRequests/approve")
+            .set("cookie", `${cookieName}=${jwt}`)
+            .send({
+              taskRequestId: taskId,
+              userId,
+            });
+
+          expect(res).to.have.status(200);
+          const userStatus = await userStatusModel.getUserStatus(userId);
+          expect(userStatus.data.currentStatus.state).to.be.equal(userState.ACTIVE);
+        });
+        it("Should not change the user status to ACTIVE when request is unsuccessful", async function () {
+          sinon.stub(taskRequestsModel, "approveTaskRequest").resolves({ isTaskRequestInvalid: true });
+          const res = await chai
+            .request(app)
+            .patch("/taskRequests/approve")
+            .set("cookie", `${cookieName}=${jwt}`)
+            .send({
+              taskRequestId: taskId,
+              userId,
+            });
+
+          expect(res).to.have.status(400);
+          const userStatus = await userStatusModel.getUserStatus(userId);
+          expect(userStatus.data.currentStatus.state).to.be.equal(userState.IDLE);
+        });
+      });
     });
 
     describe("When the user is not super user", function () {