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

fix(tasks): address regressions from group plan rollout

Browse Source
This commit is contained in:
SabreCat
2022-08-24 11:05:19 -05:00
parent a2f191089c
commit 1aae9638ec
3 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
website/server/libs/tasks/index.js
View File

@@ -156,6 +156,7 @@ async function getTasks (req, res, options = {}) {
let limit;
let sort;
let upgradedGroups = [];
const upgradedGroupIds = [];
const owner = group || challenge || user;
if (challenge) {
@@ -179,15 +180,19 @@ async function getTasks (req, res, options = {}) {
).exec();
}
if (upgradedGroups.length > 0) {
const upgradedGroupIds = [];
for (const upgradedGroup of upgradedGroups) {
upgradedGroupIds.push(upgradedGroup._id);
}
query = {
$or: [
{ userId: user._id },
{ 'group.assignedUsers': user._id },
{ 'group.id': { $in: upgradedGroupIds }, 'group.assignedUsers.0': { $exists: false } },
{
'group.id': { $in: upgradedGroupIds },
$or: [
{ 'group.assignedUsers': user._id },
{ 'group.assignedUsers.0': { $exists: false } },
],
},
],
};
} else {
@@ -214,8 +219,13 @@ async function getTasks (req, res, options = {}) {
if (upgradedGroups.length > 0) {
query.$or = [
{ userId: user._id },
{ 'group.assignedUsers': user._id },
{ 'group.completedBy.userId': user._id },
{
'group.id': { $in: upgradedGroupIds },
$or: [
{ 'group.assignedUsers': user._id },
{ 'group.completedBy.userId': user._id },
],
},
];
} else if (owner._id === user._id) {
query.userId = user._id;