Merge pull request #250 from depromeet/feature/#171

/goal/explore 댓글 수 수정
depromeet · Apr 5, 2024 · c4dba1a · c4dba1a
2 parents 43b8f31 + abc7ea1
commit c4dba1a
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 7 deletions.
diff --git a/backend/application/api/src/main/kotlin/io/raemian/api/goal/model/GoalExploreCountSubset.kt b/backend/application/api/src/main/kotlin/io/raemian/api/goal/model/GoalExploreCountSubset.kt
@@ -10,7 +10,7 @@ data class GoalExploreCountSubset(
 ) {
     constructor(result: GoalExploreQueryResult) : this(
         reaction = 0,
-        comment = 0,
+        comment = result.commentCount,
         task = 0,
         goal = result.goalCount,
     )

diff --git a/backend/application/api/src/main/kotlin/io/raemian/api/goal/service/GoalService.kt b/backend/application/api/src/main/kotlin/io/raemian/api/goal/service/GoalService.kt
@@ -1,5 +1,6 @@
 package io.raemian.api.goal.service
 
+import io.raemian.api.comment.service.CommentService
 import io.raemian.api.emoji.service.EmojiService
 import io.raemian.api.event.model.CreatedGoalEvent
 import io.raemian.api.event.model.DeletedGoalEvent
@@ -32,6 +33,7 @@ class GoalService(
     private val emojiService: EmojiService,
     private val stickerService: StickerService,
     private val tagService: TagService,
+    private val commentService: CommentService,
 ) {
 
     @Transactional(readOnly = true)
@@ -98,7 +100,12 @@ class GoalService(
         val reactedEmojiMap = emojiService.findAllByGoalIds(goalIds, userId)
 
         return explore
-            .map { GoalExploreResult.from(it, reactedEmojiMap[it.goalId]) }
+            .map {
+                GoalExploreResult.from(
+                    explore = it,
+                    reactedEmojisResponse = reactedEmojiMap[it.goalId],
+                )
+            }
     }
 
     private fun createFirstLifeMap(userId: Long): LifeMap {

diff --git a/backend/storage/db-core/src/main/kotlin/io/raemian/storage/db/core/goal/GoalRepository.kt b/backend/storage/db-core/src/main/kotlin/io/raemian/storage/db/core/goal/GoalRepository.kt
@@ -28,9 +28,10 @@ interface GoalRepository : JpaRepository<Goal, Long> {
                 goal.tag.content,
                 goal.createdAt,
                 map.id,
-                count.goalCount,
-                count.historyCount,
-                count.viewCount,
+                lifeMapCount.goalCount,
+                lifeMapCount.historyCount,
+                lifeMapCount.viewCount,
+                commentCount.count,
                 user.id,
                 user.nickname,
                 user.username,
@@ -40,11 +41,13 @@ interface GoalRepository : JpaRepository<Goal, Long> {
             Goal as goal,
             LifeMap as map,
             USERS  as user,
-            LifeMapCount as count
+            LifeMapCount as lifeMapCount,
+            CommentCount as commentCount
         WHERE 1 = 1
             AND goal.lifeMap.id = map.id
             AND map.user.id = user.id
-            AND map.id = count.lifeMapId
+            AND map.id = lifeMapCount.lifeMapId
+            AND goal.id = commentCount.goalId
             AND map.isPublic = true
             AND goal.id < :cursor
         ORDER BY 

diff --git a/...e/db-core/src/main/kotlin/io/raemian/storage/db/core/goal/model/GoalExploreQueryResult.kt b/...e/db-core/src/main/kotlin/io/raemian/storage/db/core/goal/model/GoalExploreQueryResult.kt
@@ -15,6 +15,7 @@ data class GoalExploreQueryResult(
     val goalCount: Long,
     val historyCount: Long,
     val viewCount: Long,
+    val commentCount: Long,
     val userId: Long,
     val nickname: String,
     val username: String,