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

WIP(teams): reimplement open tasking

Browse Source
This commit is contained in:
Sabe Jones
2021-02-08 17:03:19 -06:00
committed by SabreCat
parent 6e39c79cff
commit 248e1c6fe9
7 changed files with 76 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
website/server/models/task.js
View File

@@ -216,8 +216,6 @@ TaskSchema.statics.findMultipleByIdOrAlias = async function findByIdOrAlias (
if (!userId) throw new Error('User identifier is a required argument');
const query = _.cloneDeep(additionalQueries);
query.userId = userId;
const ids = [];
const aliases = [];
@@ -229,10 +227,18 @@ TaskSchema.statics.findMultipleByIdOrAlias = async function findByIdOrAlias (
}
});
query.$or = [
{ _id: { $in: ids } },
{ alias: { $in: aliases } },
];
if (ids.length > 0 && aliases.length > 0) {
query.$or = [
{ _id: { $in: ids } },
{ alias: { $in: aliases } },
];
} else if (ids.length > 0) {
query._id = { $in: ids };
} else if (aliases.length > 0) {
query.alias = { $in: aliases };
} else {
throw new Error('No identifiers found.'); // Should be covered by the !identifiers check, but..
}
const tasks = await this.find(query).exec();