Respect the timezone passed when retrieving

hoard.go

@@ -203,11 +203,6 @@ func timeToHour(t *time.Time) *hour.Hour {
 	if t == nil {
 		return nil
 	}
-	hr := hour.Date(
-		t.Year(),
-		t.Month(),
-		t.Day(),
-		t.Hour(),
-	)
+	hr := hour.FromTime(*t)
 	return &hr
 }

internal/storage/hour/hour.go

@@ -94,6 +94,16 @@ func Date(year int, month time.Month, day, hour int) Hour {
 	return Hour{time.Date(year, month, day, hour, 0, 0, 0, time.UTC)}
 }
 
+func FromTime(t time.Time) Hour {
+	t = t.In(time.UTC)
+	return Date(
+		t.Year(),
+		t.Month(),
+		t.Day(),
+		t.Hour(),
+	)
+}
+
 func formatInt(i int) string {
 	if i < 10 {
 		return "0" + strconv.Itoa(i)

internal/storage/hour/hour_test.go

@@ -0,0 +1,21 @@
+package hour
+
+import (
+	"testing"
+	"time"
+)
+
+func TestFromTime(t *testing.T) {
+	loc, err := time.LoadLocation("America/New_York")
+	if err != nil {
+		t.Fatalf("could not load America/New_York location")
+	}
+	nyTime := time.Date(2022, time.January, 22, 21, 49, 0, 0, loc)
+	utcTime := time.Date(2022, time.January, 23, 2, 49, 0, 0, time.UTC)
+
+	nyHour := FromTime(nyTime)
+	utcHour := FromTime(utcTime)
+	if nyHour != utcHour {
+		t.Errorf("don't match: ny=%s, utc=%s", nyHour, utcHour)
+	}
+}