Skip to content

Commit f983ce8

Browse files
Removes validation for user status in task requests (#1626)
1 parent c0203fa commit f983ce8

File tree

2 files changed

+0
-73
lines changed

2 files changed

+0
-73
lines changed

middlewares/taskRequests.js

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
const { SOMETHING_WENT_WRONG } = require("../constants/errorMessages");
2-
const { userState } = require("../constants/userStatus");
3-
const userStatusModel = require("../models/userStatus.js");
42
const dataAccess = require("../services/dataAccessLayer");
53
/**
64
* Validates user id for task request
@@ -20,14 +18,6 @@ async function validateUser(req, res, next) {
2018
return res.boom.conflict("User does not exist");
2119
}
2220

23-
const { userStatusExists, data: userStatus } = await userStatusModel.getUserStatus(userId);
24-
if (!userStatusExists) {
25-
return res.boom.conflict("User status does not exist");
26-
}
27-
if (userStatus.currentStatus.state === userState.ACTIVE) {
28-
return res.boom.conflict("User is currently active on another task");
29-
}
30-
3121
req.body.user = user;
3222

3323
return next();

test/integration/taskRequests.test.js

Lines changed: 0 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -374,26 +374,6 @@ describe("Task Requests", function () {
374374

375375
taskId = (await tasksModel.updateTask(taskData[4])).taskId;
376376
});
377-
378-
it("should match response", function (done) {
379-
chai
380-
.request(app)
381-
.post("/taskRequests/addOrUpdate")
382-
.set("cookie", `${cookieName}=${jwt}`)
383-
.send({
384-
taskId,
385-
userId,
386-
})
387-
.end((err, res) => {
388-
if (err) {
389-
return done(err);
390-
}
391-
392-
expect(res).to.have.status(409);
393-
expect(res.body.message).to.equal("User status does not exist");
394-
return done();
395-
});
396-
});
397377
});
398378

399379
describe("When the user status is not idle", function () {
@@ -404,29 +384,6 @@ describe("Task Requests", function () {
404384

405385
taskId = (await tasksModel.updateTask(taskData[4])).taskId;
406386
});
407-
it("should match response when the user is active on another task", function (done) {
408-
sinon
409-
.stub(userStatusModel, "getUserStatus")
410-
.callsFake(() => ({ userStatusExists: true, data: activeUserStatus }));
411-
412-
chai
413-
.request(app)
414-
.post("/taskRequests/addOrUpdate")
415-
.set("cookie", `${cookieName}=${jwt}`)
416-
.send({
417-
taskId,
418-
userId,
419-
})
420-
.end((err, res) => {
421-
if (err) {
422-
return done(err);
423-
}
424-
425-
expect(res).to.have.status(409);
426-
expect(res.body.message).to.equal("User is currently active on another task");
427-
return done();
428-
});
429-
});
430387
});
431388
});
432389

@@ -472,26 +429,6 @@ describe("Task Requests", function () {
472429
});
473430
});
474431

475-
it("should return 409 error with message when user is active", function (done) {
476-
chai
477-
.request(app)
478-
.patch("/taskRequests/approve")
479-
.set("cookie", `${cookieName}=${jwt}`)
480-
.send({
481-
taskRequestId: taskId,
482-
userId: activeUserId,
483-
})
484-
.end((err, res) => {
485-
if (err) {
486-
return done(err);
487-
}
488-
489-
expect(res).to.have.status(409);
490-
expect(res.body.message).to.equal("User is currently active on another task");
491-
return done();
492-
});
493-
});
494-
495432
it("should throw 400 error when taskRequestId is missing", function (done) {
496433
chai
497434
.request(app)

0 commit comments

Comments
 (0)