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

Made challenge paging optional

Browse Source
This commit is contained in:
Keith Holliday
2018-03-30 11:34:00 -05:00
parent 0d65e5219e
commit 2f69f4039e
3 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
website/server/controllers/api-v3/challenges.js
View File

@@ -341,7 +341,7 @@ api.getUserChallenges = {
middlewares: [authWithHeaders()],
async handler (req, res) {
const CHALLENGES_PER_PAGE = 10;
const page = req.query.page || 0;
const page = req.query.page;
const user = res.locals.user;
let orOptions = [
@@ -385,14 +385,20 @@ api.getUserChallenges = {
query.categories = { $elemMatch: { slug: {$in: categorySlugs} } };
}
const challenges = await Challenge.find(query)
.sort('-createdAt')
.limit(CHALLENGES_PER_PAGE)
.skip(CHALLENGES_PER_PAGE * page)
// see below why we're not using populate
// .populate('group', basicGroupFields)
// .populate('leader', nameFields)
.exec();
let mongoQuery = Challenge.find(query)
.sort('-createdAt');
if (page) {
mongoQuery = mongoQuery
.limit(CHALLENGES_PER_PAGE)
.skip(CHALLENGES_PER_PAGE * page);
}
// see below why we're not using populate
// .populate('group', basicGroupFields)
// .populate('leader', nameFields)
const challenges = await mongoQuery.exec();
let resChals = challenges.map(challenge => challenge.toJSON());