diff --git a/db/query/project.sql b/db/query/project.sql index 71d5652..a1f5e44 100644 --- a/db/query/project.sql +++ b/db/query/project.sql @@ -30,11 +30,11 @@ SELECT (SELECT json_agg(json_build_object('id', c.id, 'edit_summary', c.edit_summary) ORDER BY c.created_at DESC) FROM commits c WHERE c.project_id = p.id AND c.is_deleted = false), '[]' - )::json AS commits, - COALESCE( - (SELECT json_agg(json_build_object('id', s.id, 'status', s.status)) FROM submissions s WHERE s.project_id = p.id), - '[]' - )::json AS submissions, + )::json AS commits, + COALESCE( + (SELECT json_agg(json_build_object('id', s.id, 'status', s.status)) FROM submissions s WHERE s.project_id = p.id AND s.is_deleted = false), + '[]' + )::json AS submissions, json_build_object( 'id', u.id, 'email', u.email, @@ -84,11 +84,11 @@ RETURNING (SELECT json_agg(json_build_object('id', c.id, 'edit_summary', c.edit_summary) ORDER BY c.created_at DESC) FROM commits c WHERE c.project_id = projects.id AND c.is_deleted = false), '[]' - )::json AS commits, - COALESCE( - (SELECT json_agg(json_build_object('id', s.id, 'status', s.status)) FROM submissions s WHERE s.project_id = projects.id), - '[]' - )::json AS submissions, + )::json AS commits, + COALESCE( + (SELECT json_agg(json_build_object('id', s.id, 'status', s.status)) FROM submissions s WHERE s.project_id = projects.id AND s.is_deleted = false), + '[]' + )::json AS submissions, COALESCE( (SELECT json_agg(json_build_object( 'user_id', pm.user_id, 'role', pm.role, @@ -114,11 +114,11 @@ SELECT (SELECT json_agg(json_build_object('id', c.id, 'edit_summary', c.edit_summary) ORDER BY c.created_at DESC) FROM commits c WHERE c.project_id = p.id AND c.is_deleted = false), '[]' - )::json AS commits, - COALESCE( - (SELECT json_agg(json_build_object('id', s.id, 'status', s.status)) FROM submissions s WHERE s.project_id = p.id), - '[]' - )::json AS submissions, + )::json AS commits, + COALESCE( + (SELECT json_agg(json_build_object('id', s.id, 'status', s.status)) FROM submissions s WHERE s.project_id = p.id AND s.is_deleted = false), + '[]' + )::json AS submissions, json_build_object( 'id', u.id, 'email', u.email, @@ -190,7 +190,7 @@ SELECT '[]' )::json AS commits, COALESCE( - (SELECT json_agg(json_build_object('id', s.id, 'status', s.status)) FROM submissions s WHERE s.project_id = p.id), + (SELECT json_agg(json_build_object('id', s.id, 'status', s.status)) FROM submissions s WHERE s.project_id = p.id AND s.is_deleted = false), '[]' )::json AS submissions, json_build_object( @@ -229,7 +229,7 @@ SELECT '[]' )::json AS commits, COALESCE( - (SELECT json_agg(json_build_object('id', s.id, 'status', s.status)) FROM submissions s WHERE s.project_id = p.id), + (SELECT json_agg(json_build_object('id', s.id, 'status', s.status)) FROM submissions s WHERE s.project_id = p.id AND s.is_deleted = false), '[]' )::json AS submissions, json_build_object( diff --git a/internal/gen/sqlc/project.sql.go b/internal/gen/sqlc/project.sql.go index a852099..3d8988b 100644 --- a/internal/gen/sqlc/project.sql.go +++ b/internal/gen/sqlc/project.sql.go @@ -214,10 +214,10 @@ SELECT FROM commits c WHERE c.project_id = p.id AND c.is_deleted = false), '[]' )::json AS commits, - COALESCE( - (SELECT json_agg(json_build_object('id', s.id, 'status', s.status)) FROM submissions s WHERE s.project_id = p.id), - '[]' - )::json AS submissions, + COALESCE( + (SELECT json_agg(json_build_object('id', s.id, 'status', s.status)) FROM submissions s WHERE s.project_id = p.id AND s.is_deleted = false), + '[]' + )::json AS submissions, json_build_object( 'id', u.id, 'email', u.email, @@ -289,10 +289,10 @@ SELECT FROM commits c WHERE c.project_id = p.id AND c.is_deleted = false), '[]' )::json AS commits, - COALESCE( - (SELECT json_agg(json_build_object('id', s.id, 'status', s.status)) FROM submissions s WHERE s.project_id = p.id), - '[]' - )::json AS submissions, + COALESCE( + (SELECT json_agg(json_build_object('id', s.id, 'status', s.status)) FROM submissions s WHERE s.project_id = p.id AND s.is_deleted = false), + '[]' + )::json AS submissions, json_build_object( 'id', u.id, 'email', u.email, @@ -376,11 +376,11 @@ SELECT (SELECT json_agg(json_build_object('id', c.id, 'edit_summary', c.edit_summary) ORDER BY c.created_at DESC) FROM commits c WHERE c.project_id = p.id AND c.is_deleted = false), '[]' - )::json AS commits, - COALESCE( - (SELECT json_agg(json_build_object('id', s.id, 'status', s.status)) FROM submissions s WHERE s.project_id = p.id), - '[]' - )::json AS submissions, + )::json AS commits, + COALESCE( + (SELECT json_agg(json_build_object('id', s.id, 'status', s.status)) FROM submissions s WHERE s.project_id = p.id AND s.is_deleted = false), + '[]' + )::json AS submissions, json_build_object( 'id', u.id, 'email', u.email, @@ -489,11 +489,11 @@ SELECT (SELECT json_agg(json_build_object('id', c.id, 'edit_summary', c.edit_summary) ORDER BY c.created_at DESC) FROM commits c WHERE c.project_id = p.id AND c.is_deleted = false), '[]' - )::json AS commits, - COALESCE( - (SELECT json_agg(json_build_object('id', s.id, 'status', s.status)) FROM submissions s WHERE s.project_id = p.id), - '[]' - )::json AS submissions, + )::json AS commits, + COALESCE( + (SELECT json_agg(json_build_object('id', s.id, 'status', s.status)) FROM submissions s WHERE s.project_id = p.id AND s.is_deleted = false), + '[]' + )::json AS submissions, json_build_object( 'id', u.id, 'email', u.email, @@ -657,10 +657,10 @@ RETURNING FROM commits c WHERE c.project_id = projects.id AND c.is_deleted = false), '[]' )::json AS commits, - COALESCE( - (SELECT json_agg(json_build_object('id', s.id, 'status', s.status)) FROM submissions s WHERE s.project_id = projects.id), - '[]' - )::json AS submissions, + COALESCE( + (SELECT json_agg(json_build_object('id', s.id, 'status', s.status)) FROM submissions s WHERE s.project_id = projects.id AND s.is_deleted = false), + '[]' + )::json AS submissions, COALESCE( (SELECT json_agg(json_build_object( 'user_id', pm.user_id, 'role', pm.role,