From 45fc2b62e37f6bd8048a79847ed6d47390a47492 Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Mon, 13 Sep 2021 10:48:05 -0500 Subject: [PATCH] fix(cron): process team board tasks assigned to the user --- website/server/middlewares/cron.js | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/website/server/middlewares/cron.js b/website/server/middlewares/cron.js index 664d65cc3e..1b32b4c01b 100644 --- a/website/server/middlewares/cron.js +++ b/website/server/middlewares/cron.js @@ -74,10 +74,19 @@ async function cronAsync (req, res) { } const tasks = await Tasks.Task.find({ - userId: user._id, - $or: [ // Exclude completed todos - { type: 'todo', completed: false }, - { type: { $in: ['habit', 'daily', 'reward'] } }, + $and: [ + { + $or: [ + { userId: user._id }, + { userId: { $exists: false }, 'group.assignedUsers': user._id }, + ], + }, + { + $or: [ // Exclude completed todos + { type: 'todo', completed: false }, + { type: { $in: ['habit', 'daily', 'reward'] } }, + ], + }, ], }).exec();