From 46e4d52c5884cca01e8199e21e19ba9d6156cbc4 Mon Sep 17 00:00:00 2001
From: Slick Daddy <129640104+slick-daddy@users.noreply.github.com>
Date: Thu, 3 Sep 2026 01:09:54 +0300
Subject: [PATCH] fix(api): exclude deleted scenes from performer studio scene
 counts

GetStudiosByPerformer and GetStudiosByPerformerAndNetwork were counting
soft-deleted scenes in scene_count, inflating counts on performer studio
lists. Add scenes.deleted = FALSE filter to both queries.
---
 internal/queries/sql/studio.sql | 332 ++++++++++++++++----------------
 internal/queries/studio.sql.go  |   4 +-
 2 files changed, 168 insertions(+), 168 deletions(-)

diff --git a/internal/queries/sql/studio.sql b/internal/queries/sql/studio.sql
index ec621c191..b12f993f8 100644
--- a/internal/queries/sql/studio.sql
+++ b/internal/queries/sql/studio.sql
@@ -1,166 +1,166 @@
--- Studio queries
-
--- name: CreateStudio :one
-INSERT INTO studios (id, name, parent_studio_id, created_at, updated_at)
-VALUES ($1, $2, $3, now(), now())
-RETURNING *;
-
--- name: UpdateStudio :one
-UPDATE studios 
-SET name = $2, parent_studio_id = $3, updated_at = NOW()
-WHERE id = $1
-RETURNING *;
-
--- name: DeleteStudio :exec
-DELETE FROM studios WHERE id = $1;
-
--- name: SoftDeleteStudio :one
-UPDATE studios SET deleted = true, updated_at = NOW() WHERE id = $1
-RETURNING *;
-
--- name: FindStudio :one
-SELECT * FROM studios WHERE id = $1;
-
--- name: GetStudios :many
-SELECT * FROM studios WHERE id = ANY($1::UUID[]) ORDER BY name;
-
--- name: FindStudioByName :one
-SELECT * FROM studios WHERE UPPER(name) = UPPER($1) AND deleted = false;
-
--- name: SearchStudios :many
-SELECT
-    studio_id,
-    pdb.agg('{"value_count": {"field": "studio_id"}}') OVER () as total_count
-FROM studio_search
-WHERE studio_id @@@ paradedb.disjunction_max(disjuncts => ARRAY[
-    paradedb.boost(factor => 2, query => paradedb.match(field => 'name', value => sqlc.narg('term')::TEXT)),
-    paradedb.match(field => 'network', value => sqlc.narg('term')::TEXT),
-    paradedb.match(field => 'aliases', value => sqlc.narg('term')::TEXT)
-])
-ORDER BY pdb.score(studio_id) DESC
-LIMIT sqlc.arg('limit');
-
--- name: GetStudiosByPerformer :many
-SELECT
-    sqlc.embed(studios),
-    COUNT(scenes.id) as scene_count
-FROM studios
-JOIN scenes ON studios.id = scenes.studio_id
-JOIN scene_performers SP ON scenes.id = SP.scene_id
-WHERE SP.performer_id = $1
-GROUP BY studios.id;
-
--- name: GetStudiosByPerformerAndNetwork :many
--- Get studios where performer has scenes, filtered to a studio network (the studio, its parent, and children)
-WITH studio_network AS (
-    -- The studio itself
-    SELECT sqlc.arg('studio_id')::uuid AS id
-    UNION
-    -- Parent studio (if exists)
-    SELECT parent_studio_id AS id FROM studios WHERE id = sqlc.arg('studio_id') AND parent_studio_id IS NOT NULL
-    UNION
-    -- Child studios
-    SELECT id FROM studios WHERE parent_studio_id = sqlc.arg('studio_id') AND deleted = FALSE
-)
-SELECT
-    sqlc.embed(studios),
-    COUNT(scenes.id) as scene_count
-FROM studios
-JOIN scenes ON studios.id = scenes.studio_id
-JOIN scene_performers SP ON scenes.id = SP.scene_id
-WHERE SP.performer_id = sqlc.arg('performer_id')
-  AND studios.id IN (SELECT id FROM studio_network WHERE id IS NOT NULL)
-GROUP BY studios.id;
-
--- name: GetChildStudios :many
-SELECT * FROM studios WHERE parent_studio_id = $1 AND deleted = false ORDER BY name;
-
--- Studio URLs
-
--- name: CreateStudioURLs :copyfrom
-INSERT INTO studio_urls (studio_id, url, site_id) VALUES ($1, $2, $3);
-
--- name: DeleteStudioURLs :exec
-DELETE FROM studio_urls WHERE studio_id = $1;
-
--- name: GetStudioURLs :many
-SELECT * FROM studio_urls WHERE studio_id = $1;
-
--- Studio images
-
--- name: CreateStudioImages :copyfrom
-INSERT INTO studio_images (studio_id, image_id) VALUES ($1, $2);
-
--- name: GetStudioImages :many
-SELECT image_id FROM studio_images WHERE studio_id = $1;
-
--- name: DeleteStudioImages :exec
-DELETE FROM studio_images WHERE studio_id = $1;
-
--- Studio aliases
-
--- name: CreateStudioAliases :copyfrom
-INSERT INTO studio_aliases (studio_id, alias) VALUES ($1, $2);
-
--- name: DeleteStudioAliases :exec
-DELETE FROM studio_aliases WHERE studio_id = $1;
-
--- name: GetStudioAliases :many
-SELECT alias FROM studio_aliases WHERE studio_id = $1;
-
--- name: FindStudioByAlias :one
-SELECT s.* FROM studios s
-JOIN studio_aliases sa ON s.id = sa.studio_id
-WHERE UPPER(sa.alias) = UPPER($1) AND s.deleted = false;
-
--- Studio redirects
-
--- name: CreateStudioRedirect :exec
-INSERT INTO studio_redirects (source_id, target_id) VALUES ($1, $2);
-
--- name: UpdateStudioRedirects :exec
-UPDATE studio_redirects SET target_id = @new_target_id WHERE target_id = @old_target_id;
-
--- name: FindStudioWithRedirect :one
-SELECT S.* FROM studios S
-WHERE S.id = $1 AND S.deleted = FALSE
-UNION
-SELECT SS.* FROM studio_redirects R
-JOIN studios SS ON SS.id = R.target_id
-WHERE R.source_id = $1 AND SS.deleted = FALSE;
-
--- name: FindStudioUrlsByIds :many
--- Get URLs for multiple studios
-SELECT studio_id, url, site_id FROM studio_urls WHERE studio_id = ANY(sqlc.arg(studio_ids)::UUID[]);
-
--- name: FindStudioAliasesByIds :many
--- Get aliases for multiple studios
-SELECT studio_id, alias FROM studio_aliases WHERE studio_id = ANY(sqlc.arg(studio_ids)::UUID[]);
-
--- name: FindStudioFavoritesByIds :many
--- Check favorite status for multiple studios for a specific user
-SELECT studio_id, (studio_id IS NOT NULL)::BOOLEAN as is_favorite
-FROM studio_favorites
-WHERE studio_id = ANY(sqlc.arg(studio_ids)::UUID[]) AND user_id = sqlc.arg(user_id);
-
--- Studio favorites
-
--- name: CreateStudioFavorite :exec
-INSERT INTO studio_favorites (studio_id, user_id, created_at) VALUES ($1, $2, NOW())
-ON CONFLICT (studio_id, user_id) DO NOTHING;
-
--- name: DeleteStudioFavorite :exec
-DELETE FROM studio_favorites WHERE studio_id = $1 AND user_id = $2;
-
--- name: DeleteStudioFavorites :exec
-DELETE FROM studio_favorites WHERE studio_id = $1;
-
--- name: ReassignStudioFavorites :exec
-UPDATE studio_favorites
-   SET studio_id = @new_studio_id
-   WHERE studio_favorites.studio_id = @old_studio_id
-   AND user_id NOT IN (
-    SELECT user_id
-    FROM studio_favorites SF
-    WHERE SF.studio_id = @new_studio_id
-  );
+-- Studio queries
+
+-- name: CreateStudio :one
+INSERT INTO studios (id, name, parent_studio_id, created_at, updated_at)
+VALUES ($1, $2, $3, now(), now())
+RETURNING *;
+
+-- name: UpdateStudio :one
+UPDATE studios 
+SET name = $2, parent_studio_id = $3, updated_at = NOW()
+WHERE id = $1
+RETURNING *;
+
+-- name: DeleteStudio :exec
+DELETE FROM studios WHERE id = $1;
+
+-- name: SoftDeleteStudio :one
+UPDATE studios SET deleted = true, updated_at = NOW() WHERE id = $1
+RETURNING *;
+
+-- name: FindStudio :one
+SELECT * FROM studios WHERE id = $1;
+
+-- name: GetStudios :many
+SELECT * FROM studios WHERE id = ANY($1::UUID[]) ORDER BY name;
+
+-- name: FindStudioByName :one
+SELECT * FROM studios WHERE UPPER(name) = UPPER($1) AND deleted = false;
+
+-- name: SearchStudios :many
+SELECT
+    studio_id,
+    pdb.agg('{"value_count": {"field": "studio_id"}}') OVER () as total_count
+FROM studio_search
+WHERE studio_id @@@ paradedb.disjunction_max(disjuncts => ARRAY[
+    paradedb.boost(factor => 2, query => paradedb.match(field => 'name', value => sqlc.narg('term')::TEXT)),
+    paradedb.match(field => 'network', value => sqlc.narg('term')::TEXT),
+    paradedb.match(field => 'aliases', value => sqlc.narg('term')::TEXT)
+])
+ORDER BY pdb.score(studio_id) DESC
+LIMIT sqlc.arg('limit');
+
+-- name: GetStudiosByPerformer :many
+SELECT
+    sqlc.embed(studios),
+    COUNT(scenes.id) as scene_count
+FROM studios
+JOIN scenes ON studios.id = scenes.studio_id AND scenes.deleted = FALSE
+JOIN scene_performers SP ON scenes.id = SP.scene_id
+WHERE SP.performer_id = $1
+GROUP BY studios.id;
+
+-- name: GetStudiosByPerformerAndNetwork :many
+-- Get studios where performer has scenes, filtered to a studio network (the studio, its parent, and children)
+WITH studio_network AS (
+    -- The studio itself
+    SELECT sqlc.arg('studio_id')::uuid AS id
+    UNION
+    -- Parent studio (if exists)
+    SELECT parent_studio_id AS id FROM studios WHERE id = sqlc.arg('studio_id') AND parent_studio_id IS NOT NULL
+    UNION
+    -- Child studios
+    SELECT id FROM studios WHERE parent_studio_id = sqlc.arg('studio_id') AND deleted = FALSE
+)
+SELECT
+    sqlc.embed(studios),
+    COUNT(scenes.id) as scene_count
+FROM studios
+JOIN scenes ON studios.id = scenes.studio_id AND scenes.deleted = FALSE
+JOIN scene_performers SP ON scenes.id = SP.scene_id
+WHERE SP.performer_id = sqlc.arg('performer_id')
+  AND studios.id IN (SELECT id FROM studio_network WHERE id IS NOT NULL)
+GROUP BY studios.id;
+
+-- name: GetChildStudios :many
+SELECT * FROM studios WHERE parent_studio_id = $1 AND deleted = false ORDER BY name;
+
+-- Studio URLs
+
+-- name: CreateStudioURLs :copyfrom
+INSERT INTO studio_urls (studio_id, url, site_id) VALUES ($1, $2, $3);
+
+-- name: DeleteStudioURLs :exec
+DELETE FROM studio_urls WHERE studio_id = $1;
+
+-- name: GetStudioURLs :many
+SELECT * FROM studio_urls WHERE studio_id = $1;
+
+-- Studio images
+
+-- name: CreateStudioImages :copyfrom
+INSERT INTO studio_images (studio_id, image_id) VALUES ($1, $2);
+
+-- name: GetStudioImages :many
+SELECT image_id FROM studio_images WHERE studio_id = $1;
+
+-- name: DeleteStudioImages :exec
+DELETE FROM studio_images WHERE studio_id = $1;
+
+-- Studio aliases
+
+-- name: CreateStudioAliases :copyfrom
+INSERT INTO studio_aliases (studio_id, alias) VALUES ($1, $2);
+
+-- name: DeleteStudioAliases :exec
+DELETE FROM studio_aliases WHERE studio_id = $1;
+
+-- name: GetStudioAliases :many
+SELECT alias FROM studio_aliases WHERE studio_id = $1;
+
+-- name: FindStudioByAlias :one
+SELECT s.* FROM studios s
+JOIN studio_aliases sa ON s.id = sa.studio_id
+WHERE UPPER(sa.alias) = UPPER($1) AND s.deleted = false;
+
+-- Studio redirects
+
+-- name: CreateStudioRedirect :exec
+INSERT INTO studio_redirects (source_id, target_id) VALUES ($1, $2);
+
+-- name: UpdateStudioRedirects :exec
+UPDATE studio_redirects SET target_id = @new_target_id WHERE target_id = @old_target_id;
+
+-- name: FindStudioWithRedirect :one
+SELECT S.* FROM studios S
+WHERE S.id = $1 AND S.deleted = FALSE
+UNION
+SELECT SS.* FROM studio_redirects R
+JOIN studios SS ON SS.id = R.target_id
+WHERE R.source_id = $1 AND SS.deleted = FALSE;
+
+-- name: FindStudioUrlsByIds :many
+-- Get URLs for multiple studios
+SELECT studio_id, url, site_id FROM studio_urls WHERE studio_id = ANY(sqlc.arg(studio_ids)::UUID[]);
+
+-- name: FindStudioAliasesByIds :many
+-- Get aliases for multiple studios
+SELECT studio_id, alias FROM studio_aliases WHERE studio_id = ANY(sqlc.arg(studio_ids)::UUID[]);
+
+-- name: FindStudioFavoritesByIds :many
+-- Check favorite status for multiple studios for a specific user
+SELECT studio_id, (studio_id IS NOT NULL)::BOOLEAN as is_favorite
+FROM studio_favorites
+WHERE studio_id = ANY(sqlc.arg(studio_ids)::UUID[]) AND user_id = sqlc.arg(user_id);
+
+-- Studio favorites
+
+-- name: CreateStudioFavorite :exec
+INSERT INTO studio_favorites (studio_id, user_id, created_at) VALUES ($1, $2, NOW())
+ON CONFLICT (studio_id, user_id) DO NOTHING;
+
+-- name: DeleteStudioFavorite :exec
+DELETE FROM studio_favorites WHERE studio_id = $1 AND user_id = $2;
+
+-- name: DeleteStudioFavorites :exec
+DELETE FROM studio_favorites WHERE studio_id = $1;
+
+-- name: ReassignStudioFavorites :exec
+UPDATE studio_favorites
+   SET studio_id = @new_studio_id
+   WHERE studio_favorites.studio_id = @old_studio_id
+   AND user_id NOT IN (
+    SELECT user_id
+    FROM studio_favorites SF
+    WHERE SF.studio_id = @new_studio_id
+  );
diff --git a/internal/queries/studio.sql.go b/internal/queries/studio.sql.go
index af95e7962..a29d58dfe 100644
--- a/internal/queries/studio.sql.go
+++ b/internal/queries/studio.sql.go
@@ -452,7 +452,7 @@ SELECT
     studios.id, studios.name, studios.parent_studio_id, studios.created_at, studios.updated_at, studios.deleted,
     COUNT(scenes.id) as scene_count
 FROM studios
-JOIN scenes ON studios.id = scenes.studio_id
+JOIN scenes ON studios.id = scenes.studio_id AND scenes.deleted = FALSE
 JOIN scene_performers SP ON scenes.id = SP.scene_id
 WHERE SP.performer_id = $1
 GROUP BY studios.id
@@ -506,7 +506,7 @@ SELECT
     studios.id, studios.name, studios.parent_studio_id, studios.created_at, studios.updated_at, studios.deleted,
     COUNT(scenes.id) as scene_count
 FROM studios
-JOIN scenes ON studios.id = scenes.studio_id
+JOIN scenes ON studios.id = scenes.studio_id AND scenes.deleted = FALSE
 JOIN scene_performers SP ON scenes.id = SP.scene_id
 WHERE SP.performer_id = $1
   AND studios.id IN (SELECT id FROM studio_network WHERE id IS NOT NULL)