-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #191 from Kek-i/develop-sprint-3
[develop-sprint-3] 3차 개발 sprint develop 브랜치로 이전
- Loading branch information
Showing
33 changed files
with
890 additions
and
25 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 5 additions & 0 deletions
5
src/main/java/com/codepatissier/keki/dessert/dto/PatchDessertReq.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,16 @@ | ||
| package com.codepatissier.keki.dessert.dto; | ||
|
|
||
| import lombok.Data; | ||
| import lombok.Getter; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| @Data | ||
| @Getter | ||
| public class PatchDessertReq { | ||
| private String dessertImg; | ||
| private String dessertName; | ||
| private Integer dessertPrice; | ||
| private String dessertDescription; | ||
| private List<OptionDTO> options; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
137 changes: 137 additions & 0 deletions
137
src/main/java/com/codepatissier/keki/order/controller/OrderController.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,152 @@ | ||
| package com.codepatissier.keki.order.controller; | ||
|
|
||
| import com.codepatissier.keki.common.BaseException; | ||
| import com.codepatissier.keki.common.BaseResponse; | ||
|
|
||
| import com.codepatissier.keki.order.dto.*; | ||
| import com.codepatissier.keki.order.dto.PatchOrderStatusReq; | ||
| import com.codepatissier.keki.order.dto.OrderReq; | ||
| import com.codepatissier.keki.order.entity.OrderStatus; | ||
|
|
||
| import com.codepatissier.keki.order.service.OrderService; | ||
| import com.codepatissier.keki.user.service.AuthService; | ||
| import io.swagger.v3.oas.annotations.security.SecurityRequirement; | ||
| import io.swagger.v3.oas.annotations.tags.Tag; | ||
| import lombok.RequiredArgsConstructor; | ||
|
|
||
| import org.springframework.util.StringUtils; | ||
| import org.springframework.web.bind.annotation.PatchMapping; | ||
| import org.springframework.web.bind.annotation.PathVariable; | ||
| import org.springframework.web.bind.annotation.RequestMapping; | ||
| import org.springframework.web.bind.annotation.RestController; | ||
|
|
||
| import org.springframework.web.bind.annotation.*; | ||
|
|
||
|
|
||
| import java.util.Objects; | ||
|
|
||
| import static com.codepatissier.keki.common.BaseResponseStatus.*; | ||
| import static com.codepatissier.keki.order.entity.OrderStatus.getOrderStatusByName; | ||
|
|
||
| @SecurityRequirement(name = "Bearer") | ||
| @Tag(name = "orders", description = "주문 API") | ||
| @RestController | ||
| @RequestMapping(value = "/orders") | ||
| @RequiredArgsConstructor | ||
| public class OrderController { | ||
|
|
||
| private final AuthService authService; | ||
| private final OrderService orderService; | ||
|
|
||
|
|
||
| /** | ||
| * 주문하기 API | ||
| * [POST] /orders | ||
| */ | ||
| @PostMapping("") | ||
| public BaseResponse<String> makeOrder(@RequestBody OrderReq orderReq){ | ||
| try { | ||
| orderService.makeOrder(authService.getUserIdx(), orderReq); | ||
| return new BaseResponse<>(SUCCESS); | ||
| } catch (BaseException e) { | ||
| return new BaseResponse<>(e.getStatus()); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * 주문수정 API | ||
| * [PATCH] /orders/:orderIdx | ||
| */ | ||
| @PatchMapping("{orderIdx}") | ||
| public BaseResponse<String> editOrder(@PathVariable("orderIdx") Long orderIdx, @RequestBody OrderReq orderReq){ | ||
| try { | ||
| orderService.editOrder(authService.getUserIdx(), orderIdx, orderReq); | ||
| return new BaseResponse<>(SUCCESS); | ||
| } catch (BaseException e) { | ||
| return new BaseResponse<>(e.getStatus()); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * [구매자/판매자] 주문 상세 조회 API | ||
| * @param orderIdx | ||
| * @return GetOrder | ||
| */ | ||
| @GetMapping("{orderIdx}") | ||
| public BaseResponse<GetOrder> getOrder(@PathVariable("orderIdx") Long orderIdx){ | ||
| try { | ||
| return new BaseResponse<>(orderService.getOrderReturn(authService.getUserIdx(), orderIdx)); | ||
| } catch (BaseException e) { | ||
| return new BaseResponse<>(e.getStatus()); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * 주문 내역 조회 API | ||
| * @param getOrderHistoryReq(orderStatus) | ||
| */ | ||
| @GetMapping("/history") | ||
| public BaseResponse<GetOrderHistoryRes> getOrderHistory(GetOrderHistoryReq getOrderHistoryReq){ | ||
| try { | ||
| return new BaseResponse<>(orderService.getOrderHistory(authService.getUserIdx(), getOrderHistoryReq)); | ||
| } catch (BaseException e) { | ||
| return new BaseResponse<>(e.getStatus()); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * 주문 취소 API | ||
| * @param orderIdx | ||
| */ | ||
| @PatchMapping("/cancel/{orderIdx}") | ||
| public BaseResponse<?> cancelOrder(@PathVariable("orderIdx") Long orderIdx) { | ||
| try{ | ||
| orderService.cancelOrder(authService.getUserIdx(), orderIdx); | ||
| return new BaseResponse<>(SUCCESS); | ||
| }catch (BaseException e){ | ||
| return new BaseResponse<>(e.getStatus()); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * [판매자] 주문 상태 변경 | ||
| * @param patchOrderStatusReq(orderIdx, orderStatus) | ||
| */ | ||
| @PatchMapping("/status") | ||
| public BaseResponse<?> changeOrderStatus(PatchOrderStatusReq patchOrderStatusReq) { | ||
| try{ | ||
| if(Objects.isNull(patchOrderStatusReq.getOrderIdx())) throw new BaseException(NULL_ORDER_IDX); | ||
| String orderStatus = patchOrderStatusReq.getOrderStatus(); | ||
| if(!StringUtils.hasText(orderStatus)) throw new BaseException(NULL_ORDER_STATUS); | ||
| if(Objects.isNull(getOrderStatusByName(orderStatus)) || getOrderStatusByName(orderStatus) == OrderStatus.CANCELED) throw new BaseException(INVALID_ORDER_STATUS); | ||
| orderService.changeOrderStatus(authService.getUserIdx(), patchOrderStatusReq); | ||
| return new BaseResponse<>(SUCCESS); | ||
| }catch (BaseException e){ | ||
| return new BaseResponse<>(e.getStatus()); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * 주문 화면 조회 | ||
| */ | ||
| @GetMapping("/view/{storeIdx}") | ||
| public BaseResponse<GetOrderStore> getStoreDessertsAndOptions(@PathVariable("storeIdx") Long storeIdx){ | ||
| try{ | ||
| return new BaseResponse<>(this.orderService.getStoreDessertsAndOptions(storeIdx)); | ||
| }catch (BaseException e){ | ||
| return new BaseResponse<>(e.getStatus()); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * 주문 수정 화면 조회 | ||
| */ | ||
| @GetMapping("/{orderIdx}/editView") | ||
| public BaseResponse<GetEditOrder> getEditOrderView(@PathVariable("orderIdx") Long orderIdx){ | ||
| try { | ||
| return new BaseResponse<>(this.orderService.getEditOrderView(orderIdx, authService.getUserIdx())); | ||
| } catch (BaseException e) { | ||
| return new BaseResponse<>(e.getStatus()); | ||
| } | ||
| } | ||
| } |
18 changes: 18 additions & 0 deletions
18
src/main/java/com/codepatissier/keki/order/dto/GetEditOrder.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| package com.codepatissier.keki.order.dto; | ||
|
|
||
| import lombok.AllArgsConstructor; | ||
| import lombok.Getter; | ||
| import lombok.NoArgsConstructor; | ||
| import lombok.Setter; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| @Getter | ||
| @Setter | ||
| @AllArgsConstructor | ||
| @NoArgsConstructor | ||
| public class GetEditOrder { | ||
| GetOrder getOrder; | ||
| List<GetStoreDessertAndOptions> getStoreDessertAndOptions; | ||
|
|
||
| } |
Oops, something went wrong.