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

Updated new recur logic to work with tests

Browse Source
This commit is contained in:
Keith Holliday
2017-05-08 09:39:50 -06:00
parent 6174624b89
commit a0ee73e944
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/common/shouldDo.test.js
View File

@@ -70,7 +70,7 @@ describe('shouldDo', () => {
expect(shouldDo(day, dailyTask, options)).to.equal(true); expect(shouldDo(day, dailyTask, options)).to.equal(true);
}); });
it('returns true if Start Date is today', () => { it('returns true if Start Date is today', () => {
dailyTask.startDate = moment().startOf('day').toDate(); dailyTask.startDate = moment().startOf('day').toDate();
expect(shouldDo(day, dailyTask, options)).to.equal(true); expect(shouldDo(day, dailyTask, options)).to.equal(true);
}); });

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

@@ -33,7 +33,7 @@ function sanitizeOptions (o) {
let timezoneOffset; let timezoneOffset;
let timezoneOffsetDefault = Number(moment().utcOffset()); let timezoneOffsetDefault = Number(moment().utcOffset());
if (_.isFinite(o.timezoneOffsetOverride)) { if (isFinite(o.timezoneOffsetOverride)) {
timezoneOffset = Number(o.timezoneOffsetOverride); timezoneOffset = Number(o.timezoneOffsetOverride);
} else if (Number.isFinite(o.timezoneOffset)) { } else if (Number.isFinite(o.timezoneOffset)) {
timezoneOffset = Number(o.timezoneOffset); timezoneOffset = Number(o.timezoneOffset);
@@ -97,11 +97,15 @@ export function shouldDo (day, dailyTask, options = {}) {
return false; return false;
} }
let o = sanitizeOptions(options); let o = sanitizeOptions(options);
let startOfDayWithCDSTime = startOfDay(_.defaults({ now: day }, o)); let startOfDayWithCDSTime = startOfDay(defaults({ now: day }, o));
// The time portion of the Start Date is never visible to or modifiable by the user so we must ignore it. // The time portion of the Start Date is never visible to or modifiable by the user so we must ignore it.
// Therefore, we must also ignore the time portion of the user's day start (startOfDayWithCDSTime), otherwise the date comparison will be wrong for some times. // Therefore, we must also ignore the time portion of the user's day start (startOfDayWithCDSTime), otherwise the date comparison will be wrong for some times.
// NB: The user's day start date has already been converted to the PREVIOUS day's date if the time portion was before CDS. // NB: The user's day start date has already been converted to the PREVIOUS day's date if the time portion was before CDS.
let startDate = moment(dailyTask.startDate).utcOffset(o.timezoneOffset); let startDate = moment(dailyTask.startDate).utcOffset(o.timezoneOffset).startOf('day');
if (startDate > startOfDayWithCDSTime.startOf('day')) {
return false; // Daily starts in the future
}
let daysOfTheWeek = []; let daysOfTheWeek = [];
@@ -115,7 +119,7 @@ export function shouldDo (day, dailyTask, options = {}) {
if (!dailyTask.everyX) return false; // error condition if (!dailyTask.everyX) return false; // error condition
let schedule = moment(startDate).recur() let schedule = moment(startDate).recur()
.every(dailyTask.everyX).days(); .every(dailyTask.everyX).days();
return schedule.matches(day); return schedule.matches(startOfDayWithCDSTime);
} else if (dailyTask.frequency === 'weekly') { } else if (dailyTask.frequency === 'weekly') {
let schedule = moment(startDate).recur(); let schedule = moment(startDate).recur();
@@ -125,7 +129,7 @@ export function shouldDo (day, dailyTask, options = {}) {
schedule = schedule.every(daysOfTheWeek).daysOfWeek(); schedule = schedule.every(daysOfTheWeek).daysOfWeek();
return schedule.matches(day); return schedule.matches(startOfDayWithCDSTime);
} else if (dailyTask.frequency === 'monthly') { } else if (dailyTask.frequency === 'monthly') {
let schedule = moment(startDate).recur(); let schedule = moment(startDate).recur();