diff --git a/src/main/java/com/pickle/server/dress/controller/DressController.java b/src/main/java/com/pickle/server/dress/controller/DressController.java index d34cffb..1c6d8fa 100644 --- a/src/main/java/com/pickle/server/dress/controller/DressController.java +++ b/src/main/java/com/pickle/server/dress/controller/DressController.java @@ -156,13 +156,12 @@ public ResponseEntity> findDressLikeByUser(@ApiIgnore @Authen @ApiResponses({ @ApiResponse(code = 200, message = "의상 예약 상세 내역 조회 성공") }) - @GetMapping("/orders") - public ResponseEntity> getOrder (@ApiIgnore @AuthenticationPrincipal User user){ - return new ResponseEntity<>(dressService.getDressOrder(user.getId()), HttpStatus.OK); + @GetMapping("/orders/{dress_reservation_id}") + public ResponseEntity> getOrder(@PathVariable(name="dress_reservation_id") Long dressReservationId, + @ApiIgnore @AuthenticationPrincipal User user){ + return new ResponseEntity<>(dressService.getDressOrder(dressReservationId,user.getId()), HttpStatus.OK); } - - @ApiOperation(value = "의상 예약 내역 조회", httpMethod = "GET", response = DressOrderDto.class, @@ -172,7 +171,7 @@ public ResponseEntity> getOrder (@ApiIgnore @AuthenticationP @ApiResponse(code = 200, message = "의상 예약 내역 조회 성공") }) @GetMapping("/order-list") - public ResponseEntity> getOrderList (@ApiIgnore @AuthenticationPrincipal User user){ - return new ResponseEntity<>(dressService.getDressOrderList(user.getId()), HttpStatus.OK); + public ResponseEntity> getOrderList(@RequestParam(name="status")String status,@ApiIgnore @AuthenticationPrincipal User user){ + return new ResponseEntity<>(dressService.getDressOrderList(status,user.getId()), HttpStatus.OK); } } diff --git a/src/main/java/com/pickle/server/dress/dto/DressOrderDto.java b/src/main/java/com/pickle/server/dress/dto/DressOrderDto.java index 1f1937f..de936df 100644 --- a/src/main/java/com/pickle/server/dress/dto/DressOrderDto.java +++ b/src/main/java/com/pickle/server/dress/dto/DressOrderDto.java @@ -12,7 +12,6 @@ import java.time.format.DateTimeFormatter; - @Getter public class DressOrderDto { @ApiModelProperty(example = "예약내역 id") @@ -55,18 +54,17 @@ public class DressOrderDto { @JsonProperty("price") private String price; - @ApiModelProperty(example = "드레스 옵션 1") - @JsonProperty("dress_option1") - private String dressOption1; +// @ApiModelProperty(example = "드레스 옵션 1") +// @JsonProperty("dress_option1") +// private String dressOption1; @ApiModelProperty(example = "드레스 옵션 1_name") @JsonProperty("dress_option1_name") -// private DressOptionDetail dressOption1; private String dressOptionName1; - @ApiModelProperty(example = "드레스 옵션 2") - @JsonProperty("dress_option2") - private String dressOption2; +// @ApiModelProperty(example = "드레스 옵션 2") +// @JsonProperty("dress_option2") +// private String dressOption2; @ApiModelProperty(example = "드레스 옵션 2_name") @JsonProperty("dress_option2_name") // private DressOptionDetail dressOption1; @@ -90,9 +88,9 @@ public DressOrderDto(DressReservation dressReservation, ReservedDress reservedDr + dressReservation.getStore().getCloseTime().format(DateTimeFormatter.ofPattern("HH:mm")); this.storeOpenDay = makeStoreOpenDayIntroduction(dressReservation.getStore().getStoreOpenDay()); this.pickUpDateTime = dressReservation.getPickUpDateTime().toString(); - this.dressOption1 = reservedDress.getDressOptionDetail1().getDressOption().getName(); +// this.dressOption1 = reservedDress.getDressOptionDetail1().getDressOption().getName(); this.dressOptionName1 = reservedDress.getDressOptionDetail1().getName(); - this.dressOption2 = reservedDress.getDressOptionDetail2().getDressOption().getName(); +// this.dressOption2 = reservedDress.getDressOptionDetail2().getDressOption().getName(); this.dressOptionName2 = reservedDress.getDressOptionDetail2().getName(); this.comment =dressReservation.getComment(); this.price = priceFormat.format(dressReservation.getPrice()*reservedDress.getQuantity())+"원"; diff --git a/src/main/java/com/pickle/server/dress/repository/DressDslRepository.java b/src/main/java/com/pickle/server/dress/repository/DressDslRepository.java index 6788130..5952592 100644 --- a/src/main/java/com/pickle/server/dress/repository/DressDslRepository.java +++ b/src/main/java/com/pickle/server/dress/repository/DressDslRepository.java @@ -17,6 +17,6 @@ public interface DressDslRepository { List findDressByStoreAndCreatedAt(Long userId, Double latitude, Double longitude, LocalDateTime stdDate); List findDressByCategory(Long userId, String category, Double latitude, Double longitude); - List findReservationByUser(Long userId); - List findReservationListByUser(Long userId); + List findReservationByUserAndReservationId(Long dressReservationId,Long userId); + List findReservationListByStatusAndUser(String status,Long userId); } diff --git a/src/main/java/com/pickle/server/dress/repository/DressRepositoryImpl.java b/src/main/java/com/pickle/server/dress/repository/DressRepositoryImpl.java index 633ce56..38e3b4c 100644 --- a/src/main/java/com/pickle/server/dress/repository/DressRepositoryImpl.java +++ b/src/main/java/com/pickle/server/dress/repository/DressRepositoryImpl.java @@ -195,7 +195,7 @@ private NumberExpression radianToDegree(NumberExpression radian) return radian.multiply(180 / Math.PI); } @Override - public List findReservationByUser(Long userId) { + public List findReservationByUserAndReservationId(Long dressReservationId,Long userId) { return queryFactory .select(new QDressOrderDto( dressReservation,reservedDress, @@ -204,13 +204,13 @@ public List findReservationByUser(Long userId) { .where(dressImage.dress.id.eq(dress.id)).limit(1) )) .from(dressReservation, reservedDress) - .where(dressReservation.user.id.eq(userId)) + .where(dressReservation.user.id.eq(userId).and(dressReservation.id.eq(dressReservationId))) .where(dressReservation.id.eq(reservedDress.dressReservation.id)) .fetch(); } @Override - public List findReservationListByUser(Long userId) { + public List findReservationListByStatusAndUser(String status,Long userId) { return queryFactory .select(new QDressOrderListDto( dressReservation,reservedDress, @@ -221,6 +221,7 @@ public List findReservationListByUser(Long userId) { .from(dressReservation, reservedDress) .where(dressReservation.user.id.eq(userId)) .where(dressReservation.id.eq(reservedDress.dressReservation.id)) + .where(dressReservation.status.eq(status)) .fetch(); } } diff --git a/src/main/java/com/pickle/server/dress/service/DressService.java b/src/main/java/com/pickle/server/dress/service/DressService.java index 810c025..845d350 100644 --- a/src/main/java/com/pickle/server/dress/service/DressService.java +++ b/src/main/java/com/pickle/server/dress/service/DressService.java @@ -106,13 +106,14 @@ public void makeDressReservation(DressReservationDto dressReservationDto, User u } } - public List getDressOrder(Long userId){ + public List getDressOrder(Long dressReservationId,Long userId){ User user = userRepository.findById(userId).orElseThrow(() -> new NotFoundIdException()); - return dressRepository.findReservationByUser(userId); + + return dressRepository.findReservationByUserAndReservationId(dressReservationId,userId); } - public List getDressOrderList(Long userId){ + public List getDressOrderList(String status,Long userId){ User user = userRepository.findById(userId).orElseThrow(() -> new NotFoundIdException()); - return dressRepository.findReservationListByUser(userId); + return dressRepository.findReservationListByStatusAndUser(status,userId); } public void cancelReservation(Long reservationId) {