API v3 [WIP] (#6144)
* Fixed more tests
* Added tags into user service
* Added api-v3 auth urls
* v3: fix package.json
* v3: fix package.json
* Fixed auth tests. Updated Authctrl response
* v3: remove newrelic config file in favour of env variables
* v3: upgrade some deps
* switch from Q to Bluebird
* v3 fix tests with deferred
* Removed extra consoles.log. Changed data.data to res.data
* v3 fix tests and use coroutines instead of regenerator
* v3: fix tests
* v3: do not await a non promise
* v3: q -> bluebird
* Changed id param for registration response
* Updated party query and create
* Ensured login callback happens after user sync
* Add challenges to groups. Fixed isMemberOfGuild check
* Updated party and group tests
* Fixed cron test
* return user.id and send analytics event before changing page
* fix trailing spaces
* disable redirects
* Api v3 party tavern fixes (#7191)
* Added check if user is in party before query
* Cached party query. Prevented party request when user is not in party. Updated Party create with no invites
* Update tavern ctrl to use new promise
* v3: misc fixes
* Api v3 task fixes (#7193)
* Update task view to use _id
* Added try catch to user service ops calls
* v3 client: saving after syncing is complete
* Fixed test broken by part sync change (#7195)
* v3: fix todo scoring and try to fix production testing problem
* revert changes to mongoose config
* mongoose: increase keepAlive
* test mongoose fix
* fix: Only apply captureStackTrace if it exists on the error object
* v3: fix reminders with no startDate
* mongoose: use options
* chore(): rename website/src -> website/server and website/public -> website/client (#7199)
* v3 fix GET /groups: return an error only if an invalid type is supplied not when there are 0 results (#7203)
* [API v3] Fix calls to user.ops and deleting tags (#7204)
* v3: fixes calls to user.ops from views and deleting tags
* v3: fix tests that use user._statsComputed
* Api v3 fixes continued (#7205)
* Added timzeone offset back
* Added APIToken back to settings page
* Fixed fetch recent messages for party
* Fixed returning group description
* Fixed check if user is member of challenge
* Fixed party members appearing in header
* Updated get myGroups param to include public groups. Fixed isMemberOf group
* Fixed hourglass purchase
* Fixed challenge addding tasks on first creating
* Updated tests to accomidate new changes
* fix: Correct checklist on client
Closes #7207
* fix: Pin eslint to 2.9
* minor improvements to cron code for clarity; fix inaccurate comments; add TODOs for rest-in-inn actions
* fix: Add missing type param to equip call
closes #7212
* rename and reword pubChalsMinPrize to reflect that it's only for Tavern challenges
* allows players to send gems to each other; other minor related changes - fixes https://github.com/HabitRPG/habitrpg/issues/7227
* fix tests for /members/transfer-gems
* fix: Set gems sent notification as translatable string
* chore: Remove unusued variable
* fix: Remove requirement on message paramter in transfer-gems
* add a missing variable declaration
* chore: clarify comments on cron code
* fix: Correct client request from habitrpg -> tavern
* update apidoc URL in package.json
Closes #7222
* Fixed start party by invites
* Updated spell casting to v3
* Fixed adding and removing tags on tasks
* Fixed page reload on settings change
* Fixed battle monsters with friends button
* Loaded completed todos when done is clicked
* chore: Reinstate floating version number for eslint
babel-eslint regression fixed
* Fixed reload tests
* change "an user" to "a user" in comments and text (no code changes) (#7257)
* fix: Alert user that drops were recieved
* remove userServices.js from karma.conf - it's been moved to website/client/js/services
* feat: Create debug update user route
* fix: Correct set cron debug function
* feat: Add make admin button to debug menu
* lint: Add missing semicolons in test
* fix: Temporarilly comment out udpate user debug route
* v3: fix _tmp for crit and streakBonus
* v3: execute all actions when leaving a solo party
* v3 client: fix group not found when leaving party
* v3 migration: fix challenge prize
* v3 cron: only save modified tasks
* v3: add CHALLENGE_TASK_NOT_FOUND to valid broken reasons
* v3: fix tasks chart
* v3 client: fix ability to leave challenge
* v3 client: fix filtering by tag and correctly show tag tooltip
* v3 common: fix tags tests
* v3 client: support unlinking not found challenges tasks
* v3: disable Bluebird warning for missing return, fixes #7269
* feat: Separate out update-user into set-cron and make-admin debug routes
* chore: Disable make admin debug route for v3 prod testing
* v3: misc fixes
* v3: misc fixes
* v3: fix adding multiple tasks
* Fixed join/leave button updates
* Queried only user groups to be available when creating challenges
* Fixed bulk add tasks to challenge
* Synced challenge tasks after leave and join.
* Fixed default selected group
* Fixed challenge member info. Fixed challenge winner selection
* Fixed deleting challenge tasks
* Fixed particiapting filter
* v3 client: fix casting spells
* v3: do not log sensitive data
* v3: always save user when casting spell
* v3: always save user when casting spell
* v3: more fixes for spells
* fix typos and missing information in apidocs - fixes https://github.com/HabitRPG/habitrpg/issues/7277 (#7282)
* v3: add TODO for client side spells
* feat: Add modify inventory debug menu
* Fixed viewing user progress on challenge
* Updated tests
* fix: Fix quest progress button
* fix incorrect Armoire test; remove unneeded param details from apidocs; disambiguate health potion
* v3: fix stealth casting
* v3: fix tasks saving and selection for rebirth reroll and reset (server-only)
* v3: fix auto allocation
* v3 client: misc fixes
* rename buyPotion and buy-potion to buyHealthPotion and buy-health-potion; fix apidoc param error
* Added delete for saved challenge task
* Fixed member modal on front page
* adjust text in apidocs for errors / clarity / consistency / standard terminology (no code changes) (#7298)
* fix bug in Rebirth test, add new tests, adjust apidocs (#7293)
* Updated task model to allow setting streak (#7306)
* fix: Correct missing * in apidoc comments
* Api v3 challenge fixes (#7287)
* Fixed join/leave button updates
* Queried only user groups to be available when creating challenges
* Fixed bulk add tasks to challenge
* Synced challenge tasks after leave and join.
* Fixed default selected group
* Fixed challenge member info. Fixed challenge winner selection
* Fixed deleting challenge tasks
* Fixed particiapting filter
* Fixed viewing user progress on challenge
* Updated tests
* Added delete for saved challenge task
* v3: fix sorting
* [API v3] add CRON_SAFE_MODE (#7286)
* add CRON_SAFE_MODE to example config file, fix some bugs, add an unrelated low-priority TODO
* create CRON_SAFE_MODE to disable parts of cron for use after extended outage - fixes https://github.com/HabitRPG/habitrpg/issues/7161
* fix a bug with CRON_SAFE_MODE, remove duplicated code, remove completed TODO comment
* fix check for CRON_SAFE_MODE
* v3 client: fix typo
* adjust debug menu Modify Inventory: hungrier pets, fewer Special items, "Hide" buttons
* completed To-Dos: return the 30 most recent instead of 30 oldest (#7318)
* v3 migration: fix createdAt date
* adjust locales text, key names, and files for Rebirth, Reset, and Fortify / ReRoll for consistency with existing strings (#7321)
* v3: fix unlinking multiple tasks
* v3 fix releasing pets
* v3: fix authenticating with apiUrl
* v3: fix typo
* v3 fix client tests for unlinking
* v3 client: do not show start quest button when quest is active
* v3 client: fix ability to send cards
* v3 client: fix misc challenge issues
* v3: fix notifications
* v3 client: more user friendly errors
* v3 client: only load completed todos once
* v3 client: fix tests
* v3: move TAVERN_ID to common code
* fix: Provide default type and text for new task creation in score route
* fix: Provide default history [] for habit in score route
* fix: Add _legacyId prop to tasks to support non-uuid identifiers
* chore: Change v3 migration to use _legacyId instead of legacyId
* fix: check for _legacyId in tasks if id does not exist
* refactor: Extract out finding task by id or _legacyId into a function
* Api v3 party quest fixes (#7341)
* Fix display of add challenge message when group challenges are empty
* Fixed forced quest start to update quest without reload
* Fixed needing to reload when accepting party invite
* Fix group leave and join reload
* Fixed leave current party and join another
* Updated party tests
* v3 client: remove console.log statement
* v3: misc fixes
* v3 client: fix predicatbale random
* v3: info about API v3
* v3: update footer with links to developer resources
* v3: support party invitation from email
* v3 client: fix chat flagging
* fix: Correct get tasks route to properly get todos (#7349)
* move locales strings from api-v3.json to other locales files (#7347)
* move locales strings from api-v3.json: authentication strings -> front.json
* move locales strings from api-v3.json: authentication strings -> tasks.json
* move locales strings from api-v3.json: authentication strings -> groups.json
* move locales strings from api-v3.json: authentication strings -> challenge.json
* move locales strings from api-v3.json: authentication strings -> groups.json (again)
* move locales strings from api-v3.json: authentication strings -> quests.json
* move locales strings from api-v3.json: authentication strings -> subscriber.json
* move locales strings from api-v3.json: authentication strings -> spells.json
* move locales strings from api-v3.json: authentication strings -> character.json
* move locales strings from api-v3.json: authentication strings -> groups.json (PMs)
* move locales strings from api-v3.json: authentication strings -> npc.json
* move locales strings from api-v3.json: authentication strings -> pets.json
* move locales strings from api-v3.json: authentication strings -> miscellaneous
* move locales strings from api-v3.json: authentication strings -> contrib.json and settings.json
* move locales strings from api-v3.json: delete unused string (invalidTasksOwner), delete api-v3.json, whitespace cleanup
* v3 client: fix sticky header
* v3: remove unused code
* v3 client: correctly redirect after inviting
* Removed v2 calls from views (#7351)
* v3: fix tests for challenge export
* v3: fallbackto authWithHeaders if wuthWithSession or authWithUrl fails
* Added force cache update when fetching new messages (#7360)
* v3: fetch whole user when booting from group tto avoid issues with pre save hook expecting all data
* v3: misc fixes for payments
* v3: limit fields of challenge tasks that can be updated
* fix(tests): never connect to NODE_DB_URI for tests
* Added new route for setting last cron and updated front end
* v3: fix iap url
* v3: fix build and ios IAP
* Changed route to user set custom day start
* v3: iap accessible under /api/v3, fixes to spells and groups invitations
* v3: correctly use v3 routes in client
* remove XP, GP when unticking a Daily with a completed checklist - fixes https://github.com/HabitRPG/habitrpg/issues/7246
* use natural language for error message about skills on challenge tasks (#7336), fix other gramatical error
* Updated ui when user rejects a guild invite (#7368)
* feat: complete custom day start route
Closes #7363
* fix: Correct spelling of healAll skill
fix: Correct sprite name of healAll skill
* fix: Change all instances of spookDust -> spookySparkles
* add dateCreated to all tasks; add empty challenge object to tasks that don't have one (#7386)
* add plumilla to artists for Tangle Tree in Bailey message
* Fixed quest drop modal (#7377)
* Fixed quest drop modal
* Fixed broken party test
* [API v3] Maintenance Mode (#7367)
* WIP(maintenance): maintenance
* WIP(maintenance): working locale features
* fix(maintenance): don't translate info page target
* WIP(maintenance): start adding info page
* fix(maintenance): linting
* feat: Add container to maintenance info page
* fix(maintenance): add config.json edits
Also DRY variables for main vs info pages
* fix(maintenance): linting
* refactor(maintenance): further slim down variables
* refactor: Remove unnecessary variables
* fix: Correct string interpolation in maintenace view
* feat: Dynamically add time to maintenance pages
* maintenance mode: do not connect to mongodb
* fix(maintenance): clean up timezones etc.
* fix(maintenance): remove unneeded sprite
* Tavern party challenges invites fix (#7394)
* Added challenges and invitations to party
* Loaded tavern challenges
* Updated group and quest services tests
* v3: implement automatic syncing if user is not up to date
* Removed unnecessary fields when updating groups and challenges (#7395)
* v3: do not saved populated user
* v3: correctly return user subset
* Chained party promises together (#7396)
* v3: $w -> splitWhitespace
* use bluebird
* use babel polyfill
* migration: fix items
* update links for v3
* Updated shortname validation to support multiple browsers
* Docs changes (#7401)
* chore: Clarify transfer-gems documentation
* chore: Clarify api status route documentation
* chore: Mark webhooks as BETA
* Added tags update route. Added sort to user service (#7381)
* Added tags update route. Added sort to user service
* Change update tasks route to reorder tasks
* Fixed linting issue
* Changed params for reorder tags route
* Fixed not found tag and added test
* Added password confirmation when deleteing account (#7402)
* fix production logging
* feat(commit): push
* empty commit
* feat(maintenance): post-downtime news & awards (#7406)
* fix exporting avatar
* second attempt at fixing exporting avatar
* fix production logging
* s3: convert moment to date instance
* fix avatar sharing and caching (30 minutes)
* fix: Correct missing parameter
Closes #7433
* fix: Validate challenge shortname on server
* adjust text strings - fixes https://github.com/HabitRPG/habitrpg/issues/5631 and also Short Name -> Tag Name
2016-05-23 11:58:31 +00:00
|
|
|
// TODO what can be moved to /website/server?
|
2015-11-21 10:33:01 +00:00
|
|
|
/*
|
|
|
|
|
------------------------------------------------------
|
|
|
|
|
Cron and time / day functions
|
|
|
|
|
------------------------------------------------------
|
|
|
|
|
*/
|
2017-03-15 20:13:15 +00:00
|
|
|
import defaults from 'lodash/defaults';
|
|
|
|
|
import invert from 'lodash/invert';
|
2015-11-22 01:05:03 +00:00
|
|
|
import moment from 'moment';
|
2017-03-15 20:13:15 +00:00
|
|
|
import 'moment-recur';
|
2015-11-21 10:33:01 +00:00
|
|
|
|
|
|
|
|
export const DAY_MAPPING = {
|
|
|
|
|
0: 'su',
|
|
|
|
|
1: 'm',
|
|
|
|
|
2: 't',
|
|
|
|
|
3: 'w',
|
|
|
|
|
4: 'th',
|
|
|
|
|
5: 'f',
|
|
|
|
|
6: 's',
|
|
|
|
|
};
|
|
|
|
|
|
2017-03-15 20:13:15 +00:00
|
|
|
export const DAY_MAPPING_STRING_TO_NUMBER = invert(DAY_MAPPING);
|
|
|
|
|
|
2015-11-21 12:06:02 +00:00
|
|
|
/*
|
|
|
|
|
Each time we perform date maths (cron, task-due-days, etc), we need to consider user preferences.
|
2019-10-09 14:51:17 +00:00
|
|
|
Specifically {dayStart} (custom day start) and {timezoneOffset}.
|
|
|
|
|
This function sanitizes / defaults those values.
|
|
|
|
|
{now} is also passed in for various purposes,
|
|
|
|
|
one example being the test scripts scripts testing different "now" times.
|
2015-11-21 12:06:02 +00:00
|
|
|
*/
|
|
|
|
|
|
2015-11-22 01:28:51 +00:00
|
|
|
function sanitizeOptions (o) {
|
2019-10-08 14:57:10 +00:00
|
|
|
const ref = Number(o.dayStart || 0);
|
|
|
|
|
const dayStart = !Number.isNaN(ref) && ref >= 0 && ref <= 24 ? ref : 0;
|
2016-04-02 01:42:15 +00:00
|
|
|
|
2020-07-25 11:22:41 +00:00
|
|
|
let timezoneUtcOffset;
|
|
|
|
|
const timezoneUtcOffsetDefault = moment().utcOffset();
|
|
|
|
|
|
|
|
|
|
if (Number.isFinite(o.timezoneUtcOffset)) {
|
|
|
|
|
// Options were already sanitized
|
|
|
|
|
timezoneUtcOffset = o.timezoneUtcOffset;
|
|
|
|
|
} else if (Number.isFinite(o.timezoneUtcOffsetOverride)) {
|
|
|
|
|
timezoneUtcOffset = o.timezoneUtcOffsetOverride;
|
2017-03-15 20:13:15 +00:00
|
|
|
} else if (Number.isFinite(o.timezoneOffset)) {
|
2020-07-25 11:22:41 +00:00
|
|
|
timezoneUtcOffset = -o.timezoneOffset;
|
2016-04-02 01:42:15 +00:00
|
|
|
} else {
|
2020-07-25 11:22:41 +00:00
|
|
|
timezoneUtcOffset = timezoneUtcOffsetDefault;
|
2016-04-02 01:42:15 +00:00
|
|
|
}
|
2020-07-25 11:22:41 +00:00
|
|
|
if (timezoneUtcOffset < -720 || timezoneUtcOffset > 840) {
|
|
|
|
|
// timezones range from -12 (offset -720) to +14 (offset 840)
|
|
|
|
|
timezoneUtcOffset = timezoneUtcOffsetDefault;
|
2016-04-02 01:42:15 +00:00
|
|
|
}
|
|
|
|
|
|
2020-07-25 11:22:41 +00:00
|
|
|
const now = moment(o.now).utcOffset(timezoneUtcOffset);
|
2015-11-21 12:06:02 +00:00
|
|
|
// return a new object, we don't want to add "now" to user object
|
|
|
|
|
return {
|
|
|
|
|
dayStart,
|
2020-07-25 11:22:41 +00:00
|
|
|
timezoneUtcOffset,
|
2015-11-21 12:06:02 +00:00
|
|
|
now,
|
|
|
|
|
};
|
|
|
|
|
}
|
2015-11-21 12:26:05 +00:00
|
|
|
|
2015-11-22 01:05:03 +00:00
|
|
|
export function startOfWeek (options = {}) {
|
2019-10-08 14:57:10 +00:00
|
|
|
const o = sanitizeOptions(options);
|
2015-11-21 12:26:05 +00:00
|
|
|
|
|
|
|
|
return moment(o.now).startOf('week');
|
|
|
|
|
}
|
|
|
|
|
|
2015-11-21 21:13:44 +00:00
|
|
|
/*
|
2019-10-09 14:51:17 +00:00
|
|
|
This is designed for use with any date that has an important time portion
|
|
|
|
|
(e.g., when comparing the current date-time with the previous cron's date-time
|
2019-12-23 16:52:55 +00:00
|
|
|
for determining if cron should run now).
|
2019-10-09 14:51:17 +00:00
|
|
|
It changes the time portion of the date-time to be the Custom Day Start hour,
|
|
|
|
|
so that the date-time is now the user's correct start of day.
|
|
|
|
|
It SUBTRACTS a day if the date-time's original hour is before CDS
|
|
|
|
|
(e.g., if your CDS is 5am and it's currently 4am, it's still the previous day).
|
|
|
|
|
This is NOT suitable for manipulating any dates that are displayed to the user
|
|
|
|
|
as a date with no time portion, such as a Daily's Start Dates
|
|
|
|
|
(e.g., a Start Date of today shows only the date,
|
|
|
|
|
so it should be considered to be today even if the hidden time portion is before CDS).
|
2015-11-21 21:13:44 +00:00
|
|
|
*/
|
|
|
|
|
|
2015-11-22 01:05:03 +00:00
|
|
|
export function startOfDay (options = {}) {
|
2019-10-08 14:57:10 +00:00
|
|
|
const o = sanitizeOptions(options);
|
|
|
|
|
const dayStart = moment(o.now).startOf('day').add({ hours: o.dayStart });
|
2015-11-21 21:13:44 +00:00
|
|
|
|
2020-07-25 11:22:41 +00:00
|
|
|
if (o.now.hour() < o.dayStart) {
|
2015-11-21 21:13:44 +00:00
|
|
|
dayStart.subtract({ days: 1 });
|
|
|
|
|
}
|
2017-11-20 18:22:01 +00:00
|
|
|
|
2015-11-21 21:13:44 +00:00
|
|
|
return dayStart;
|
|
|
|
|
}
|
|
|
|
|
|
2015-11-21 22:38:45 +00:00
|
|
|
/*
|
|
|
|
|
Absolute diff from "yesterday" till now
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
export function daysSince (yesterday, options = {}) {
|
2019-10-08 14:57:10 +00:00
|
|
|
const o = sanitizeOptions(options);
|
|
|
|
|
const startOfNow = startOfDay(defaults({ now: o.now }, o));
|
|
|
|
|
const startOfYesterday = startOfDay(defaults({ now: yesterday }, o));
|
2015-11-21 22:38:45 +00:00
|
|
|
|
2017-06-21 19:28:12 +00:00
|
|
|
return startOfNow.diff(startOfYesterday, 'days');
|
2015-11-21 22:38:45 +00:00
|
|
|
}
|
|
|
|
|
|
2015-11-22 01:28:51 +00:00
|
|
|
/*
|
2019-10-09 14:51:17 +00:00
|
|
|
Should the user do this task on this date,
|
|
|
|
|
given the task's repeat options and user.preferences.dayStart?
|
2015-11-22 01:28:51 +00:00
|
|
|
*/
|
|
|
|
|
|
2017-03-10 23:37:52 +00:00
|
|
|
export function shouldDo (day, dailyTask, options = {}) {
|
2017-06-08 17:34:05 +00:00
|
|
|
if (dailyTask.type !== 'daily' || dailyTask.startDate === null || dailyTask.everyX < 1 || dailyTask.everyX > 9999) {
|
2015-11-22 01:28:51 +00:00
|
|
|
return false;
|
|
|
|
|
}
|
2019-10-08 14:57:10 +00:00
|
|
|
const o = sanitizeOptions(options);
|
|
|
|
|
const startOfDayWithCDSTime = startOfDay(defaults({ now: day }, o));
|
2017-07-08 01:46:54 +00:00
|
|
|
|
2019-10-09 14:51:17 +00:00
|
|
|
// 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.
|
|
|
|
|
// NB: The user's day start date has already been converted to the PREVIOUS
|
|
|
|
|
// day's date if the time portion was before CDS.
|
2015-11-22 01:28:51 +00:00
|
|
|
|
2020-07-25 11:22:41 +00:00
|
|
|
const startDate = moment(dailyTask.startDate).utcOffset(o.timezoneUtcOffset).startOf('day');
|
2017-05-08 15:39:50 +00:00
|
|
|
|
2017-05-11 19:11:16 +00:00
|
|
|
if (startDate > startOfDayWithCDSTime.startOf('day') && !options.nextDue) {
|
2017-05-08 15:39:50 +00:00
|
|
|
return false; // Daily starts in the future
|
|
|
|
|
}
|
2015-11-22 01:28:51 +00:00
|
|
|
|
2019-10-08 14:57:10 +00:00
|
|
|
const daysOfTheWeek = [];
|
2017-03-15 20:13:15 +00:00
|
|
|
if (dailyTask.repeat) {
|
2019-10-08 14:57:10 +00:00
|
|
|
for (const [repeatDay, active] of Object.entries(dailyTask.repeat)) {
|
2019-10-10 20:15:58 +00:00
|
|
|
if (!Number.isFinite(parseInt(DAY_MAPPING_STRING_TO_NUMBER[repeatDay], 10))) continue; // eslint-disable-line no-continue, max-len
|
2017-03-15 20:13:15 +00:00
|
|
|
if (active) daysOfTheWeek.push(parseInt(DAY_MAPPING_STRING_TO_NUMBER[repeatDay], 10));
|
|
|
|
|
}
|
2015-11-22 01:28:51 +00:00
|
|
|
}
|
2017-03-15 20:13:15 +00:00
|
|
|
|
|
|
|
|
if (dailyTask.frequency === 'daily') {
|
|
|
|
|
if (!dailyTask.everyX) return false; // error condition
|
2019-10-08 14:57:10 +00:00
|
|
|
const schedule = moment(startDate).recur()
|
2017-11-09 22:13:34 +00:00
|
|
|
.every(dailyTask.everyX).days();
|
2017-05-11 19:11:16 +00:00
|
|
|
|
2017-06-08 17:34:05 +00:00
|
|
|
if (options.nextDue) {
|
2019-10-08 14:57:10 +00:00
|
|
|
const filteredDates = [];
|
2019-10-09 14:51:17 +00:00
|
|
|
for (let i = 1; filteredDates.length < 6; i += 1) {
|
2019-10-08 14:57:10 +00:00
|
|
|
const calcDate = moment(startDate).add(dailyTask.everyX * i, 'days');
|
2017-06-08 17:34:05 +00:00
|
|
|
if (calcDate > startOfDayWithCDSTime) filteredDates.push(calcDate);
|
|
|
|
|
}
|
|
|
|
|
return filteredDates;
|
|
|
|
|
}
|
2017-05-11 19:11:16 +00:00
|
|
|
|
2017-11-09 22:13:34 +00:00
|
|
|
return schedule.matches(startOfDayWithCDSTime);
|
2019-10-08 14:57:10 +00:00
|
|
|
} if (dailyTask.frequency === 'weekly') {
|
2017-03-15 20:13:15 +00:00
|
|
|
let schedule = moment(startDate).recur();
|
|
|
|
|
|
2019-10-08 14:57:10 +00:00
|
|
|
const differenceInWeeks = moment(startOfDayWithCDSTime).diff(moment(startDate), 'week');
|
|
|
|
|
const matchEveryX = differenceInWeeks % dailyTask.everyX === 0;
|
2015-11-22 01:28:51 +00:00
|
|
|
|
2017-05-22 14:37:45 +00:00
|
|
|
if (daysOfTheWeek.length === 0) return false;
|
2017-03-15 20:13:15 +00:00
|
|
|
schedule = schedule.every(daysOfTheWeek).daysOfWeek();
|
2017-05-18 20:12:36 +00:00
|
|
|
if (options.nextDue) {
|
2019-10-08 14:57:10 +00:00
|
|
|
const filteredDates = [];
|
2019-10-09 14:51:17 +00:00
|
|
|
for (let i = 0; filteredDates.length < 6; i += 1) {
|
|
|
|
|
for (let j = 0; j < daysOfTheWeek.length && filteredDates.length < 6; j += 1) {
|
2019-10-08 14:57:10 +00:00
|
|
|
const calcDate = moment(startDate).day(daysOfTheWeek[j]).add(dailyTask.everyX * i, 'weeks');
|
2017-06-08 17:34:05 +00:00
|
|
|
if (calcDate > startOfDayWithCDSTime) filteredDates.push(calcDate);
|
|
|
|
|
}
|
|
|
|
|
}
|
2019-10-08 14:57:10 +00:00
|
|
|
const sortedDates = filteredDates.sort((date1, date2) => {
|
2017-06-08 17:34:05 +00:00
|
|
|
if (date1.toDate() > date2.toDate()) return 1;
|
|
|
|
|
if (date2.toDate() > date1.toDate()) return -1;
|
|
|
|
|
return 0;
|
2017-05-18 20:12:36 +00:00
|
|
|
});
|
2017-06-08 17:34:05 +00:00
|
|
|
return sortedDates;
|
2017-05-18 20:12:36 +00:00
|
|
|
}
|
2017-05-11 19:11:16 +00:00
|
|
|
|
2017-05-18 16:11:29 +00:00
|
|
|
return schedule.matches(startOfDayWithCDSTime) && matchEveryX;
|
2019-10-08 14:57:10 +00:00
|
|
|
} if (dailyTask.frequency === 'monthly') {
|
2017-03-15 20:13:15 +00:00
|
|
|
let schedule = moment(startDate).recur();
|
|
|
|
|
|
2017-11-20 18:22:01 +00:00
|
|
|
// Use startOf to ensure that we are always comparing month
|
|
|
|
|
// to the next rather than a month from the day
|
2019-10-08 14:57:10 +00:00
|
|
|
const differenceInMonths = moment(startOfDayWithCDSTime).startOf('month')
|
2017-11-20 18:22:01 +00:00
|
|
|
.diff(moment(startDate).startOf('month'), 'month', true);
|
|
|
|
|
|
2019-10-08 14:57:10 +00:00
|
|
|
const matchEveryX = differenceInMonths % dailyTask.everyX === 0;
|
2017-03-15 20:13:15 +00:00
|
|
|
|
|
|
|
|
if (dailyTask.weeksOfMonth && dailyTask.weeksOfMonth.length > 0) {
|
2017-06-14 18:27:50 +00:00
|
|
|
if (daysOfTheWeek.length === 0) return false;
|
2017-03-15 20:13:15 +00:00
|
|
|
schedule = schedule.every(daysOfTheWeek).daysOfWeek()
|
2017-06-08 17:34:05 +00:00
|
|
|
.every(dailyTask.weeksOfMonth).weeksOfMonthByDay();
|
|
|
|
|
|
|
|
|
|
if (options.nextDue) {
|
2019-10-08 14:57:10 +00:00
|
|
|
const filteredDates = [];
|
2019-10-09 14:51:17 +00:00
|
|
|
for (let i = 1; filteredDates.length < 6; i += 1) {
|
2019-10-08 14:57:10 +00:00
|
|
|
const recurDate = moment(startDate).add(dailyTask.everyX * i, 'months');
|
|
|
|
|
const calcDate = recurDate.clone();
|
2017-06-08 17:34:05 +00:00
|
|
|
calcDate.day(daysOfTheWeek[0]);
|
|
|
|
|
|
2019-10-08 14:57:10 +00:00
|
|
|
const startDateWeek = Math.ceil(moment(startDate).date() / 7);
|
2017-06-08 17:34:05 +00:00
|
|
|
let calcDateWeek = Math.ceil(calcDate.date() / 7);
|
|
|
|
|
|
|
|
|
|
// adjust week since weeks will rollover to other months
|
|
|
|
|
if (calcDate.month() < recurDate.month()) calcDate.add(1, 'weeks');
|
|
|
|
|
else if (calcDate.month() > recurDate.month()) calcDate.subtract(1, 'weeks');
|
|
|
|
|
else if (calcDateWeek > startDateWeek) calcDate.subtract(1, 'weeks');
|
|
|
|
|
else if (calcDateWeek < startDateWeek) calcDate.add(1, 'weeks');
|
|
|
|
|
|
|
|
|
|
calcDateWeek = Math.ceil(calcDate.date() / 7);
|
|
|
|
|
|
2019-10-09 14:51:17 +00:00
|
|
|
if (
|
|
|
|
|
calcDate >= startOfDayWithCDSTime
|
|
|
|
|
&& calcDateWeek === startDateWeek
|
|
|
|
|
&& calcDate.month() === recurDate.month()
|
|
|
|
|
) filteredDates.push(calcDate);
|
2017-06-08 17:34:05 +00:00
|
|
|
}
|
|
|
|
|
return filteredDates;
|
|
|
|
|
}
|
2017-11-20 18:22:01 +00:00
|
|
|
|
2017-06-08 17:34:05 +00:00
|
|
|
return schedule.matches(startOfDayWithCDSTime) && matchEveryX;
|
2019-10-08 14:57:10 +00:00
|
|
|
} if (dailyTask.daysOfMonth && dailyTask.daysOfMonth.length > 0) {
|
2017-03-15 20:13:15 +00:00
|
|
|
schedule = schedule.every(dailyTask.daysOfMonth).daysOfMonth();
|
2017-06-08 17:34:05 +00:00
|
|
|
if (options.nextDue) {
|
2019-10-08 14:57:10 +00:00
|
|
|
const filteredDates = [];
|
2019-10-09 14:51:17 +00:00
|
|
|
for (let i = 1; filteredDates.length < 6; i += 1) {
|
2019-10-08 14:57:10 +00:00
|
|
|
const calcDate = moment(startDate).add(dailyTask.everyX * i, 'months');
|
2017-06-08 17:34:05 +00:00
|
|
|
if (calcDate >= startOfDayWithCDSTime) filteredDates.push(calcDate);
|
|
|
|
|
}
|
|
|
|
|
return filteredDates;
|
|
|
|
|
}
|
2017-05-18 20:12:36 +00:00
|
|
|
}
|
2017-05-11 19:11:16 +00:00
|
|
|
|
2017-05-08 16:20:47 +00:00
|
|
|
return schedule.matches(startOfDayWithCDSTime) && matchEveryX;
|
2019-10-08 14:57:10 +00:00
|
|
|
} if (dailyTask.frequency === 'yearly') {
|
2017-03-15 20:13:15 +00:00
|
|
|
let schedule = moment(startDate).recur();
|
|
|
|
|
|
|
|
|
|
schedule = schedule.every(dailyTask.everyX).years();
|
|
|
|
|
|
2017-05-18 20:12:36 +00:00
|
|
|
if (options.nextDue) {
|
2019-10-08 14:57:10 +00:00
|
|
|
const filteredDates = [];
|
2019-10-09 14:51:17 +00:00
|
|
|
for (let i = 1; filteredDates.length < 6; i += 1) {
|
2019-10-08 14:57:10 +00:00
|
|
|
const calcDate = moment(startDate).add(dailyTask.everyX * i, 'years');
|
2017-06-08 17:34:05 +00:00
|
|
|
if (calcDate > startOfDayWithCDSTime) filteredDates.push(calcDate);
|
|
|
|
|
}
|
|
|
|
|
return filteredDates;
|
2017-05-18 20:12:36 +00:00
|
|
|
}
|
2017-05-11 19:11:16 +00:00
|
|
|
|
2017-05-08 16:20:47 +00:00
|
|
|
return schedule.matches(startOfDayWithCDSTime);
|
2015-11-22 01:28:51 +00:00
|
|
|
}
|
2017-03-15 20:13:15 +00:00
|
|
|
return false;
|
|
|
|
|
}
|