Merge branch 'main' into fix/388/correctly-use-multi-select

KonferCA · Feb 4, 2025 · d2c9ea6 · d2c9ea6
2 parents 7f68d32 + 2472851
commit d2c9ea6
Show file tree

Hide file tree

Showing 8 changed files with 450 additions and 316 deletions.
diff --git a/backend/.sqlc/queries/projects.sql b/backend/.sqlc/queries/projects.sql
@@ -224,13 +224,15 @@ INSERT INTO project_answers (
 ) RETURNING *;
 
 -- name: GetProjectComments :many
-SELECT * FROM project_comments
-WHERE project_id = $1
-ORDER BY created_at DESC;
+SELECT pc.*, u.first_name as commenter_first_name, u.last_name as commenter_last_name FROM project_comments pc
+JOIN users u ON u.id = pc.commenter_id
+WHERE pc.project_id = $1
+ORDER BY pc.created_at DESC;
 
 -- name: GetProjectComment :one
-SELECT * FROM project_comments
-WHERE id = $1 AND project_id = $2
+SELECT pc.*, u.first_name as commenter_first_name, u.last_name as commenter_last_name FROM project_comments pc
+JOIN users u ON u.id = pc.commenter_id
+WHERE pc.id = $1 AND pc.project_id = $2
 LIMIT 1;
 
 -- name: CreateProjectComment :one

diff --git a/backend/db/projects.sql.go b/backend/db/projects.sql.go