mirror of
https://github.com/sudoxnym/habitica-self-host.git
synced 2026-05-21 05:08:42 +00:00
Revert "perf(challenges): WIP" (see #4085)
This reverts commit 632726fe02.
Conflicts:
src/controllers/challenges.js
This commit is contained in:
parent
351e220b83
commit
efbf151c11
1 changed files with 16 additions and 43 deletions
|
|
@ -105,50 +105,23 @@ api.csv = function(req, res, next) {
|
|||
}
|
||||
|
||||
api.getMember = function(req, res, next) {
|
||||
var cid = req.params.cid;
|
||||
var uid = req.params.uid;
|
||||
|
||||
// We need to start using the aggregation framework instead of in-app filtering, see http://docs.mongodb.org/manual/aggregation/
|
||||
|
||||
// See http://stackoverflow.com/a/18546277/362790
|
||||
// However, this doesn't work. If not all $match conditions are met (eg, if a challenge doesn't have any one of habit/daily/todo/reward
|
||||
// then the $match fails and that user object is removed from the results. See http://stackoverflow.com/questions/23636175/filter-subdocument-array-while-still-returning-parent-data-if-empty
|
||||
// User.aggregate()
|
||||
// .match({_id: uid})
|
||||
// .unwind('habits').match({'habits.challenge.id': cid})
|
||||
// .unwind('dailys').match({'dailys.challenge.id': cid})
|
||||
// .unwind('todos').match({'todos.challenge.id': cid})
|
||||
// .unwind('rewards').match({'rewards.challenge.id': cid})
|
||||
// .group({_id:'$_id', 'profile.name':'$profile.name', habits:{$push: '$habits'}, dailys:{$push:'$dailys'}, todos:{$push:'$todos'}, rewards:{$push:'$rewards'}})
|
||||
// .exec(function(err, member){
|
||||
// if (err) return next(err);
|
||||
// if (!member) return res.json(404, {err: 'Member '+uid+' for challenge '+cid+' not found'});
|
||||
// res.json(member[0]);
|
||||
// });
|
||||
|
||||
//http://stackoverflow.com/questions/24027213/how-to-match-multiple-array-elements-without-using-unwind
|
||||
var proj = {'profile.name':'$profile.name'};
|
||||
_.each(['habits','dailys','todos','rewards'], function(type){
|
||||
proj[type] = {
|
||||
$setDifference: [{
|
||||
$map: {
|
||||
input: '$'+type,
|
||||
as: "el",
|
||||
in: {
|
||||
$cond: [{$eq: ["$$el.challenge.id", cid]}, '$$el', false]
|
||||
}
|
||||
}
|
||||
}, [false]]
|
||||
}
|
||||
});
|
||||
User.aggregate()
|
||||
.match({_id: uid})
|
||||
.project(proj)
|
||||
.exec(function(err, member){
|
||||
if (err) return next(err);
|
||||
var cid = req.params.cid, uid = req.params.uid;
|
||||
User.findById(uid)
|
||||
.select('profile.name habits dailys todos rewards')
|
||||
.exec(function(err, member){
|
||||
if(err) return next(err);
|
||||
if (!member) return res.json(404, {err: 'Member '+uid+' for challenge '+cid+' not found'});
|
||||
res.json(member[0]);
|
||||
});
|
||||
|
||||
// Prune un-related tasks. See http://goo.gl/9fnwei
|
||||
// See http://stackoverflow.com/a/18546277/362790 for fix
|
||||
_.each(['habits','dailys','todos', 'rewards'], function(type){
|
||||
member[type] = _.filter(member[type], function(task){
|
||||
return task.challenge && task.challenge.id && task.challenge.id == cid;
|
||||
});
|
||||
});
|
||||
|
||||
res.json(member);
|
||||
})
|
||||
}
|
||||
|
||||
// CREATE
|
||||
|
|
|
|||
Loading…
Reference in a new issue