Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[fix] 내 선물 조회하기 API 엔드포인트 변경 및 종료된 선물방 response 추가 #72

Merged
merged 2 commits into from
Jan 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ ResponseEntity<SuccessResponse<?>> getMyGift(
required = true,
example = "12345"
) @UserId Long userId,
@Valid @RequestBody MyGiftsRequestDto myGiftsRequestDto
@Valid @PathVariable Long roomId
);

@Operation(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ public record ClosedRoomResponseDto(
Long roomId,
String imageUrl,
String gifteeName,
int gifterNumber
int gifterNumber,
Boolean isOwner
) {
}
Original file line number Diff line number Diff line change
Expand Up @@ -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())
);
}

Expand Down