fixed validation

devtron-labs · Jun 25, 2024 · 8d9fbbc · 8d9fbbc
1 parent f4daf26
commit 8d9fbbc
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/timeRangeLib/validator.go b/timeRangeLib/validator.go
@@ -22,6 +22,16 @@ func (tr TimeRange) ValidateTimeRange() error {
 		}
 
 	}
+
+	if !tr.TimeFrom.IsZero() && !tr.TimeTo.IsZero() {
+		if tr.TimeFrom.After(tr.TimeTo) {
+			return errors.New(string(TimeFromLessThanTimeTo))
+		}
+		if tr.TimeFrom.Equal(tr.TimeTo) {
+			return errors.New(string(TimeFromEqualToTimeTo))
+		}
+	}
+
 	switch tr.Frequency {
 	case Daily:
 		if tr.HourMinuteFrom == "" || tr.HourMinuteTo == "" {
@@ -31,12 +41,6 @@ func (tr TimeRange) ValidateTimeRange() error {
 		if tr.TimeFrom.IsZero() || tr.TimeTo.IsZero() {
 			return errors.New(string(TimeFromOrToNotPresent))
 		}
-		if tr.TimeFrom.After(tr.TimeTo) {
-			return errors.New(string(TimeFromLessThanTimeTo))
-		}
-		if tr.TimeFrom.Equal(tr.TimeTo) {
-			return errors.New(string(TimeFromEqualToTimeTo))
-		}
 	case Weekly:
 		if len(tr.Weekdays) == 0 {
 			return errors.New(string(WeekDaysNotPresent))