krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 15:48:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

[#1675] fixes to populating Group.challenges, and display challenges in party

Browse Source 
page. I'm not sure about having challenges as a subdoc anymore, i think
it will be better performance and maintenance if we just reference
Challenge.group/members and remove User.challenges & Group.challenges
This commit is contained in:
Tyler Renelle
2013-10-31 16:20:48 -07:00
parent 4afcd406f5
commit b3804c4d1f
4 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/controllers/groups.js
View File

@@ -19,6 +19,7 @@ var api = module.exports;
var itemFields = 'items.armor items.head items.shield items.weapon items.currentPet';
var partyFields = 'profile preferences stats achievements party backer flags.rest auth.timestamps ' + itemFields;
var nameFields = 'profile.name';
var challengeFields = '_id name';
api.getMember = function(req, res) {
User.findById(req.params.uid).select(partyFields).exec(function(err, user){
@@ -106,18 +107,25 @@ api.get = function(req, res) {
// This will be called for the header, we need extra members' details than usuals
if (gid == 'party') {
Group.findOne({type: 'party', members: {'$in': [user._id]}})
.populate('members invites', partyFields).exec(function(err, group){
.populate('members', partyFields)
.populate('invites', nameFields)
.populate('challenges', challengeFields)
.exec(function(err, group){
if (err) return res.json(500,{err:err});
res.json(group);
});
} else {
Group.findById(gid).populate('members invites', nameFields).exec(function(err, group){
if ( (group.type == 'guild' && group.privacy == 'private') || group.type == 'party') {
if(!_.find(group.members, {_id: user._id}))
return res.json(401, {err: "You don't have access to this group"});
}
res.json(group);
})
Group.findById(gid)
.populate('members', partyFields)
.populate('invites', nameFields)
.populate('challenges', challengeFields)
.exec(function(err, group){
if ( (group.type == 'guild' && group.privacy == 'private') || group.type == 'party') {
if(!_.find(group.members, {_id: user._id}))
return res.json(401, {err: "You don't have access to this group"});
}
res.json(group);
});
}
};