Refactor/kotlin

src/main/kotlin/com/eatsfinder/domain/comment/controller/CommentController.kt

@@ -19,7 +19,8 @@ class CommentController(
     @Operation(summary = "댓글 전체 조회")
     @GetMapping("/posts/{postId}/comments")
     fun getCommentList(@PathVariable postId: Long, @AuthenticationPrincipal userPrincipal: UserPrincipal?): ResponseEntity<CommentsResponse> {
-        return ResponseEntity.status(HttpStatus.OK).body(commentService.getCommentList(postId, userPrincipal))
+        val userId = userPrincipal?.id
+        return ResponseEntity.status(HttpStatus.OK).body(commentService.getCommentList(postId, userPrincipal, userId))
     }
 
     @Operation(summary = "댓글 작성")

src/main/kotlin/com/eatsfinder/domain/comment/dto/CommentResponse.kt

@@ -9,5 +9,6 @@ data class CommentResponse(
     val content: String,
     val likeCount: Int,
     val isMyComment: Boolean,
+    val likeStatus: Boolean,
     val createdAt: LocalDateTime
 )

src/main/kotlin/com/eatsfinder/domain/comment/dto/CommentsResponse.kt

@@ -1,14 +1,15 @@
 package com.eatsfinder.domain.comment.dto
 
 import com.eatsfinder.domain.comment.model.Comment
+import com.eatsfinder.domain.like.model.CommentLikes
 import com.eatsfinder.global.security.jwt.UserPrincipal
 
 data class CommentsResponse(
     val totalCommentCount: Int = 0,
     val comments: List<CommentResponse>
 ) {
     companion object {
-        fun from(comments: List<Comment>, userPrincipal: UserPrincipal?, commentCount: Int): CommentsResponse {
+        fun from(comments: List<Comment>, userPrincipal: UserPrincipal?, commentCount: Int, commentLikes: List<CommentLikes>?): CommentsResponse {
             val res = comments.map { comment ->
                 CommentResponse(
                     id = comment.id!!,
@@ -17,6 +18,7 @@ data class CommentsResponse(
                     content = comment.content,
                     likeCount = comment.likeCount,
                     isMyComment = (userPrincipal != null && comment.userId.id == userPrincipal.id),
+                    likeStatus = (commentLikes?.any { it.commentId.id == comment.id && it.userId.id == userPrincipal?.id } == true),
                     createdAt = comment.createdAt
                 )
             }

src/main/kotlin/com/eatsfinder/domain/comment/service/CommentService.kt

@@ -6,7 +6,7 @@ import com.eatsfinder.global.security.jwt.UserPrincipal
 
 interface CommentService {
 
-    fun getCommentList(postId: Long, userId: UserPrincipal?): CommentsResponse
+    fun getCommentList(postId: Long, userPrincipal: UserPrincipal?, userId: Long?): CommentsResponse
 
     fun createComment(postId: Long, req: CommentRequest, userId: Long): String
 

src/main/kotlin/com/eatsfinder/domain/comment/service/CommentServiceImpl.kt

@@ -5,6 +5,7 @@ import com.eatsfinder.domain.comment.dto.CommentsResponse
 import com.eatsfinder.domain.comment.dto.CommentsResponse.Companion.from
 import com.eatsfinder.domain.comment.model.Comment
 import com.eatsfinder.domain.comment.repository.CommentRepository
+import com.eatsfinder.domain.like.repository.CommentLikeRepository
 import com.eatsfinder.domain.post.repository.PostRepository
 import com.eatsfinder.domain.user.model.MyActiveType
 import com.eatsfinder.domain.user.model.UserLog
@@ -21,20 +22,31 @@ class CommentServiceImpl(
     private val userRepository: UserRepository,
     private val postRepository: PostRepository,
     private val commentRepository: CommentRepository,
+    private val commentLikeRepository: CommentLikeRepository,
     private val userLogRepository: UserLogRepository
 ) : CommentService {
 
     @Transactional(readOnly = true)
-    override fun getCommentList(postId: Long, userId: UserPrincipal?): CommentsResponse {
+    override fun getCommentList(postId: Long, userPrincipal: UserPrincipal?, userId: Long?): CommentsResponse {
+        val loginUser = userPrincipal?.id
+
+        val user = loginUser?.let {
+            userRepository.findByIdAndDeletedAt(it, null) ?: throw ModelNotFoundException(
+                "user",
+                "이 유저 아이디(${userId})는 존재하지 않습니다."
+            )
+        }
+
         val post = postRepository.findByIdAndDeletedAt(postId, null) ?: throw ModelNotFoundException(
             "post",
             "이 게시물 아이디: (${postId})는 존재하지 않습니다."
         )
 
         val commentCount = commentRepository.countByPostIdAndDeletedAt(post, null) ?: 0
         val comments = commentRepository.findByPostIdAndDeletedAt(post, null)
+        val commentLikes = user?.let { commentLikeRepository.findCommentLikesByUserId(it) } ?: emptyList()
 
-        return from(comments, userId, commentCount)
+        return from(comments, userPrincipal, commentCount, commentLikes)
     }
 
     @Transactional

src/main/kotlin/com/eatsfinder/domain/like/repository/CommentLikeRepository.kt

@@ -8,5 +8,5 @@ import org.springframework.data.jpa.repository.JpaRepository
 interface CommentLikeRepository : JpaRepository<CommentLikes, Long> {
     fun findByUserIdAndCommentId(userId: User, commentId: Comment): CommentLikes?
 
-//    fun findByUserId(userId: User): List<CommentLikes>
+    fun findCommentLikesByUserId(userId: User): List<CommentLikes>?
 }

src/main/kotlin/com/eatsfinder/domain/like/repository/PostLikeRepository.kt

@@ -5,7 +5,6 @@ import com.eatsfinder.domain.post.model.Post
 import com.eatsfinder.domain.user.model.User
 import org.springframework.data.jpa.repository.JpaRepository
 import org.springframework.data.jpa.repository.Query
-import java.time.LocalDateTime
 
 interface PostLikeRepository : JpaRepository<PostLikes, Long> {
     fun findByUserIdAndPostId(userId: User, postId: Post): PostLikes?

src/main/kotlin/com/eatsfinder/domain/user/model/User.kt

@@ -5,7 +5,6 @@ import jakarta.persistence.*
 import org.hibernate.annotations.ColumnDefault
 import org.hibernate.annotations.SQLDelete
 import java.time.LocalDate
-import java.time.LocalDateTime
 
 @Entity
 @SQLDelete(sql = "UPDATE users SET deleted_at = CURRENT_TIMESTAMP WHERE id = ?")