add missing post and comment fields in response, harden like responses

Author: nevzattalhaozcan

internal/models/comment.go

@@ -52,6 +52,20 @@ type CommentResponse struct {
 	UpdatedAt time.Time `json:"updated_at"`
 }
 
+type CommentLikeResponse struct {
+    ID        uint         `json:"id"`
+    User      UserResponse `json:"user"`
+    CreatedAt time.Time    `json:"created_at"`
+}
+
+func (cl CommentLike) ToResponse() CommentLikeResponse {
+    return CommentLikeResponse{
+        ID:        cl.ID,
+        User:      cl.User.ToResponse(),
+        CreatedAt: cl.CreatedAt,
+    }
+}
+
 func (c *Comment) ToResponse() CommentResponse {
 	return CommentResponse{
 		ID:         c.ID,

internal/models/post.go

@@ -71,6 +71,20 @@ type PostResponse struct {
 	UpdatedAt time.Time `json:"updated_at"`
 }
 
+type PostLikeResponse struct {
+    ID        uint         `json:"id"`
+    User      UserResponse `json:"user"`
+    CreatedAt time.Time    `json:"created_at"`
+}
+
+func (pl PostLike) ToResponse() PostLikeResponse {
+    return PostLikeResponse{
+        ID:        pl.ID,
+        User:      pl.User.ToResponse(),
+        CreatedAt: pl.CreatedAt,
+    }
+}
+
 func (p *Post) ToResponse() PostResponse {
 	return PostResponse{
 		ID:            p.ID,

internal/repository/comment.go

@@ -78,11 +78,9 @@ func (r *commentRepository) CountLikes(commentID uint) (int64, error) {
 	return count, nil
 }
 
-func (r *commentRepository) ListCommentLikes(commentID uint) ([]models.CommentLike, error) {
-	var likes []models.CommentLike
+func (r *commentRepository) ListCommentLikes(commentID uint) ([]models.CommentLikeResponse, error) {
+	var likes []models.CommentLikeResponse
 	if err := r.db.
-		Preload("User").
-		Preload("Comment").
 		Where("comment_id = ?", commentID).
 		Find(&likes).Error; err != nil {
 		return nil, err

internal/repository/interfaces.go

@@ -63,7 +63,7 @@ type PostRepository interface {
 	ListAll() ([]models.Post, error)
 	AddLike(like *models.PostLike) error
 	RemoveLike(userID, postID uint) error
-	ListLikesByPostID(postID uint) ([]models.PostLike, error)
+	ListLikesByPostID(postID uint) ([]models.PostLikeResponse, error)
 	HasUserLiked(userID, postID uint) (bool, error)
 	CountLikes(postID uint) (int64, error)
 	UpdateLikesCount(postID uint, count int) error
@@ -78,7 +78,7 @@ type CommentRepository interface {
 	ListByUserID(userID uint) ([]models.Comment, error)
 	LikeComment(like *models.CommentLike) error
 	UnlikeComment(userID, commentID uint) error
-	ListCommentLikes(commentID uint) ([]models.CommentLike, error)
+	ListCommentLikes(commentID uint) ([]models.CommentLikeResponse, error)
 	HasUserLiked(userID, commentID uint) (bool, error)
 	CountLikes(commentID uint) (int64, error)
 	UpdateLikesCount(commentID uint, count int) error

internal/repository/post.go

@@ -99,11 +99,9 @@ func (r *postRepository) CountLikes(postID uint) (int64, error) {
 	return count, nil
 }
 
-func (r *postRepository) ListLikesByPostID(postID uint) ([]models.PostLike, error) {
-	var likes []models.PostLike
+func (r *postRepository) ListLikesByPostID(postID uint) ([]models.PostLikeResponse, error) {
+	var likes []models.PostLikeResponse
 	if err := r.db.
-		Preload("User").
-		Preload("Post").
 		Where("post_id = ?", postID).
 		Find(&likes).Error; err != nil {
 		return nil, err

internal/services/comment.go

@@ -217,7 +217,7 @@ func (s *CommentService) UnlikeComment(userID, commentID uint) error {
 	return s.commentRepo.UpdateLikesCount(commentID, int(count))
 }
 
-func (s *CommentService) ListLikesByCommentID(commentID uint) ([]models.CommentLike, error) {
+func (s *CommentService) ListLikesByCommentID(commentID uint) ([]models.CommentLikeResponse, error) {
 	_, err := s.commentRepo.GetByID(commentID)
 	if err != nil {
 		if err == gorm.ErrRecordNotFound {

internal/services/post.go

@@ -265,7 +265,7 @@ func (s *PostService) UnlikePost(userID, postID uint) error {
 	return s.postRepo.UpdateLikesCount(postID, int(count))
 }
 
-func (s *PostService) ListLikesByPostID(postID uint) ([]models.PostLike, error) {
+func (s *PostService) ListLikesByPostID(postID uint) ([]models.PostLikeResponse, error) {
 	_, err := s.postRepo.GetByID(postID)
 	if err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {