gabehf/Koito
1
0
Fork 0
mirror of https://github.com/gabehf/Koito.git synced 2026-04-22 12:01:52 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

maybe actually fixed now

Browse source
This commit is contained in:
Gabe Farrell 2026-01-10 00:57:01 -05:00
parent 913c6c00e5
commit 738ac871e6
12 changed files with 293 additions and 298 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -10,7 +10,7 @@ postgres.schemadump:
-v --dbname="koitodb" -f "/tmp/dump/schema.sql" -v --dbname="koitodb" -f "/tmp/dump/schema.sql"
postgres.run: postgres.run:
docker run --name koito-db -p 5432:5432 -e POSTGRES_PASSWORD=secret -e TZ=America/New_York -d postgres docker run --name koito-db -p 5432:5432 -e POSTGRES_PASSWORD=secret -d postgres
postgres.run-scratch: postgres.run-scratch:
docker run --name koito-scratch -p 5433:5432 -e POSTGRES_PASSWORD=secret -d postgres docker run --name koito-scratch -p 5433:5432 -e POSTGRES_PASSWORD=secret -d postgres

11
client/app/components/ActivityGrid.tsx
View file

@ -63,7 +63,7 @@ export default function ActivityGrid({
queryFn: ({ queryKey }) => getActivity(queryKey[1] as getActivityArgs), queryFn: ({ queryKey }) => getActivity(queryKey[1] as getActivityArgs),
}); });
const { theme, themeName } = useTheme(); const { theme } = useTheme();
const color = getPrimaryColor(theme); const color = getPrimaryColor(theme);
if (isPending) { if (isPending) {
@ -129,14 +129,7 @@ export default function ActivityGrid({
} }
v = Math.min(v, t); v = Math.min(v, t);
if (themeName === "pearl") { return ((v - t) / t) * 0.8;
// special case for the only light theme lol
// could be generalized by pragmatically comparing the
// lightness of the bg vs the primary but eh
return (t - v) / t;
} else {
return ((v - t) / t) * 0.8;
}
}; };
const CHUNK_SIZE = 26 * 7; const CHUNK_SIZE = 26 * 7;

130
client/app/root.tsx
View file

@ -9,16 +9,19 @@ import {
} from "react-router"; } from "react-router";
import type { Route } from "./+types/root"; import type { Route } from "./+types/root";
import './themes.css' import "./themes.css";
import "./app.css"; import "./app.css";
import { QueryClient, QueryClientProvider } from "@tanstack/react-query"; import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
import { ThemeProvider } from './providers/ThemeProvider'; import { ThemeProvider } from "./providers/ThemeProvider";
import Sidebar from "./components/sidebar/Sidebar"; import Sidebar from "./components/sidebar/Sidebar";
import Footer from "./components/Footer"; import Footer from "./components/Footer";
import { AppProvider } from "./providers/AppProvider"; import { AppProvider } from "./providers/AppProvider";
import { initTimezoneCookie } from "./tz";
initTimezoneCookie();
// Create a client // Create a client
const queryClient = new QueryClient() const queryClient = new QueryClient();
export const links: Route.LinksFunction = () => [ export const links: Route.LinksFunction = () => [
{ rel: "preconnect", href: "https://fonts.googleapis.com" }, { rel: "preconnect", href: "https://fonts.googleapis.com" },
@ -35,14 +38,23 @@ export const links: Route.LinksFunction = () => [
export function Layout({ children }: { children: React.ReactNode }) { export function Layout({ children }: { children: React.ReactNode }) {
return ( return (
<html lang="en" style={{backgroundColor: 'black'}}> <html lang="en" style={{ backgroundColor: "black" }}>
<head> <head>
<meta charSet="utf-8" /> <meta charSet="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" /> <meta name="viewport" content="width=device-width, initial-scale=1" />
<link rel="icon" type="image/png" href="/favicon-96x96.png" sizes="96x96" /> <link
rel="icon"
type="image/png"
href="/favicon-96x96.png"
sizes="96x96"
/>
<link rel="icon" type="image/svg+xml" href="/favicon.svg" /> <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
<link rel="shortcut icon" href="/favicon.ico" /> <link rel="shortcut icon" href="/favicon.ico" />
<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" /> <link
rel="apple-touch-icon"
sizes="180x180"
href="/apple-touch-icon.png"
/>
<meta name="apple-mobile-web-app-title" content="Koito" /> <meta name="apple-mobile-web-app-title" content="Koito" />
<link rel="manifest" href="/site.webmanifest" /> <link rel="manifest" href="/site.webmanifest" />
<Meta /> <Meta />
@ -60,71 +72,71 @@ export function Layout({ children }: { children: React.ReactNode }) {
export default function App() { export default function App() {
return ( return (
<> <>
<AppProvider> <AppProvider>
<ThemeProvider> <ThemeProvider>
<QueryClientProvider client={queryClient}> <QueryClientProvider client={queryClient}>
<div className="flex-col flex sm:flex-row"> <div className="flex-col flex sm:flex-row">
<Sidebar /> <Sidebar />
<div className="flex flex-col items-center mx-auto w-full ml-0 sm:ml-[40px]"> <div className="flex flex-col items-center mx-auto w-full ml-0 sm:ml-[40px]">
<Outlet /> <Outlet />
<Footer /> <Footer />
</div> </div>
</div> </div>
</QueryClientProvider> </QueryClientProvider>
</ThemeProvider> </ThemeProvider>
</AppProvider> </AppProvider>
</> </>
); );
} }
export function HydrateFallback() { export function HydrateFallback() {
return null return null;
} }
export function ErrorBoundary() { export function ErrorBoundary() {
const error = useRouteError(); const error = useRouteError();
let message = "Oops!"; let message = "Oops!";
let details = "An unexpected error occurred."; let details = "An unexpected error occurred.";
let stack: string | undefined; let stack: string | undefined;
if (isRouteErrorResponse(error)) { if (isRouteErrorResponse(error)) {
message = error.status === 404 ? "404" : "Error"; message = error.status === 404 ? "404" : "Error";
details = error.status === 404 details =
error.status === 404
? "The requested page could not be found." ? "The requested page could not be found."
: error.statusText || details; : error.statusText || details;
} else if (import.meta.env.DEV && error instanceof Error) { } else if (import.meta.env.DEV && error instanceof Error) {
details = error.message; details = error.message;
stack = error.stack; stack = error.stack;
} }
const title = `${message} - Koito`;
const title = `${message} - Koito` return (
<AppProvider>
return ( <ThemeProvider>
<AppProvider> <title>{title}</title>
<ThemeProvider> <div className="flex">
<title>{title}</title> <Sidebar />
<div className="flex"> <div className="w-full flex flex-col">
<Sidebar /> <main className="pt-16 p-4 container mx-auto flex-grow">
<div className="w-full flex flex-col"> <div className="flex gap-4 items-end">
<main className="pt-16 p-4 container mx-auto flex-grow"> <img className="w-[200px] rounded" src="../yuu.jpg" />
<div className="flex gap-4 items-end"> <div>
<img className="w-[200px] rounded" src="../yuu.jpg" /> <h1>{message}</h1>
<div> <p>{details}</p>
<h1>{message}</h1>
<p>{details}</p>
</div>
</div>
{stack && (
<pre className="w-full p-4 overflow-x-auto">
<code>{stack}</code>
</pre>
)}
</main>
<Footer />
</div>
</div> </div>
</ThemeProvider> </div>
</AppProvider> {stack && (
); <pre className="w-full p-4 overflow-x-auto">
<code>{stack}</code>
</pre>
)}
</main>
<Footer />
</div>
</div>
</ThemeProvider>
</AppProvider>
);
} }

10
client/app/tz.ts Normal file
View file

@ -0,0 +1,10 @@
export function initTimezoneCookie() {
if (typeof window === "undefined") return;
if (document.cookie.includes("tz=")) return;
const tz = Intl.DateTimeFormat().resolvedOptions().timeZone;
if (!tz) return;
document.cookie = `tz=${tz}; Path=/; Max-Age=31536000; SameSite=Lax`;
}

124
db/queries/listen.sql
View file

@ -144,97 +144,51 @@ WHERE l.listened_at BETWEEN $1 AND $2
AND t.id = $3; AND t.id = $3;
-- name: ListenActivity :many -- name: ListenActivity :many
WITH buckets AS ( SELECT
SELECT (listened_at AT TIME ZONE $1::text)::date as day,
d::date AS bucket_start_date, COUNT(*) AS listen_count
(d + $3::interval)::date AS bucket_end_date FROM listens
FROM generate_series( WHERE listened_at >= $2
$1::date, AND listened_at < $3
$2::date, GROUP BY day
$3::interval ORDER BY day;
) AS d
),
bucketed_listens AS (
SELECT
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_date::timestamptz
AND l.listened_at < b.bucket_end_date::timestamptz
GROUP BY b.bucket_start_date
ORDER BY b.bucket_start_date
)
SELECT bucketed_listens.bucket_start_date::timestamptz, listen_count FROM bucketed_listens;
-- name: ListenActivityForArtist :many -- name: ListenActivityForArtist :many
WITH buckets AS ( SELECT
SELECT generate_series($1::timestamptz, $2::timestamptz, $3::interval) AS bucket_start (listened_at AT TIME ZONE $1::text)::date as day,
), COUNT(*) AS listen_count
filtered_listens AS ( FROM listens l
SELECT l.* JOIN tracks t ON l.track_id = t.id
FROM listens l JOIN artist_tracks at ON t.id = at.track_id
JOIN artist_tracks t ON l.track_id = t.track_id WHERE l.listened_at >= $2
WHERE t.artist_id = $4 AND l.listened_at < $3
), AND at.artist_id = $4
bucketed_listens AS ( GROUP BY day
SELECT ORDER BY day;
b.bucket_start,
COUNT(l.listened_at) AS listen_count
FROM buckets b
LEFT JOIN filtered_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
)
SELECT * FROM bucketed_listens;
-- name: ListenActivityForRelease :many -- name: ListenActivityForRelease :many
WITH buckets AS ( SELECT
SELECT generate_series($1::timestamptz, $2::timestamptz, $3::interval) AS bucket_start (listened_at AT TIME ZONE $1::text)::date as day,
), COUNT(*) AS listen_count
filtered_listens AS ( FROM listens l
SELECT l.* JOIN tracks t ON l.track_id = t.id
FROM listens l WHERE l.listened_at >= $2
JOIN tracks t ON l.track_id = t.id AND l.listened_at < $3
WHERE t.release_id = $4 AND t.release_id = $4
), GROUP BY day
bucketed_listens AS ( ORDER BY day;
SELECT
b.bucket_start,
COUNT(l.listened_at) AS listen_count
FROM buckets b
LEFT JOIN filtered_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
)
SELECT * FROM bucketed_listens;
-- name: ListenActivityForTrack :many -- name: ListenActivityForTrack :many
WITH buckets AS ( SELECT
SELECT generate_series($1::timestamptz, $2::timestamptz, $3::interval) AS bucket_start (listened_at AT TIME ZONE $1::text)::date as day,
), COUNT(*) AS listen_count
filtered_listens AS ( FROM listens l
SELECT l.* JOIN tracks t ON l.track_id = t.id
FROM listens l WHERE l.listened_at >= $2
JOIN tracks t ON l.track_id = t.id AND l.listened_at < $3
WHERE t.id = $4 AND t.id = $4
), GROUP BY day
bucketed_listens AS ( ORDER BY day;
SELECT
b.bucket_start,
COUNT(l.listened_at) AS listen_count
FROM buckets b
LEFT JOIN filtered_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
)
SELECT * FROM bucketed_listens;
-- name: UpdateTrackIdForListens :exec -- name: UpdateTrackIdForListens :exec
UPDATE listens SET track_id = $2 UPDATE listens SET track_id = $2

51
engine/handlers/get_listen_activity.go
View file

@ -4,6 +4,7 @@ import (
"net/http" "net/http"
"strconv" "strconv"
"strings" "strings"
"time"
"github.com/gabehf/koito/internal/db" "github.com/gabehf/koito/internal/db"
"github.com/gabehf/koito/internal/logger" "github.com/gabehf/koito/internal/logger"
@ -85,11 +86,17 @@ func GetListenActivityHandler(store db.DB) func(w http.ResponseWriter, r *http.R
Range: _range, Range: _range,
Month: month, Month: month,
Year: year, Year: year,
Timezone: parseTZ(r),
AlbumID: int32(albumId), AlbumID: int32(albumId),
ArtistID: int32(artistId), ArtistID: int32(artistId),
TrackID: int32(trackId), TrackID: int32(trackId),
} }
if strings.ToLower(opts.Timezone.String()) == "local" {
opts.Timezone, _ = time.LoadLocation("UTC")
l.Warn().Msg("GetListenActivityHandler: Timezone is unset, using UTC")
}
l.Debug().Msgf("GetListenActivityHandler: Retrieving listen activity with options: %+v", opts) l.Debug().Msgf("GetListenActivityHandler: Retrieving listen activity with options: %+v", opts)
activity, err := store.GetListenActivity(ctx, opts) activity, err := store.GetListenActivity(ctx, opts)
@ -99,7 +106,51 @@ func GetListenActivityHandler(store db.DB) func(w http.ResponseWriter, r *http.R
return return
} }
activity = fillMissingActivity(activity, opts)
l.Debug().Msg("GetListenActivityHandler: Successfully retrieved listen activity") l.Debug().Msg("GetListenActivityHandler: Successfully retrieved listen activity")
utils.WriteJSON(w, http.StatusOK, activity) utils.WriteJSON(w, http.StatusOK, activity)
} }
} }
// ngl i hate this
func fillMissingActivity(
items []db.ListenActivityItem,
opts db.ListenActivityOpts,
) []db.ListenActivityItem {
from, to := db.ListenActivityOptsToTimes(opts)
existing := make(map[string]int64, len(items))
for _, item := range items {
existing[item.Start.Format("2006-01-02")] = 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
}
result = append(result, db.ListenActivityItem{
Start: t,
Listens: int64(listens),
})
}
return result
}
func addStep(t time.Time, step db.StepInterval) time.Time {
switch step {
case db.StepDay:
return t.AddDate(0, 0, 1)
case db.StepWeek:
return t.AddDate(0, 0, 7)
case db.StepMonth:
return t.AddDate(0, 1, 0)
default:
return t.AddDate(0, 0, 1)
}
}

19
engine/handlers/handlers.go
View file

@ -5,6 +5,7 @@ import (
"net/http" "net/http"
"strconv" "strconv"
"strings" "strings"
"time"
"github.com/gabehf/koito/internal/db" "github.com/gabehf/koito/internal/db"
"github.com/gabehf/koito/internal/logger" "github.com/gabehf/koito/internal/logger"
@ -100,5 +101,23 @@ func TimeframeFromRequest(r *http.Request) db.Timeframe {
Week: parseInt("week"), Week: parseInt("week"),
FromUnix: parseInt64("from"), FromUnix: parseInt64("from"),
ToUnix: parseInt64("to"), ToUnix: parseInt64("to"),
Timezone: parseTZ(r),
} }
} }
func parseTZ(r *http.Request) *time.Location {
if tz := r.URL.Query().Get("tz"); tz != "" {
if loc, err := time.LoadLocation(tz); err == nil {
return loc
}
}
if c, err := r.Cookie("tz"); err == nil {
if loc, err := time.LoadLocation(c.Value); err == nil {
return loc
}
}
return time.Now().Location()
}

1
internal/db/opts.go
View file

@ -134,6 +134,7 @@ type ListenActivityOpts struct {
Range int Range int
Month int Month int
Year int Year int
Timezone *time.Location
AlbumID int32 AlbumID int32
ArtistID int32 ArtistID int32
TrackID int32 TrackID int32

15
internal/db/period.go
View file

@ -58,16 +58,17 @@ const (
// If opts.Year (or opts.Year + opts.Month) is provided, start and end will simply by the start and end times of that year/month. // If opts.Year (or opts.Year + opts.Month) is provided, start and end will simply by the start and end times of that year/month.
func ListenActivityOptsToTimes(opts ListenActivityOpts) (start, end time.Time) { func ListenActivityOptsToTimes(opts ListenActivityOpts) (start, end time.Time) {
now := time.Now() now := time.Now()
loc := opts.Timezone
// If Year (and optionally Month) are specified, use calendar boundaries // If Year (and optionally Month) are specified, use calendar boundaries
if opts.Year != 0 { if opts.Year != 0 {
if opts.Month != 0 { if opts.Month != 0 {
// Specific month of a specific year // Specific month of a specific year
start = time.Date(opts.Year, time.Month(opts.Month), 1, 0, 0, 0, 0, now.Location()) start = time.Date(opts.Year, time.Month(opts.Month), 1, 0, 0, 0, 0, loc)
end = start.AddDate(0, 1, 0).Add(-time.Nanosecond) end = start.AddDate(0, 1, 0).Add(-time.Nanosecond)
} else { } else {
// Whole year // Whole year
start = time.Date(opts.Year, 1, 1, 0, 0, 0, 0, now.Location()) start = time.Date(opts.Year, 1, 1, 0, 0, 0, 0, loc)
end = start.AddDate(1, 0, 0).Add(-time.Nanosecond) end = start.AddDate(1, 0, 0).Add(-time.Nanosecond)
} }
return start, end return start, end
@ -79,30 +80,30 @@ func ListenActivityOptsToTimes(opts ListenActivityOpts) (start, end time.Time) {
// Determine step and align accordingly // Determine step and align accordingly
switch opts.Step { switch opts.Step {
case StepDay: case StepDay:
today := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, now.Location()) today := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, loc)
start = today.AddDate(0, 0, -opts.Range) start = today.AddDate(0, 0, -opts.Range)
end = today.AddDate(0, 0, 1).Add(-time.Nanosecond) end = today.AddDate(0, 0, 1).Add(-time.Nanosecond)
case StepWeek: case StepWeek:
// Align to most recent Sunday // Align to most recent Sunday
weekday := int(now.Weekday()) // Sunday = 0 weekday := int(now.Weekday()) // Sunday = 0
startOfThisWeek := time.Date(now.Year(), now.Month(), now.Day()-weekday, 0, 0, 0, 0, now.Location()) startOfThisWeek := time.Date(now.Year(), now.Month(), now.Day()-weekday, 0, 0, 0, 0, loc)
start = startOfThisWeek.AddDate(0, 0, -7*opts.Range) start = startOfThisWeek.AddDate(0, 0, -7*opts.Range)
end = startOfThisWeek.AddDate(0, 0, 7).Add(-time.Nanosecond) end = startOfThisWeek.AddDate(0, 0, 7).Add(-time.Nanosecond)
case StepMonth: case StepMonth:
firstOfThisMonth := time.Date(now.Year(), now.Month(), 1, 0, 0, 0, 0, now.Location()) firstOfThisMonth := time.Date(now.Year(), now.Month(), 1, 0, 0, 0, 0, loc)
start = firstOfThisMonth.AddDate(0, -opts.Range, 0) start = firstOfThisMonth.AddDate(0, -opts.Range, 0)
end = firstOfThisMonth.AddDate(0, 1, 0).Add(-time.Nanosecond) end = firstOfThisMonth.AddDate(0, 1, 0).Add(-time.Nanosecond)
case StepYear: case StepYear:
firstOfThisYear := time.Date(now.Year(), 1, 1, 0, 0, 0, 0, now.Location()) firstOfThisYear := time.Date(now.Year(), 1, 1, 0, 0, 0, 0, loc)
start = firstOfThisYear.AddDate(-opts.Range, 0, 0) start = firstOfThisYear.AddDate(-opts.Range, 0, 0)
end = firstOfThisYear.AddDate(1, 0, 0).Add(-time.Nanosecond) end = firstOfThisYear.AddDate(1, 0, 0).Add(-time.Nanosecond)
default: default:
// Default to daily // Default to daily
today := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, now.Location()) today := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, loc)
start = today.AddDate(0, 0, -opts.Range) start = today.AddDate(0, 0, -opts.Range)
end = today.AddDate(0, 0, 1).Add(-time.Nanosecond) end = today.AddDate(0, 0, 1).Add(-time.Nanosecond)
} }

39
internal/db/psql/listen_activity.go
View file

@ -8,7 +8,6 @@ import (
"github.com/gabehf/koito/internal/db" "github.com/gabehf/koito/internal/db"
"github.com/gabehf/koito/internal/logger" "github.com/gabehf/koito/internal/logger"
"github.com/gabehf/koito/internal/repository" "github.com/gabehf/koito/internal/repository"
"github.com/jackc/pgx/v5/pgtype"
) )
func (d *Psql) GetListenActivity(ctx context.Context, opts db.ListenActivityOpts) ([]db.ListenActivityItem, error) { func (d *Psql) GetListenActivity(ctx context.Context, opts db.ListenActivityOpts) ([]db.ListenActivityItem, error) {
@ -26,10 +25,10 @@ func (d *Psql) GetListenActivity(ctx context.Context, opts db.ListenActivityOpts
l.Debug().Msgf("Fetching listen activity for %d %s(s) from %v to %v for release group %d", l.Debug().Msgf("Fetching listen activity for %d %s(s) from %v to %v for release group %d",
opts.Range, opts.Step, t1.Format("Jan 02, 2006 15:04:05"), t2.Format("Jan 02, 2006 15:04:05"), opts.AlbumID) opts.Range, opts.Step, t1.Format("Jan 02, 2006 15:04:05"), t2.Format("Jan 02, 2006 15:04:05"), opts.AlbumID)
rows, err := d.q.ListenActivityForRelease(ctx, repository.ListenActivityForReleaseParams{ rows, err := d.q.ListenActivityForRelease(ctx, repository.ListenActivityForReleaseParams{
Column1: t1, Column1: opts.Timezone.String(),
Column2: t2, ListenedAt: t1,
Column3: stepToInterval(opts.Step), ListenedAt_2: t2,
ReleaseID: opts.AlbumID, ReleaseID: opts.AlbumID,
}) })
if err != nil { if err != nil {
return nil, fmt.Errorf("GetListenActivity: ListenActivityForRelease: %w", err) return nil, fmt.Errorf("GetListenActivity: ListenActivityForRelease: %w", err)
@ -37,7 +36,7 @@ func (d *Psql) GetListenActivity(ctx context.Context, opts db.ListenActivityOpts
listenActivity = make([]db.ListenActivityItem, len(rows)) listenActivity = make([]db.ListenActivityItem, len(rows))
for i, row := range rows { for i, row := range rows {
t := db.ListenActivityItem{ t := db.ListenActivityItem{
Start: row.BucketStart, Start: row.Day.Time,
Listens: row.ListenCount, Listens: row.ListenCount,
} }
listenActivity[i] = t listenActivity[i] = t
@ -47,10 +46,10 @@ func (d *Psql) GetListenActivity(ctx context.Context, opts db.ListenActivityOpts
l.Debug().Msgf("Fetching listen activity for %d %s(s) from %v to %v for artist %d", l.Debug().Msgf("Fetching listen activity for %d %s(s) from %v to %v for artist %d",
opts.Range, opts.Step, t1.Format("Jan 02, 2006 15:04:05"), t2.Format("Jan 02, 2006 15:04:05"), opts.ArtistID) opts.Range, opts.Step, t1.Format("Jan 02, 2006 15:04:05"), t2.Format("Jan 02, 2006 15:04:05"), opts.ArtistID)
rows, err := d.q.ListenActivityForArtist(ctx, repository.ListenActivityForArtistParams{ rows, err := d.q.ListenActivityForArtist(ctx, repository.ListenActivityForArtistParams{
Column1: t1, Column1: opts.Timezone.String(),
Column2: t2, ListenedAt: t1,
Column3: stepToInterval(opts.Step), ListenedAt_2: t2,
ArtistID: opts.ArtistID, ArtistID: opts.ArtistID,
}) })
if err != nil { if err != nil {
return nil, fmt.Errorf("GetListenActivity: ListenActivityForArtist: %w", err) return nil, fmt.Errorf("GetListenActivity: ListenActivityForArtist: %w", err)
@ -58,7 +57,7 @@ func (d *Psql) GetListenActivity(ctx context.Context, opts db.ListenActivityOpts
listenActivity = make([]db.ListenActivityItem, len(rows)) listenActivity = make([]db.ListenActivityItem, len(rows))
for i, row := range rows { for i, row := range rows {
t := db.ListenActivityItem{ t := db.ListenActivityItem{
Start: row.BucketStart, Start: row.Day.Time,
Listens: row.ListenCount, Listens: row.ListenCount,
} }
listenActivity[i] = t listenActivity[i] = t
@ -68,10 +67,10 @@ func (d *Psql) GetListenActivity(ctx context.Context, opts db.ListenActivityOpts
l.Debug().Msgf("Fetching listen activity for %d %s(s) from %v to %v for track %d", l.Debug().Msgf("Fetching listen activity for %d %s(s) from %v to %v for track %d",
opts.Range, opts.Step, t1.Format("Jan 02, 2006 15:04:05"), t2.Format("Jan 02, 2006 15:04:05"), opts.TrackID) opts.Range, opts.Step, t1.Format("Jan 02, 2006 15:04:05"), t2.Format("Jan 02, 2006 15:04:05"), opts.TrackID)
rows, err := d.q.ListenActivityForTrack(ctx, repository.ListenActivityForTrackParams{ rows, err := d.q.ListenActivityForTrack(ctx, repository.ListenActivityForTrackParams{
Column1: t1, Column1: opts.Timezone.String(),
Column2: t2, ListenedAt: t1,
Column3: stepToInterval(opts.Step), ListenedAt_2: t2,
ID: opts.TrackID, ID: opts.TrackID,
}) })
if err != nil { if err != nil {
return nil, fmt.Errorf("GetListenActivity: ListenActivityForTrack: %w", err) return nil, fmt.Errorf("GetListenActivity: ListenActivityForTrack: %w", err)
@ -79,7 +78,7 @@ func (d *Psql) GetListenActivity(ctx context.Context, opts db.ListenActivityOpts
listenActivity = make([]db.ListenActivityItem, len(rows)) listenActivity = make([]db.ListenActivityItem, len(rows))
for i, row := range rows { for i, row := range rows {
t := db.ListenActivityItem{ t := db.ListenActivityItem{
Start: row.BucketStart, Start: row.Day.Time,
Listens: row.ListenCount, Listens: row.ListenCount,
} }
listenActivity[i] = t listenActivity[i] = t
@ -89,9 +88,9 @@ func (d *Psql) GetListenActivity(ctx context.Context, opts db.ListenActivityOpts
l.Debug().Msgf("Fetching listen activity for %d %s(s) from %v to %v", l.Debug().Msgf("Fetching listen activity for %d %s(s) from %v to %v",
opts.Range, opts.Step, t1.Format("Jan 02, 2006 15:04:05"), t2.Format("Jan 02, 2006 15:04:05")) opts.Range, opts.Step, t1.Format("Jan 02, 2006 15:04:05"), t2.Format("Jan 02, 2006 15:04:05"))
rows, err := d.q.ListenActivity(ctx, repository.ListenActivityParams{ rows, err := d.q.ListenActivity(ctx, repository.ListenActivityParams{
Column1: pgtype.Date{Time: t1, Valid: true}, Column1: opts.Timezone.String(),
Column2: pgtype.Date{Time: t2, Valid: true}, ListenedAt: t1,
Column3: stepToInterval(opts.Step), ListenedAt_2: t2,
}) })
if err != nil { if err != nil {
return nil, fmt.Errorf("GetListenActivity: ListenActivity: %w", err) return nil, fmt.Errorf("GetListenActivity: ListenActivity: %w", err)
@ -99,7 +98,7 @@ func (d *Psql) GetListenActivity(ctx context.Context, opts db.ListenActivityOpts
listenActivity = make([]db.ListenActivityItem, len(rows)) listenActivity = make([]db.ListenActivityItem, len(rows))
for i, row := range rows { for i, row := range rows {
t := db.ListenActivityItem{ t := db.ListenActivityItem{
Start: row.BucketedListensBucketStartDate, Start: row.Day.Time,
Listens: row.ListenCount, Listens: row.ListenCount,
} }
listenActivity[i] = t listenActivity[i] = t

3
internal/db/timeframe.go
View file

@ -13,11 +13,12 @@ type Timeframe struct {
ToUnix int64 ToUnix int64
From time.Time From time.Time
To time.Time To time.Time
Timezone *time.Location
} }
func TimeframeToTimeRange(tf Timeframe) (t1, t2 time.Time) { func TimeframeToTimeRange(tf Timeframe) (t1, t2 time.Time) {
now := time.Now() now := time.Now()
loc := now.Location() loc := tf.Timezone
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
// 1. Explicit From / To (time.Time) — highest precedence // 1. Explicit From / To (time.Time) — highest precedence

186
internal/repository/listen.sql.go
View file

@ -695,43 +695,29 @@ func (q *Queries) InsertListen(ctx context.Context, arg InsertListenParams) erro
} }
const listenActivity = `-- name: ListenActivity :many const listenActivity = `-- name: ListenActivity :many
WITH buckets AS ( SELECT
SELECT (listened_at AT TIME ZONE $1::text)::date as day,
d::date AS bucket_start_date, COUNT(*) AS listen_count
(d + $3::interval)::date AS bucket_end_date FROM listens
FROM generate_series( WHERE listened_at >= $2
$1::date, AND listened_at < $3
$2::date, GROUP BY day
$3::interval ORDER BY day
) AS d
),
bucketed_listens AS (
SELECT
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_date::timestamptz
AND l.listened_at < b.bucket_end_date::timestamptz
GROUP BY b.bucket_start_date
ORDER BY b.bucket_start_date
)
SELECT bucketed_listens.bucket_start_date::timestamptz, listen_count FROM bucketed_listens
` `
type ListenActivityParams struct { type ListenActivityParams struct {
Column1 pgtype.Date Column1 string
Column2 pgtype.Date ListenedAt time.Time
Column3 pgtype.Interval ListenedAt_2 time.Time
} }
type ListenActivityRow struct { type ListenActivityRow struct {
BucketedListensBucketStartDate time.Time Day pgtype.Date
ListenCount int64 ListenCount int64
} }
func (q *Queries) ListenActivity(ctx context.Context, arg ListenActivityParams) ([]ListenActivityRow, error) { func (q *Queries) ListenActivity(ctx context.Context, arg ListenActivityParams) ([]ListenActivityRow, error) {
rows, err := q.db.Query(ctx, listenActivity, arg.Column1, arg.Column2, arg.Column3) rows, err := q.db.Query(ctx, listenActivity, arg.Column1, arg.ListenedAt, arg.ListenedAt_2)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -739,7 +725,7 @@ func (q *Queries) ListenActivity(ctx context.Context, arg ListenActivityParams)
var items []ListenActivityRow var items []ListenActivityRow
for rows.Next() { for rows.Next() {
var i ListenActivityRow var i ListenActivityRow
if err := rows.Scan(&i.BucketedListensBucketStartDate, &i.ListenCount); err != nil { if err := rows.Scan(&i.Day, &i.ListenCount); err != nil {
return nil, err return nil, err
} }
items = append(items, i) items = append(items, i)
@ -751,46 +737,36 @@ func (q *Queries) ListenActivity(ctx context.Context, arg ListenActivityParams)
} }
const listenActivityForArtist = `-- name: ListenActivityForArtist :many const listenActivityForArtist = `-- name: ListenActivityForArtist :many
WITH buckets AS ( SELECT
SELECT generate_series($1::timestamptz, $2::timestamptz, $3::interval) AS bucket_start (listened_at AT TIME ZONE $1::text)::date as day,
), COUNT(*) AS listen_count
filtered_listens AS ( FROM listens l
SELECT l.track_id, l.listened_at, l.client, l.user_id JOIN tracks t ON l.track_id = t.id
FROM listens l JOIN artist_tracks at ON t.id = at.track_id
JOIN artist_tracks t ON l.track_id = t.track_id WHERE l.listened_at >= $2
WHERE t.artist_id = $4 AND l.listened_at < $3
), AND at.artist_id = $4
bucketed_listens AS ( GROUP BY day
SELECT ORDER BY day
b.bucket_start,
COUNT(l.listened_at) AS listen_count
FROM buckets b
LEFT JOIN filtered_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
)
SELECT bucket_start, listen_count FROM bucketed_listens
` `
type ListenActivityForArtistParams struct { type ListenActivityForArtistParams struct {
Column1 time.Time Column1 string
Column2 time.Time ListenedAt time.Time
Column3 pgtype.Interval ListenedAt_2 time.Time
ArtistID int32 ArtistID int32
} }
type ListenActivityForArtistRow struct { type ListenActivityForArtistRow struct {
BucketStart time.Time Day pgtype.Date
ListenCount int64 ListenCount int64
} }
func (q *Queries) ListenActivityForArtist(ctx context.Context, arg ListenActivityForArtistParams) ([]ListenActivityForArtistRow, error) { func (q *Queries) ListenActivityForArtist(ctx context.Context, arg ListenActivityForArtistParams) ([]ListenActivityForArtistRow, error) {
rows, err := q.db.Query(ctx, listenActivityForArtist, rows, err := q.db.Query(ctx, listenActivityForArtist,
arg.Column1, arg.Column1,
arg.Column2, arg.ListenedAt,
arg.Column3, arg.ListenedAt_2,
arg.ArtistID, arg.ArtistID,
) )
if err != nil { if err != nil {
@ -800,7 +776,7 @@ func (q *Queries) ListenActivityForArtist(ctx context.Context, arg ListenActivit
var items []ListenActivityForArtistRow var items []ListenActivityForArtistRow
for rows.Next() { for rows.Next() {
var i ListenActivityForArtistRow var i ListenActivityForArtistRow
if err := rows.Scan(&i.BucketStart, &i.ListenCount); err != nil { if err := rows.Scan(&i.Day, &i.ListenCount); err != nil {
return nil, err return nil, err
} }
items = append(items, i) items = append(items, i)
@ -812,46 +788,35 @@ func (q *Queries) ListenActivityForArtist(ctx context.Context, arg ListenActivit
} }
const listenActivityForRelease = `-- name: ListenActivityForRelease :many const listenActivityForRelease = `-- name: ListenActivityForRelease :many
WITH buckets AS ( SELECT
SELECT generate_series($1::timestamptz, $2::timestamptz, $3::interval) AS bucket_start (listened_at AT TIME ZONE $1::text)::date as day,
), COUNT(*) AS listen_count
filtered_listens AS ( FROM listens l
SELECT l.track_id, l.listened_at, l.client, l.user_id JOIN tracks t ON l.track_id = t.id
FROM listens l WHERE l.listened_at >= $2
JOIN tracks t ON l.track_id = t.id AND l.listened_at < $3
WHERE t.release_id = $4 AND t.release_id = $4
), GROUP BY day
bucketed_listens AS ( ORDER BY day
SELECT
b.bucket_start,
COUNT(l.listened_at) AS listen_count
FROM buckets b
LEFT JOIN filtered_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
)
SELECT bucket_start, listen_count FROM bucketed_listens
` `
type ListenActivityForReleaseParams struct { type ListenActivityForReleaseParams struct {
Column1 time.Time Column1 string
Column2 time.Time ListenedAt time.Time
Column3 pgtype.Interval ListenedAt_2 time.Time
ReleaseID int32 ReleaseID int32
} }
type ListenActivityForReleaseRow struct { type ListenActivityForReleaseRow struct {
BucketStart time.Time Day pgtype.Date
ListenCount int64 ListenCount int64
} }
func (q *Queries) ListenActivityForRelease(ctx context.Context, arg ListenActivityForReleaseParams) ([]ListenActivityForReleaseRow, error) { func (q *Queries) ListenActivityForRelease(ctx context.Context, arg ListenActivityForReleaseParams) ([]ListenActivityForReleaseRow, error) {
rows, err := q.db.Query(ctx, listenActivityForRelease, rows, err := q.db.Query(ctx, listenActivityForRelease,
arg.Column1, arg.Column1,
arg.Column2, arg.ListenedAt,
arg.Column3, arg.ListenedAt_2,
arg.ReleaseID, arg.ReleaseID,
) )
if err != nil { if err != nil {
@ -861,7 +826,7 @@ func (q *Queries) ListenActivityForRelease(ctx context.Context, arg ListenActivi
var items []ListenActivityForReleaseRow var items []ListenActivityForReleaseRow
for rows.Next() { for rows.Next() {
var i ListenActivityForReleaseRow var i ListenActivityForReleaseRow
if err := rows.Scan(&i.BucketStart, &i.ListenCount); err != nil { if err := rows.Scan(&i.Day, &i.ListenCount); err != nil {
return nil, err return nil, err
} }
items = append(items, i) items = append(items, i)
@ -873,46 +838,35 @@ func (q *Queries) ListenActivityForRelease(ctx context.Context, arg ListenActivi
} }
const listenActivityForTrack = `-- name: ListenActivityForTrack :many const listenActivityForTrack = `-- name: ListenActivityForTrack :many
WITH buckets AS ( SELECT
SELECT generate_series($1::timestamptz, $2::timestamptz, $3::interval) AS bucket_start (listened_at AT TIME ZONE $1::text)::date as day,
), COUNT(*) AS listen_count
filtered_listens AS ( FROM listens l
SELECT l.track_id, l.listened_at, l.client, l.user_id JOIN tracks t ON l.track_id = t.id
FROM listens l WHERE l.listened_at >= $2
JOIN tracks t ON l.track_id = t.id AND l.listened_at < $3
WHERE t.id = $4 AND t.id = $4
), GROUP BY day
bucketed_listens AS ( ORDER BY day
SELECT
b.bucket_start,
COUNT(l.listened_at) AS listen_count
FROM buckets b
LEFT JOIN filtered_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
)
SELECT bucket_start, listen_count FROM bucketed_listens
` `
type ListenActivityForTrackParams struct { type ListenActivityForTrackParams struct {
Column1 time.Time Column1 string
Column2 time.Time ListenedAt time.Time
Column3 pgtype.Interval ListenedAt_2 time.Time
ID int32 ID int32
} }
type ListenActivityForTrackRow struct { type ListenActivityForTrackRow struct {
BucketStart time.Time Day pgtype.Date
ListenCount int64 ListenCount int64
} }
func (q *Queries) ListenActivityForTrack(ctx context.Context, arg ListenActivityForTrackParams) ([]ListenActivityForTrackRow, error) { func (q *Queries) ListenActivityForTrack(ctx context.Context, arg ListenActivityForTrackParams) ([]ListenActivityForTrackRow, error) {
rows, err := q.db.Query(ctx, listenActivityForTrack, rows, err := q.db.Query(ctx, listenActivityForTrack,
arg.Column1, arg.Column1,
arg.Column2, arg.ListenedAt,
arg.Column3, arg.ListenedAt_2,
arg.ID, arg.ID,
) )
if err != nil { if err != nil {
@ -922,7 +876,7 @@ func (q *Queries) ListenActivityForTrack(ctx context.Context, arg ListenActivity
var items []ListenActivityForTrackRow var items []ListenActivityForTrackRow
for rows.Next() { for rows.Next() {
var i ListenActivityForTrackRow var i ListenActivityForTrackRow
if err := rows.Scan(&i.BucketStart, &i.ListenCount); err != nil { if err := rows.Scan(&i.Day, &i.ListenCount); err != nil {
return nil, err return nil, err
} }
items = append(items, i) items = append(items, i)