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 index 740914b..8b895e1 100644 --- 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> createNewGift(@UserId Long userId, @Re return SuccessResponse.created(null); } - @GetMapping("/my") - public ResponseEntity> getMyGift(@UserId Long userId, @RequestBody MyGiftsRequestDto myGiftsRequestDto) { - final MyGiftsResponseDto myGiftsResponseDto = giftService.getMyGift(userId, myGiftsRequestDto); + @GetMapping("/my-gift/{roomId}") + public ResponseEntity> getMyGift(@UserId Long userId, @PathVariable Long roomId) { + final MyGiftsResponseDto myGiftsResponseDto = giftService.getMyGift(userId, roomId); return SuccessResponse.ok(myGiftsResponseDto); } + @DeleteMapping("/my/{giftId}") public ResponseEntity> deleteMyGift(@UserId Long userId, @PathVariable Long giftId) { giftService.deleteMyGift(userId, giftId); @@ -52,13 +53,13 @@ public ResponseEntity> evaluateTournamentScore(@UserId Long u return SuccessResponse.created(null); } - @GetMapping("tournament-info/{roomId}") + @GetMapping("/tournament-info/{roomId}") public ResponseEntity> 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> getRanking(@UserId Long userId, @PathVariable Long roomId) { final List 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 index b13ef0f..1d29292 100644 --- 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 gifts = giftRepository.findByRoomAndMember(room, member); List myGiftsDtoList = mapGiftsToMyGiftDtoList(gifts);