krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-15 05:37:22 +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

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

@@ -157,9 +157,17 @@ api.getChallengeTasks = {
let user = res.locals.user;
let challengeId = req.params.challengeId;
let challenge = await Challenge.findOne({_id: challengeId}).select('group leader tasksOrder').exec();
let challenge = await Challenge.findOne({
_id: challengeId,
}).select('group leader tasksOrder').exec();
if (!challenge) throw new NotFound(res.t('challengeNotFound'));
let group = await Group.getGroup({user, groupId: challenge.group, fields: '_id type privacy', optionalMembership: true});
let group = await Group.getGroup({
user,
groupId: challenge.group,
fields: '_id type privacy',
optionalMembership: true,
});
if (!group || !challenge.canView(user, group)) throw new NotFound(res.t('challengeNotFound'));
let tasks = await getTasks(req, res, {user, challenge});
@@ -339,7 +347,8 @@ api.scoreTask = {
task.group.approval.requestedDate = new Date();
let group = await Group.getGroup({user, groupId: task.group.id, fields: requiredGroupFields});
let groupLeader = await User.findById(group.leader); // Use this method so we can get access to notifications
let groupLeader = await User.findById(group.leader).exec(); // Use this method so we can get access to notifications
groupLeader.addNotification('GROUP_TASK_APPROVAL', {
message: res.t('userHasRequestedTaskApproval', {
user: user.profile.name,