+
+
+
-
-
-
-
- {{ $t('addTask') }}
-
@@ -211,6 +217,7 @@
:search-text="searchTextThrottled"
:selected-tags="selectedTags"
@editTask="editTask"
+ @taskSummary="taskSummary"
@openBuyDialog="openBuyDialog($event)"
/>
@@ -345,7 +352,7 @@
}
.create-task-area {
- top: -2.5rem;
+ top: 1px;
}
.drag {
@@ -381,6 +388,7 @@ import cloneDeep from 'lodash/cloneDeep';
import draggable from 'vuedraggable';
import TaskColumn from './column';
import TaskModal from './taskModal';
+import TaskSummary from './taskSummary';
import spells from './spells';
import markdown from '@/directives/markdown';
@@ -401,6 +409,7 @@ export default {
components: {
TaskColumn,
TaskModal,
+ TaskSummary,
spells,
brokenTaskModal,
draggable,
@@ -524,13 +533,19 @@ export default {
};
this.newTag = null;
},
+ // Need Vue.nextTick() otherwise the first time the modal is not rendered
editTask (task) {
this.editingTask = cloneDeep(task);
- // Necessary otherwise the first time the modal is not rendered
Vue.nextTick(() => {
this.$root.$emit('bv::show::modal', 'task-modal');
});
},
+ taskSummary (task) {
+ this.editingTask = cloneDeep(task);
+ Vue.nextTick(() => {
+ this.$root.$emit('bv::show::modal', 'task-summary');
+ });
+ },
createTask (type) {
this.openCreateBtn = false;
this.creatingTask = taskDefaults({ type, text: '' }, this.user);
diff --git a/website/client/src/components/tasks/yesterdailyModal.vue b/website/client/src/components/tasks/yesterdailyModal.vue
index 0a24fbac8a..1c12e39fb8 100644
--- a/website/client/src/components/tasks/yesterdailyModal.vue
+++ b/website/client/src/components/tasks/yesterdailyModal.vue
@@ -84,6 +84,7 @@
import moment from 'moment';
import { mapState } from '@/libs/store';
import scoreTask from '@/mixins/scoreTask';
+import sync from '@/mixins/sync';
import Task from './task';
import LoadingSpinner from '../ui/loadingSpinner';
@@ -92,7 +93,7 @@ export default {
Task,
LoadingSpinner,
},
- mixins: [scoreTask],
+ mixins: [scoreTask, sync],
props: {
yesterDailies: {
type: Array,
@@ -180,6 +181,7 @@ export default {
this.isLoading = false;
this.$root.$emit('bv::hide::modal', 'yesterdaily');
+ if (this.$route.fullPath.indexOf('task-information') !== -1) this.sync();
},
},
};
diff --git a/website/client/src/libs/staffList.js b/website/client/src/libs/staffList.js
index 50513e8a68..8f96e907eb 100644
--- a/website/client/src/libs/staffList.js
+++ b/website/client/src/libs/staffList.js
@@ -29,6 +29,11 @@ export default [
type: 'Staff',
uuid: '61b2c855-0a30-444c-bcc6-1cac876460b0',
},
+ {
+ name: 'heyeilatan',
+ type: 'Staff',
+ uuid: 'f4e5c6da-0617-48bf-b3bd-9f97636774a8',
+ },
{
name: 'Alys',
type: 'Moderator',
diff --git a/website/client/src/mixins/scoreTask.js b/website/client/src/mixins/scoreTask.js
index 91cf72ea4d..fdd1377c71 100644
--- a/website/client/src/mixins/scoreTask.js
+++ b/website/client/src/mixins/scoreTask.js
@@ -15,24 +15,8 @@ export default {
}),
},
methods: {
- async beforeTaskScore (task) {
- const { user } = this;
- if (this.castingSpell) return false;
-
- if (task.group.approval.required && !task.group.approval.approved) {
- task.group.approval.requested = true;
- const { data: groupPlans } = await this.$store.dispatch('guilds:getGroupPlans');
- const groupPlan = groupPlans.find(g => g.id === task.group.id);
- if (groupPlan) {
- const managers = Object.keys(groupPlan.managers);
- managers.push(groupPlan.leader);
- if (managers.indexOf(user._id) !== -1) {
- task.group.approval.approved = true;
- }
- }
- }
-
- return true;
+ async beforeTaskScore () {
+ return (!this.castingSpell);
},
playTaskScoreSound (task, direction) {
switch (task.type) { // eslint-disable-line default-case
diff --git a/website/client/src/mixins/syncTask.js b/website/client/src/mixins/syncTask.js
new file mode 100644
index 0000000000..f4ab03239f
--- /dev/null
+++ b/website/client/src/mixins/syncTask.js
@@ -0,0 +1,32 @@
+import clone from 'lodash/clone';
+
+export default {
+ methods: {
+ async syncTask () {
+ if (this.groupId || this.task?.group.id) {
+ const members = await this.$store.dispatch('members:getGroupMembers', {
+ groupId: this.groupId || this.task?.group.id,
+ includeAllPublicFields: true,
+ });
+ this.members = members;
+ this.membersNameAndId = [];
+ this.members.forEach(member => {
+ this.membersNameAndId.push({
+ id: member._id,
+ name: member.profile.name,
+ addlText: `@${member.auth.local.username}`,
+ });
+ this.memberNamesById[member._id] = member.profile.name;
+ });
+ this.assignedMembers = [];
+ if (this.task?.group?.assignedUsers) {
+ this.assignedMembers = this.task.group.assignedUsers;
+ }
+ }
+
+ // @TODO: Task modal component is mutating a prop
+ // and that causes issues. We need to not copy the prop similar to group modals
+ if (this.task) this.checklist = clone(this.task.checklist);
+ },
+ },
+};
diff --git a/website/client/src/store/actions/tasks.js b/website/client/src/store/actions/tasks.js
index 863f137578..e6fe10e488 100644
--- a/website/client/src/store/actions/tasks.js
+++ b/website/client/src/store/actions/tasks.js
@@ -204,7 +204,7 @@ export async function createGroupTasks (store, payload) {
}
export async function assignTask (store, payload) {
- const response = await axios.post(`/api/v4/tasks/${payload.taskId}/assign/${payload.userId}`);
+ const response = await axios.post(`/api/v4/tasks/${payload.taskId}/assign`, payload.assignedUserIds);
return response.data.data;
}
diff --git a/website/client/src/store/getters/tasks.js b/website/client/src/store/getters/tasks.js
index 80038a1020..859201de84 100644
--- a/website/client/src/store/getters/tasks.js
+++ b/website/client/src/store/getters/tasks.js
@@ -84,7 +84,8 @@ export function canEdit (store) {
const user = store.state.user.data;
const userId = user.id || user._id;
- const isUserAdmin = user.permissions && user.permissions.challengeAdmin;
+ const isUserAdmin = user.permissions
+ && (user.permissions.challengeAdmin || user.permissions.fullAccess);
const isUserGroupLeader = group && (group.leader
&& group.leader._id === userId);
const isUserGroupManager = group && (group.managers
@@ -101,11 +102,7 @@ export function canEdit (store) {
}
break;
case 'group':
- if (!onUserDashboard) {
- isUserCanEditTask = isUserGroupLeader || isUserGroupManager || isUserAdmin;
- } else {
- isUserCanEditTask = true;
- }
+ isUserCanEditTask = isUserGroupLeader || isUserGroupManager || isUserAdmin;
break;
default:
break;
@@ -114,15 +111,20 @@ export function canEdit (store) {
};
}
-function _nonInteractive (task) {
- return (task.group && task.group.id && !task.userId)
- || (task.challenge && task.challenge.id && !task.userId)
- || (task.group && task.group.approval && task.group.approval.requested
- && task.type !== 'habit');
+function _nonInteractive (task, userId) {
+ if (task.userId) return false;
+ if (task.challenge && task.challenge.id) return true;
+ if (
+ task.group && task.group.assignedUsers
+ && task.group.assignedUsers.length > 0
+ && task.group.assignedUsers.indexOf(userId) === -1
+ ) return true;
+ return false;
}
export function getTaskClasses (store) {
const userPreferences = store.state.user.data.preferences;
+ const userId = store.state.user.data._id;
// Purpose can be one of the following strings:
// Edit Modal: edit-modal-bg, edit-modal-text, edit-modal-icon
@@ -169,9 +171,14 @@ export function getTaskClasses (store) {
case 'control':
if (type === 'todo' || type === 'daily') {
- if (task.completed || (!shouldDo(dueDate, task, userPreferences) && type === 'daily')) {
+ if (task.completed
+ || (!shouldDo(dueDate, task, userPreferences) && type === 'daily')
+ || (task.group && task.group.assignedUsersDetail
+ && task.group.assignedUsersDetail[userId]
+ && task.group.assignedUsersDetail[userId].completed)
+ ) {
return {
- bg: _nonInteractive(task) ? 'task-disabled-daily-todo-control-bg-noninteractive' : 'task-disabled-daily-todo-control-bg',
+ bg: _nonInteractive(task, userId) ? 'task-disabled-daily-todo-control-bg-noninteractive' : 'task-disabled-daily-todo-control-bg',
checkbox: 'task-disabled-daily-todo-control-checkbox',
inner: 'task-disabled-daily-todo-control-inner',
content: 'task-disabled-daily-todo-control-content',
@@ -179,28 +186,28 @@ export function getTaskClasses (store) {
}
return {
- bg: _nonInteractive(task) ? `task-${color}-control-bg-noninteractive` : `task-${color}-control-bg`,
+ bg: _nonInteractive(task, userId) ? `task-${color}-control-bg-noninteractive` : `task-${color}-control-bg`,
checkbox: `task-${color}-control-checkbox`,
inner: `task-${color}-control-inner-daily-todo`,
icon: `task-${color}-control-icon`,
};
} if (type === 'reward') {
return {
- bg: _nonInteractive(task) ? 'task-reward-control-bg-noninteractive' : 'task-reward-control-bg',
+ bg: _nonInteractive(task, userId) ? 'task-reward-control-bg-noninteractive' : 'task-reward-control-bg',
};
} if (type === 'habit') {
return {
up: task.up
? {
- bg: _nonInteractive(task) ? `task-${color}-control-bg-noninteractive` : `task-${color}-control-bg`,
- inner: _nonInteractive(task) ? `task-${color}-control-inner-habit-noninteractive` : `task-${color}-control-inner-habit`,
+ bg: _nonInteractive(task, userId) ? `task-${color}-control-bg-noninteractive` : `task-${color}-control-bg`,
+ inner: _nonInteractive(task, userId) ? `task-${color}-control-inner-habit-noninteractive` : `task-${color}-control-inner-habit`,
icon: `task-${color}-control-icon`,
}
: { bg: 'task-disabled-habit-control-bg', inner: 'task-disabled-habit-control-inner', icon: `task-${color}-control-icon` },
down: task.down
? {
- bg: _nonInteractive(task) ? `task-${color}-control-bg-noninteractive` : `task-${color}-control-bg`,
- inner: _nonInteractive(task) ? `task-${color}-control-inner-habit-noninteractive` : `task-${color}-control-inner-habit`,
+ bg: _nonInteractive(task, userId) ? `task-${color}-control-bg-noninteractive` : `task-${color}-control-bg`,
+ inner: _nonInteractive(task, userId) ? `task-${color}-control-inner-habit-noninteractive` : `task-${color}-control-inner-habit`,
icon: `task-${color}-control-icon`,
}
: { bg: 'task-disabled-habit-control-bg', inner: 'task-disabled-habit-control-inner', icon: `task-${color}-control-icon` },
diff --git a/website/client/tests/unit/store/getters/tasks/canEdit.spec.js b/website/client/tests/unit/store/getters/tasks/canEdit.spec.js
index e736a77493..15962b7030 100644
--- a/website/client/tests/unit/store/getters/tasks/canEdit.spec.js
+++ b/website/client/tests/unit/store/getters/tasks/canEdit.spec.js
@@ -35,7 +35,10 @@ describe('canEdit getter', () => {
});
it('can Edit task in own dashboard', () => {
expect(store.getters['tasks:canEdit'](task, 'challenge', true, null, challenge)).to.equal(true);
- expect(store.getters['tasks:canEdit'](task, 'group', true, group, null)).to.equal(true);
+ });
+
+ it('cannot Edit group task in own dashboard', () => {
+ expect(store.getters['tasks:canEdit'](task, 'group', true, group, null)).to.equal(false);
});
it('can Edit any challenge task if admin', () => {
diff --git a/website/client/tests/unit/store/getters/tasks/getTaskClasses.spec.js b/website/client/tests/unit/store/getters/tasks/getTaskClasses.spec.js
index 4782eafeac..ad05f73a6c 100644
--- a/website/client/tests/unit/store/getters/tasks/getTaskClasses.spec.js
+++ b/website/client/tests/unit/store/getters/tasks/getTaskClasses.spec.js
@@ -143,7 +143,14 @@ describe('getTaskClasses getter', () => {
});
it('returns noninteractive classes and padlock icons for group board tasks', () => {
- const task = { type: 'todo', value: 2, group: { id: 'group-id' } };
+ const task = {
+ type: 'todo',
+ value: 2,
+ group: {
+ id: 'group-id',
+ assignedUsers: ['not-me'],
+ },
+ };
expect(getTaskClasses(task, 'control')).to.deep.equal({
bg: 'task-good-control-bg-noninteractive',
checkbox: 'task-good-control-checkbox',
diff --git a/website/common/locales/en/content.json b/website/common/locales/en/content.json
index 50c1e0dd8a..2b0fe859ce 100644
--- a/website/common/locales/en/content.json
+++ b/website/common/locales/en/content.json
@@ -309,6 +309,7 @@
"hatchingPotionSolarSystem": "Solar System",
"hatchingPotionOnyx": "Onyx",
"hatchingPotionVirtualPet": "Virtual Pet",
+ "hatchingPotionPorcelain": "Porcelain",
"hatchingPotionNotes": "Pour this on an egg, and it will hatch as a <%= potText(locale) %> pet.",
"premiumPotionAddlNotes": "Not usable on quest pet eggs. Available for purchase until <%= date(locale) %>.",
diff --git a/website/common/locales/en/faq.json b/website/common/locales/en/faq.json
index 46df7df048..0008f060b6 100644
--- a/website/common/locales/en/faq.json
+++ b/website/common/locales/en/faq.json
@@ -68,5 +68,8 @@
"iosFaqStillNeedHelp": "If you have a question that isn't on this list or on the [Wiki FAQ](https://habitica.fandom.com/wiki/FAQ), come ask in the Tavern chat under Menu > Tavern! We're happy to help.",
"androidFaqStillNeedHelp": "If you have a question that isn't on this list or on the [Wiki FAQ](https://habitica.fandom.com/wiki/FAQ), come ask in the Tavern chat under Menu > Tavern! We're happy to help.",
- "webFaqStillNeedHelp": "If you have a question that isn't on this list or on the [Wiki FAQ](https://habitica.fandom.com/wiki/FAQ), come ask in the [Habitica Help guild](https://habitica.com/groups/guild/5481ccf3-5d2d-48a9-a871-70a7380cee5a)! We're happy to help."
+ "webFaqStillNeedHelp": "If you have a question that isn't on this list or on the [Wiki FAQ](https://habitica.fandom.com/wiki/FAQ), come ask in the [Habitica Help guild](https://habitica.com/groups/guild/5481ccf3-5d2d-48a9-a871-70a7380cee5a)! We're happy to help.",
+
+ "faqQuestion13": "What is a Group Plan?",
+ "webFaqAnswer13": "## How do Group Plans work?\n\nA [Group Plan](/group-plans) gives your Party or Guild access to a shared task board that’s similar to your personal task board! It’s a shared Habitica experience where tasks can be created and checked off by anyone in the group.\n\nThere are also features available like member roles, status view, and task assigning that give you a more controlled experience. [Visit our wiki](https://habitica.fandom.com/wiki/Group_Plans) to learn more about our Group Plans’ features!\n\n## Who benefits from a Group Plan?\n\nGroup Plans work best when you have a small team of people who want to collaborate together. We recommend 2-5 members.\n\nGroup Plans are great for families, whether it’s a parent and child or you and a partner. Shared goals, chores, or responsibilities are easy to keep track of on one board.\n\nGroup Plans can also be useful for teams of colleagues that have shared goals, or managers that want to introduce their employees to gamification.\n\n## Quick tips for using Groups\n\nHere are some quick tips to get you started with your new Group. We’ll provide more details in the following sections:\n\n* Make a member a manager to give them the ability to create and edit tasks\n* Leave tasks unassigned if anyone can complete it and it only needs done once\n* Assign a task to one person to make sure no one else can complete their task\n* Assign a task to multiple people if they all need to complete it\n* Toggle the ability to display shared tasks on your personal board to not miss anything\n* You get rewarded for the tasks you complete, even multi-assigned\n* Task completion rewards aren’t shared or split between Team members\n* Use task color on the team board to judge the average completion rate of tasks\n* Regularly review the tasks on your Team Board to make sure they are still relevant\n* Missing a Daily won’t damage you or your team, but the task will degrade in color\n\n## How can others in the group create tasks?\n\nOnly the group leader and managers can create tasks. If you’d like a group member to be able to create tasks, then you should promote them to be a manager by going to the Group Information tab, viewing the member list, and clicking the dot icon by their name.\n\n## How does assigning a task work?\n\nGroup Plans give you the unique ability to assign tasks to other group members. Assigning a task is great for delegating. If you assign a task to someone, then other members are prevented from completing it.\n\nYou can also assign a task to multiple people if it needs to be completed by more than one member. For example, if everyone has to brush their teeth, create a task and assign it to each group member. They will all be able to check it off and get their individual rewards for doing so. The main task will show as complete once everyone checks it off.\n\n## How do unassigned tasks work?\n\nUnassigned tasks can be completed by anyone in the group, so leave a task unassigned to allow any member to complete it. For example, taking out the trash. Whoever takes out the trash can check off the unassigned task and it will show as completed for everyone.\n\n## How does the synchronized day reset work?\n\nShared tasks will reset at the same time for everyone to keep the shared task board in sync. This time is visible on the shared task board and is determined by the group leader’s day start time. Because shared tasks reset automatically, you will not get a chance to complete yesterday’s uncompleted shared Dailies when you check in the next morning.\n\nShared Dailies will not do damage if they are missed, however they will degrade in color to help visualize progress. We don’t want the shared experience to be a negative one!\n\n## How do I use my Group on the mobile apps?\n\nWhile the mobile apps don’t fully support all Group Plans functionality yet, you can still complete shared tasks from the iOS and Android app. On the browser version of Habitica, go to your group’s shared task board and turn on the copy tasks toggle. Now all open and assigned shared tasks will display on your personal task board across all platforms.\n\n## What’s the difference between a Group’s shared tasks and Challenges?\n\nGroup Plan shared task boards are more dynamic than Challenges, in that they can constantly be updated and interacted with. Challenges are great if you have one set of tasks to send out to many people.\n\nGroup Plans are also a paid feature, while Challenges are available free to everyone.\n\nYou cannot assign specific tasks in Challenges, and Challenges do not have a shared day reset. In general, Challenges offer less control and direct interaction."
}
diff --git a/website/common/locales/en/gear.json b/website/common/locales/en/gear.json
index 6e0857865e..c2678b12cd 100644
--- a/website/common/locales/en/gear.json
+++ b/website/common/locales/en/gear.json
@@ -471,6 +471,8 @@
"weaponMystery202111Notes": "Shape the flow of time with this mysterious and powerful staff. Confers no benefit. November 2021 Subscriber Item.",
"weaponMystery202201Text": "Midnight Confetti Cannon",
"weaponMystery202201Notes": "Unleash a cloud of gold and silver glitter when the clock strikes midnight. Happy New Year! Now who's cleaning this up? Confers no benefit. January 2022 Subscriber Item.",
+ "weaponMystery202209Text": "Magic Manual",
+ "weaponMystery202209Notes": "This book will guide you through your journey into magic-making. Confers no benefit. September 2022 Subscriber Item.",
"weaponMystery301404Text": "Steampunk Cane",
"weaponMystery301404Notes": "Excellent for taking a turn about town. March 3015 Subscriber Item. Confers no benefit.",
@@ -2357,6 +2359,8 @@
"shieldMystery201902Notes": "This glittery paper forms magic hearts that slowly drift and dance in the air. Confers no benefit. February 2019 Subscriber Item.",
"shieldMystery202011Text": "Foliated Staff",
"shieldMystery202011Notes": "Harness the power of the autumn wind with this staff. Use for arcane magic or to make awesome leaf piles, the choice is yours! Confers no benefit. November 2020 Subscriber Item.",
+ "shieldMystery202209Text": "Mound o' Magic Books",
+ "shieldMystery202209Notes": "Building your sorcery knowledge takes a lot of reading, but you're sure to enjoy your education. Confers no benefit. September 2022 Subscriber Item.",
"shieldMystery301405Text": "Clock Shield",
"shieldMystery301405Notes": "Time is on your side with this towering clock shield! Confers no benefit. June 3015 Subscriber Item.",
"shieldMystery301704Text": "Fluttery Fan",
diff --git a/website/common/locales/en/groups.json b/website/common/locales/en/groups.json
index e6c0f943cc..f777bd766d 100644
--- a/website/common/locales/en/groups.json
+++ b/website/common/locales/en/groups.json
@@ -175,14 +175,15 @@
"onlyCreatorOrAdminCanDeleteChat": "Not authorized to delete this message!",
"onlyGroupLeaderCanEditTasks": "Not authorized to manage tasks!",
"onlyGroupTasksCanBeAssigned": "Only group tasks can be assigned",
- "assignedTo": "Assign To",
- "assignedToUser": "Assigned to
<%- userName %>",
- "assignedToMembers": "Assigned to
<%= userCount %> members",
- "assignedToYouAndMembers": "Assigned to you and
<%= userCount %> members",
- "youAreAssigned": "Assigned to you",
+ "assignTo": "Assign To",
+ "assignedTo": "Assigned to",
+ "assignedToUser": "Assigned:
@<%- userName %>",
+ "assignedToMembers": "<%= userCount %> users",
+ "assignedToYouAndMembers": "
You, <%= userCount %> users",
+ "youAreAssigned": "Assigned:
you",
"taskIsUnassigned": "This task is unassigned",
"unassigned": "Unassigned",
- "chooseTeamMember": "Choose a team member",
+ "chooseTeamMember": "Search for a team member",
"confirmUnClaim": "Are you sure you want to unclaim this task?",
"confirmNeedsWork": "Are you sure you want to mark this task as needing work?",
"userRequestsApproval": "
<%- userName %> requests approval",
@@ -200,7 +201,7 @@
"yourTaskHasBeenApproved": "Your task
<%- taskText %> has been approved.",
"thisTaskApproved": "This task was approved",
"taskClaimed": "<%- userName %> has claimed the task
<%- taskText %>.",
- "taskNeedsWork": "
<%- managerName %> marked
<%- taskText %> as needing additional work.",
+ "taskNeedsWork": "
<%- taskText %> was unchecked by
@<%- managerName %>. Your rewards for completing the task were reverted.",
"userHasRequestedTaskApproval": "
<%- user %> requests approval for
<%- taskName %>",
"approve": "Approve",
"approveTask": "Approve Task",
@@ -363,7 +364,28 @@
"groupActivityNotificationTitle": "<%= user %> posted in <%= group %>",
"managerNotes": "Manager's Notes",
"assignedDateOnly": "Assigned on
<%= date %>",
- "assignedDateAndUser": "Assigned by
@<%- username %> on
<%= date %>",
+ "assignedDateAndUser": "Assigned by @<%- username %> on <%= date %>",
"claimRewards": "Claim Rewards",
- "chatTemporarilyUnavailable": "Chat is temporarily unavailable. Please try again later."
+ "dayStart": "
Day start: <%= startTime %>",
+ "viewStatus": "Status",
+ "lastCompleted": "Last completed",
+ "youEmphasized": "
You",
+ "chatTemporarilyUnavailable": "Chat is temporarily unavailable. Please try again later.",
+ "newGroupsWelcome": "Welcome to the New Shared Task Board!",
+ "newGroupsWhatsNew": "Check Out What's New:",
+ "newGroupsBullet01": "Interact with tasks directly from the shared task board",
+ "newGroupsBullet02": "Anyone can complete an unassigned task",
+ "newGroupsBullet03": "Shared tasks reset at the same time for everyone for easier collaboration",
+ "newGroupsBullet04": "Shared Dailies will not cause damage when missed or appear in the Record Yesterday’s Activity prompt",
+ "newGroupsBullet05": "Shared tasks will degrade in color if left incomplete to help track progress",
+ "newGroupsBullet06": "The task status view allows you to quickly see which assignee has completed a task",
+ "newGroupsBullet07": "Toggle the ability to display the shared tasks on your personal task board",
+ "newGroupsBullet08": "The group leader and managers can quickly add tasks from the top of the task columns",
+ "newGroupsBullet09": "A shared task can be unchecked to show it still needs work",
+ "newGroupsBullet10": "Assignment status determines completion condition:",
+ "newGroupsBullet10a": "
Leave a task unassigned if any member can complete it",
+ "newGroupsBullet10b": "
Assign a task to one member so only they can complete it",
+ "newGroupsBullet10c": "
Assign a task to multiple members if they all need to complete it",
+ "newGroupsVisitFAQ": "Visit the
FAQ from the Help dropdown for more guidance.",
+ "newGroupsEnjoy": "We hope you enjoy the new Group Plans experience!"
}
diff --git a/website/common/locales/en/npc.json b/website/common/locales/en/npc.json
index 5f0ac20e7d..7c173cae02 100644
--- a/website/common/locales/en/npc.json
+++ b/website/common/locales/en/npc.json
@@ -17,10 +17,9 @@
"mattBochText1": "Welcome to the Stable! I’m Matt, the beastmaster. Every time you complete a task, you'll have a random chance at receiving an Egg or a Hatching Potion to hatch Pets. When you hatch a Pet, it will appear here! Click a Pet's image to add it to your Avatar. Feed them with the Pet Food you find, and they'll grow into hardy Mounts.",
"welcomeToTavern": "Welcome to The Tavern!",
"sleepDescription": "Need a break? Check into Daniel's Inn to pause some of Habitica's more difficult game mechanics:",
- "sleepBullet1": "Missed Dailies won't damage you",
- "sleepBullet2": "Tasks won't lose streaks",
- "sleepBullet3": "Bosses won't do damage for your own missed Dailies",
- "sleepBullet4": "Your boss damage or collection Quest items will stay pending until check-out",
+ "sleepBullet1": "Your missed Dailies won't damage you (bosses will still do damage caused by other Party member's missed Dailies)",
+ "sleepBullet2": "Your Task streaks and Habit counters will not reset",
+ "sleepBullet3": "Your damage to the Quest boss or found collection items will remain pending until you check out of the Inn",
"pauseDailies": "Pause Damage",
"unpauseDailies": "Unpause Damage",
"staffAndModerators": "Staff and Moderators",
diff --git a/website/common/locales/en/subscriber.json b/website/common/locales/en/subscriber.json
index 808f9bd208..e7cc53175a 100644
--- a/website/common/locales/en/subscriber.json
+++ b/website/common/locales/en/subscriber.json
@@ -141,6 +141,7 @@
"mysterySet202206": "Sea Sprite Set",
"mysterySet202207": "Jammin' Jelly Set",
"mysterySet202208": "Perky Ponytail Set",
+ "mysterySet202209": "Magical Scholar Set",
"mysterySet301404": "Steampunk Standard Set",
"mysterySet301405": "Steampunk Accessories Set",
"mysterySet301703": "Peacock Steampunk Set",
diff --git a/website/common/locales/en/tasks.json b/website/common/locales/en/tasks.json
index 0d8b395665..77551f11a6 100644
--- a/website/common/locales/en/tasks.json
+++ b/website/common/locales/en/tasks.json
@@ -132,5 +132,6 @@
"errorTemporaryItem": "This item is temporary and cannot be pinned.",
"addTags": "Add tags...",
"enterTag": "Enter a tag",
- "pressEnterToAddTag": "Press Enter to add tag: '<%= tagName %>'"
+ "pressEnterToAddTag": "Press Enter to add tag: '<%= tagName %>'",
+ "taskSummary": "<%= type %> Summary"
}
diff --git a/website/common/script/content/constants/events.js b/website/common/script/content/constants/events.js
index 3106567984..688744f779 100644
--- a/website/common/script/content/constants/events.js
+++ b/website/common/script/content/constants/events.js
@@ -9,12 +9,18 @@ const gemsPromo = {
};
export const EVENTS = {
- noCurrentEventAfter: {
- start: '2022-09-30T20:00-04:00',
+ noCurrentEvent: {
+ start: '2022-08-31T20:00-04:00',
end: '2022-12-21T08:00-04:00',
season: 'normal',
npcImageSuffix: '',
},
+ potions202208: {
+ start: '2022-08-16T08:00-04:00',
+ end: '2022-08-31T20:00-04:00',
+ season: 'normal',
+ npcImageSuffix: '',
+ },
bundle202208: {
start: '2022-08-09T08:00-04:00',
end: '2022-09-30T20:00-04:00',
@@ -28,12 +34,6 @@ export const EVENTS = {
npcImageSuffix: '_summer',
gear: true,
},
- noCurrentEvent: {
- start: '2022-04-30T20:00-04:00',
- end: '2022-06-21T08:00-04:00',
- season: 'normal',
- npcImageSuffix: '',
- },
bundle202206: {
start:'2022-06-14T08:00-04:00',
end:'2022-06-30T20:00-04:00',
diff --git a/website/common/script/content/gear/sets/mystery.js b/website/common/script/content/gear/sets/mystery.js
index dc8d8f2be7..716bdfdcb0 100644
--- a/website/common/script/content/gear/sets/mystery.js
+++ b/website/common/script/content/gear/sets/mystery.js
@@ -231,6 +231,7 @@ const shield = {
201802: { },
201902: { },
202011: { },
+ 202209: { },
301405: { },
301704: { },
};
@@ -248,6 +249,7 @@ const weapon = {
202104: { twoHanded: true },
202111: { twoHanded: true },
202201: { },
+ 202209: { },
301404: { },
};
diff --git a/website/common/script/content/hatching-potions.js b/website/common/script/content/hatching-potions.js
index 42a865fa7b..e4d75817ef 100644
--- a/website/common/script/content/hatching-potions.js
+++ b/website/common/script/content/hatching-potions.js
@@ -503,12 +503,13 @@ const premium = {
value: 2,
text: t('hatchingPotionMoonglow'),
limited: true,
- event: EVENTS.potions202108,
+ event: EVENTS.potions202208,
_addlNotes: t('premiumPotionAddlNotes', {
date: t('dateEndAugust'),
+ previousDate: t('augustYYYY', { year: 2021 }),
}),
canBuy () {
- return moment().isBetween(EVENTS.potions202108.start, EVENTS.potions202108.end);
+ return moment().isBetween(EVENTS.potions202208.start, EVENTS.potions202208.end);
},
},
SolarSystem: {
@@ -525,6 +526,18 @@ const premium = {
canBuy: hasQuestAchievementFunction('onyx'),
_addlNotes: t('premiumPotionUnlimitedNotes'),
},
+ Porcelain: {
+ value: 2,
+ text: t('hatchingPotionPorcelain'),
+ limited: true,
+ event: EVENTS.potions202208,
+ _addlNotes: t('premiumPotionAddlNotes', {
+ date: t('dateEndAugust'),
+ }),
+ canBuy () {
+ return moment().isBetween(EVENTS.potions202208.start, EVENTS.potions202208.end);
+ },
+ },
};
const wacky = {
diff --git a/website/common/script/content/shop-featuredItems.js b/website/common/script/content/shop-featuredItems.js
index 419b2d29a7..b6e4e0705d 100644
--- a/website/common/script/content/shop-featuredItems.js
+++ b/website/common/script/content/shop-featuredItems.js
@@ -5,7 +5,7 @@ import { EVENTS } from './constants';
// path: 'premiumHatchingPotions.Rainbow',
const featuredItems = {
market () {
- if (moment().isBefore(EVENTS.summer2022.end)) {
+ if (moment().isBetween(EVENTS.potions202208.start, EVENTS.potions202208.end)) {
return [
{
type: 'armoire',
@@ -13,15 +13,15 @@ const featuredItems = {
},
{
type: 'premiumHatchingPotion',
- path: 'premiumHatchingPotions.Sunset',
+ path: 'premiumHatchingPotions.Moonglow',
},
{
type: 'premiumHatchingPotion',
- path: 'premiumHatchingPotions.Watery',
+ path: 'premiumHatchingPotions.Porcelain',
},
{
- type: 'premiumHatchingPotion',
- path: 'premiumHatchingPotions.Aquatic',
+ type: 'food',
+ path: 'food.Milk',
},
];
}
@@ -32,15 +32,15 @@ const featuredItems = {
},
{
type: 'food',
- path: 'food.Honey',
+ path: 'food.RottenMeat',
},
{
type: 'hatchingPotions',
- path: 'hatchingPotions.CottonCandyPink',
+ path: 'hatchingPotions.Zombie',
},
{
type: 'eggs',
- path: 'eggs.BearCub',
+ path: 'eggs.Dragon',
},
];
},
diff --git a/website/common/script/ops/scoreTask.js b/website/common/script/ops/scoreTask.js
index 335b3a85bf..a9a0de139b 100644
--- a/website/common/script/ops/scoreTask.js
+++ b/website/common/script/ops/scoreTask.js
@@ -1,8 +1,10 @@
+import find from 'lodash/find';
import timesLodash from 'lodash/times';
import reduce from 'lodash/reduce';
import moment from 'moment';
import max from 'lodash/max';
import {
+ BadRequest,
NotAuthorized,
} from '../libs/errors';
import i18n from '../i18n';
@@ -104,6 +106,7 @@ function _gainMP (user, val) {
// ===== CONSTITUTION =====
// TODO Decreases HP loss from bad habits / missed dailies by 0.5% per point.
function _subtractPoints (user, task, stats, delta) {
+ if (task.group.id && task.type === 'daily') return stats.hp;
let conBonus = 1 - statsComputed(user).con / 250;
if (conBonus < 0.1) conBonus = 0.1;
@@ -233,11 +236,6 @@ export default function scoreTask (options = {}, req = {}, analytics) {
exp: user.stats.exp,
};
- if (
- task.group && task.group.approval && task.group.approval.required
- && !task.group.approval.approved && !(task.type === 'todo' && cron)
- ) return 0;
-
// This is for setting one-time temporary flags,
// such as streakBonus or itemDropped. Useful for notifying
// the API consumer, then cleared afterwards
@@ -248,6 +246,13 @@ export default function scoreTask (options = {}, req = {}, analytics) {
if (oldLeveledUp) user._tmp.leveledUp = oldLeveledUp;
+ // Thanks to open group tasks, userId is not guaranteed. Don't allow scoring inaccessible tasks
+ if (task.userId && task.userId !== user._id) {
+ throw new BadRequest('Cannot score task belonging to another user.');
+ } else if (task.group.id && user.guilds.indexOf(task.group.id) === -1
+ && user.party._id !== task.group.id) {
+ throw new BadRequest('Cannot score task belonging to another user.');
+ }
// If they're trying to purchase a too-expensive reward, don't allow them to do that.
if (task.value > user.stats.gp && task.type === 'reward') throw new NotAuthorized(i18n.t('messageNotEnoughGold', req.language));
@@ -296,34 +301,69 @@ export default function scoreTask (options = {}, req = {}, analytics) {
_gainMP(user, max([1, 0.01 * statsComputed(user).maxMP]) * (direction === 'down' ? -1 : 1));
if (direction === 'up') {
- task.streak += 1;
- // Give a streak achievement when the streak is a multiple of 21
- if (task.streak !== 0 && task.streak % 21 === 0) {
- user.achievements.streak = user.achievements.streak ? user.achievements.streak + 1 : 1;
- if (user.addNotification) user.addNotification('STREAK_ACHIEVEMENT');
- }
- task.completed = true;
+ if (task.group.id) {
+ if (!task.group.assignedUsers || task.group.assignedUsers.length === 0) {
+ task.group.completedBy = {
+ userId: user._id,
+ date: new Date(),
+ };
+ task.completed = true;
+ task.streak += 1;
+ } else {
+ task.group.assignedUsersDetail[user._id].completed = true;
+ task.group.assignedUsersDetail[user._id].completedDate = new Date();
+ if (!find(task.group.assignedUsersDetail, assignedUser => !assignedUser.completed)) {
+ task.dateCompleted = new Date();
+ task.completed = true;
+ task.streak += 1;
+ }
+ }
+ if (task.markModified) task.markModified('group');
+ } else {
+ task.streak += 1;
+ // Give a streak achievement when the streak is a multiple of 21
+ if (task.streak !== 0 && task.streak % 21 === 0) {
+ user.achievements.streak = user.achievements.streak ? user.achievements.streak + 1 : 1;
+ if (user.addNotification) user.addNotification('STREAK_ACHIEVEMENT');
+ }
+ task.completed = true;
- // Save history entry for daily
- task.history = task.history || [];
- const historyEntry = {
- date: Number(new Date()),
- value: task.value,
- isDue: task.isDue,
- completed: true,
- };
- task.history.push(historyEntry);
+ // Save history entry for daily
+ task.history = task.history || [];
+ const historyEntry = {
+ date: Number(new Date()),
+ value: task.value,
+ isDue: task.isDue,
+ completed: true,
+ };
+ task.history.push(historyEntry);
+ }
} else if (direction === 'down') {
- // Remove a streak achievement if streak was a multiple of 21 and the daily was undone
- if (task.streak !== 0 && task.streak % 21 === 0) {
- user.achievements.streak = user.achievements.streak ? user.achievements.streak - 1 : 0;
- }
- task.streak -= 1;
- task.completed = false;
+ if (task.group.id) {
+ if (!task.group.assignedUsersDetail
+ || !find(task.group.assignedUsersDetail, assignedUser => !assignedUser.completed)
+ ) {
+ task.streak -= 1;
+ task.completed = false;
+ }
+ if (task.group.completedBy) task.group.completedBy = {};
+ if (task.group.assignedUsersDetail && task.group.assignedUsersDetail[user._id]) {
+ task.group.assignedUsersDetail[user._id].completed = false;
+ task.group.assignedUsersDetail[user._id].completedDate = undefined;
+ }
+ if (task.markModified) task.markModified('group');
+ } else {
+ // Remove a streak achievement if streak was a multiple of 21 and the daily was undone
+ if (task.streak !== 0 && task.streak % 21 === 0) {
+ user.achievements.streak = user.achievements.streak ? user.achievements.streak - 1 : 0;
+ }
+ task.streak -= 1;
+ task.completed = false;
- // Delete history entry when daily unchecked
- if (task.history || task.history.length > 0) {
- task.history.splice(-1, 1);
+ // Delete history entry when daily unchecked
+ if (task.history || task.history.length > 0) {
+ task.history.splice(-1, 1);
+ }
}
}
}
@@ -332,11 +372,37 @@ export default function scoreTask (options = {}, req = {}, analytics) {
delta += _changeTaskValue(user, task, direction, times, cron);
} else {
if (direction === 'up') {
- task.dateCompleted = new Date();
- task.completed = true;
+ if (task.group.id) {
+ if (!task.group.assignedUsers || task.group.assignedUsers.length === 0) {
+ task.group.completedBy = {
+ userId: user._id,
+ date: new Date(),
+ };
+ task.completed = true;
+ } else {
+ task.group.assignedUsersDetail[user._id].completed = true;
+ task.group.assignedUsersDetail[user._id].completedDate = new Date();
+ if (!find(task.group.assignedUsersDetail, assignedUser => !assignedUser.completed)) {
+ task.dateCompleted = new Date();
+ task.completed = true;
+ }
+ }
+ if (task.markModified) task.markModified('group');
+ } else {
+ task.dateCompleted = new Date();
+ task.completed = true;
+ }
} else if (direction === 'down') {
task.completed = false;
task.dateCompleted = undefined;
+ if (task.group.id) {
+ if (task.group.completedBy) task.group.completedBy = {};
+ if (task.group.assignedUsersDetail && task.group.assignedUsersDetail[user._id]) {
+ task.group.assignedUsersDetail[user._id].completed = false;
+ task.group.assignedUsersDetail[user._id].completedDate = undefined;
+ }
+ if (task.markModified) task.markModified('group');
+ }
}
delta += _changeTaskValue(user, task, direction, times, cron);
diff --git a/website/server/controllers/api-v3/groups.js b/website/server/controllers/api-v3/groups.js
index 7e0f22c0ff..cfa582ecd9 100644
--- a/website/server/controllers/api-v3/groups.js
+++ b/website/server/controllers/api-v3/groups.js
@@ -419,14 +419,16 @@ api.getGroup = {
}
const groupJson = await Group.toJSONCleanChat(group, user);
-
- if (groupJson.leader === user._id) {
- groupJson.purchased.plan = group.purchased.plan.toObject();
- }
+ groupJson.purchased.plan = group.purchased.plan.toObject();
// Instead of populate we make a find call manually because of https://github.com/Automattic/mongoose/issues/3833
- const leader = await User.findById(groupJson.leader).select(nameFields).exec();
+ const leader = await User.findById(groupJson.leader).select(`${nameFields} preferences.timezoneOffset preferences.dayStart`).exec();
if (leader) groupJson.leader = leader.toJSON({ minimize: true });
+ if (groupJson.purchased.plan.planId) {
+ groupJson.cron.timezoneOffset = leader.preferences.timezoneOffset;
+ groupJson.cron.dayStart = leader.preferences.dayStart;
+ }
+ delete groupJson.leader.preferences;
res.respond(200, groupJson);
},
diff --git a/website/server/controllers/api-v3/tasks.js b/website/server/controllers/api-v3/tasks.js
index c168cd4ca5..c937f5efb0 100644
--- a/website/server/controllers/api-v3/tasks.js
+++ b/website/server/controllers/api-v3/tasks.js
@@ -632,7 +632,6 @@ api.updateTask = {
verifyTaskModification(task, user, group, challenge, res);
}
- const oldCheckList = task.checklist;
// we have to convert task to an object because otherwise things
// don't get merged correctly. Bad for performances?
const [updatedTaskObj] = common.ops.updateTask(task.toObject(), req);
@@ -654,14 +653,7 @@ api.updateTask = {
// the other of the keys when using .toObject()
// see https://github.com/Automattic/mongoose/issues/2749
- task.group.approval.required = false;
- if (sanitizedObj.requiresApproval) {
- task.group.approval.required = true;
- }
- if (sanitizedObj.sharedCompletion) {
- task.group.sharedCompletion = sanitizedObj.sharedCompletion;
- }
- if (sanitizedObj.managerNotes) {
+ if (Object.prototype.hasOwnProperty.call(sanitizedObj, 'managerNotes')) {
task.group.managerNotes = sanitizedObj.managerNotes;
}
@@ -695,28 +687,26 @@ api.updateTask = {
setNextDue(task, user);
const savedTask = await task.save();
- if (group && task.group.id && task.group.assignedUsers.length > 0) {
- const updateCheckListItems = _.remove(sanitizedObj.checklist, checklist => {
- const indexOld = _.findIndex(oldCheckList, check => check.id === checklist.id);
- if (indexOld !== -1) return checklist.text !== oldCheckList[indexOld].text;
- return false; // Only return changes. Adding and remove are handled differently
- });
-
- await group.updateTask(savedTask, { updateCheckListItems });
- }
-
res.respond(200, savedTask);
if (challenge) {
challenge.updateTask(savedTask);
- } else if (group && task.group.id && task.group.assignedUsers.length > 0) {
- await group.updateTask(savedTask);
- } else {
+ } else if (!group) {
taskActivityWebhook.send(user, {
type: 'updated',
task: savedTask,
});
}
+
+ if (group) {
+ res.analytics.track('task edit', {
+ uuid: user._id,
+ hitType: 'event',
+ category: 'behavior',
+ taskType: task.type,
+ groupID: group._id,
+ });
+ }
},
};
@@ -772,17 +762,12 @@ api.scoreTask = {
const userStats = user.stats.toJSON();
- // group tasks that require a manager's approval
- if (taskResponse.requiresApproval === true) {
- res.respond(202, { requiresApproval: true }, taskResponse.message);
- } else {
- const resJsonData = _.assign({
- delta: taskResponse.delta,
- _tmp: user._tmp,
- }, userStats);
+ const resJsonData = _.assign({
+ delta: taskResponse.delta,
+ _tmp: user._tmp,
+ }, userStats);
- res.respond(200, resJsonData);
- }
+ res.respond(200, resJsonData);
},
};
@@ -830,40 +815,25 @@ api.moveTask = {
const group = await getGroupFromTaskAndUser(task, user);
const challenge = await getChallengeFromTask(task);
- verifyTaskModification(task, user, group, challenge, res);
+ if (task.group.id && !task.userId) {
+ if (!group || (user.guilds.indexOf(group._id) === -1 && user.party._id !== group._id)) {
+ throw new NotFound(res.t('groupNotFound'));
+ }
+ if (task.group.assignedUsers.length !== 0
+ && task.group.assignedUsers.indexOf(user._id) === -1) {
+ throw new BadRequest('Use /group/:groupId/tasks/:taskId/move/to/:position route');
+ }
+ } else {
+ verifyTaskModification(task, user, group, challenge, res);
+ }
if (task.type === 'todo' && task.completed) throw new BadRequest(res.t('cantMoveCompletedTodo'));
- const owner = group || challenge || user;
+ const owner = challenge || user;
// In memory updates
const order = owner.tasksOrder[`${task.type}s`];
- if (order.indexOf(task._id) === -1) { // task is missing from list, list needs repair
- const taskListQuery = { type: task.type };
- if (group) {
- taskListQuery['group.id'] = owner._id;
- taskListQuery.userId = { $exists: false };
- } else if (challenge) {
- taskListQuery['challenge.id'] = owner._id;
- taskListQuery.userId = { $exists: false };
- } else {
- taskListQuery.userId = owner._id;
- }
- const taskList = await Tasks.Task.find(
- taskListQuery,
- { _id: 1 },
- ).exec();
- for (const foundTask of taskList) {
- if (order.indexOf(foundTask._id) === -1) {
- order.push(foundTask._id);
- }
- }
- const fixQuery = { $set: {} };
- fixQuery.$set[`tasksOrder.${task.type}s`] = order;
- await owner.update(fixQuery).exec();
- }
-
moveTask(order, task._id, to);
// Server updates
@@ -886,7 +856,7 @@ api.moveTask = {
// it cannot be updated in the pre update hook
// See https://github.com/HabitRPG/habitica/pull/9321#issuecomment-354187666 for more info
// Only users have a version.
- if (!group && !challenge) {
+ if (!challenge) {
owner._v += 1;
}
@@ -956,9 +926,6 @@ api.addChecklistItem = {
res.respond(200, savedTask);
if (challenge) challenge.updateTask(savedTask);
- if (group && task.group.id && task.group.assignedUsers.length > 0) {
- await group.updateTask(savedTask, { newCheckListItem });
- }
},
};
@@ -989,9 +956,15 @@ api.scoreCheckListItem = {
if (validationErrors) throw validationErrors;
const { taskId } = req.params;
- const task = await Tasks.Task.findByIdOrAlias(taskId, user._id, { userId: user._id });
+ const task = await Tasks.Task.findByIdOrAlias(taskId, user._id);
- if (!task) throw new NotFound(res.t('messageTaskNotFound'));
+ if (!task || (!task.userId && !task.group.id)) throw new NotFound(res.t('messageTaskNotFound'));
+ if (task.userId && task.userId !== user._id) {
+ throw new BadRequest('Cannot score task belonging to another user.');
+ } else if (task.group.id && user.guilds.indexOf(task.group.id) === -1
+ && user.party._id !== task.group.id) {
+ throw new BadRequest('Cannot score task belonging to another user.');
+ }
if (task.type !== 'daily' && task.type !== 'todo') throw new BadRequest(res.t('checklistOnlyDailyTodo'));
const item = _.find(task.checklist, { id: req.params.itemId });
@@ -1063,9 +1036,6 @@ api.updateChecklistItem = {
res.respond(200, savedTask);
if (challenge) challenge.updateTask(savedTask);
- if (group && task.group.id && task.group.assignedUsers.length > 0) {
- await group.updateTask(savedTask);
- }
},
};
@@ -1125,9 +1095,6 @@ api.removeChecklistItem = {
const savedTask = await task.save();
res.respond(200, savedTask);
if (challenge) challenge.updateTask(savedTask);
- if (group && task.group.id && task.group.assignedUsers.length > 0) {
- await group.updateTask(savedTask, { removedCheckListItemId: req.params.itemId });
- }
},
};
diff --git a/website/server/controllers/api-v3/tasks/groups.js b/website/server/controllers/api-v3/tasks/groups.js
index 59cf9c2b9d..963fcdbf91 100644
--- a/website/server/controllers/api-v3/tasks/groups.js
+++ b/website/server/controllers/api-v3/tasks/groups.js
@@ -1,3 +1,4 @@
+import isUUID from 'validator/lib/isUUID';
import { authWithHeaders } from '../../../middlewares/auth';
import * as Tasks from '../../../models/task';
import { model as Group } from '../../../models/group';
@@ -12,13 +13,12 @@ import {
createTasks,
getTasks,
groupSubscriptionNotFound,
+ scoreTasks,
} from '../../../libs/tasks';
import {
moveTask,
} from '../../../libs/tasks/utils';
-import { handleSharedCompletion } from '../../../libs/groupTasks';
import apiError from '../../../libs/apiError';
-import logger from '../../../libs/logger';
const requiredGroupFields = '_id leader tasksOrder name';
// @TODO: abstract to task lib
@@ -150,14 +150,15 @@ api.groupMoveTask = {
if (task.type === 'todo' && task.completed) throw new BadRequest(res.t('cantMoveCompletedTodo'));
+ const groupFields = requiredGroupFields.concat(' managers purchased');
const group = await Group.getGroup({
user,
groupId: task.group.id,
- fields: requiredGroupFields.concat(' purchased'),
+ fields: groupFields,
});
if (groupSubscriptionNotFound(group)) throw new NotFound(res.t('groupNotFound'));
- if (group.leader !== user._id) throw new NotAuthorized(res.t('onlyGroupLeaderCanEditTasks'));
+ if (canNotEditTasks(group, user)) throw new NotAuthorized(res.t('onlyGroupLeaderCanEditTasks'));
const order = group.tasksOrder[`${task.type}s`];
@@ -184,30 +185,31 @@ api.groupMoveTask = {
};
/**
- * @api {post} /api/v3/tasks/:taskId/assign/:assignedUserId Assign a group task to a user
- * @apiDescription Assigns a user to a group task
+ * @api {post} /api/v3/tasks/:taskId/assign Assign a group task to a user or users
+ * @apiDescription Assign users to a group task
* @apiName AssignTask
* @apiGroup Task
*
* @apiParam (Path) {UUID} taskId The id of the task that will be assigned
- * @apiParam (Path) {UUID} assignedUserId The id of the user that will be assigned to the task
+ * @apiParam (Body) {UUID[]} [assignedUserIds] Array of user IDs to be assigned to the task
*
* @apiSuccess data The assigned task
*/
api.assignTask = {
method: 'POST',
- url: '/tasks/:taskId/assign/:assignedUserId',
+ url: '/tasks/:taskId/assign',
middlewares: [authWithHeaders()],
async handler (req, res) {
req.checkParams('taskId', apiError('taskIdRequired')).notEmpty().isUUID();
- req.checkParams('assignedUserId', res.t('userIdRequired')).notEmpty().isUUID();
const reqValidationErrors = req.validationErrors();
if (reqValidationErrors) throw reqValidationErrors;
const { user } = res.locals;
- const { assignedUserId } = req.params;
- const assignedUser = await User.findById(assignedUserId).exec();
+ const assignedUserIds = req.body;
+ for (const userId of assignedUserIds) {
+ if (!isUUID(userId)) throw new BadRequest('Assigned users must be UUIDs');
+ }
const { taskId } = req.params;
const task = await Tasks.Task.findByIdOrAlias(taskId, user._id);
@@ -224,37 +226,36 @@ api.assignTask = {
const group = await Group.getGroup({ user, groupId: task.group.id, fields: groupFields });
if (groupSubscriptionNotFound(group)) throw new NotFound(res.t('groupNotFound'));
- if (canNotEditTasks(group, user, assignedUserId)) throw new NotAuthorized(res.t('onlyGroupLeaderCanEditTasks'));
+ if (canNotEditTasks(group, user)) throw new NotAuthorized(res.t('onlyGroupLeaderCanEditTasks'));
+ const assignedUsers = await User.find({ _id: { $in: assignedUserIds } }).exec();
const promises = [];
const taskText = task.text;
const userName = `@${user.auth.local.username}`;
- if (user._id === assignedUserId) {
- const managerIds = Object.keys(group.managers);
- managerIds.push(group.leader);
- const managers = await User.find({ _id: managerIds }, 'notifications preferences').exec();
- managers.forEach(manager => {
- if (manager._id === user._id) return;
- manager.addNotification('GROUP_TASK_CLAIMED', {
- message: res.t('taskClaimed', { userName, taskText }, manager.preferences.language),
+ for (const userToAssign of assignedUsers) {
+ if (user._id !== userToAssign._id) {
+ userToAssign.addNotification('GROUP_TASK_ASSIGNED', {
+ message: res.t('youHaveBeenAssignedTask', { managerName: userName, taskText }),
groupId: group._id,
taskId: task._id,
});
- promises.push(manager.save());
- });
- } else {
- assignedUser.addNotification('GROUP_TASK_ASSIGNED', {
- message: res.t('youHaveBeenAssignedTask', { managerName: userName, taskText }),
- taskId: task._id,
- });
+ }
}
- promises.push(group.syncTask(task, assignedUser, user));
+ promises.push(group.syncTask(task, assignedUsers, user));
promises.push(group.save());
await Promise.all(promises);
res.respond(200, task);
+
+ res.analytics.track('task assign', {
+ uuid: user._id,
+ hitType: 'event',
+ category: 'behavior',
+ taskType: task.type,
+ groupID: group._id,
+ });
},
};
@@ -299,7 +300,7 @@ api.unassignTask = {
const group = await Group.getGroup({ user, groupId: task.group.id, fields });
if (groupSubscriptionNotFound(group)) throw new NotFound(res.t('groupNotFound'));
- if (canNotEditTasks(group, user, assignedUserId)) throw new NotAuthorized(res.t('onlyGroupLeaderCanEditTasks'));
+ if (canNotEditTasks(group, user)) throw new NotAuthorized(res.t('onlyGroupLeaderCanEditTasks'));
await group.unlinkTask(task, assignedUser);
@@ -314,111 +315,6 @@ api.unassignTask = {
},
};
-/**
- * @api {post} /api/v3/tasks/:taskId/approve/:userId Approve a user's task
- * @apiDescription Approves a user assigned to a group task
- * @apiVersion 3.0.0
- * @apiName ApproveTask
- * @apiGroup Task
- *
- * @apiParam (Path) {UUID} taskId The id of the task that is the original group task
- * @apiParam (Path) {UUID} userId The id of the user that will be approved
- *
- * @apiSuccess task The approved task
- */
-api.approveTask = {
- method: 'POST',
- url: '/tasks/:taskId/approve/:userId',
- middlewares: [authWithHeaders()],
- async handler (req, res) {
- req.checkParams('taskId', apiError('taskIdRequired')).notEmpty().isUUID();
- req.checkParams('userId', res.t('userIdRequired')).notEmpty().isUUID();
-
- const reqValidationErrors = req.validationErrors();
- if (reqValidationErrors) throw reqValidationErrors;
-
- const { user } = res.locals;
- const assignedUserId = req.params.userId;
- const assignedUser = await User.findById(assignedUserId).exec();
-
- const { taskId } = req.params;
- const task = await Tasks.Task.findOne({
- 'group.taskId': taskId,
- userId: assignedUserId,
- }).exec();
-
- if (!task) {
- throw new NotFound(res.t('messageTaskNotFound'));
- }
-
- const fields = requiredGroupFields.concat(' purchased managers');
- const group = await Group.getGroup({ user, groupId: task.group.id, fields });
- if (groupSubscriptionNotFound(group)) throw new NotFound(res.t('groupNotFound'));
-
- if (canNotEditTasks(group, user)) throw new NotAuthorized(res.t('onlyGroupLeaderCanEditTasks'));
- if (task.group.approval.approved === true) throw new NotAuthorized(res.t('canOnlyApproveTaskOnce'));
- if (!task.group.approval.requested) {
- throw new NotAuthorized(res.t('taskApprovalWasNotRequested'));
- }
-
- task.group.approval.dateApproved = new Date();
- task.group.approval.approvingUser = user._id;
- task.group.approval.approved = true;
-
- // Get Managers
- const managerIds = Object.keys(group.managers);
- managerIds.push(group.leader);
- const managers = await User.find({ _id: managerIds }, 'notifications').exec(); // Use this method so we can get access to notifications
-
- // Get task direction
- const firstManagerNotifications = managers[0].notifications;
- const firstNotificationIndex = firstManagerNotifications.findIndex(notification => notification && notification.data && notification.data.taskId === task._id && notification.type === 'GROUP_TASK_APPROVAL');
- let direction = 'up';
- if (firstManagerNotifications[firstNotificationIndex]) {
- direction = firstManagerNotifications[firstNotificationIndex].direction || direction;
- }
-
- // Remove old notifications
- const approvalPromises = [];
- managers.forEach(manager => {
- const notificationIndex = manager.notifications.findIndex(notification => notification && notification.data && notification.data.taskId === task._id && notification.type === 'GROUP_TASK_APPROVAL');
-
- if (notificationIndex !== -1) {
- manager.notifications.splice(notificationIndex, 1);
- approvalPromises.push(manager.save());
- }
- });
-
- // Add new notifications to user
- assignedUser.addNotification('GROUP_TASK_APPROVED', {
- message: res.t('yourTaskHasBeenApproved', { taskText: task.text }),
- groupId: group._id,
- task,
- direction,
- });
-
- approvalPromises.push(task.save());
- approvalPromises.push(assignedUser.save());
- await Promise.all(approvalPromises);
-
- res.respond(200, task);
-
- // Wrapping everything in a try/catch block because if an error occurs
- // using `await` it MUST NOT bubble up because the request has already been handled
- try {
- const groupTask = await Tasks.Task.findOne({
- _id: task.group.taskId,
- }).exec();
-
- if (groupTask) {
- await handleSharedCompletion(groupTask, task);
- }
- } catch (e) {
- logger.error('Error handling group task', e);
- }
- },
-};
-
/**
* @api {post} /api/v3/tasks/:taskId/needs-work/:userId Require more work for a group task
* @apiDescription Mark an assigned group task as needing more work before it can be approved
@@ -450,122 +346,54 @@ api.taskNeedsWork = {
const [assignedUser, task] = await Promise.all([
User.findById(assignedUserId).exec(),
await Tasks.Task.findOne({
- 'group.taskId': taskId,
- userId: assignedUserId,
+ _id: taskId,
}).exec(),
]);
if (!task) {
throw new NotFound(res.t('messageTaskNotFound'));
}
+ if (['daily', 'todo'].indexOf(task.type) === -1) {
+ throw new BadRequest('Cannot roll back use of Habits or Rewards.');
+ }
+
+ if (task.group.completedBy.userId) {
+ if (task.group.completedBy.userId !== assignedUserId) {
+ throw new BadRequest('Task not completed by this user.');
+ }
+ } else if (!task.group.assignedUsersDetail || !task.group.assignedUsersDetail[assignedUserId]
+ || !task.group.assignedUsersDetail[assignedUserId].completed) {
+ throw new BadRequest('Task not completed by this user.');
+ }
const fields = requiredGroupFields.concat(' purchased managers');
const group = await Group.getGroup({ user, groupId: task.group.id, fields });
if (groupSubscriptionNotFound(group)) throw new NotFound(res.t('groupNotFound'));
if (canNotEditTasks(group, user)) throw new NotAuthorized(res.t('onlyGroupLeaderCanEditTasks'));
- if (task.group.approval.approved === true) throw new NotAuthorized(res.t('canOnlyApproveTaskOnce'));
- if (!task.group.approval.requested) {
- throw new NotAuthorized(res.t('taskApprovalWasNotRequested'));
+
+ await scoreTasks(assignedUser, [{ id: task._id, direction: 'down' }], req, res);
+ if (assignedUserId !== user._id) {
+ assignedUser.addNotification('GROUP_TASK_NEEDS_WORK', {
+ message: res.t('taskNeedsWork', { taskText: task.text, managerName: user.auth.local.username }, assignedUser.preferences.language),
+ task: {
+ id: task._id,
+ text: task.text,
+ },
+ group: {
+ id: group._id,
+ name: group.name,
+ },
+ manager: {
+ id: user._id,
+ name: user.auth.local.username,
+ },
+ });
}
-
- // Get Managers
- const managerIds = Object.keys(group.managers);
- managerIds.push(group.leader);
- const managers = await User.find({ _id: managerIds }, 'notifications').exec(); // Use this method so we can get access to notifications
-
- const promises = [];
-
- // Remove old notifications
- managers.forEach(manager => {
- const notificationIndex = manager.notifications.findIndex(notification => notification && notification.data && notification.data.taskId === task._id && notification.type === 'GROUP_TASK_APPROVAL');
-
- if (notificationIndex !== -1) {
- manager.notifications.splice(notificationIndex, 1);
- promises.push(manager.save());
- }
- });
-
- task.group.approval.requested = false;
- task.group.approval.requestedDate = undefined;
-
- const taskText = task.text;
- const managerName = user.profile.name;
-
- const message = res.t('taskNeedsWork', { taskText, managerName }, assignedUser.preferences.language);
-
- assignedUser.addNotification('GROUP_TASK_NEEDS_WORK', {
- message,
- task: {
- id: task._id,
- text: taskText,
- },
- group: {
- id: group._id,
- name: group.name,
- },
- manager: {
- id: user._id,
- name: managerName,
- },
- });
-
- await Promise.all([...promises, assignedUser.save(), task.save()]);
+ await Promise.all([assignedUser.save(), task.save()]);
res.respond(200, task);
},
};
-/**
- * @api {get} /api/v3/approvals/group/:groupId Get a group's approvals
- * @apiVersion 3.0.0
- * @apiName GetGroupApprovals
- * @apiGroup Task
- *
- * @apiParam (Path) {UUID} groupId The id of the group from which to retrieve the approvals
- *
- * @apiSuccess {Array} data An array of tasks
- */
-api.getGroupApprovals = {
- method: 'GET',
- url: '/approvals/group/:groupId',
- middlewares: [authWithHeaders()],
- async handler (req, res) {
- req.checkParams('groupId', apiError('groupIdRequired')).notEmpty().isUUID();
-
- const validationErrors = req.validationErrors();
- if (validationErrors) throw validationErrors;
-
- const { user } = res.locals;
- const { groupId } = req.params;
-
- const fields = requiredGroupFields.concat(' purchased managers');
- const group = await Group.getGroup({ user, groupId, fields });
- if (groupSubscriptionNotFound(group)) throw new NotFound(res.t('groupNotFound'));
-
- let approvals;
- if (canNotEditTasks(group, user)) {
- approvals = await Tasks.Task.find({
- 'group.id': groupId,
- 'group.approval.approved': false,
- 'group.approval.requested': true,
- 'group.assignedUsers': user._id,
- userId: user._id,
- }, 'userId group text')
- .populate('userId', 'profile')
- .exec();
- } else {
- approvals = await Tasks.Task.find({
- 'group.id': groupId,
- 'group.approval.approved': false,
- 'group.approval.requested': true,
- }, 'userId group text')
- .populate('userId', 'profile')
- .exec();
- }
-
- res.respond(200, approvals);
- },
-};
-
export default api;
diff --git a/website/server/libs/cron.js b/website/server/libs/cron.js
index 5899a44f06..cfbdbb0dc5 100644
--- a/website/server/libs/cron.js
+++ b/website/server/libs/cron.js
@@ -343,17 +343,18 @@ export async function cron (options = {}) {
if (!user.party.quest.progress.down) user.party.quest.progress.down = 0;
tasksByType.dailys.forEach(task => {
+ const isTeamBoardTask = task.group.id && !task.userId;
if (
- task.group.assignedDate
+ !isTeamBoardTask && task.group.assignedDate
&& moment(task.group.assignedDate).isAfter(user.auth.timestamps.updated)
) return;
const { completed } = task;
// Deduct points for missed Daily tasks
- let EvadeTask = 0;
+ let evadeTask = 0;
let scheduleMisses = daysMissed;
if (completed) {
- dailyChecked += 1;
+ if (!isTeamBoardTask) dailyChecked += 1;
if (!atLeastOneDailyDue) { // only bother checking until the first thing is found
const thatDay = moment(now).subtract({ days: daysMissed });
atLeastOneDailyDue = shouldDo(thatDay.toDate(), task, user.preferences);
@@ -368,15 +369,15 @@ export async function cron (options = {}) {
if (shouldDo(thatDay.toDate(), task, user.preferences)) {
atLeastOneDailyDue = true;
scheduleMisses += 1;
- if (user.stats.buffs.stealth) {
+ if (user.stats.buffs.stealth && !isTeamBoardTask) {
user.stats.buffs.stealth -= 1;
- EvadeTask += 1;
+ evadeTask += 1;
}
}
if (multiDaysCountAsOneDay) break;
}
- if (scheduleMisses > EvadeTask) {
+ if (scheduleMisses > evadeTask) {
// The user did not complete this due Daily
// (but no penalty if cron is running in safe mode).
if (CRON_SAFE_MODE) {
@@ -402,7 +403,7 @@ export async function cron (options = {}) {
user,
task,
direction: 'down',
- times: multiDaysCountAsOneDay ? 1 : scheduleMisses - EvadeTask,
+ times: multiDaysCountAsOneDay ? 1 : scheduleMisses - evadeTask,
cron: true,
});
@@ -437,13 +438,6 @@ export async function cron (options = {}) {
task.checklist.forEach(i => { i.completed = false; });
}
}
-
- if (task.group && task.group.approval && task.group.approval.approved) {
- task.group.approval.approved = false;
- task.group.approval.dateApproved = null;
- task.group.approval.requested = false;
- task.group.approval.requestedDate = null;
- }
});
resetHabitCounters(user, tasksByType, now, daysMissed);
@@ -454,12 +448,6 @@ export async function cron (options = {}) {
if (task.up === false || task.down === false) {
task.value = Math.abs(task.value) < 0.1 ? 0 : task.value /= 2;
}
- if (task.group && task.group.approval && task.group.approval.approved) {
- task.group.approval.approved = false;
- task.group.approval.dateApproved = null;
- task.group.approval.requested = false;
- task.group.approval.requestedDate = null;
- }
});
// Finished tallying
diff --git a/website/server/libs/groupTasks.js b/website/server/libs/groupTasks.js
index baad36e57d..fcd13273c3 100644
--- a/website/server/libs/groupTasks.js
+++ b/website/server/libs/groupTasks.js
@@ -1,56 +1,18 @@
import * as Tasks from '../models/task'; // eslint-disable-line import/no-cycle
-const SHARED_COMPLETION = {
- default: 'recurringCompletion',
- single: 'singleCompletion',
- every: 'allAssignedCompletion',
-};
-
-async function _completeMasterTask (masterTask) {
- masterTask.completed = true;
- await masterTask.save();
-}
-
-async function _deleteUnfinishedTasks (groupMemberTask) {
- await Tasks.Task.deleteMany({
- 'group.taskId': groupMemberTask.group.taskId,
- $and: [
- { userId: { $exists: true } },
- { userId: { $ne: groupMemberTask.userId } },
- ],
- }).exec();
-}
-
-async function _evaluateAllAssignedCompletion (masterTask) {
- let completions;
- if (masterTask.group.approval && masterTask.group.approval.required) {
- completions = await Tasks.Task.countDocuments({
- 'group.taskId': masterTask._id,
- 'group.approval.approved': true,
- }).exec();
- } else {
- completions = await Tasks.Task.countDocuments({
- 'group.taskId': masterTask._id,
- completed: true,
- }).exec();
- }
- if (completions >= masterTask.group.assignedUsers.length) {
- await _completeMasterTask(masterTask);
- }
-}
-
-async function handleSharedCompletion (masterTask, groupMemberTask) {
- if (masterTask.type !== 'todo') return;
-
- if (masterTask.group.sharedCompletion === SHARED_COMPLETION.single) {
- await _deleteUnfinishedTasks(groupMemberTask);
- await _completeMasterTask(masterTask);
- } else if (masterTask.group.sharedCompletion === SHARED_COMPLETION.every) {
- await _evaluateAllAssignedCompletion(masterTask);
+async function handleSharedCompletion (teamTask) {
+ if (teamTask.type === 'reward') return;
+ const incompleteTask = await Tasks.Task.findOne({
+ 'group.taskId': teamTask._id,
+ userId: { $exists: true },
+ completed: false,
+ }, { _id: 1 }).exec();
+ if (!incompleteTask) {
+ teamTask.completed = true;
+ teamTask.save();
}
}
export {
- SHARED_COMPLETION,
handleSharedCompletion,
};
diff --git a/website/server/libs/payments/groupPayments.js b/website/server/libs/payments/groupPayments.js
index cae19cccd7..3587c7585e 100644
--- a/website/server/libs/payments/groupPayments.js
+++ b/website/server/libs/payments/groupPayments.js
@@ -3,6 +3,7 @@ import _ from 'lodash';
import moment from 'moment';
import { model as User } from '../../models/user'; // eslint-disable-line import/no-cycle
+import * as Tasks from '../../models/task'; // eslint-disable-line import/no-cycle
import { // eslint-disable-line import/no-cycle
model as Group,
basicFields as basicGroupFields,
@@ -220,6 +221,8 @@ async function cancelGroupSubscriptionForUser (user, group, userWasRemoved = fal
const index = userGroups.indexOf(group._id);
if (index >= 0) userGroups.splice(index, 1);
+ await Tasks.Task.remove({ userId: user._id, 'group.id': group._id }).exec();
+
const groupPlansQuery = {
// type: { $in: ['guild', 'party'] },
// privacy: 'private',
diff --git a/website/server/libs/spells.js b/website/server/libs/spells.js
index 9319205ab4..4a132f290b 100644
--- a/website/server/libs/spells.js
+++ b/website/server/libs/spells.js
@@ -21,8 +21,8 @@ async function castTaskSpell (res, req, targetId, user, spell, quantity = 1) {
if (!targetId) throw new BadRequest(res.t('targetIdUUID'));
const task = await Tasks.Task.findOne({
- _id: targetId,
userId: user._id,
+ _id: targetId,
}).exec();
if (!task) throw new NotFound(res.t('messageTaskNotFound'));
if (task.challenge.id) throw new BadRequest(res.t('challengeTasksNoCast'));
diff --git a/website/server/libs/tasks/index.js b/website/server/libs/tasks/index.js
index e743967137..d32280fd3c 100644
--- a/website/server/libs/tasks/index.js
+++ b/website/server/libs/tasks/index.js
@@ -1,5 +1,9 @@
import moment from 'moment';
-import _ from 'lodash';
+import cloneDeep from 'lodash/cloneDeep';
+import compact from 'lodash/compact';
+import forEach from 'lodash/forEach';
+import keys from 'lodash/keys';
+import remove from 'lodash/remove';
import validator from 'validator';
import {
setNextDue,
@@ -17,7 +21,6 @@ import {
NotAuthorized,
} from '../errors';
import {
- SHARED_COMPLETION,
handleSharedCompletion,
} from '../groupTasks';
import shared from '../../../common';
@@ -64,10 +67,7 @@ async function createTasks (req, res, options = {}) {
newTask.challenge.id = challenge.id;
} else if (group) {
newTask.group.id = group._id;
- if (taskData.requiresApproval) {
- newTask.group.approval.required = true;
- }
- newTask.group.sharedCompletion = taskData.sharedCompletion || SHARED_COMPLETION.default;
+ newTask.tags = [group._id];
newTask.group.managerNotes = taskData.managerNotes || '';
} else {
newTask.userId = user._id;
@@ -152,23 +152,60 @@ async function getTasks (req, res, options = {}) {
dueDate,
} = options;
- let query = { userId: user._id };
+ let query;
let limit;
let sort;
+ let upgradedGroups = [];
+ const upgradedGroupIds = [];
const owner = group || challenge || user;
if (challenge) {
query = { 'challenge.id': challenge.id, userId: { $exists: false } };
} else if (group) {
- query = { 'group.id': group._id, userId: { $exists: false } };
+ query = { 'group.id': group._id };
+ } else {
+ const groupsToMirror = user.preferences.tasks.mirrorGroupTasks;
+ if (groupsToMirror && groupsToMirror.length > 0) {
+ upgradedGroups = await Group.find(
+ {
+ _id: { $in: groupsToMirror },
+ 'purchased.plan.customerId': { $exists: true },
+ $or: [
+ { 'purchased.plan.dateTerminated': { $exists: false } },
+ { 'purchased.plan.dateTerminated': null },
+ { 'purchased.plan.dateTerminated': { $gt: new Date() } },
+ ],
+ },
+ { _id: 1 },
+ ).exec();
+ }
+ if (upgradedGroups.length > 0) {
+ for (const upgradedGroup of upgradedGroups) {
+ upgradedGroupIds.push(upgradedGroup._id);
+ }
+ query = {
+ $or: [
+ { userId: user._id },
+ {
+ 'group.id': { $in: upgradedGroupIds },
+ $or: [
+ { 'group.assignedUsers': user._id },
+ { 'group.assignedUsers.0': { $exists: false } },
+ ],
+ },
+ ],
+ };
+ } else {
+ query = { userId: user._id };
+ }
}
const { type } = req.query;
if (type) {
if (type === 'todos') {
- query.completed = false; // Exclude completed todos
query.type = 'todo';
+ query.completed = false; // Exclude completed todos
} else if (type === 'completedTodos' || type === '_allCompletedTodos') { // _allCompletedTodos is currently in BETA and is likely to be removed in future
limit = 30;
@@ -179,7 +216,18 @@ async function getTasks (req, res, options = {}) {
query.type = 'todo';
query.completed = true;
- if (owner._id === user._id) {
+ if (upgradedGroups.length > 0) {
+ query.$or = [
+ { 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;
}
@@ -190,10 +238,12 @@ async function getTasks (req, res, options = {}) {
query.type = type.slice(0, -1); // removing the final "s"
}
} else {
- query.$or = [ // Exclude completed todos
- { type: 'todo', completed: false },
- { type: { $in: ['habit', 'daily', 'reward'] } },
- ];
+ query.$and = [{
+ $or: [ // Exclude completed todos
+ { type: 'todo', completed: false },
+ { type: { $in: ['habit', 'daily', 'reward'] } },
+ ],
+ }];
}
const mQuery = Tasks.Task.find(query);
@@ -208,6 +258,19 @@ async function getTasks (req, res, options = {}) {
});
}
+ let ownerDirty = false;
+ // Prune nonexistent tasks from tasksOrder
+ forEach(owner.tasksOrder, (taskOrder, key) => {
+ if (type && key.slice(0, -1) !== type) return;
+ const preLength = taskOrder.length;
+ remove(taskOrder, taskId => tasks.findIndex(task => task._id === taskId) === -1);
+ if (preLength !== taskOrder.length) {
+ owner.tasksOrder[key] = taskOrder;
+ owner.markModified('tasksOrder');
+ ownerDirty = true;
+ }
+ });
+
// Order tasks based on tasksOrder
let order = [];
if (type && type !== 'completedTodos' && type !== '_allCompletedTodos') {
@@ -228,13 +291,18 @@ async function getTasks (req, res, options = {}) {
const i = order[index] === taskId ? index : order.indexOf(taskId);
if (i === -1) {
unorderedTasks.push(task);
+ const typeString = `${task.type}s`;
+ owner.tasksOrder[typeString].push(taskId);
+ ownerDirty = true;
} else {
orderedTasks[i] = task;
}
});
+ if (ownerDirty) await owner.save();
+
// Remove empty values from the array and add any unordered task
- orderedTasks = _.compact(orderedTasks).concat(unorderedTasks);
+ orderedTasks = compact(orderedTasks).concat(unorderedTasks);
return orderedTasks;
}
@@ -301,22 +369,23 @@ async function handleChallengeTask (task, delta, direction) {
}
}
-async function handleGroupTask (task, delta, direction) {
+async function handleTeamTask (task, delta, direction) {
if (task.group && task.group.taskId) {
// Wrapping everything in a try/catch block because if an error occurs
// using `await` it MUST NOT bubble up because the request has already been handled
try {
- const groupTask = await Tasks.Task.findOne({
+ const teamTask = await Tasks.Task.findOne({
_id: task.group.taskId,
}).exec();
- if (groupTask) {
- await handleSharedCompletion(groupTask, task);
-
- const groupDelta = groupTask.group.assignedUsers
- ? delta / groupTask.group.assignedUsers.length
+ if (teamTask) {
+ const groupDelta = teamTask.group.assignedUsers
+ ? delta / keys(teamTask.group.assignedUsers).length
: delta;
- await groupTask.scoreChallengeTask(groupDelta, direction);
+ await teamTask.scoreChallengeTask(groupDelta, direction);
+ if (task.type === 'daily' || task.type === 'todo') {
+ await handleSharedCompletion(teamTask);
+ }
}
} catch (e) {
logger.error(e, 'Error scoring group task');
@@ -334,106 +403,96 @@ async function handleGroupTask (task, delta, direction) {
*/
async function scoreTask (user, task, direction, req, res) {
if (task.type === 'daily' || task.type === 'todo') {
- if (task.completed && direction === 'up') {
+ if (task.group.id && task.group.assignedUsersDetail
+ && task.group.assignedUsersDetail[user._id]
+ ) {
+ if (task.group.assignedUsersDetail[user._id].completed && direction === 'up') {
+ throw new NotAuthorized(res.t('sessionOutdated'));
+ } else if (!task.group.assignedUsersDetail[user._id].completed && direction === 'down') {
+ throw new NotAuthorized(res.t('sessionOutdated'));
+ }
+ } else if (task.completed && direction === 'up') {
throw new NotAuthorized(res.t('sessionOutdated'));
} else if (!task.completed && direction === 'down') {
throw new NotAuthorized(res.t('sessionOutdated'));
}
}
- if (task.group.approval.required && !task.group.approval.approved) {
- const fields = requiredGroupFields.concat(' managers');
- const group = await Group.getGroup({ user, groupId: task.group.id, fields });
+ let rollbackUser;
+ let group;
- const managerIds = Object.keys(group.managers);
- managerIds.push(group.leader);
-
- if (managerIds.indexOf(user._id) !== -1) {
- task.group.approval.approved = true;
- task.group.approval.requested = true;
- task.group.approval.requestedDate = new Date();
- } else {
- if (task.group.approval.requested) {
- return {
- task,
- requiresApproval: true,
- message: res.t('taskRequiresApproval'),
- };
- }
-
- task.group.approval.requested = true;
- task.group.approval.requestedDate = new Date();
-
- const managers = await User.find({ _id: managerIds }, 'notifications preferences').exec(); // Use this method so we can get access to notifications
-
- // @TODO: we can use the User.pushNotification function because
- // we need to ensure notifications are translated
- const managerPromises = [];
- managers.forEach(manager => {
- manager.addNotification('GROUP_TASK_APPROVAL', {
- message: res.t('userHasRequestedTaskApproval', {
- user: user.profile.name,
- taskName: task.text,
- }, manager.preferences.language),
- groupId: group._id,
- // user task id, used to match the notification when the task is approved
- taskId: task._id,
- userId: user._id,
- groupTaskId: task.group.taskId, // the original task id
- direction,
- });
- managerPromises.push(manager.save());
- });
-
- managerPromises.push(task.save());
- await Promise.all(managerPromises);
-
- return {
- task,
- requiresApproval: true,
- message: res.t('taskApprovalHasBeenRequested'),
- };
- }
+ if (task.group.id) {
+ group = await Group.getGroup({
+ user,
+ groupId: task.group.id,
+ fields: 'leader managers',
+ });
}
-
- if (task.group.approval.required && task.group.approval.approved) {
- const notificationIndex = user.notifications.findIndex(notification => notification
- && notification.data && notification.data.task
- && notification.data.task._id === task._id && notification.type === 'GROUP_TASK_APPROVED');
-
- if (notificationIndex !== -1) {
- user.notifications.splice(notificationIndex, 1);
+ if (
+ group && task.group.id && !task.userId // Task is on team board
+ && ['todo', 'daily'].includes(task.type) // Task is a To Do or Daily
+ && direction === 'down' // Task is being "unchecked"
+ ) {
+ const userIsManagement = group.leader === user._id || Boolean(group.managers[user._id]);
+ if (!userIsManagement
+ && !(task.group.completedBy && task.group.completedBy.userId === user._id)
+ && !(task.group.assignedUsersDetail && task.group.assignedUsersDetail[user._id])
+ ) {
+ throw new BadRequest('Cannot uncheck task you did not complete if not a manager.');
}
+ if (task.group.assignedUsers && keys(task.group.assignedUsers).length === 1) {
+ const rollbackUserId = keys(task.group.assignedUsers)[0];
+ rollbackUser = await User.findOne({ _id: rollbackUserId });
+ } else {
+ rollbackUser = await User.findOne({ _id: task.group.completedBy.userId });
+ }
+ task.group.completedBy = {};
}
const wasCompleted = task.completed;
-
const firstTask = !user.achievements.completedTask;
- const delta = shared.ops.scoreTask({ task, user, direction }, req, res.analytics);
+ let delta;
+
+ if (rollbackUser) {
+ delta = shared.ops.scoreTask({
+ task,
+ user: rollbackUser,
+ direction,
+ }, req, res.analytics);
+ await rollbackUser.save();
+ } else {
+ delta = shared.ops.scoreTask({ task, user, direction }, req, res.analytics);
+ }
// Drop system (don't run on the client,
// as it would only be discarded since ops are sent to the API, not the results)
if (direction === 'up' && !firstTask) shared.fns.randomDrop(user, { task, delta }, req, res.analytics);
// If a todo was completed or uncompleted move it in or out of the user.tasksOrder.todos list
// TODO move to common code?
- let pullTask = false;
- let pushTask = false;
+ let pullTask;
+ let pushTask;
if (task.type === 'todo') {
if (!wasCompleted && task.completed) {
// @TODO: mongoose's push and pull should be atomic and help with
// our concurrency issues. If not, we need to use this update $pull and $push
- pullTask = true;
- // user.tasksOrder.todos.pull(task._id);
+ pullTask = task._id;
} else if (
wasCompleted
&& !task.completed
&& user.tasksOrder.todos.indexOf(task._id) === -1
) {
- pushTask = true;
- // user.tasksOrder.todos.push(task._id);
+ pushTask = task._id;
}
}
+ if (task.completed && task.group.id
+ && !task.userId && !task.group.assignedUsers) {
+ task.group.completedBy = {
+ userId: user._id,
+ date: new Date(),
+ };
+ }
+
setNextDue(task, user);
taskScoredWebhook.send(user, {
@@ -443,6 +502,27 @@ async function scoreTask (user, task, direction, req, res) {
user,
});
+ if (group) {
+ let role;
+ if (group.leader === user._id) {
+ role = 'leader';
+ } else if (group.managers[user._id]) {
+ role = 'manager';
+ } else {
+ role = 'member';
+ }
+ res.analytics.track('team task scored', {
+ uuid: user._id,
+ hitType: 'event',
+ category: 'behavior',
+ taskType: task.type,
+ direction,
+ headers: req.headers,
+ groupID: group._id,
+ role,
+ });
+ }
+
return {
task,
delta,
@@ -451,7 +531,7 @@ async function scoreTask (user, task, direction, req, res) {
pushTask,
// clone user._tmp so that it's not overwritten by other score operations
// when using the bulk scoring API
- _tmp: _.cloneDeep(user._tmp),
+ _tmp: cloneDeep(user._tmp),
};
}
@@ -519,8 +599,8 @@ export async function scoreTasks (user, taskScorings, req, res) {
const pushIDs = [];
returnDatas.forEach(returnData => {
- if (returnData.pushTask === true) pushIDs.push(returnData.task._id);
- if (returnData.pullTask === true) pullIDs.push(returnData.task._id);
+ if (returnData.pushTask) pushIDs.push(returnData.pushTask);
+ if (returnData.pullTask) pullIDs.push(returnData.pullTask);
});
const moveUpdateObject = {};
@@ -535,14 +615,7 @@ export async function scoreTasks (user, taskScorings, req, res) {
return returnDatas.map(data => {
// Handle challenge and group tasks tasks here because the task must have been saved first
handleChallengeTask(data.task, data.delta, data.direction);
- handleGroupTask(data.task, data.delta, data.direction);
-
- // Handle group tasks that require approval
- if (data.requiresApproval === true) {
- return {
- id: data.task._id, message: data.message, requiresApproval: true,
- };
- }
+ handleTeamTask(data.task, data.delta, data.direction);
return { id: data.task._id, delta: data.delta, _tmp: data._tmp };
});
diff --git a/website/server/libs/user/index.js b/website/server/libs/user/index.js
index f2aa73df69..35068ad3f9 100644
--- a/website/server/libs/user/index.js
+++ b/website/server/libs/user/index.js
@@ -1,6 +1,7 @@
import _ from 'lodash';
import common from '../../../common';
import * as Tasks from '../../models/task';
+import { model as Groups } from '../../models/group';
import {
BadRequest,
NotAuthorized,
@@ -132,6 +133,34 @@ export async function update (req, res, { isV3 = false }) {
await checkNewInputForProfanity(user, res, newBlurb);
}
+ if (req.body['preferences.tasks.mirrorGroupTasks'] !== undefined) {
+ const groupsToMirror = req.body['preferences.tasks.mirrorGroupTasks'];
+ if (!Array.isArray(groupsToMirror)) {
+ throw new BadRequest('Groups to copy tasks from must be an array.');
+ }
+ const memberGroups = _.clone(user.guilds);
+ if (user.party._id) memberGroups.push(user.party._id);
+ for (const targetGroup of groupsToMirror) {
+ if (memberGroups.indexOf(targetGroup) === -1) {
+ throw new BadRequest(`User not a member of group ${targetGroup}.`);
+ }
+ }
+
+ const matchingGroupsCount = await Groups.countDocuments({
+ _id: { $in: groupsToMirror },
+ 'purchased.plan.customerId': { $exists: true },
+ $or: [
+ { 'purchased.plan.dateTerminated': { $exists: false } },
+ { 'purchased.plan.dateTerminated': null },
+ { 'purchased.plan.dateTerminated': { $gt: new Date() } },
+ ],
+ }).exec();
+
+ if (matchingGroupsCount !== groupsToMirror.length) {
+ throw new BadRequest('Groups to copy tasks from must have subscriptions.');
+ }
+ }
+
_.each(req.body, (val, key) => {
const purchasable = requiresPurchase[key];
@@ -140,7 +169,7 @@ export async function update (req, res, { isV3 = false }) {
}
if (key === 'tags') {
- if (!Array.isArray(val)) throw new BadRequest('mustBeArray');
+ if (!Array.isArray(val)) throw new BadRequest('Tag list must be an array.');
const removedTagsIds = [];
diff --git a/website/server/middlewares/cron.js b/website/server/middlewares/cron.js
index 664d65cc3e..7c837c9632 100644
--- a/website/server/middlewares/cron.js
+++ b/website/server/middlewares/cron.js
@@ -77,7 +77,7 @@ async function cronAsync (req, res) {
userId: user._id,
$or: [ // Exclude completed todos
{ type: 'todo', completed: false },
- { type: { $in: ['habit', 'daily', 'reward'] } },
+ { type: { $in: ['habit', 'daily'] } },
],
}).exec();
@@ -117,19 +117,8 @@ async function cronAsync (req, res) {
// Save user and tasks
const toSave = [user.save()];
- tasks.forEach(async task => {
+ tasks.forEach(task => {
if (task.isModified()) toSave.push(task.save());
- if (task.isModified() && task.group && task.group.taskId) {
- const groupTask = await Tasks.Task.findOne({
- _id: task.group.taskId,
- }).exec();
-
- if (groupTask) {
- let delta = (0.9747 ** task.value) * -1;
- if (groupTask.group.assignedUsers) delta /= groupTask.group.assignedUsers.length;
- await groupTask.scoreChallengeTask(delta, 'down');
- }
- }
});
await Promise.all(toSave);
diff --git a/website/server/models/group.js b/website/server/models/group.js
index 6ccf73613f..1c770823b6 100644
--- a/website/server/models/group.js
+++ b/website/server/models/group.js
@@ -29,9 +29,6 @@ import {
import baseModel from '../libs/baseModel';
import { sendTxn as sendTxnEmail } from '../libs/email'; // eslint-disable-line import/no-cycle
import { sendNotification as sendPushNotification } from '../libs/pushNotifications'; // eslint-disable-line import/no-cycle
-import { // eslint-disable-line import/no-cycle
- syncableAttrs,
-} from '../libs/tasks/utils';
import {
schema as SubscriptionPlanSchema,
} from './subscriptionPlan';
@@ -144,6 +141,9 @@ export const schema = new Schema({
slug: { $type: String },
name: { $type: String },
}],
+ cron: {
+ lastProcessed: { $type: Date },
+ },
}, {
strict: true,
minimize: false, // So empty objects are returned
@@ -1386,10 +1386,13 @@ schema.methods.leave = async function leaveGroup (user, keep = 'keep-all', keepC
const promises = user.isModified() ? [user.save()] : [];
// remove the group from the user's groups
+ const userUpdate = { $pull: { 'preferences.tasks.mirrorGroupTasks': group._id } };
if (group.type === 'guild') {
- promises.push(User.update({ _id: user._id }, { $pull: { guilds: group._id } }).exec());
+ userUpdate.$pull.guilds = group._id;
+ promises.push(User.update({ _id: user._id }, userUpdate).exec());
} else {
- promises.push(User.update({ _id: user._id }, { $set: { party: {} } }).exec());
+ userUpdate.$set = { party: {} };
+ promises.push(User.update({ _id: user._id }, userUpdate).exec());
update.$unset = { [`quest.members.${user._id}`]: 1 };
}
@@ -1441,132 +1444,50 @@ schema.methods.unlinkTags = function unlinkTags (user) {
});
};
-/**
- * Updates all linked tasks for a group task
- *
- * @param taskToSync The group task that will be synced
- * @param options.newCheckListItem The new checklist item
- * that needs to be synced to all assigned users
- * @param options.removedCheckListItem The removed checklist item that
- * needs to be removed from all assigned users
- *
- * @return The created tasks
- */
-schema.methods.updateTask = async function updateTask (taskToSync, options = {}) {
- const group = this;
-
- const updateCmd = { $set: {} };
-
- const syncableAttributes = syncableAttrs(taskToSync);
- for (const key of Object.keys(syncableAttributes)) {
- updateCmd.$set[key] = syncableAttributes[key];
- }
-
- updateCmd.$set['group.approval.required'] = taskToSync.group.approval.required;
- updateCmd.$set['group.assignedUsers'] = taskToSync.group.assignedUsers;
- updateCmd.$set['group.sharedCompletion'] = taskToSync.group.sharedCompletion;
- updateCmd.$set['group.managerNotes'] = taskToSync.group.managerNotes;
-
- const taskSchema = Tasks[taskToSync.type];
-
- const updateQuery = {
- userId: { $exists: true },
- 'group.id': group.id,
- 'group.taskId': taskToSync._id,
- };
-
- if (options.newCheckListItem) {
- const newCheckList = { completed: false };
- newCheckList.linkId = options.newCheckListItem.id;
- newCheckList.text = options.newCheckListItem.text;
- updateCmd.$push = { checklist: newCheckList };
- }
-
- if (options.removedCheckListItemId) {
- updateCmd.$pull = { checklist: { linkId: { $in: [options.removedCheckListItemId] } } };
- }
-
- if (options.updateCheckListItems) {
- updateCmd.$set.checklist = taskToSync.checklist;
- }
-
- // Updating instead of loading and saving for performances,
- // risks becoming a problem if we introduce more complexity in tasks
- await taskSchema.update(updateQuery, updateCmd, { multi: true }).exec();
-};
-
-schema.methods.syncTask = async function groupSyncTask (taskToSync, user, assigningUser) {
+schema.methods.syncTask = async function groupSyncTask (taskToSync, users, assigningUser) {
const group = this;
const toSave = [];
+ for (const user of users) {
+ const assignmentData = {
+ assignedDate: new Date(),
+ assignedUsername: user.auth.local.username,
+ assigningUsername: assigningUser.auth.local.username,
+ completed: false,
+ };
- if (taskToSync.group.assignedUsers.indexOf(user._id) === -1) {
- taskToSync.group.assignedUsers.push(user._id);
- }
-
- // Sync tags
- const userTags = user.tags;
- const i = _.findIndex(userTags, { id: group._id });
-
- if (i !== -1) {
- if (userTags[i].name !== group.name) {
- // update the name - it's been changed since
- userTags[i].name = group.name;
- userTags[i].group = group._id;
+ if (!taskToSync.group.assignedUsers) {
+ taskToSync.group.assignedUsers = [];
}
- } else {
- userTags.push({
- id: group._id,
- name: group.name,
- group: group._id,
- });
+ taskToSync.group.assignedUsers.push(user._id);
+
+ if (!taskToSync.group.assignedUsersDetail) {
+ taskToSync.group.assignedUsersDetail = {};
+ }
+ if (!taskToSync.group.assignedUsersDetail[user._id]) {
+ taskToSync.group.assignedUsersDetail[user._id] = assignmentData;
+ }
+ taskToSync.markModified('group.assignedUsersDetail');
+
+ // Sync tags
+ const userTags = user.tags;
+ const i = _.findIndex(userTags, { id: group._id });
+
+ if (i !== -1) {
+ if (userTags[i].name !== group.name) {
+ // update the name - it's been changed since
+ userTags[i].name = group.name;
+ userTags[i].group = group._id;
+ }
+ } else {
+ userTags.push({
+ id: group._id,
+ name: group.name,
+ group: group._id,
+ });
+ }
+ toSave.push(user.save());
}
-
- const findQuery = {
- 'group.taskId': taskToSync._id,
- userId: user._id,
- 'group.id': group._id,
- };
-
- let matchingTask = await Tasks.Task.findOne(findQuery).exec();
-
- if (!matchingTask) { // If the task is new, create it
- matchingTask = new Tasks[taskToSync.type](Tasks.Task.sanitize(syncableAttrs(taskToSync)));
- matchingTask.group.id = taskToSync.group.id;
- matchingTask.userId = user._id;
- matchingTask.group.taskId = taskToSync._id;
- matchingTask.group.assignedDate = new Date();
- user.tasksOrder[`${taskToSync.type}s`].unshift(matchingTask._id);
- } else {
- _.merge(matchingTask, syncableAttrs(taskToSync));
- // Make sure the task is in user.tasksOrder
- const orderList = user.tasksOrder[`${taskToSync.type}s`];
- if (orderList.indexOf(matchingTask._id) === -1 && (matchingTask.type !== 'todo' || !matchingTask.completed)) orderList.push(matchingTask._id);
- }
-
- matchingTask.group.approval.required = taskToSync.group.approval.required;
- matchingTask.group.assignedUsers = taskToSync.group.assignedUsers;
- matchingTask.group.sharedCompletion = taskToSync.group.sharedCompletion;
- matchingTask.group.managerNotes = taskToSync.group.managerNotes;
- if (assigningUser && user._id !== assigningUser._id) {
- matchingTask.group.assigningUsername = assigningUser.auth.local.username;
- }
-
- // sync checklist
- if (taskToSync.checklist) {
- taskToSync.checklist.forEach(element => {
- const newCheckList = { completed: false };
- newCheckList.linkId = element.id;
- newCheckList.text = element.text;
- matchingTask.checklist.push(newCheckList);
- });
- }
-
- // don't override the notes, but provide it if not provided
- if (!matchingTask.notes) matchingTask.notes = taskToSync.notes;
- // add tag if missing
- if (matchingTask.tags.indexOf(group._id) === -1) matchingTask.tags.push(group._id);
-
- toSave.push(matchingTask.save(), taskToSync.save(), user.save());
+ toSave.push(taskToSync.save());
return Promise.all(toSave);
};
@@ -1576,11 +1497,15 @@ schema.methods.unlinkTask = async function groupUnlinkTask (
) {
const findQuery = {
'group.taskId': unlinkingTask._id,
- userId: user._id,
+ 'group.assignedUsers': user._id,
};
+ delete unlinkingTask.group.assignedUsersDetail[user._id];
const assignedUserIndex = unlinkingTask.group.assignedUsers.indexOf(user._id);
unlinkingTask.group.assignedUsers.splice(assignedUserIndex, 1);
+ unlinkingTask.markModified('group');
+
+ const promises = [unlinkingTask.save()];
if (keep === 'keep-all') {
await Tasks.Task.update(findQuery, {
@@ -1598,16 +1523,14 @@ schema.methods.unlinkTask = async function groupUnlinkTask (
user.markModified('tasksOrder');
}
- const promises = [unlinkingTask.save()];
if (task) {
promises.push(task.remove());
}
// When multiple tasks are being unlinked at the same time,
// save the user once outside of this function
if (saveUser) promises.push(user.save());
-
- await Promise.all(promises);
}
+ await Promise.all(promises);
};
schema.methods.removeTask = async function groupRemoveTask (task) {
diff --git a/website/server/models/task.js b/website/server/models/task.js
index 604de20ca9..f9601cd10c 100644
--- a/website/server/models/task.js
+++ b/website/server/models/task.js
@@ -5,7 +5,6 @@ import _ from 'lodash';
import shared from '../../common';
import baseModel from '../libs/baseModel';
import { preenHistory } from '../libs/preening';
-import { SHARED_COMPLETION } from '../libs/groupTasks'; // eslint-disable-line import/no-cycle
const { Schema } = mongoose;
@@ -128,25 +127,24 @@ export const TaskSchema = new Schema({
group: {
id: { $type: String, ref: 'Group', validate: [v => validator.isUUID(v), 'Invalid uuid for group task.'] },
- broken: { $type: String, enum: ['GROUP_DELETED', 'TASK_DELETED', 'UNSUBSCRIBED'] },
+ assignedDate: { $type: Date }, // To be removed
+ assigningUsername: { $type: String }, // To be removed
assignedUsers: [{ $type: String, ref: 'User', validate: [v => validator.isUUID(v), 'Invalid uuid for group assigned user.'] }],
- assignedDate: { $type: Date },
- assigningUsername: { $type: String },
+ assignedUsersDetail: {
+ $type: Schema.Types.Mixed,
+ // key is assigned UUID, with
+ // { assignedDate: Date,
+ // assignedUsername: '@username',
+ // assigningUsername: '@username',
+ // completed: Boolean,
+ // completedDate: Date }
+ },
taskId: { $type: String, ref: 'Task', validate: [v => validator.isUUID(v), 'Invalid uuid for group task.'] },
- approval: {
- required: { $type: Boolean, default: false },
- approved: { $type: Boolean, default: false },
- dateApproved: { $type: Date },
- approvingUser: { $type: String, ref: 'User', validate: [v => validator.isUUID(v), 'Invalid uuid for group approving user.'] },
- requested: { $type: Boolean, default: false },
- requestedDate: { $type: Date },
- },
- sharedCompletion: {
- $type: String,
- enum: _.values(SHARED_COMPLETION),
- default: SHARED_COMPLETION.single,
- },
managerNotes: { $type: String },
+ completedBy: {
+ userId: { $type: String, ref: 'User', validate: [v => validator.isUUID(v), 'Invalid uuid for task completing user.'] },
+ date: { $type: Date },
+ },
},
reminders: [reminderSchema],
@@ -207,7 +205,7 @@ TaskSchema.statics.findByIdOrAlias = async function findByIdOrAlias (
return task;
};
-TaskSchema.statics.findMultipleByIdOrAlias = async function findByIdOrAlias (
+TaskSchema.statics.findMultipleByIdOrAlias = async function findMultipleByIdOrAlias (
identifiers,
userId,
additionalQueries = {},
@@ -216,8 +214,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 +225,20 @@ TaskSchema.statics.findMultipleByIdOrAlias = async function findByIdOrAlias (
}
});
- query.$or = [
- { _id: { $in: ids } },
- { alias: { $in: aliases } },
- ];
+ if (ids.length > 0 && aliases.length > 0) {
+ query.userId = userId;
+ query.$or = [
+ { _id: { $in: ids } },
+ { alias: { $in: aliases } },
+ ];
+ } else if (ids.length > 0) {
+ query._id = { $in: ids };
+ } else if (aliases.length > 0) {
+ query.userId = userId;
+ 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();
diff --git a/website/server/models/user/methods.js b/website/server/models/user/methods.js
index 2c7c9d591d..f339cff896 100644
--- a/website/server/models/user/methods.js
+++ b/website/server/models/user/methods.js
@@ -1,6 +1,6 @@
import moment from 'moment';
import {
- defaults, map, flatten, flow, compact, uniq, partialRight,
+ defaults, map, flatten, flow, compact, uniq, partialRight, remove,
} from 'lodash';
import common from '../../../common';
@@ -502,6 +502,21 @@ schema.methods.isMemberOfGroupPlan = async function isMemberOfGroupPlan () {
return groups.some(g => g.hasActiveGroupPlan());
};
+schema.methods.teamsLed = async function teamsLed () {
+ const user = this;
+ const groups = await getUserGroupData(user);
+
+ remove(groups, group => !group.hasActiveGroupPlan);
+ remove(groups, group => user._id !== group.leader);
+
+ const groupIds = [];
+ groups.forEach(group => {
+ groupIds.push(group._id);
+ });
+
+ return groupIds;
+};
+
schema.methods.isAdmin = function isAdmin () {
return Boolean(this.contributor && this.contributor.admin);
};
diff --git a/website/server/models/user/schema.js b/website/server/models/user/schema.js
index 1b803e4b5b..3e0b4b84c0 100644
--- a/website/server/models/user/schema.js
+++ b/website/server/models/user/schema.js
@@ -236,6 +236,7 @@ export default new Schema({
mounts: { $type: Number, default: -1 },
hall: { $type: Number, default: -1 },
equipment: { $type: Number, default: -1 },
+ groupPlans: { $type: Number, default: -1 },
},
tutorial: {
common: {
@@ -583,6 +584,9 @@ export default new Schema({
tasks: {
groupByChallenge: { $type: Boolean, default: false }, // @TODO remove? not used
confirmScoreNotes: { $type: Boolean, default: false }, // @TODO remove? not used
+ mirrorGroupTasks: [
+ { $type: String, validate: [v => validator.isUUID(v), 'Invalid group UUID.'], ref: 'Group' },
+ ],
},
improvementCategories: {
$type: Array,
+