sudoxreboot/habitica-self-host
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-self-host.git synced 2026-07-13 01:38:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(tasks): fix unassigned error case

Browse source
This commit is contained in:
SabreCat 2022-08-23 09:54:44 -05:00
parent da5c3f9602
commit 395b8db932
2 changed files with 23 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
test/api/v3/integration/tasks/groups/POST-group_tasks_id_needs-work_userId.test.js
View file

@ -32,9 +32,9 @@ describe('POST /tasks/:id/needs-work/:userId', () => {
it('errors when user is not assigned', async () => {
await expect(user.post(`/tasks/${task._id}/needs-work/${member._id}`))
.to.eventually.be.rejected.and.to.eql({
code: 404,
error: 'NotFound',
message: t('messageTaskNotFound'),
code: 400,
error: 'BadRequest',
message: 'Task not completed by this user.',
});
});

37
website/server/controllers/api-v3/tasks/groups.js
View file

@ -356,10 +356,11 @@ api.taskNeedsWork = {
if (['daily', 'todo'].indexOf(task.type) === -1) {
throw new BadRequest('Cannot roll back use of Habits or Rewards.');
}
if (!task.group.assignedUsersDetail) task.group.assignedUsersDetail = {};
if (
(task.group.completedBy.userId && task.group.completedBy.userId !== assignedUserId)
|| (task.group.assignedUsersDetail && !(task.group.assignedUsersDetail[assignedUserId]
&& task.group.assignedUsersDetail[assignedUserId].completed))) {
|| !(task.group.assignedUsersDetail[assignedUserId]
&& task.group.assignedUsersDetail[assignedUserId].completed)) {
throw new BadRequest('Task not completed by this user.');
}
@ -370,21 +371,23 @@ api.taskNeedsWork = {
if (canNotEditTasks(group, user)) throw new NotAuthorized(res.t('onlyGroupLeaderCanEditTasks'));
await scoreTasks(assignedUser, [{ id: task._id, direction: 'down' }], req, res);
assignedUser.addNotification('GROUP_TASK_NEEDS_WORK', {
message: res.t('taskNeedsWork', { taskText: task.text, managerName: user.auth.local.username }, assignedUser.preferences.language),
task: {
id: task._id,
text: task.text,
},
group: {
id: group._id,
name: group.name,
},
manager: {
id: user._id,
name: user.auth.local.username,
},
});
if (assignedUserId !== user._id) {
assignedUser.addNotification('GROUP_TASK_NEEDS_WORK', {
message: res.t('taskNeedsWork', { taskText: task.text, managerName: user.auth.local.username }, assignedUser.preferences.language),
task: {
id: task._id,
text: task.text,
},
group: {
id: group._id,
name: group.name,
},
manager: {
id: user._id,
name: user.auth.local.username,
},
});
}
await Promise.all([assignedUser.save(), task.save()]);
res.respond(200, task);