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

WIP(teams): begin simplification

Browse Source
This commit is contained in:
Sabe Jones
2021-02-04 14:42:48 -06:00
committed by SabreCat
parent 5708cb8ef1
commit cab4a2a8fa
4 changed files with 50 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
website/server/middlewares/cron.js
View File

@@ -73,13 +73,37 @@ async function cronAsync (req, res) {
return null;
}
const tasks = await Tasks.Task.find({
userId: user._id,
$or: [ // Exclude completed todos
{ type: 'todo', completed: false },
{ type: { $in: ['habit', 'daily', 'reward'] } },
],
}).exec();
const teamsLed = await user.teamsLed();
let tasksQuery;
if (teamsLed.length > 0) {
tasksQuery = {
$and: [
{
$or: [
{ userId: user._id },
{ userId: { $exists: false }, 'group.id': { $in: teamsLed } },
],
},
{
$or: [
{ type: 'todo', completed: false },
{ type: { $in: ['habit', 'daily'] } },
],
},
],
};
} else {
tasksQuery = {
userId: user._id,
$or: [
{ type: 'todo', completed: false },
{ type: { $in: ['habit', 'daily'] } },
],
};
}
const tasks = await Tasks.Task.find(tasksQuery).exec();
const tasksByType = {
habits: [], dailys: [], todos: [], rewards: [],