refactor: 나눔 신청한 사용자 이름,프로필 이미지 추가

DDD-Community · Feb 24, 2024 · 69e25b7 · 69e25b7
1 parent 33f84d5
commit 69e25b7
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 6 deletions.
diff --git a/src/main/kotlin/mara/server/domain/share/ShareController.kt b/src/main/kotlin/mara/server/domain/share/ShareController.kt
@@ -46,7 +46,7 @@ class ShareController(private val shareService: ShareService) {
 
     @GetMapping("/{id}/applies")
     @Operation(summary = "나눔 신청 사용자 이름 조회 API")
-    fun getAllApplyUserList(@PathVariable(name = "id") shareId: Long): CommonResponse<List<String>?> {
+    fun getAllApplyUserList(@PathVariable(name = "id") shareId: Long): CommonResponse<List<AppliedUserDto>?> {
         return success(shareService.getAllApplyUserList(shareId))
     }
 

diff --git a/src/main/kotlin/mara/server/domain/share/ShareDto.kt b/src/main/kotlin/mara/server/domain/share/ShareDto.kt
@@ -37,7 +37,7 @@ data class UpdateShareStatusRequest(
 )
 
 data class ShareResponse(
-    val userName: String,
+    val nickname: String,
     val profileImage: ProfileImage,
     val shareId: Long,
     val title: String,
@@ -53,7 +53,7 @@ data class ShareResponse(
     val thumbNailImage: String
 ) {
     constructor(share: Share) : this(
-        userName = share.user.nickname,
+        nickname = share.user.nickname,
         profileImage = share.user.profileImage,
         shareId = share.id,
         title = share.title,
@@ -69,6 +69,20 @@ data class ShareResponse(
     )
 }
 
+data class AppliedUserDto(
+    val nickname: String,
+    val profileImage: ProfileImage,
+) {
+    constructor(applyShare: ApplyShare) : this(
+        nickname = applyShare.user.nickname,
+        profileImage = applyShare.user.profileImage,
+    )
+}
+
 fun Page<Share>.toShareResponseListPage(): Page<ShareResponse> {
     return this.map { ShareResponse(it) }
 }
+
+fun List<ApplyShare>.toApplyShareResponseList(): List<AppliedUserDto> {
+    return this.map { AppliedUserDto(it) }
+}
diff --git a/src/main/kotlin/mara/server/domain/share/ShareService.kt b/src/main/kotlin/mara/server/domain/share/ShareService.kt
@@ -83,10 +83,9 @@ class ShareService(
             .toShareResponseListPage()
     }
 
-    fun getAllApplyUserList(shareId: Long): List<String>? {
+    fun getAllApplyUserList(shareId: Long): List<AppliedUserDto>? {
         val share = getShare(shareId)
-        val applyShareList = share.applyShareList
-        return applyShareList.map { it.user.nickname }.toList()
+        return share.applyShareList.toApplyShareResponseList()
     }
 
     fun getAllMyAppliedShareList(pageable: Pageable, status: String): Page<ShareResponse>? {