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

Abstracted set next due logic, set offset, and mapped to ISO

Browse Source
This commit is contained in:
Keith Holliday
2017-05-12 07:39:32 -06:00
parent 1292f9a3d5
commit f192ca4c6f
4 changed files with 22 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
website/server/libs/taskManager.js
View File

@@ -23,6 +23,19 @@ async function _validateTaskAlias (tasks, res) {
});
}
export function setNextDue (task, user) {
if (task.type !== 'daily') return;
let optionsForShouldDo = cloneDeep(user.preferences.toObject());
task.isDue = shared.shouldDo(Date.now(), task, optionsForShouldDo);
optionsForShouldDo.nextDue = true;
let nextDue = shared.shouldDo(Date.now(), task, optionsForShouldDo);
if (nextDue && nextDue.length > 0) {
task.nextDue = nextDue.map((dueDate) => {
return dueDate.toISOString();
});
}
}
/**
* Creates tasks for a user, challenge or group.
@@ -65,15 +78,7 @@ export async function createTasks (req, res, options = {}) {
newTask.userId = user._id;
}
if (newTask.type === 'daily') {
let optionsForShouldDo = cloneDeep(user.preferences.toObject());
newTask.isDue = shared.shouldDo(Date.now(), newTask, optionsForShouldDo);
optionsForShouldDo.nextDue = true;
let nextDue = shared.shouldDo(Date.now(), newTask, optionsForShouldDo);
if (nextDue && nextDue.length > 0) {
newTask.nextDue = nextDue;
}
}
setNextDue(newTask, user);
// Validate that the task is valid and throw if it isn't
// otherwise since we're saving user/challenge/group and task in parallel it could save the user/challenge/group with a tasksOrder that doens't match reality