내 뱃지 조회에 정렬을 수행한다. (#99)

earlgrey02 · web-flow · commit 4a018fbab91c · 2025-08-15T16:26:53.000+09:00
* feat: implement my badges sorting

* refactor: change projection name

* feat: modify my badge response
diff --git a/api/src/main/kotlin/com/gotchai/api/presentation/v1/badge/BadgeController.kt b/api/src/main/kotlin/com/gotchai/api/presentation/v1/badge/BadgeController.kt
@@ -1,8 +1,8 @@
 package com.gotchai.api.presentation.v1.badge
 
 import com.gotchai.api.global.annotation.ApiV1Controller
-import com.gotchai.api.presentation.v1.badge.response.BadgeListResponse
 import com.gotchai.api.presentation.v1.badge.response.BadgeResponse
+import com.gotchai.api.presentation.v1.badge.response.GetMyBadgesResponse
 import com.gotchai.domain.badge.port.`in`.BadgeQueryUseCase
 import org.springframework.security.core.annotation.AuthenticationPrincipal
 import org.springframework.web.bind.annotation.GetMapping
@@ -25,8 +25,8 @@ class BadgeController(
     fun getMyBadges(
         @AuthenticationPrincipal
         userId: Long
-    ): BadgeListResponse =
+    ): GetMyBadgesResponse =
         badgeQueryUseCase
             .getMyBadges(userId)
-            .let { BadgeListResponse.from(it) }
+            .let { GetMyBadgesResponse.from(it) }
 }
diff --git a/api/src/main/kotlin/com/gotchai/api/presentation/v1/badge/response/GetMyBadgeResponse.kt b/api/src/main/kotlin/com/gotchai/api/presentation/v1/badge/response/GetMyBadgeResponse.kt
@@ -0,0 +1,23 @@
+package com.gotchai.api.presentation.v1.badge.response
+
+import com.gotchai.domain.badge.dto.projection.BadgeWithAcquiredAt
+import java.time.LocalDateTime
+
+data class GetMyBadgeResponse(
+    val id: Long,
+    val name: String,
+    val image: String,
+    val acquiredAt: LocalDateTime
+) {
+    companion object {
+        fun from(badge: BadgeWithAcquiredAt): GetMyBadgeResponse =
+            with(badge) {
+                GetMyBadgeResponse(
+                    id = id,
+                    name = name,
+                    image = image,
+                    acquiredAt = acquiredAt
+                )
+            }
+    }
+}
diff --git a/api/src/main/kotlin/com/gotchai/api/presentation/v1/badge/response/GetMyBadgesResponse.kt b/api/src/main/kotlin/com/gotchai/api/presentation/v1/badge/response/GetMyBadgesResponse.kt
@@ -0,0 +1,18 @@
+package com.gotchai.api.presentation.v1.badge.response
+
+import com.gotchai.domain.badge.dto.result.GetMyBadgesResult
+
+data class GetMyBadgesResponse(
+    val badges: List<GetMyBadgeResponse>,
+    val totalBadgeCount: Long
+) {
+    companion object {
+        fun from(result: GetMyBadgesResult): GetMyBadgesResponse =
+            with(result) {
+                GetMyBadgesResponse(
+                    badges = badges.map { GetMyBadgeResponse.from(it) },
+                    totalBadgeCount = totalBadgeCount
+                )
+            }
+    }
+}
diff --git a/api/src/test/kotlin/com/gotchai/api/presentation/v1/badge/BadgeControllerTest.kt b/api/src/test/kotlin/com/gotchai/api/presentation/v1/badge/BadgeControllerTest.kt
@@ -1,19 +1,20 @@
 package com.gotchai.api.presentation.v1.badge
 
 import com.gotchai.api.common.ControllerTest
-import com.gotchai.api.docs.badgeListResponseFields
 import com.gotchai.api.docs.badgeResponseFields
 import com.gotchai.api.docs.errorResponseFields
+import com.gotchai.api.docs.getMyBadgesResponseFields
 import com.gotchai.api.global.dto.ApiResponse
-import com.gotchai.api.presentation.v1.badge.response.BadgeListResponse
 import com.gotchai.api.presentation.v1.badge.response.BadgeResponse
+import com.gotchai.api.presentation.v1.badge.response.GetMyBadgesResponse
 import com.gotchai.api.util.desc
 import com.gotchai.api.util.document
 import com.gotchai.api.util.expectError
 import com.gotchai.domain.badge.exception.BadgeNotFoundException
 import com.gotchai.domain.badge.port.`in`.BadgeQueryUseCase
 import com.gotchai.domain.fixture.ID
 import com.gotchai.domain.fixture.createBadge
+import com.gotchai.domain.fixture.createGetMyBadgesResult
 import com.ninjasquad.springmockk.MockkBean
 import io.mockk.every
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest
@@ -64,21 +65,19 @@ class BadgeControllerTest : ControllerTest() {
         }
 
         describe("getMyBadges()는") {
-            context("뱃지를 취득한 사용자가 존재하는 경우") {
-                every { badgeQueryUseCase.getMyBadges(ID) } returns listOf(createBadge())
+            every { badgeQueryUseCase.getMyBadges(ID) } returns createGetMyBadgesResult()
 
-                it("상태 코드 200과 GetMyBadgeResponse들을 반환한다.") {
-                    webClient
-                        .get()
-                        .uri("/api/v1/users/me/badges")
-                        .exchange()
-                        .expectStatus()
-                        .isOk
-                        .expectBody<ApiResponse<BadgeListResponse>>()
-                        .document("내가 취득한 뱃지 리스트 조회 성공(200)") {
-                            responseBody(badgeListResponseFields)
-                        }
-                }
+            it("상태 코드 200과 GetMyBadgeResponse들을 반환한다.") {
+                webClient
+                    .get()
+                    .uri("/api/v1/users/me/badges")
+                    .exchange()
+                    .expectStatus()
+                    .isOk
+                    .expectBody<ApiResponse<GetMyBadgesResponse>>()
+                    .document("내가 취득한 뱃지 리스트 조회 성공(200)") {
+                        responseBody(getMyBadgesResponseFields)
+                    }
             }
         }
     }
diff --git a/api/src/testFixtures/kotlin/com/gotchai/api/docs/BadgeDocs.kt b/api/src/testFixtures/kotlin/com/gotchai/api/docs/BadgeDocs.kt
@@ -1,6 +1,8 @@
 package com.gotchai.api.docs
 
 import com.gotchai.api.presentation.v1.badge.response.BadgeResponse
+import com.gotchai.api.presentation.v1.badge.response.GetMyBadgeResponse
+import com.gotchai.api.presentation.v1.badge.response.GetMyBadgesResponse
 import com.gotchai.api.util.desc
 import com.gotchai.api.util.fieldsOf
 import com.gotchai.api.util.listFieldsOf
@@ -21,3 +23,20 @@ val badgeListResponseFields =
         "list" desc "뱃지 리스트",
         *badgeResponseFields.toTypedArray()
     )
+
+val getMyBadgeResponseFields =
+    fieldsOf(
+        GetMyBadgeResponse::id desc "식별자",
+        GetMyBadgeResponse::name desc "이름",
+        GetMyBadgeResponse::image desc "이미지 URI",
+        GetMyBadgeResponse::acquiredAt desc "취득 날짜"
+    )
+
+val getMyBadgesResponseFields =
+    fieldsOf(
+        *listFieldsOf(
+            GetMyBadgesResponse::badges desc "내가 취득한 뱃지 리스트",
+            *getMyBadgeResponseFields.toTypedArray()
+        ).toTypedArray(),
+        GetMyBadgesResponse::totalBadgeCount desc "총 뱃지 개수"
+    )
diff --git a/domain/src/main/kotlin/com/gotchai/domain/badge/adapter/in/BadgeQueryService.kt b/domain/src/main/kotlin/com/gotchai/domain/badge/adapter/in/BadgeQueryService.kt
@@ -1,30 +1,34 @@
 package com.gotchai.domain.badge.adapter.`in`
 
+import com.gotchai.domain.badge.dto.result.GetMyBadgesResult
 import com.gotchai.domain.badge.entity.Badge
 import com.gotchai.domain.badge.entity.Tier
 import com.gotchai.domain.badge.exception.BadgeNotFoundException
 import com.gotchai.domain.badge.port.`in`.BadgeQueryUseCase
 import com.gotchai.domain.badge.port.out.BadgeQueryPort
-import com.gotchai.domain.badge.port.out.UserBadgeQueryPort
+import com.gotchai.domain.exam.port.out.ExamQueryPort
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
 
 @Service
 class BadgeQueryService(
     private val badgeQueryPort: BadgeQueryPort,
-    private val userBadgeQueryPort: UserBadgeQueryPort
+    private val examQueryPort: ExamQueryPort
 ) : BadgeQueryUseCase {
     @Transactional(readOnly = true)
     override fun getBadgeById(badgeId: Long): Badge =
         badgeQueryPort.getBadgeById(badgeId)
             ?: throw BadgeNotFoundException()
 
     @Transactional(readOnly = true)
-    override fun getMyBadges(userId: Long): List<Badge> {
-        val userBadges = userBadgeQueryPort.getUserBadgesByUserId(userId)
-        val badges = badgeQueryPort.getBadgesByIdIn(userBadges.map { it.badgeId })
+    override fun getMyBadges(userId: Long): GetMyBadgesResult {
+        val badges = badgeQueryPort.getBadgesWithAcquiredAtByUserId(userId)
+        val examCount = examQueryPort.getExamCount()
 
-        return badges
+        return GetMyBadgesResult(
+            badges = badges,
+            totalBadgeCount = examCount
+        )
     }
 
     @Transactional(readOnly = true)
diff --git a/domain/src/main/kotlin/com/gotchai/domain/badge/dto/projection/BadgeWithAcquiredAt.kt b/domain/src/main/kotlin/com/gotchai/domain/badge/dto/projection/BadgeWithAcquiredAt.kt
@@ -0,0 +1,15 @@
+package com.gotchai.domain.badge.dto.projection
+
+import com.gotchai.domain.badge.entity.Tier
+import java.time.LocalDateTime
+
+data class BadgeWithAcquiredAt(
+    val id: Long,
+    val examId: Long,
+    val name: String,
+    val description: String,
+    val image: String,
+    val tier: Tier,
+    val createdAt: LocalDateTime,
+    val acquiredAt: LocalDateTime
+)
diff --git a/domain/src/main/kotlin/com/gotchai/domain/badge/dto/result/GetMyBadgesResult.kt b/domain/src/main/kotlin/com/gotchai/domain/badge/dto/result/GetMyBadgesResult.kt
@@ -0,0 +1,8 @@
+package com.gotchai.domain.badge.dto.result
+
+import com.gotchai.domain.badge.dto.projection.BadgeWithAcquiredAt
+
+data class GetMyBadgesResult(
+    val badges: List<BadgeWithAcquiredAt>,
+    val totalBadgeCount: Long
+)
diff --git a/domain/src/main/kotlin/com/gotchai/domain/badge/port/in/BadgeQueryUseCase.kt b/domain/src/main/kotlin/com/gotchai/domain/badge/port/in/BadgeQueryUseCase.kt
@@ -1,12 +1,13 @@
 package com.gotchai.domain.badge.port.`in`
 
+import com.gotchai.domain.badge.dto.result.GetMyBadgesResult
 import com.gotchai.domain.badge.entity.Badge
 import com.gotchai.domain.badge.entity.Tier
 
 interface BadgeQueryUseCase {
     fun getBadgeById(badgeId: Long): Badge
 
-    fun getMyBadges(userId: Long): List<Badge>
+    fun getMyBadges(userId: Long): GetMyBadgesResult
 
     fun getBadgeByExamIdAndTier(
         examId: Long,
diff --git a/domain/src/main/kotlin/com/gotchai/domain/badge/port/out/BadgeQueryPort.kt b/domain/src/main/kotlin/com/gotchai/domain/badge/port/out/BadgeQueryPort.kt
@@ -1,15 +1,16 @@
 package com.gotchai.domain.badge.port.out
 
+import com.gotchai.domain.badge.dto.projection.BadgeWithAcquiredAt
 import com.gotchai.domain.badge.entity.Badge
 import com.gotchai.domain.badge.entity.Tier
 
 interface BadgeQueryPort {
     fun getBadgeById(id: Long): Badge?
 
-    fun getBadgesByIdIn(ids: Collection<Long>): List<Badge>
-
     fun getBadgeByExamIdAndTier(
         examId: Long,
         badgeTier: Tier
     ): Badge?
+
+    fun getBadgesWithAcquiredAtByUserId(userId: Long): List<BadgeWithAcquiredAt>
 }
diff --git a/domain/src/main/kotlin/com/gotchai/domain/exam/dto/projection/ExamWithIsSolved.kt b/domain/src/main/kotlin/com/gotchai/domain/exam/dto/projection/ExamWithIsSolved.kt
@@ -1,4 +1,4 @@
-package com.gotchai.domain.exam.entity
+package com.gotchai.domain.exam.dto.projection
 
 import java.time.LocalDateTime
 
diff --git a/domain/src/main/kotlin/com/gotchai/domain/exam/dto/result/ExamResult.kt b/domain/src/main/kotlin/com/gotchai/domain/exam/dto/result/ExamResult.kt
@@ -1,6 +1,6 @@
 package com.gotchai.domain.exam.dto.result
 
-import com.gotchai.domain.exam.entity.ExamWithIsSolved
+import com.gotchai.domain.exam.dto.projection.ExamWithIsSolved
 import java.time.LocalDateTime
 
 data class ExamResult(
diff --git a/domain/src/main/kotlin/com/gotchai/domain/exam/port/out/ExamQueryPort.kt b/domain/src/main/kotlin/com/gotchai/domain/exam/port/out/ExamQueryPort.kt
@@ -1,7 +1,7 @@
 package com.gotchai.domain.exam.port.out
 
+import com.gotchai.domain.exam.dto.projection.ExamWithIsSolved
 import com.gotchai.domain.exam.entity.Exam
-import com.gotchai.domain.exam.entity.ExamWithIsSolved
 
 interface ExamQueryPort {
     fun getExamById(id: Long): Exam?
@@ -21,4 +21,6 @@ interface ExamQueryPort {
         userId: Long,
         isSolved: Boolean
     ): List<ExamWithIsSolved>
+
+    fun getExamCount(): Long
 }
diff --git a/domain/src/testFixtures/kotlin/com/gotchai/domain/fixture/BadgeFixture.kt b/domain/src/testFixtures/kotlin/com/gotchai/domain/fixture/BadgeFixture.kt
@@ -1,5 +1,7 @@
 package com.gotchai.domain.fixture
 
+import com.gotchai.domain.badge.dto.projection.BadgeWithAcquiredAt
+import com.gotchai.domain.badge.dto.result.GetMyBadgesResult
 import com.gotchai.domain.badge.entity.Badge
 import com.gotchai.domain.badge.entity.Tier
 import com.gotchai.domain.badge.entity.UserBadge
@@ -9,6 +11,7 @@ const val NAME = "AI 산타 감별사"
 const val DESCRIPTION_BADGE = "크리스마스엔 선물보다 눈치가 중요하다는 걸 증명했어요!"
 const val IMAGE = "https://gotchai.com/image.png"
 val TIER = Tier.GOLD
+const val TOTAL_BADGE_COUNT = 5L
 
 fun createBadge(
     id: Long = ID,
@@ -41,3 +44,33 @@ fun createUserBadge(
         badgeId = badgeId,
         createdAt = createdAt
     )
+
+fun createBadgeWithAcquiredAt(
+    id: Long = ID,
+    examId: Long = ID,
+    name: String = NAME,
+    description: String = DESCRIPTION_BADGE,
+    image: String = IMAGE,
+    tier: Tier = TIER,
+    createdAt: LocalDateTime = CREATED_AT,
+    acquiredAt: LocalDateTime = CREATED_AT
+): BadgeWithAcquiredAt =
+    BadgeWithAcquiredAt(
+        id = id,
+        examId = examId,
+        name = name,
+        description = description,
+        image = image,
+        tier = tier,
+        createdAt = createdAt,
+        acquiredAt = acquiredAt
+    )
+
+fun createGetMyBadgesResult(
+    badges: List<BadgeWithAcquiredAt> = listOf(createBadgeWithAcquiredAt()),
+    totalBadgeCount: Long = TOTAL_BADGE_COUNT
+): GetMyBadgesResult =
+    GetMyBadgesResult(
+        badges = badges,
+        totalBadgeCount = totalBadgeCount
+    )
diff --git a/storage/rdb/src/main/kotlin/com/gotchai/storage/rdb/badge/adapter/out/BadgeQueryAdapter.kt b/storage/rdb/src/main/kotlin/com/gotchai/storage/rdb/badge/adapter/out/BadgeQueryAdapter.kt
diff --git a/storage/rdb/src/main/kotlin/com/gotchai/storage/rdb/exam/adapter/out/ExamQueryAdapter.kt b/storage/rdb/src/main/kotlin/com/gotchai/storage/rdb/exam/adapter/out/ExamQueryAdapter.kt
