mirrors/oneuptime
1
0
Fork 0
mirror of https://github.com/OneUptime/oneuptime synced 2024-11-22 15:24:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix date calculation bug in LayerUtil class

Browse Source
This commit is contained in:
Simon Larsen 2023-12-05 14:52:16 +00:00
parent f24e540fc6
commit 07ecf31473
No known key found for this signature in database
GPG Key ID: AB45983AA9C81CDE
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Common/Types/OnCallDutyPolicy/Layer.ts
View File

@ -274,7 +274,7 @@ export default class LayerUtil {
if (data.rotation.intervalType === EventInterval.Day) {
intervalBetweenStartTimeAndHandoffTime =
OneUptimeDate.getDaysBetweenTwoDates(
OneUptimeDate.getDaysBetweenTwoDatesInclusive(
handOffTime,
data.currentEventStartTime
);
@ -300,7 +300,7 @@ export default class LayerUtil {
if (data.rotation.intervalType === EventInterval.Hour) {
intervalBetweenStartTimeAndHandoffTime =
OneUptimeDate.getHoursBetweenTwoDates(
OneUptimeDate.getHoursBetweenTwoDatesInclusive(
handOffTime,
data.currentEventStartTime
);
@ -326,7 +326,7 @@ export default class LayerUtil {
if (data.rotation.intervalType === EventInterval.Week) {
intervalBetweenStartTimeAndHandoffTime =
OneUptimeDate.getWeeksBetweenTwoDates(
OneUptimeDate.getWeeksBetweenTwoDatesInclusive(
handOffTime,
data.currentEventStartTime
);
@ -352,7 +352,7 @@ export default class LayerUtil {
if (data.rotation.intervalType === EventInterval.Month) {
intervalBetweenStartTimeAndHandoffTime =
OneUptimeDate.getMonthsBetweenTwoDates(
OneUptimeDate.getMonthsBetweenTwoDatesInclusive(
handOffTime,
data.currentEventStartTime
);
@ -378,7 +378,7 @@ export default class LayerUtil {
if (data.rotation.intervalType === EventInterval.Year) {
intervalBetweenStartTimeAndHandoffTime =
OneUptimeDate.getYearsBetweenTwoDates(
OneUptimeDate.getYearsBetweenTwoDatesInclusive(
handOffTime,
data.currentEventStartTime
);
@ -603,10 +603,16 @@ export default class LayerUtil {
data.eventStartTime
);
// if the event is ourside the restriction times, we need to return the trimmed array
if(OneUptimeDate.isAfter(restrictionStartTime, currentEndTime)) {
return trimmedStartAndEndTimes;
}
// if current event start time is after the restriction end time then we need to return empty array as there is no event.
if (OneUptimeDate.isAfter(currentStartTime, restrictionEndTime)) {
return [];
return trimmedStartAndEndTimes;
}
// if the restriction end time is before the restriction start time, we need to add one day to the restriction end time
@ -658,7 +664,8 @@ export default class LayerUtil {
currentStartTime,
restrictionStartTime
) &&
OneUptimeDate.isBefore(currentEndTime, restrictionEndTime)
OneUptimeDate.isBefore(currentEndTime, restrictionEndTime) &&
OneUptimeDate.isAfter(currentEndTime, restrictionStartTime)
) {
trimmedStartAndEndTimes.push({
startTime: restrictionStartTime,