Merge pull request #72 from SWEET-DEVELOPERS/feature/#69-gift

[fix] 내 선물 조회하기 API 엔드포인트 변경 및 종료된 선물방 response 추가
SWEET-DEVELOPERS · Jan 15, 2024 · 21009db · 21009db
2 parents 0d1f888 + 1ff919c
commit 21009db
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 12 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
@@ -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/gift/controller/GiftController.java b/src/main/java/org/sopt/sweet/domain/gift/controller/GiftController.java
@@ -28,12 +28,13 @@ public ResponseEntity<SuccessResponse<?>> createNewGift(@UserId Long userId, @Re
         return SuccessResponse.created(null);
     }
 
-    @GetMapping("/my")
-    public ResponseEntity<SuccessResponse<?>> getMyGift(@UserId Long userId, @RequestBody MyGiftsRequestDto myGiftsRequestDto) {
-        final MyGiftsResponseDto myGiftsResponseDto = giftService.getMyGift(userId, myGiftsRequestDto);
+    @GetMapping("/my-gift/{roomId}")
+    public ResponseEntity<SuccessResponse<?>> getMyGift(@UserId Long userId, @PathVariable Long roomId) {
+        final MyGiftsResponseDto myGiftsResponseDto = giftService.getMyGift(userId, roomId);
         return SuccessResponse.ok(myGiftsResponseDto);
     }
 
+
     @DeleteMapping("/my/{giftId}")
     public ResponseEntity<SuccessResponse<?>> deleteMyGift(@UserId Long userId, @PathVariable Long giftId) {
         giftService.deleteMyGift(userId, giftId);
@@ -52,13 +53,13 @@ public ResponseEntity<SuccessResponse<?>> evaluateTournamentScore(@UserId Long u
         return SuccessResponse.created(null);
     }
 
-    @GetMapping("tournament-info/{roomId}")
+    @GetMapping("/tournament-info/{roomId}")
     public ResponseEntity<SuccessResponse<?>> getTournamentInfo(@UserId Long userId, @PathVariable Long roomId) {
         final TournamentInfoDto tournamentInfo = giftService.getTournamentInfo(userId, roomId);
         return SuccessResponse.ok(tournamentInfo);
     }
 
-    @GetMapping("ranking/{roomId}")
+    @GetMapping("/ranking/{roomId}")
     public ResponseEntity<SuccessResponse<?>> getRanking(@UserId Long userId, @PathVariable Long roomId) {
         final List<TournamentRankingResponseDto> ranking = giftService.getTournamentRanking(roomId);
         return SuccessResponse.ok(ranking);

diff --git a/src/main/java/org/sopt/sweet/domain/gift/service/GiftService.java b/src/main/java/org/sopt/sweet/domain/gift/service/GiftService.java
@@ -53,9 +53,9 @@ public void createNewGift(Long memberId, CreateGiftRequestDto createGiftRequestD
     }
 
     @Transactional(readOnly = true)
-    public MyGiftsResponseDto getMyGift(Long memberId, MyGiftsRequestDto myGiftsRequestDto) {
+    public MyGiftsResponseDto getMyGift(Long memberId, Long roomId) {
         Member member = findMemberByIdOrThrow(memberId);
-        Room room = findRoomByIdOrThrow(myGiftsRequestDto.roomId());
+        Room room = findRoomByIdOrThrow(roomId);
         checkRoomMemberNotExists(room, member);
         List<Gift> gifts = giftRepository.findByRoomAndMember(room, member);
         List<MyGiftDto> myGiftsDtoList = mapGiftsToMyGiftDtoList(gifts);

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
@@ -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
@@ -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())
         );
     }