fix listen activity not correctly aggregating step

engine/handlers/get_listen_activity.go

@@ -106,7 +106,7 @@ func GetListenActivityHandler(store db.DB) func(w http.ResponseWriter, r *http.R
 			return
 		}
 
-		activity = fillMissingActivity(activity, opts)
+		activity = processActivity(activity, opts)
 
 		l.Debug().Msg("GetListenActivityHandler: Successfully retrieved listen activity")
 		utils.WriteJSON(w, http.StatusOK, activity)
@@ -114,34 +114,55 @@ func GetListenActivityHandler(store db.DB) func(w http.ResponseWriter, r *http.R
 }
 
 // ngl i hate this
-func fillMissingActivity(
+func processActivity(
 	items []db.ListenActivityItem,
 	opts db.ListenActivityOpts,
 ) []db.ListenActivityItem {
 	from, to := db.ListenActivityOptsToTimes(opts)
 
-	existing := make(map[string]int64, len(items))
+	buckets := make(map[string]int64)
+
 	for _, item := range items {
-		existing[item.Start.Format("2006-01-02")] = item.Listens
+		bucketStart := normalizeToStep(item.Start, opts.Step)
+		key := bucketStart.Format("2006-01-02")
+		buckets[key] += item.Listens
 	}
 
 	var result []db.ListenActivityItem
 
-	for t := from; t.Before(to); t = addStep(t, opts.Step) {
-		listens := int64(0)
-		if v, ok := existing[t.Format("2006-01-02")]; ok {
-			listens = v
-		}
+	for t := normalizeToStep(from, opts.Step); t.Before(to); t = addStep(t, opts.Step) {
+		key := t.Format("2006-01-02")
 
 		result = append(result, db.ListenActivityItem{
 			Start:   t,
-			Listens: int64(listens),
+			Listens: buckets[key],
 		})
 	}
 
 	return result
 }
 
+func normalizeToStep(t time.Time, step db.StepInterval) time.Time {
+	switch step {
+	case db.StepDay:
+		return time.Date(t.Year(), t.Month(), t.Day(), 0, 0, 0, 0, t.Location())
+
+	case db.StepWeek:
+		weekday := int(t.Weekday())
+		if weekday == 0 {
+			weekday = 7
+		}
+		start := t.AddDate(0, 0, -(weekday - 1))
+		return time.Date(start.Year(), start.Month(), start.Day(), 0, 0, 0, 0, t.Location())
+
+	case db.StepMonth:
+		return time.Date(t.Year(), t.Month(), 1, 0, 0, 0, 0, t.Location())
+
+	default:
+		return t
+	}
+}
+
 func addStep(t time.Time, step db.StepInterval) time.Time {
 	switch step {
 	case db.StepDay:

internal/db/period.go

@@ -91,7 +91,9 @@ func ListenActivityOptsToTimes(opts ListenActivityOpts) (start, end time.Time) {
 		// Align to most recent Sunday
 		weekday := int(now.Weekday()) // Sunday = 0
 		startOfThisWeek := time.Date(now.Year(), now.Month(), now.Day()-weekday, 0, 0, 0, 0, loc)
-		start = startOfThisWeek.AddDate(0, 0, -7*opts.Range)
+		// need to subtract 1 from range for week because we are going back from the beginning of this
+		// week, so we sort of already went back a week
+		start = startOfThisWeek.AddDate(0, 0, -7*(opts.Range-1))
 		end = startOfThisWeek.AddDate(0, 0, 7).Add(-time.Nanosecond)
 
 	case StepMonth:

internal/db/psql/listen_activity_test.go

@@ -2,6 +2,7 @@ package psql_test
 
 import (
 	"context"
+	"log"
 	"testing"
 
 	"github.com/gabehf/koito/internal/db"
@@ -97,20 +98,20 @@ func TestListenActivity(t *testing.T) {
 
 	err = store.Exec(context.Background(),
 		`INSERT INTO listens (user_id, track_id, listened_at)
-			VALUES (1, 1, NOW() - INTERVAL '1 month'),
+			VALUES (1, 1, NOW() - INTERVAL '1 month 3 days'),
 				   (1, 1, NOW() - INTERVAL '2 months'),
 				   (1, 1, NOW() - INTERVAL '3 months'),
-				   (1, 2, NOW() - INTERVAL '1 month'),
+				   (1, 2, NOW() - INTERVAL '1 month 3 days'),
+				   (1, 2, NOW() - INTERVAL '1 hour'),
+				   (1, 2, NOW()),
 				   (1, 2, NOW() - INTERVAL '2 months')`)
 	require.NoError(t, err)
 
-	// This test is bad, and I think it's because of daylight savings.
-	// I need to find a better test.
-
 	activity, err = store.GetListenActivity(ctx, db.ListenActivityOpts{Step: db.StepMonth, Range: 8})
 	require.NoError(t, err)
-	// require.Len(t, activity, 8)
-	// assert.Equal(t, []int64{0, 0, 0, 0, 1, 2, 2, 0}, flattenListenCounts(activity))
+	require.Len(t, activity, 4)
+	assert.Equal(t, []int64{1, 2, 2, 2, 1}, flattenListenCounts(activity))
+	log.Println(activity)
 
 	// Truncate listens table and insert specific dates for testing opts.Step = db.StepYear
 	err = store.Exec(context.Background(), `TRUNCATE TABLE listens RESTART IDENTITY`)