chore(git): merge dev branch updates

Signed-off-by: Gabriel Harris-Rouquette <gabizou@me.com>

Author: gabizou

cmd/frontend/main.go

@@ -10,7 +10,7 @@ import (
 	"time"
 
 	"github.com/exaring/otelpgx"
-	"github.com/go-chi/httplog/v2"
+	"github.com/go-chi/httplog/v3"
 	"github.com/go-slog/otelslog"
 	"github.com/jackc/pgx/v5/pgxpool"
 	"github.com/klauspost/compress/gzhttp"
@@ -114,21 +114,21 @@ func NewOTel(lc fx.Lifecycle, logs *logging.Result) *otelsetup.Result {
 
 func NewMux(fe *frontend.Server, otel *otelsetup.Result) http.Handler {
 	mux := http.NewServeMux()
-
 	fe.RegisterRoutes(mux)
 
-	logger := httplog.NewLogger("soad-frontend", httplog.Options{
-		LogLevel:       slog.LevelInfo,
-		JSON:           true,
-		Concise:        true,
-		RequestHeaders: true,
-		Writer:         os.Stderr,
-	})
+	logger := slog.New(slog.NewJSONHandler(os.Stderr, nil)).
+		With(slog.String("service", "soad-frontend"))
 
 	handler := gzhttp.GzipHandler(otelhttp.NewHandler(mux, "soad-frontend"))
-	loggedHandler := httplog.RequestLogger(logger)(handler)
-
-	// Outer mux: /healthz and /metrics bypass request logging.
+	loggedHandler := httplog.RequestLogger(logger, &httplog.Options{
+		Level:             slog.LevelInfo,
+		Schema:            httplog.SchemaOTEL,
+		RecoverPanics:     true,
+		LogRequestHeaders: []string{"User-Agent", "Referer"},
+	})(handler)
+
+	// Outer mux: /healthz and /metrics bypass tracing, gzip, and request logging
+	// to keep probe/scrape traffic off the observability pipelines.
 	outer := http.NewServeMux()
 	outer.HandleFunc("GET /healthz", func(w http.ResponseWriter, r *http.Request) {
 		w.WriteHeader(http.StatusOK)

cmd/server/main.go

@@ -11,7 +11,7 @@ import (
 	"time"
 
 	"github.com/exaring/otelpgx"
-	"github.com/go-chi/httplog/v2"
+	"github.com/go-chi/httplog/v3"
 	"github.com/go-slog/otelslog"
 	"github.com/jackc/pgx/v5/pgxpool"
 	"github.com/spongepowered/systemofadownload/internal/logging"
@@ -172,18 +172,19 @@ func NewMux(h *httpapi.Handler, cfg *Config, otel *otelsetup.Result) http.Handle
 	apiHandler := api.NewStrictHandler(h, middlewares)
 	mux := http.NewServeMux()
 
-	logger := httplog.NewLogger("soad-server", httplog.Options{
-		LogLevel:       slog.LevelInfo,
-		JSON:           true,
-		Concise:        true,
-		RequestHeaders: true,
-		Writer:         os.Stderr,
-	})
+	logger := slog.New(slog.NewJSONHandler(os.Stderr, nil)).
+		With(slog.String("service", "soad-server"))
 
 	handler := otelhttp.NewHandler(api.HandlerFromMux(apiHandler, mux), "soad-server")
-	loggedHandler := httplog.RequestLogger(logger)(handler)
-
-	// Outer mux: /healthz and /metrics bypass request logging.
+	loggedHandler := httplog.RequestLogger(logger, &httplog.Options{
+		Level:             slog.LevelInfo,
+		Schema:            httplog.SchemaOTEL,
+		RecoverPanics:     true,
+		LogRequestHeaders: []string{"User-Agent", "Referer"},
+	})(handler)
+
+	// Outer mux: /healthz and /metrics bypass tracing and request logging
+	// to keep probe/scrape traffic off the observability pipelines.
 	outer := http.NewServeMux()
 	outer.HandleFunc("/healthz", func(w http.ResponseWriter, r *http.Request) {
 		w.WriteHeader(http.StatusOK)

db/migrations/000005_versioned_tags_covering_index.down.sql

@@ -0,0 +1 @@
+DROP INDEX IF EXISTS idx_versioned_tags_av_key_value;

db/migrations/000005_versioned_tags_covering_index.up.sql

@@ -0,0 +1,2 @@
+CREATE INDEX idx_versioned_tags_av_key_value
+    ON artifact_versioned_tags (artifact_version_id, tag_key, tag_value);

db/schema.sql

@@ -46,5 +46,7 @@ CREATE TABLE artifact_versioned_tags (
 );
 
 CREATE INDEX idx_versioned_tags_key_value ON artifact_versioned_tags(tag_key, tag_value, artifact_version_id);
+CREATE INDEX idx_versioned_tags_av_key_value ON artifact_versioned_tags(artifact_version_id, tag_key, tag_value);
+CREATE INDEX idx_versioned_assets_version_id ON artifact_versioned_assets(artifact_version_id);
 CREATE INDEX idx_versions_artifact_sort ON artifact_versions(artifact_id, sort_order DESC);
 CREATE INDEX idx_versions_artifact_recommended_sort ON artifact_versions(artifact_id, recommended, sort_order DESC);

go.mod

@@ -4,7 +4,7 @@ go 1.26.1
 
 require (
 	github.com/exaring/otelpgx v0.10.0
-	github.com/go-chi/httplog/v2 v2.1.1
+	github.com/go-chi/httplog/v3 v3.3.0
 	github.com/go-git/go-git/v5 v5.18.0
 	github.com/go-slog/otelslog v0.3.0
 	github.com/google/go-cmp v0.7.0

go.sum

@@ -69,16 +69,14 @@ github.com/gliderlabs/ssh v0.3.8 h1:a4YXD1V7xMF9g5nTkdfnja3Sxy1PVDCj1Zg4Wb8vY6c=
 github.com/gliderlabs/ssh v0.3.8/go.mod h1:xYoytBv1sV0aL3CavoDuJIQNURXkkfPA/wxQ1pL1fAU=
 github.com/go-chi/chi/v5 v5.2.2 h1:CMwsvRVTbXVytCk1Wd72Zy1LAsAh9GxMmSNWLHCG618=
 github.com/go-chi/chi/v5 v5.2.2/go.mod h1:L2yAIGWB3H+phAw1NxKwWM+7eUH/lU8pOMm5hHcoops=
-github.com/go-chi/httplog/v2 v2.1.1 h1:ojojiu4PIaoeJ/qAO4GWUxJqvYUTobeo7zmuHQJAxRk=
-github.com/go-chi/httplog/v2 v2.1.1/go.mod h1:/XXdxicJsp4BA5fapgIC3VuTD+z0Z/VzukoB3VDc1YE=
+github.com/go-chi/httplog/v3 v3.3.0 h1:Gr6Y7nSzbpyCyRwKPOVKjDH3BH6TH5uvRNDsTZWDpvU=
+github.com/go-chi/httplog/v3 v3.3.0/go.mod h1:N/J1l5l1fozUrqIVuT8Z/HzNeSy8TF2EFyokPLe6y2w=
 github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 h1:+zs/tPmkDkHx3U66DAb0lQFJrpS6731Oaa12ikc+DiI=
 github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376/go.mod h1:an3vInlBmSxCcxctByoQdvwPiA7DTK7jaaFDBTtu0ic=
 github.com/go-git/go-billy/v5 v5.8.0 h1:I8hjc3LbBlXTtVuFNJuwYuMiHvQJDq1AT6u4DwDzZG0=
 github.com/go-git/go-billy/v5 v5.8.0/go.mod h1:RpvI/rw4Vr5QA+Z60c6d6LXH0rYJo0uD5SqfmrrheCY=
 github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399 h1:eMje31YglSBqCdIqdhKBW8lokaMrL3uTkpGYlE2OOT4=
 github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399/go.mod h1:1OCfN199q1Jm3HZlxleg+Dw/mwps2Wbk9frAWm+4FII=
-github.com/go-git/go-git/v5 v5.17.2 h1:B+nkdlxdYrvyFK4GPXVU8w1U+YkbsgciIR7f2sZJ104=
-github.com/go-git/go-git/v5 v5.17.2/go.mod h1:pW/VmeqkanRFqR6AljLcs7EA7FbZaN5MQqO7oZADXpo=
 github.com/go-git/go-git/v5 v5.18.0 h1:O831KI+0PR51hM2kep6T8k+w0/LIAD490gvqMCvL5hM=
 github.com/go-git/go-git/v5 v5.18.0/go.mod h1:pW/VmeqkanRFqR6AljLcs7EA7FbZaN5MQqO7oZADXpo=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
@@ -238,42 +236,24 @@ go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ
 go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.67.0 h1:OyrsyzuttWTSur2qN/Lm0m2a8yqyIjUVBZcxFPuXq2o=
 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.67.0/go.mod h1:C2NGBr+kAB4bk3xtMXfZ94gqFDtg/GkI7e9zqGh5Beg=
-go.opentelemetry.io/otel v1.42.0 h1:lSQGzTgVR3+sgJDAU/7/ZMjN9Z+vUip7leaqBKy4sho=
-go.opentelemetry.io/otel v1.42.0/go.mod h1:lJNsdRMxCUIWuMlVJWzecSMuNjE7dOYyWlqOXWkdqCc=
 go.opentelemetry.io/otel v1.43.0 h1:mYIM03dnh5zfN7HautFE4ieIig9amkNANT+xcVxAj9I=
 go.opentelemetry.io/otel v1.43.0/go.mod h1:JuG+u74mvjvcm8vj8pI5XiHy1zDeoCS2LB1spIq7Ay0=
-go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.42.0 h1:H7O6RlGOMTizyl3R08Kn5pdM06bnH8oscSj7o11tmLA=
-go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.42.0/go.mod h1:mBFWu/WOVDkWWsR7Tx7h6EpQB8wsv7P0Yrh0Pb7othc=
 go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.43.0 h1:w1K+pCJoPpQifuVpsKamUdn9U0zM3xUziVOqsGksUrY=
 go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.43.0/go.mod h1:HBy4BjzgVE8139ieRI75oXm3EcDN+6GhD88JT1Kjvxg=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.42.0 h1:THuZiwpQZuHPul65w4WcwEnkX2QIuMT+UFoOrygtoJw=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.42.0/go.mod h1:J2pvYM5NGHofZ2/Ru6zw/TNWnEQp5crgyDeSrYpXkAw=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.43.0 h1:88Y4s2C8oTui1LGM6bTWkw0ICGcOLCAI5l6zsD1j20k=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.43.0/go.mod h1:Vl1/iaggsuRlrHf/hfPJPvVag77kKyvrLeD10kpMl+A=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.42.0 h1:uLXP+3mghfMf7XmV4PkGfFhFKuNWoCvvx5wP/wOXo0o=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.42.0/go.mod h1:v0Tj04armyT59mnURNUJf7RCKcKzq+lgJs6QSjHjaTc=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.43.0 h1:3iZJKlCZufyRzPzlQhUIWVmfltrXuGyfjREgGP3UUjc=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.43.0/go.mod h1:/G+nUPfhq2e+qiXMGxMwumDrP5jtzU+mWN7/sjT2rak=
 go.opentelemetry.io/otel/exporters/prometheus v0.64.0 h1:g0LRDXMX/G1SEZtK8zl8Chm4K6GBwRkjPKE36LxiTYs=
 go.opentelemetry.io/otel/exporters/prometheus v0.64.0/go.mod h1:UrgcjnarfdlBDP3GjDIJWe6HTprwSazNjwsI+Ru6hro=
-go.opentelemetry.io/otel/metric v1.42.0 h1:2jXG+3oZLNXEPfNmnpxKDeZsFI5o4J+nz6xUlaFdF/4=
-go.opentelemetry.io/otel/metric v1.42.0/go.mod h1:RlUN/7vTU7Ao/diDkEpQpnz3/92J9ko05BIwxYa2SSI=
 go.opentelemetry.io/otel/metric v1.43.0 h1:d7638QeInOnuwOONPp4JAOGfbCEpYb+K6DVWvdxGzgM=
 go.opentelemetry.io/otel/metric v1.43.0/go.mod h1:RDnPtIxvqlgO8GRW18W6Z/4P462ldprJtfxHxyKd2PY=
-go.opentelemetry.io/otel/sdk v1.42.0 h1:LyC8+jqk6UJwdrI/8VydAq/hvkFKNHZVIWuslJXYsDo=
-go.opentelemetry.io/otel/sdk v1.42.0/go.mod h1:rGHCAxd9DAph0joO4W6OPwxjNTYWghRWmkHuGbayMts=
 go.opentelemetry.io/otel/sdk v1.43.0 h1:pi5mE86i5rTeLXqoF/hhiBtUNcrAGHLKQdhg4h4V9Dg=
 go.opentelemetry.io/otel/sdk v1.43.0/go.mod h1:P+IkVU3iWukmiit/Yf9AWvpyRDlUeBaRg6Y+C58QHzg=
-go.opentelemetry.io/otel/sdk/metric v1.42.0 h1:D/1QR46Clz6ajyZ3G8SgNlTJKBdGp84q9RKCAZ3YGuA=
-go.opentelemetry.io/otel/sdk/metric v1.42.0/go.mod h1:Ua6AAlDKdZ7tdvaQKfSmnFTdHx37+J4ba8MwVCYM5hc=
 go.opentelemetry.io/otel/sdk/metric v1.43.0 h1:S88dyqXjJkuBNLeMcVPRFXpRw2fuwdvfCGLEo89fDkw=
 go.opentelemetry.io/otel/sdk/metric v1.43.0/go.mod h1:C/RJtwSEJ5hzTiUz5pXF1kILHStzb9zFlIEe85bhj6A=
-go.opentelemetry.io/otel/trace v1.42.0 h1:OUCgIPt+mzOnaUTpOQcBiM/PLQ/Op7oq6g4LenLmOYY=
-go.opentelemetry.io/otel/trace v1.42.0/go.mod h1:f3K9S+IFqnumBkKhRJMeaZeNk9epyhnCmQh/EysQCdc=
 go.opentelemetry.io/otel/trace v1.43.0 h1:BkNrHpup+4k4w+ZZ86CZoHHEkohws8AY+WTX09nk+3A=
 go.opentelemetry.io/otel/trace v1.43.0/go.mod h1:/QJhyVBUUswCphDVxq+8mld+AvhXZLhe+8WVFxiFff0=
-go.opentelemetry.io/proto/otlp v1.9.0 h1:l706jCMITVouPOqEnii2fIAuO3IVGBRPV5ICjceRb/A=
-go.opentelemetry.io/proto/otlp v1.9.0/go.mod h1:xE+Cx5E/eEHw+ISFkwPLwCZefwVjY+pqKg1qcK03+/4=
 go.opentelemetry.io/proto/otlp v1.10.0 h1:IQRWgT5srOCYfiWnpqUYz9CVmbO8bFmKcwYxpuCSL2g=
 go.opentelemetry.io/proto/otlp v1.10.0/go.mod h1:/CV4QoCR/S9yaPj8utp3lvQPoqMtxXdzn7ozvvozVqk=
 go.temporal.io/api v1.62.7 h1:joCtF30Dr+ynzrFJySewZsWbyf4AETZpuizHhFIyj/o=
@@ -355,18 +335,12 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=
-gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E=
-google.golang.org/genproto/googleapis/api v0.0.0-20260319164105-cd36c79ee9b0 h1:f3D8mgSgZxY7SMrLKd02nLQ9izWkzkvisJvVNgkts1w=
-google.golang.org/genproto/googleapis/api v0.0.0-20260319164105-cd36c79ee9b0/go.mod h1:EIQZ5bFCfRQDV4MhRle7+OgjNtZ6P1PiZBgAKuxXu/Y=
+gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4=
+gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E=
 google.golang.org/genproto/googleapis/api v0.0.0-20260401024825-9d38bb4040a9 h1:VPWxll4HlMw1Vs/qXtN7BvhZqsS9cdAittCNvVENElA=
 google.golang.org/genproto/googleapis/api v0.0.0-20260401024825-9d38bb4040a9/go.mod h1:7QBABkRtR8z+TEnmXTqIqwJLlzrZKVfAUm7tY3yGv0M=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20260319164105-cd36c79ee9b0 h1:WrVi7iN1ydLVeyPGOLBXhf09uZtKZEpS69YmVVnF1cg=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20260319164105-cd36c79ee9b0/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9 h1:m8qni9SQFH0tJc1X0vmnpw/0t+AImlSvp30sEupozUg=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8=
-google.golang.org/grpc v1.79.3 h1:sybAEdRIEtvcD68Gx7dmnwjZKlyfuc61Dyo9pGXXkKE=
-google.golang.org/grpc v1.79.3/go.mod h1:KmT0Kjez+0dde/v2j9vzwoAScgEPx/Bw1CYChhHLrHQ=
 google.golang.org/grpc v1.80.0 h1:Xr6m2WmWZLETvUNvIUmeD5OAagMw3FiKmMlTdViWsHM=
 google.golang.org/grpc v1.80.0/go.mod h1:ho/dLnxwi3EDJA4Zghp7k2Ec1+c2jqup0bFkw07bwF4=
 google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=

internal/repository/repository.go

@@ -316,21 +316,20 @@ type VersionsWithAssetsResult struct {
 
 // ListVersionsWithAssets returns paginated versions with pre-aggregated assets in a single query.
 // This is a frontend-optimized query that eliminates the N+1 pattern for the downloads page.
+//
+// Shape: filter versions in a CTE, paginate, THEN join assets — so the asset
+// LEFT JOIN and jsonb_agg only run for the current page, not the whole match set.
+// Each tag is an EXISTS subquery that hits the (artifact_version_id, tag_key)
+// primary key on artifact_versioned_tags.
 func (q *querierWithConn) ListVersionsWithAssets(ctx context.Context, params VersionQueryParams) (*VersionsWithAssetsResult, error) {
 	var args []any
 	argN := 1
 
-	query := `SELECT av.id, av.version, av.recommended, av.commit_body,
-	COUNT(*) OVER() AS total_count,
-	COALESCE(jsonb_agg(jsonb_build_object(
-		'classifier', ava.classifier,
-		'download_url', ava.download_url,
-		'extension', ava.extension
-	)) FILTER (WHERE ava.id IS NOT NULL), '[]'::jsonb) AS assets_json
-FROM artifact_versions av
-JOIN artifacts a ON av.artifact_id = a.id
-LEFT JOIN artifact_versioned_assets ava ON ava.artifact_version_id = av.id
-WHERE a.group_id = $` + strconv.Itoa(argN)
+	query := `WITH filtered AS (
+	SELECT av.id, av.version, av.recommended, av.commit_body, av.sort_order
+	FROM artifact_versions av
+	JOIN artifacts a ON av.artifact_id = a.id
+	WHERE a.group_id = $` + strconv.Itoa(argN)
 	args = append(args, params.GroupID)
 	argN++
 
@@ -344,31 +343,39 @@ WHERE a.group_id = $` + strconv.Itoa(argN)
 		argN++
 	}
 
-	if len(params.Tags) > 0 {
-		query += ` AND av.id IN (SELECT t.artifact_version_id FROM artifact_versioned_tags t WHERE (`
-		i := 0
-		for key, value := range params.Tags {
-			if i > 0 {
-				query += ` OR `
-			}
-			query += `(t.tag_key = $` + strconv.Itoa(argN) +
-				` AND (t.tag_value = $` + strconv.Itoa(argN+1) +
-				` OR t.tag_value LIKE $` + strconv.Itoa(argN+2) + `))`
-			args = append(args, key, value, value+".%")
-			argN += 3
-			i++
-		}
-		query += `) GROUP BY t.artifact_version_id HAVING COUNT(DISTINCT t.tag_key) = $` + strconv.Itoa(argN) + `)`
-		args = append(args, len(params.Tags))
-		argN++
+	// Prefix matching with dot boundary: "minecraft:1.12" matches "1.12" and
+	// "1.12.2" but NOT "1.120". Each tag becomes an independent EXISTS hitting
+	// the (artifact_version_id, tag_key) PK on artifact_versioned_tags.
+	for key, value := range params.Tags {
+		query += ` AND EXISTS (SELECT 1 FROM artifact_versioned_tags` +
+			` WHERE artifact_version_id = av.id` +
+			` AND tag_key = $` + strconv.Itoa(argN) +
+			` AND (tag_value = $` + strconv.Itoa(argN+1) +
+			` OR tag_value LIKE $` + strconv.Itoa(argN+2) + `))`
+		args = append(args, key, value, value+".%")
+		argN += 3
 	}
 
-	query += ` GROUP BY av.id, av.version, av.recommended, av.commit_body, av.sort_order`
-	query += ` ORDER BY av.sort_order DESC`
-	query += ` LIMIT $` + strconv.Itoa(argN)
+	query += `
+), page AS (
+	SELECT f.*, COUNT(*) OVER() AS total_count
+	FROM filtered f
+	ORDER BY f.sort_order DESC
+	LIMIT $` + strconv.Itoa(argN)
 	args = append(args, params.Limit)
 	argN++
-	query += ` OFFSET $` + strconv.Itoa(argN)
+	query += ` OFFSET $` + strconv.Itoa(argN) + `
+)
+SELECT p.id, p.version, p.recommended, p.commit_body, p.total_count,
+	COALESCE(jsonb_agg(jsonb_build_object(
+		'classifier', ava.classifier,
+		'download_url', ava.download_url,
+		'extension', ava.extension
+	)) FILTER (WHERE ava.id IS NOT NULL), '[]'::jsonb) AS assets_json
+FROM page p
+LEFT JOIN artifact_versioned_assets ava ON ava.artifact_version_id = p.id
+GROUP BY p.id, p.version, p.recommended, p.commit_body, p.total_count, p.sort_order
+ORDER BY p.sort_order DESC`
 	args = append(args, params.Offset)
 
 	rows, err := q.conn.Query(ctx, query, args...)