From 4fa842269f25d9bb6e4ba29bbccb18b91e8d1cc4 Mon Sep 17 00:00:00 2001
From: hysong4u <hayeon_song@naver.com>
Date: Tue, 16 Jan 2024 02:10:38 +0900
Subject: [PATCH] =?UTF-8?q?[fix]=20=EC=A2=85=EB=A3=8C=EB=90=9C=20=EC=84=A0?=
 =?UTF-8?q?=EB=AC=BC=EB=B0=A9=20response=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/sopt/sweet/domain/gift/controller/GiftApi.java     | 2 +-
 .../domain/member/dto/response/ClosedRoomResponseDto.java  | 3 ++-
 .../sopt/sweet/domain/member/service/MemberService.java    | 7 ++++---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/sopt/sweet/domain/gift/controller/GiftApi.java b/src/main/java/org/sopt/sweet/domain/gift/controller/GiftApi.java
index d53d4e9..46e26f1 100644
--- a/src/main/java/org/sopt/sweet/domain/gift/controller/GiftApi.java
+++ b/src/main/java/org/sopt/sweet/domain/gift/controller/GiftApi.java
@@ -62,7 +62,7 @@ ResponseEntity<SuccessResponse<?>> getMyGift(
                     required = true,
                     example = "12345"
             ) @UserId Long userId,
-            @Valid @RequestBody MyGiftsRequestDto myGiftsRequestDto
+            @Valid @PathVariable Long roomId
     );
 
     @Operation(
diff --git a/src/main/java/org/sopt/sweet/domain/member/dto/response/ClosedRoomResponseDto.java b/src/main/java/org/sopt/sweet/domain/member/dto/response/ClosedRoomResponseDto.java
index 5e5199f..36d75cf 100644
--- a/src/main/java/org/sopt/sweet/domain/member/dto/response/ClosedRoomResponseDto.java
+++ b/src/main/java/org/sopt/sweet/domain/member/dto/response/ClosedRoomResponseDto.java
@@ -4,6 +4,7 @@ public record ClosedRoomResponseDto(
         Long roomId,
         String imageUrl,
         String gifteeName,
-        int gifterNumber
+        int gifterNumber,
+        Boolean isOwner
 ) {
 }
diff --git a/src/main/java/org/sopt/sweet/domain/member/service/MemberService.java b/src/main/java/org/sopt/sweet/domain/member/service/MemberService.java
index 8380675..10d97e2 100644
--- a/src/main/java/org/sopt/sweet/domain/member/service/MemberService.java
+++ b/src/main/java/org/sopt/sweet/domain/member/service/MemberService.java
@@ -52,17 +52,18 @@ public List<ClosedRoomResponseDto> getClosedRoom(Long memberId) {
                 .map(RoomMember::getRoom)
                 .filter(room -> room.getDeliveryDate().isBefore(LocalDateTime.now()))
                 .sorted(Comparator.comparing(Room::getDeliveryDate).reversed())
-                .map(this::mapToClosedRoomResponseDto)
+                .map(room -> mapToClosedRoomResponseDto(room, memberId))
                 .collect(Collectors.toList());
         return closedRooms;
     }
 
-    private ClosedRoomResponseDto mapToClosedRoomResponseDto(Room room) {
+    private ClosedRoomResponseDto mapToClosedRoomResponseDto(Room room, Long memberId){
         return new ClosedRoomResponseDto(
                 room.getId(),
                 room.getImageUrl(),
                 room.getGifteeName(),
-                room.getGifterNumber()
+                room.getGifterNumber(),
+                isOwner(memberId, room.getId())
         );
     }