maybe fixed for total listen activity

This commit is contained in:
Gabe Farrell 2026-01-05 18:37:33 -05:00
parent 2925425750
commit 913c6c00e5
6 changed files with 95 additions and 47 deletions

View file

@ -190,12 +190,32 @@ func (q *Queries) DeleteListen(ctx context.Context, arg DeleteListenParams) erro
return err
}
const getFirstListen = `-- name: GetFirstListen :one
SELECT
track_id, listened_at, client, user_id
FROM listens
ORDER BY listened_at ASC
LIMIT 1
`
func (q *Queries) GetFirstListen(ctx context.Context) (Listen, error) {
row := q.db.QueryRow(ctx, getFirstListen)
var i Listen
err := row.Scan(
&i.TrackID,
&i.ListenedAt,
&i.Client,
&i.UserID,
)
return i, err
}
const getFirstListenFromArtist = `-- name: GetFirstListenFromArtist :one
SELECT
SELECT
l.track_id, l.listened_at, l.client, l.user_id
FROM listens l
JOIN tracks_with_title t ON l.track_id = t.id
JOIN artist_tracks at ON t.id = at.track_id
JOIN artist_tracks at ON t.id = at.track_id
WHERE at.artist_id = $1
ORDER BY l.listened_at ASC
LIMIT 1
@ -214,7 +234,7 @@ func (q *Queries) GetFirstListenFromArtist(ctx context.Context, artistID int32)
}
const getFirstListenFromRelease = `-- name: GetFirstListenFromRelease :one
SELECT
SELECT
l.track_id, l.listened_at, l.client, l.user_id
FROM listens l
JOIN tracks t ON l.track_id = t.id
@ -236,7 +256,7 @@ func (q *Queries) GetFirstListenFromRelease(ctx context.Context, releaseID int32
}
const getFirstListenFromTrack = `-- name: GetFirstListenFromTrack :one
SELECT
SELECT
l.track_id, l.listened_at, l.client, l.user_id
FROM listens l
JOIN tracks t ON l.track_id = t.id
@ -258,14 +278,14 @@ func (q *Queries) GetFirstListenFromTrack(ctx context.Context, id int32) (Listen
}
const getLastListensFromArtistPaginated = `-- name: GetLastListensFromArtistPaginated :many
SELECT
SELECT
l.track_id, l.listened_at, l.client, l.user_id,
t.title AS track_title,
t.release_id AS release_id,
get_artists_for_track(t.id) AS artists
FROM listens l
JOIN tracks_with_title t ON l.track_id = t.id
JOIN artist_tracks at ON t.id = at.track_id
JOIN artist_tracks at ON t.id = at.track_id
WHERE at.artist_id = $5
AND l.listened_at BETWEEN $1 AND $2
ORDER BY l.listened_at DESC
@ -325,7 +345,7 @@ func (q *Queries) GetLastListensFromArtistPaginated(ctx context.Context, arg Get
}
const getLastListensFromReleasePaginated = `-- name: GetLastListensFromReleasePaginated :many
SELECT
SELECT
l.track_id, l.listened_at, l.client, l.user_id,
t.title AS track_title,
t.release_id AS release_id,
@ -391,7 +411,7 @@ func (q *Queries) GetLastListensFromReleasePaginated(ctx context.Context, arg Ge
}
const getLastListensFromTrackPaginated = `-- name: GetLastListensFromTrackPaginated :many
SELECT
SELECT
l.track_id, l.listened_at, l.client, l.user_id,
t.title AS track_title,
t.release_id AS release_id,
@ -457,7 +477,7 @@ func (q *Queries) GetLastListensFromTrackPaginated(ctx context.Context, arg GetL
}
const getLastListensPaginated = `-- name: GetLastListensPaginated :many
SELECT
SELECT
l.track_id, l.listened_at, l.client, l.user_id,
t.title AS track_title,
t.release_id AS release_id,
@ -676,31 +696,38 @@ func (q *Queries) InsertListen(ctx context.Context, arg InsertListenParams) erro
const listenActivity = `-- name: ListenActivity :many
WITH buckets AS (
SELECT generate_series($1::timestamptz, $2::timestamptz, $3::interval) AS bucket_start
SELECT
d::date AS bucket_start_date,
(d + $3::interval)::date AS bucket_end_date
FROM generate_series(
$1::date,
$2::date,
$3::interval
) AS d
),
bucketed_listens AS (
SELECT
b.bucket_start,
b.bucket_start_date::timestamptz,
COUNT(l.listened_at) AS listen_count
FROM buckets b
LEFT JOIN listens l
ON l.listened_at >= b.bucket_start
AND l.listened_at < b.bucket_start + $3::interval
GROUP BY b.bucket_start
ORDER BY b.bucket_start
ON l.listened_at >= b.bucket_start_date::timestamptz
AND l.listened_at < b.bucket_end_date::timestamptz
GROUP BY b.bucket_start_date
ORDER BY b.bucket_start_date
)
SELECT bucket_start, listen_count FROM bucketed_listens
SELECT bucketed_listens.bucket_start_date::timestamptz, listen_count FROM bucketed_listens
`
type ListenActivityParams struct {
Column1 time.Time
Column2 time.Time
Column1 pgtype.Date
Column2 pgtype.Date
Column3 pgtype.Interval
}
type ListenActivityRow struct {
BucketStart time.Time
ListenCount int64
BucketedListensBucketStartDate time.Time
ListenCount int64
}
func (q *Queries) ListenActivity(ctx context.Context, arg ListenActivityParams) ([]ListenActivityRow, error) {
@ -712,7 +739,7 @@ func (q *Queries) ListenActivity(ctx context.Context, arg ListenActivityParams)
var items []ListenActivityRow
for rows.Next() {
var i ListenActivityRow
if err := rows.Scan(&i.BucketStart, &i.ListenCount); err != nil {
if err := rows.Scan(&i.BucketedListensBucketStartDate, &i.ListenCount); err != nil {
return nil, err
}
items = append(items, i)