krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 06:37:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Always use .exec() for .find*() and .update() (#8361)

Browse Source 
* add exec where missing in /models

* ix taskManager query

* fix top-level controllers

* fix api-v3 controllers
This commit is contained in:
Matteo Pagliazzi
2017-01-04 16:49:43 +01:00
committed by GitHub
parent 6cc359a935
commit 518b874f64
13 changed files with 93 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
website/server/controllers/api-v3/tasks/groups.js
View File

@@ -104,7 +104,7 @@ api.assignTask = {
let user = res.locals.user;
let assignedUserId = req.params.assignedUserId;
let assignedUser = await User.findById(assignedUserId);
let assignedUser = await User.findById(assignedUserId).exec();
let taskId = req.params.taskId;
let task = await Tasks.Task.findByIdOrAlias(taskId, user._id);
@@ -162,7 +162,7 @@ api.unassignTask = {
let user = res.locals.user;
let assignedUserId = req.params.assignedUserId;
let assignedUser = await User.findById(assignedUserId);
let assignedUser = await User.findById(assignedUserId).exec();
let taskId = req.params.taskId;
let task = await Tasks.Task.findByIdOrAlias(taskId, user._id);
@@ -211,13 +211,13 @@ api.approveTask = {
let user = res.locals.user;
let assignedUserId = req.params.userId;
let assignedUser = await User.findById(assignedUserId);
let assignedUser = await User.findById(assignedUserId).exec();
let taskId = req.params.taskId;
let task = await Tasks.Task.findOne({
'group.taskId': taskId,
userId: assignedUserId,
});
}).exec();
if (!task) {
throw new NotFound(res.t('taskNotFound'));