gabehf/Koito
1
0
Fork 0
mirror of https://github.com/gabehf/Koito.git synced 2026-03-16 10:55:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix listen activity not correctly aggregating step

Browse source
This commit is contained in:
Gabe Farrell 2026-01-14 21:20:57 -05:00
parent d75e877295
commit c934019ad9
3 changed files with 42 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
internal/db/period.go
View file

@ -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:

15
internal/db/psql/listen_activity_test.go
View file

@ -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`)