Merge branch 'pr/glaslos/6'

# Conflicts:
#	openhours_test.go

Author: chneau

openhours.go

@@ -34,6 +34,7 @@ func (o OpenHours) Match(t time.Time) bool {
 	return i%2 == 1
 }
 
+// matchIndex returns the index of the next open hour
 func (o OpenHours) matchIndex(t time.Time) int {
 	i := 0
 	for ; i < len(o); i++ {
@@ -47,17 +48,17 @@ func (o OpenHours) matchIndex(t time.Time) int {
 // NextDur returns true if t is in the open hours and the duration until it closes
 // else it returns false if t is in the closed hours and the duration until it opens
 func (o OpenHours) NextDur(t time.Time) (bool, time.Duration) {
-	x := newDateFromTime(t)
-	i := o.matchIndex(x)
-	b := i%2 == 1
-	if i == len(o) {
+	current := newDateFromTime(t)
+	i := o.matchIndex(current)
+	isOpen := i%2 == 1 // uneven -> next time is a closing time
+	if i == len(o) {   // end of week, wrap around
 		i = 0
 	}
-	oi := o[i]
-	if x.After(oi) {
-		oi = oi.AddDate(0, 0, 7)
+	next := o[i]
+	if current.After(next) { // we wrapped, set days to end of week
+		next = next.AddDate(0, 0, 7)
 	}
-	return b, tzDiff(oi, x, t)
+	return isOpen, tzDiff(next, current, t)
 }
 
 // tzDiff calculate diff between a and b and add it to t, taking in account eventual tz changes
@@ -184,6 +185,9 @@ func simplifyTime(str string) (int, int, int) {
 	if len(strs) == 3 {
 		sec, _ = strconv.Atoi(strs[2])
 	}
+	if hour > 24 {
+		hour = hour % 24
+	}
 	if hour > 24 || hour < 0 || min > 59 || min < 0 || sec > 59 || sec < 0 || (hour == 24 && min > 0 || hour == 24 && sec > 0) {
 		return 0, 0, 0
 	}
@@ -215,7 +219,11 @@ func new(str string, loc *time.Location) (OpenHours, error) {
 			hourFrom, minFrom, secFrom := simplifyTime(times[0])
 			hourTo, minTo, secTo := simplifyTime(times[1])
 			for _, day := range days {
-				o = append(o, newDate(day, hourFrom, minFrom, secFrom, 0, loc), newDate(day, hourTo, minTo, secTo, 0, loc))
+				fromDate := newDate(day, hourFrom, minFrom, secFrom, 0, loc)
+				if hourFrom > hourTo { // closing after midnight
+					day++
+				}
+				o = append(o, fromDate, newDate(day, hourTo, minTo, secTo, 0, loc))
 			}
 		}
 	}

openhours_test.go

@@ -85,19 +85,20 @@ func Test_simplifyHour(t *testing.T) {
 		{"00:-10", 0, 0, 0},
 		{"24:01", 0, 0, 0},
 		{"-50:99", 0, 0, 0},
-		{"33:33:33", 0, 0, 0},
+		{"33:33:33", 9, 33, 33}, // allow for 25:00:00 to be 1:00:00
+		{"33:61:33", 0, 0, 0},
 	}
 	for _, tt := range tests {
 		t.Run(tt.args, func(t *testing.T) {
 			got, got1, got2 := simplifyTime(tt.args)
 			if got != tt.want {
-				t.Errorf("simplifyHour() got = %v, want %v", got, tt.want)
+				t.Errorf("simplifyHour(%s) got = %v, want %v", tt.args, got, tt.want)
 			}
 			if got1 != tt.want1 {
-				t.Errorf("simplifyHour() got1 = %v, want %v", got1, tt.want1)
+				t.Errorf("simplifyHour(%s) got1 = %v, want %v", tt.args, got1, tt.want1)
 			}
 			if got2 != tt.want2 {
-				t.Errorf("simplifyHour() got2 = %v, want %v", got2, tt.want2)
+				t.Errorf("simplifyHour(%s) got2 = %v, want %v", tt.args, got2, tt.want2)
 			}
 		})
 	}
@@ -225,8 +226,8 @@ func TestNew(t *testing.T) {
 		{"empty ;", ";", l, []time.Time{newDate(0, 0, 0, 0, 0, l), newDate(7, 0, 0, 0, 0, l)}},
 		{"all day ;", "su-sa 00:00-24:00;", l, []time.Time{newDate(0, 0, 0, 0, 0, l), newDate(7, 0, 0, 0, 0, l)}},
 		{"empty and no tz", "", nil, []time.Time{newDate(0, 0, 0, 0, 0, time.UTC), newDate(7, 0, 0, 0, 0, time.UTC)}},
-		{"order on same sentense", "mo,tu 10:00-11:00", nil, NewMust("tu,mo 10:00-11:00", nil)},
-		{"order on different sentenses", "mo 10:00-11:00;tu 10:00-12:00", nil, NewMust("tu 10:00-12:00;mo 10:00-11:00", nil)},
+		{"order on same sentence", "mo,tu 10:00-11:00", nil, NewMust("tu,mo 10:00-11:00", nil)},
+		{"order on different sentences", "mo 10:00-11:00;tu 10:00-12:00", nil, NewMust("tu 10:00-12:00;mo 10:00-11:00", nil)},
 		{"complex = simple", "su-sa 00:00-12:00,12:00-24:00", l, NewMust("", l)},
 		{"complex = simple", "su-sa 00:00-12:00;su-sa 12:00-24:00", l, NewMust("", l)},
 		{"time windows order does not matter anymore", "mo-su 00:00-24:00", l, NewMust("", l)},
@@ -387,3 +388,33 @@ func TestOpenHours_String(t *testing.T) {
 		})
 	}
 }
+
+func TestOpenHours_ClosingAfterMidnight(t *testing.T) {
+	o1 := NewMust("mo 22:00-02:00", l)
+	o2 := NewMust("mo 22:00-26:00", l)
+	tests := []struct {
+		o    OpenHours
+		name string
+		now  time.Time
+		want bool
+	}{
+		{o1, "before", time.Date(2019, 3, 4, 21, 0, 0, 0, l), false},
+		{o1, "start", time.Date(2019, 3, 4, 22, 0, 0, 0, l), true},
+		{o1, "between", time.Date(2019, 3, 4, 23, 0, 0, 0, l), true},
+		{o1, "end", time.Date(2019, 3, 5, 2, 0, 0, 0, l), false},
+		{o1, "after", time.Date(2019, 3, 5, 3, 0, 0, 0, l), false},
+		// using the 26:00 = 02:00 next day notation
+		{o2, "before", time.Date(2019, 3, 4, 21, 0, 0, 0, l), false},
+		{o2, "start", time.Date(2019, 3, 4, 22, 0, 0, 0, l), true},
+		{o2, "between", time.Date(2019, 3, 4, 23, 0, 0, 0, l), true},
+		{o2, "end", time.Date(2019, 3, 5, 2, 0, 0, 0, l), false},
+		{o2, "after", time.Date(2019, 3, 5, 3, 0, 0, 0, l), false},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got, got1 := tt.o.NextDur(tt.now); got != tt.want {
+				t.Errorf("OpenHours.NextDur().Open = %v, want %v, duration: %v", got, tt.want, got1)
+			}
+		})
+	}
+}