krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 14:47:53 +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

8
website/common/script/cron.js
View File

@@ -122,7 +122,7 @@ export function shouldDo (day, dailyTask, options = {}) {
let schedule = moment(startDate).recur()
.every(dailyTask.everyX).days();
if (options.nextDue) return schedule.next(3, 'L');
if (options.nextDue) return schedule.fromDate(startOfDayWithCDSTime).next(3);
return schedule.matches(startOfDayWithCDSTime);
} else if (dailyTask.frequency === 'weekly') {
@@ -134,7 +134,7 @@ export function shouldDo (day, dailyTask, options = {}) {
schedule = schedule.every(daysOfTheWeek).daysOfWeek();
if (options.nextDue) return schedule.next(3, 'L');
if (options.nextDue) return schedule.fromDate(startOfDayWithCDSTime).next(3);
return schedule.matches(startOfDayWithCDSTime);
} else if (dailyTask.frequency === 'monthly') {
@@ -150,7 +150,7 @@ export function shouldDo (day, dailyTask, options = {}) {
schedule = schedule.every(dailyTask.daysOfMonth).daysOfMonth();
}
if (options.nextDue) return schedule.next(3, 'L');
if (options.nextDue) return schedule.fromDate(startOfDayWithCDSTime).next(3);
return schedule.matches(startOfDayWithCDSTime) && matchEveryX;
} else if (dailyTask.frequency === 'yearly') {
@@ -158,7 +158,7 @@ export function shouldDo (day, dailyTask, options = {}) {
schedule = schedule.every(dailyTask.everyX).years();
if (options.nextDue) return schedule.next(3, 'L');
if (options.nextDue) return schedule.fromDate(startOfDayWithCDSTime).next(3);
return schedule.matches(startOfDayWithCDSTime);
}

22
website/server/controllers/api-v3/tasks.js
View File

@@ -17,11 +17,11 @@ import {
createTasks,
getTasks,
moveTask,
setNextDue,
} from '../../libs/taskManager';
import common from '../../../common';
import Bluebird from 'bluebird';
import _ from 'lodash';
import cloneDeep from 'lodash/cloneDeep';
import logger from '../../libs/logger';
const MAX_SCORE_NOTES_LENGTH = 256;
@@ -457,15 +457,7 @@ api.updateTask = {
task.group.approval.required = true;
}
if (sanitizedObj.type === 'daily') {
let optionsForShouldDo = cloneDeep(user.preferences.toObject());
task.isDue = common.shouldDo(Date.now(), sanitizedObj, optionsForShouldDo);
optionsForShouldDo.nextDue = true;
let nextDue = common.shouldDo(Date.now(), sanitizedObj, optionsForShouldDo);
if (nextDue && nextDue.length > 0) {
task.nextDue = nextDue;
}
}
setNextDue(task, user);
let savedTask = await task.save();
@@ -596,15 +588,7 @@ api.scoreTask = {
}
}
if (task.type === 'daily') {
let optionsForShouldDo = cloneDeep(user.preferences.toObject());
task.isDue = common.shouldDo(Date.now(), task, optionsForShouldDo);
optionsForShouldDo.nextDue = true;
let nextDue = common.shouldDo(Date.now(), task, optionsForShouldDo);
if (nextDue && nextDue.length > 0) {
task.nextDue = nextDue;
}
}
setNextDue(task, user);
let results = await Bluebird.all([
user.save(),

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

2
website/server/models/task.js
View File

@@ -92,7 +92,7 @@ export let TaskSchema = new Schema({
}, discriminatorOptions));
TaskSchema.plugin(baseModel, {
noSet: ['challenge', 'userId', 'completed', 'history', 'dateCompleted', '_legacyId', 'group', 'isDue'],
noSet: ['challenge', 'userId', 'completed', 'history', 'dateCompleted', '_legacyId', 'group', 'isDue', 'nextDue'],
sanitizeTransform (taskObj) {
if (taskObj.type && taskObj.type !== 'reward') { // value should be settable directly only for rewards
delete taskObj.value;