From a7366d37b651590e462364e7701abdeb7d134d88 Mon Sep 17 00:00:00 2001 From: Grigoris Avgitidis Date: Sun, 5 Jan 2014 22:04:55 +0200 Subject: [PATCH] Order controller now returns orderView as respond for new order submit --- .../com/qorder/qorderws/controller/OrderController.java | 9 ++++----- .../java/com/qorder/qorderws/service/IOrderService.java | 3 +-- .../java/com/qorder/qorderws/service/OrderService.java | 5 +++-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/QorderWS/src/main/java/com/qorder/qorderws/controller/OrderController.java b/QorderWS/src/main/java/com/qorder/qorderws/controller/OrderController.java index 21a4817..a6d5a32 100644 --- a/QorderWS/src/main/java/com/qorder/qorderws/controller/OrderController.java +++ b/QorderWS/src/main/java/com/qorder/qorderws/controller/OrderController.java @@ -20,7 +20,6 @@ import com.qorder.qorderws.exception.BusinessDoesNotExistException; import com.qorder.qorderws.exception.OrderDoesNotExistException; import com.qorder.qorderws.model.order.EOrderStatus; -import com.qorder.qorderws.model.order.Order; import com.qorder.qorderws.service.IOrderService; @Controller @@ -32,11 +31,11 @@ public class OrderController { @Autowired private IOrderService orderService; - @RequestMapping(value = "/business", params = "id", method = RequestMethod.PUT, consumes = MediaType.APPLICATION_JSON_VALUE) - ResponseEntity createOrder(@RequestParam Long id, @RequestBody OrderDTO orderDTO) throws BusinessDoesNotExistException { + @RequestMapping(value = "/business", params = "id", method = RequestMethod.PUT, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE) + ResponseEntity createOrder(@RequestParam Long id, @RequestBody OrderDTO orderDTO) throws BusinessDoesNotExistException { LOGGER.info("Request for order submit"); - Order order = orderService.submitOrder(id, orderDTO); - return new ResponseEntity(order.getId(),HttpStatus.CREATED); + OrderViewDTO orderView = orderService.submitOrder(id, orderDTO); + return new ResponseEntity(orderView,HttpStatus.CREATED); } @RequestMapping(value = "/business", params = "id", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) diff --git a/QorderWS/src/main/java/com/qorder/qorderws/service/IOrderService.java b/QorderWS/src/main/java/com/qorder/qorderws/service/IOrderService.java index 7514f98..3525bcc 100644 --- a/QorderWS/src/main/java/com/qorder/qorderws/service/IOrderService.java +++ b/QorderWS/src/main/java/com/qorder/qorderws/service/IOrderService.java @@ -6,11 +6,10 @@ import com.qorder.qorderws.exception.BusinessDoesNotExistException; import com.qorder.qorderws.exception.OrderDoesNotExistException; import com.qorder.qorderws.model.order.EOrderStatus; -import com.qorder.qorderws.model.order.Order; public interface IOrderService { - Order submitOrder(long businessId, OrderDTO order) throws BusinessDoesNotExistException; + OrderViewDTO submitOrder(long businessId, OrderDTO order) throws BusinessDoesNotExistException; BusinessOrdersDTO fetchOrdersByBusinessID(long businessId) throws BusinessDoesNotExistException; diff --git a/QorderWS/src/main/java/com/qorder/qorderws/service/OrderService.java b/QorderWS/src/main/java/com/qorder/qorderws/service/OrderService.java index d179b2e..43e06cd 100644 --- a/QorderWS/src/main/java/com/qorder/qorderws/service/OrderService.java +++ b/QorderWS/src/main/java/com/qorder/qorderws/service/OrderService.java @@ -24,10 +24,11 @@ public class OrderService implements IOrderService { private IBusinessDAO businessDAO; @Override - public Order submitOrder(long businessId, OrderDTO orderDTO) throws BusinessDoesNotExistException { + public OrderViewDTO submitOrder(long businessId, OrderDTO orderDTO) throws BusinessDoesNotExistException { Order order = new OrderDTOtoOrderMapper().map(orderDTO, new Order()); order.setBusiness(businessDAO.findById(businessId)); - return orderDAO.save(order); + orderDAO.save(order); + return new OrderToOrderViewDTOMapper().map(order, new OrderViewDTO()); } @Transactional(readOnly = true)