From 4fa842269f25d9bb6e4ba29bbccb18b91e8d1cc4 Mon Sep 17 00:00:00 2001 From: hysong4u Date: Tue, 16 Jan 2024 02:10:38 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[fix]=20=EC=A2=85=EB=A3=8C=EB=90=9C=20?= =?UTF-8?q?=EC=84=A0=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> 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 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()) ); } From 1ff919c5f15f782c3843a2687922a0b6769e7a56 Mon Sep 17 00:00:00 2001 From: hysong4u Date: Tue, 16 Jan 2024 02:11:14 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[fix]=20=EB=82=B4=20=EC=84=A0=EB=AC=BC=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=ED=95=98=EA=B8=B0=20API=20=EC=97=94=EB=93=9C?= =?UTF-8?q?=ED=8F=AC=EC=9D=B8=ED=8A=B8=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sweet/domain/gift/controller/GiftController.java | 11 ++++++----- .../sopt/sweet/domain/gift/service/GiftService.java | 4 ++-- 2 files changed, 8 insertions(+), 7 deletions(-) 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);