Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common-lib/timeRangeLib/constant.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const (
WeekDaysNotPresent ErrorMessage = "weekdays, must be present for Weekly frequency"
WeekDayFromOrToNotPresent ErrorMessage = "weekdayFrom, must be present for WeeklyRange frequency"
DayFromOrToNotPresent ErrorMessage = "dayFrom, dayTo, must be present for Monthly frequency"
ToBeforeFrom ErrorMessage = "Invalid value of hourMinuteFrom or hourMinuteTo for same day ,hourMinuteFrom >hourMinuteTo"
ToBeforeFrom ErrorMessage = "Invalid value of hourMinuteFrom or hourMinuteTo for same day ,hourMinuteFrom > hourMinuteTo"
BothLessThanZeroAndFromGreaterThanTo ErrorMessage = "invalid value of DayFrom or DayTo,DayFrom and DayTo is less than zero and dayFrom > dayTo"
DayFromOrToNotValid ErrorMessage = "invalid value of dayFrom or dayTo"
InvalidHourMinuteForWeeklyAndDaily ErrorMessage = "HourMinuteFrom should be less than HourMinuteTo in daily or weekly Frequency"
Expand Down
5 changes: 5 additions & 0 deletions common-lib/timeRangeLib/validator.go
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,11 @@ func (tr TimeRange) ValidateTimeRange() error {
if (tr.WeekdayFrom < 0 || tr.WeekdayFrom > 6) || (tr.WeekdayTo < 0 || tr.WeekdayTo > 6) {
return errors.New(string(WeekDayOutsideRange))
}
// Same weekday with a non-positive intra-day span collapses the window to zero/negative
// duration, which stalls the next-window search. Reject it (mirrors the Monthly check).
if tr.WeekdayFrom == tr.WeekdayTo && isToBeforeFrom(tr.HourMinuteFrom, tr.HourMinuteTo) {
return errors.New(string(ToBeforeFrom))
}
case Monthly:
if tr.DayFrom == 0 || tr.DayTo == 0 {
return errors.New(string(DayFromOrToNotPresent))
Expand Down
Loading