From 1eeac6fabad5a4a76c2723a02363259d9c728147 Mon Sep 17 00:00:00 2001
From: Cho jiwon <77895305+Jiwon-cho@users.noreply.github.com>
Date: Sat, 24 Feb 2024 14:00:32 +0900
Subject: [PATCH] =?UTF-8?q?HOTFIX-44=20:=20=EB=82=98=EB=88=94=20=EC=83=81?=
 =?UTF-8?q?=EC=84=B8=20,=EA=B2=8C=EC=8B=9C=EC=9E=90=20=EC=A0=95=EB=B3=B4?=
 =?UTF-8?q?=20=EC=B6=94=EA=B0=80,=20=EC=8B=A0=EC=B2=AD=ED=95=9C=20?=
 =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90=20=EC=9D=B4=EB=A6=84,=ED=94=84?=
 =?UTF-8?q?=EB=A1=9C=ED=95=84=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80=20(#45)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* refactor: 나눔 게시자 정보 추가

* refactor: 나눔 신청한 사용자 이름,프로필 이미지 추가
---
 .../server/domain/share/ShareController.kt    |  2 +-
 .../mara/server/domain/share/ShareDto.kt      | 19 +++++++++++++++++++
 .../mara/server/domain/share/ShareService.kt  |  5 ++---
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/main/kotlin/mara/server/domain/share/ShareController.kt b/src/main/kotlin/mara/server/domain/share/ShareController.kt
index 2d23928..973809f 100644
--- 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
index 3be9913..7d8a3a3 100644
--- a/src/main/kotlin/mara/server/domain/share/ShareDto.kt
+++ b/src/main/kotlin/mara/server/domain/share/ShareDto.kt
@@ -1,5 +1,6 @@
 package mara.server.domain.share
 
+import mara.server.domain.user.ProfileImage
 import org.springframework.data.domain.Page
 import java.time.LocalDate
 import java.time.LocalTime
@@ -36,6 +37,8 @@ data class UpdateShareStatusRequest(
 )
 
 data class ShareResponse(
+    val nickname: String,
+    val profileImage: ProfileImage,
     val shareId: Long,
     val title: String,
     val itemName: String,
@@ -50,6 +53,8 @@ data class ShareResponse(
     val thumbNailImage: String
 ) {
     constructor(share: Share) : this(
+        nickname = share.user.nickname,
+        profileImage = share.user.profileImage,
         shareId = share.id,
         title = share.title,
         content = share.content,
@@ -64,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
index 8325f2d..67af063 100644
--- 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>? {