krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-16 14:17: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

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

@@ -308,7 +308,8 @@ api.updateGroup = {
let response = Group.toJSONCleanChat(savedGroup, user);
// If the leader changed fetch new data, otherwise use authenticated user
if (response.leader !== user._id) {
response.leader = (await User.findById(response.leader).select(nameFields).exec()).toJSON({minimize: true});
let rawLeader = await User.findById(response.leader).select(nameFields).exec();
response.leader = rawLeader.toJSON({minimize: true});
} else {
response.leader = {
_id: user._id,
@@ -423,10 +424,16 @@ api.joinGroup = {
if (group.type === 'party' && inviter) {
if (group.memberCount > 1) {
promises.push(User.update({$or: [{'party._id': group._id}, {_id: user._id}], 'achievements.partyUp': {$ne: true}}, {$set: {'achievements.partyUp': true}}, {multi: true}).exec());
promises.push(User.update({
$or: [{'party._id': group._id}, {_id: user._id}],
'achievements.partyUp': {$ne: true},
}, {$set: {'achievements.partyUp': true}}, {multi: true}).exec());
}
if (group.memberCount > 3) {
promises.push(User.update({$or: [{'party._id': group._id}, {_id: user._id}], 'achievements.partyOn': {$ne: true}}, {$set: {'achievements.partyOn': true}}, {multi: true}).exec());
promises.push(User.update({
$or: [{'party._id': group._id}, {_id: user._id}],
'achievements.partyOn': {$ne: true},
}, {$set: {'achievements.partyOn': true}}, {multi: true}).exec());
}
}