closes #12; modify getCommentsBySlug query

aliml92 · Aug 1, 2023 · 20ff31a · 20ff31a
1 parent 65499f7
commit 20ff31a
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 28 deletions.
diff --git a/api/article_handler.go b/api/article_handler.go
@@ -918,10 +918,10 @@ func newCommentsResponse(
 		}, len(comments)),
 	}
 	for i, comment := range comments {
-		res.Comments[i].ID = comment.ID
-		res.Comments[i].CreatedAt = comment.CreatedAt
-		res.Comments[i].UpdatedAt = comment.UpdatedAt
-		res.Comments[i].Body = comment.Body
+		res.Comments[i].ID = &comment.ID
+		res.Comments[i].CreatedAt = &comment.CreatedAt
+		res.Comments[i].UpdatedAt = &comment.UpdatedAt
+		res.Comments[i].Body = &comment.Body
 		res.Comments[i].Author.Username = comment.Username
 		res.Comments[i].Author.Bio = comment.Bio
 		res.Comments[i].Author.Image = comment.Image

diff --git a/db/query/article.sql b/db/query/article.sql
@@ -130,14 +130,11 @@ SELECT
     u.id AS author_id,
     u.username,
     u.bio,
-    u.image     
-FROM (
-    SELECT id
-    FROM articles
-    WHERE slug = $1
-) a
-LEFT JOIN comments c ON a.id = c.article_id 
-LEFT JOIN users u ON c.author_id = u.id;
+    u.image 
+FROM comments c
+LEFT JOIN articles a ON a.id = c.article_id
+LEFT JOIN users u ON u.id = c.author_id
+WHERE a.slug = $1;
 
 -- name: GetArticlesByTag :many
 WITH article_tags_cte AS (

diff --git a/db/sqlc/article.sql.go b/db/sqlc/article.sql.go