refactor: Add writer info in comment response

JiwonKKang · JiwonKKang · commit 72fa25960e82 · 2024-12-08T20:48:46.000+09:00
diff --git a/quiz-service/quiz-application/app-api/src/main/kotlin/com/grepp/quizy/quiz/api/comment/CommentApi.kt b/quiz-service/quiz-application/app-api/src/main/kotlin/com/grepp/quizy/quiz/api/comment/CommentApi.kt
@@ -32,7 +32,6 @@ class CommentApi(
                                     request.toParentCommentId(),
                                     request.toContent(),
                             )
-                            .id
             )
 
     @GetMapping
diff --git a/quiz-service/quiz-application/app-api/src/main/kotlin/com/grepp/quizy/quiz/api/comment/dto/CommentResponse.kt b/quiz-service/quiz-application/app-api/src/main/kotlin/com/grepp/quizy/quiz/api/comment/dto/CommentResponse.kt
@@ -2,12 +2,14 @@ package com.grepp.quizy.quiz.api.comment.dto
 
 import com.fasterxml.jackson.annotation.JsonInclude
 import com.grepp.quizy.quiz.domain.comment.Comment
+import com.grepp.quizy.quiz.domain.comment.Writer
+import com.grepp.quizy.quiz.domain.user.QuizUser
 
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
 data class CommentResponse(
         val id: Long,
         val quizId: Long,
-        val writerId: Long,
+        val writer: WriterResponse,
         val parentCommentId: Long,
         val content: String,
         val childComments: List<CommentResponse>,
@@ -19,7 +21,7 @@ data class CommentResponse(
             return CommentResponse(
                     id = comment.id.value,
                     quizId = comment.quizId.value,
-                    writerId = comment.writerId.value,
+                    writer = WriterResponse.from(comment.writer),
                     parentCommentId = comment.parentCommentId.value,
                     content = comment.content.value,
                     childComments =
@@ -30,3 +32,19 @@ data class CommentResponse(
         }
     }
 }
+
+data  class WriterResponse(
+    val id: Long,
+    val name: String,
+    val profileImageUrl: String
+) {
+    companion object {
+        fun from(writer: Writer): WriterResponse {
+            return WriterResponse(
+                id = writer.id.value,
+                name = writer.name,
+                profileImageUrl = writer.profileImageUrl
+            )
+        }
+    }
+}
diff --git a/quiz-service/quiz-domain/src/main/kotlin/com/grepp/quizy/quiz/domain/comment/Comment.kt b/quiz-service/quiz-domain/src/main/kotlin/com/grepp/quizy/quiz/domain/comment/Comment.kt
@@ -3,11 +3,12 @@ package com.grepp.quizy.quiz.domain.comment
 import com.grepp.quizy.common.dto.DateTime
 import com.grepp.quizy.quiz.domain.comment.exception.CommentException
 import com.grepp.quizy.quiz.domain.quiz.QuizId
+import com.grepp.quizy.quiz.domain.user.QuizUser
 import com.grepp.quizy.quiz.domain.user.UserId
 
 class Comment(
         val quizId: QuizId,
-        val writerId: UserId,
+        val writer: Writer,
         val parentCommentId: CommentId,
         private var _content: CommentContent,
         val id: CommentId = CommentId(0),
@@ -37,8 +38,24 @@ class Comment(
     }
 
     fun validateOwner(userId: UserId) {
-        if (writerId != userId) {
+        if (writer.id != userId) {
             throw CommentException.NoPermission
         }
     }
 }
+
+data class Writer(
+        val id: UserId,
+        val name: String = "",
+        val profileImageUrl: String = ""
+) {
+    companion object {
+        fun from(writer: QuizUser): Writer {
+            return Writer(
+                    id = writer.id,
+                    name = writer.name,
+                    profileImageUrl = writer.imgPath
+            )
+        }
+    }
+}
diff --git a/quiz-service/quiz-domain/src/main/kotlin/com/grepp/quizy/quiz/domain/comment/CommentAppender.kt b/quiz-service/quiz-domain/src/main/kotlin/com/grepp/quizy/quiz/domain/comment/CommentAppender.kt
@@ -3,6 +3,7 @@ package com.grepp.quizy.quiz.domain.comment
 import com.grepp.quizy.quiz.domain.quiz.QuizId
 import com.grepp.quizy.quiz.domain.quiz.QuizReader
 import com.grepp.quizy.quiz.domain.quiz.QuizUpdater
+import com.grepp.quizy.quiz.domain.user.QuizUser
 import com.grepp.quizy.quiz.domain.user.UserId
 import org.springframework.stereotype.Component
 
@@ -21,7 +22,7 @@ class CommentAppender(
         val comment =
                 Comment(
                         quizId = quizId,
-                        writerId = writerId,
+                        writer = Writer(writerId),
                         parentCommentId = parentCommentId,
                         _content = content,
                 )
diff --git a/quiz-service/quiz-domain/src/main/kotlin/com/grepp/quizy/quiz/domain/comment/CommentCreateUseCase.kt b/quiz-service/quiz-domain/src/main/kotlin/com/grepp/quizy/quiz/domain/comment/CommentCreateUseCase.kt
@@ -9,5 +9,5 @@ interface CommentCreateUseCase {
             writerId: UserId,
             parentCommentId: CommentId,
             content: CommentContent,
-    ): Comment
+    ): CommentId
 }
diff --git a/quiz-service/quiz-domain/src/main/kotlin/com/grepp/quizy/quiz/domain/comment/CommentService.kt b/quiz-service/quiz-domain/src/main/kotlin/com/grepp/quizy/quiz/domain/comment/CommentService.kt
@@ -23,13 +23,13 @@ class CommentService(
             writerId: UserId,
             parentCommentId: CommentId,
             content: CommentContent,
-    ): Comment {
+    ): CommentId {
         return commentAppender.append(
                 quizId,
                 writerId,
                 parentCommentId,
                 content,
-        )
+        ).id
     }
 
     override fun getComments(quizId: QuizId): List<Comment> {
diff --git a/quiz-service/quiz-domain/src/main/kotlin/com/grepp/quizy/quiz/domain/user/QuizUser.kt b/quiz-service/quiz-domain/src/main/kotlin/com/grepp/quizy/quiz/domain/user/QuizUser.kt
@@ -5,7 +5,7 @@ import com.grepp.quizy.quiz.domain.useranswer.events.UserAnsweredEvent
 
 class QuizUser(
     val id: UserId,
-    private var profile: UserProfile,
+    private var profile: UserProfile = UserProfile("", ""),
     private val _interests: MutableList<QuizCategory> = mutableListOf(),
     private val _achievements: MutableList<QuizUserAchievement> = mutableListOf(),
     private var _stats: UserStats = UserStats(id)
diff --git a/quiz-service/quiz-infra/src/main/kotlin/com/grepp/quizy/quiz/infra/comment/entity/CommentEntity.kt b/quiz-service/quiz-infra/src/main/kotlin/com/grepp/quizy/quiz/infra/comment/entity/CommentEntity.kt
@@ -5,8 +5,10 @@ import com.grepp.quizy.jpa.BaseTimeEntity
 import com.grepp.quizy.quiz.domain.comment.Comment
 import com.grepp.quizy.quiz.domain.comment.CommentContent
 import com.grepp.quizy.quiz.domain.comment.CommentId
+import com.grepp.quizy.quiz.domain.comment.Writer
 import com.grepp.quizy.quiz.domain.quiz.QuizId
 import com.grepp.quizy.quiz.domain.user.UserId
+import com.grepp.quizy.quiz.infra.user.entity.QuizUserEntity
 import jakarta.persistence.Entity
 import jakarta.persistence.GeneratedValue
 import jakarta.persistence.GenerationType
@@ -27,11 +29,15 @@ class CommentEntity(
         createdAt: LocalDateTime,
         updatedAt: LocalDateTime,
 ) : BaseTimeEntity(createdAt, updatedAt) {
-    fun toDomain() =
+    fun toDomain(writer: QuizUserEntity) =
             Comment(
                     id = CommentId(id),
                     quizId = QuizId(quizId),
-                    writerId = UserId(writerId),
+                    writer = Writer(
+                            id = UserId(writerId),
+                            name = writer.name,
+                            profileImageUrl = writer.imgPath,
+                    ),
                     parentCommentId = CommentId(parentCommentId),
                     _content = CommentContent(content),
                     dateTime = DateTime(createdAt, updatedAt),
@@ -42,9 +48,8 @@ class CommentEntity(
                 CommentEntity(
                                 id = comment.id.value,
                                 quizId = comment.quizId.value,
-                                writerId = comment.writerId.value,
-                                parentCommentId =
-                                        comment.parentCommentId.value,
+                                writerId = comment.writer.id.value,
+                                parentCommentId = comment.parentCommentId.value,
                                 content = comment.content.value,
                                 createdAt = comment.dateTime.createdAt,
                                 updatedAt = comment.dateTime.updatedAt,
diff --git a/quiz-service/quiz-infra/src/main/kotlin/com/grepp/quizy/quiz/infra/comment/repository/CommentRepositoryAdapter.kt b/quiz-service/quiz-infra/src/main/kotlin/com/grepp/quizy/quiz/infra/comment/repository/CommentRepositoryAdapter.kt
@@ -4,31 +4,49 @@ import com.grepp.quizy.quiz.domain.comment.Comment
 import com.grepp.quizy.quiz.domain.comment.CommentId
 import com.grepp.quizy.quiz.domain.comment.CommentRepository
 import com.grepp.quizy.quiz.domain.quiz.QuizId
+import com.grepp.quizy.quiz.domain.user.exception.QuizUserException
 import com.grepp.quizy.quiz.infra.comment.entity.CommentEntity
+import com.grepp.quizy.quiz.infra.user.repository.QuizUserJpaRepository
 import org.springframework.stereotype.Repository
 import org.springframework.transaction.annotation.Transactional
 
 @Repository
 @Transactional
 class CommentRepositoryAdapter(
-        private val commentJpaRepository: CommentJpaRepository
+        private val commentJpaRepository: CommentJpaRepository,
+        private val quizUserJpaRepository: QuizUserJpaRepository
 ) : CommentRepository {
 
-    override fun save(comment: Comment): Comment =
-            commentJpaRepository
-                    .save(CommentEntity.from(comment))
-                    .toDomain()
+    override fun save(comment: Comment): Comment {
+        val commentEntity = commentJpaRepository
+            .save(CommentEntity.from(comment))
+        return commentEntity.toDomain(
+            quizUserJpaRepository.findById(commentEntity.writerId)
+                .orElseThrow { QuizUserException.NotFound }
+        )
+    }
+
 
     override fun findById(id: CommentId): Comment? =
             commentJpaRepository
                     .findById(id.value)
-                    .map { it.toDomain() }
+                    .map {
+                        val writer = quizUserJpaRepository
+                            .findById(it.writerId)
+                            .orElseThrow{ QuizUserException.NotFound }
+                        it.toDomain(writer)
+                    }
                     .orElse(null)
 
-    override fun findAllByQuizId(quizId: QuizId): List<Comment> =
-            commentJpaRepository
-                    .findAllByQuizId(quizId.value)
-                    .map(CommentEntity::toDomain)
+    override fun findAllByQuizId(quizId: QuizId): List<Comment> {
+        val commentEntities = commentJpaRepository.findAllByQuizId(quizId.value)
+        val writerEntities = quizUserJpaRepository.findAllById(
+                commentEntities.map { it.writerId }
+        ).associateBy { it.id }
+        return commentEntities.map {
+            it.toDomain(writerEntities[it.writerId] ?: throw QuizUserException.NotFound)
+        }
+    }
 
     override fun delete(comment: Comment) =
             commentJpaRepository.delete(CommentEntity.from(comment))
diff --git a/quiz-service/quiz-infra/src/main/kotlin/com/grepp/quizy/quiz/infra/quizread/messaging/listener/QuizCDCEventHandler.kt b/quiz-service/quiz-infra/src/main/kotlin/com/grepp/quizy/quiz/infra/quizread/messaging/listener/QuizCDCEventHandler.kt
@@ -16,7 +16,6 @@ class QuizCDCEventHandler(
         initActions()
     }
 
-
     final override fun initActions() {
         actions.put(DebeziumEvent.DebeziumEventPayloadOperation.CREATE) { _, after ->
             after?.let { quizDocumentSynchronizer.createQuiz(it) }

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,6 @@ class CommentApi(`
`32`	`32`	`request.toParentCommentId(),`
`33`	`33`	`request.toContent(),`
`34`	`34`	`)`
`35`		`- .id`
`36`	`35`	`)`
`37`	`36`
`38`	`37`	`@GetMapping`
Original file line number	Diff line number	Diff line change
`@@ -9,5 +9,5 @@ interface CommentCreateUseCase {`
`9`	`9`	`writerId: UserId,`
`10`	`10`	`parentCommentId: CommentId,`
`11`	`11`	`content: CommentContent,`
`12`		`- ): Comment`
	`12`	`+ ): CommentId`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@ class QuizCDCEventHandler(`
`16`	`16`	`initActions()`
`17`	`17`	`}`
`18`	`18`
`19`		`-`
`20`	`19`	`final override fun initActions() {`
`21`	`20`	`actions.put(DebeziumEvent.DebeziumEventPayloadOperation.CREATE) { _, after ->`
`22`	`21`	`after?.let { quizDocumentSynchronizer.createQuiz(it) }`