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

Filter challenge by owned (#12527)

Browse Source 
* when filtering by owned challenges, challenges that a user owns but has not joined will be included

* add tests for filtering challenges by owned

* fix lint
This commit is contained in:
Kirsty
2020-09-07 14:30:01 +01:00
committed by GitHub
parent e5ccb634e0
commit d37c156fa0
2 changed files with 169 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -371,10 +371,7 @@ api.getUserChallenges = {
{ _id: { $in: user.challenges } }, // Challenges where the user is participating
];
const { owned } = req.query;
if (!owned) {
orOptions.push({ leader: user._id });
}
orOptions.push({ leader: user._id });
if (!req.query.member) {
orOptions.push({
@@ -386,6 +383,7 @@ api.getUserChallenges = {
$and: [{ $or: orOptions }],
};
const { owned } = req.query;
if (owned) {
if (owned === 'not_owned') {
query.$and.push({ leader: { $ne: user._id } });