Order controller now returns orderView as respond for new order submit

Qorder · Jan 5, 2014 · a7366d3 · a7366d3
1 parent 549ad74
commit a7366d3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 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
@@ -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<Long> 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<OrderViewDTO> createOrder(@RequestParam Long id, @RequestBody OrderDTO orderDTO) throws BusinessDoesNotExistException {
 		LOGGER.info("Request for order submit");
-		Order order = orderService.submitOrder(id, orderDTO);
-		return new ResponseEntity<Long>(order.getId(),HttpStatus.CREATED);
+		OrderViewDTO orderView = orderService.submitOrder(id, orderDTO);
+		return new ResponseEntity<OrderViewDTO>(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
@@ -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
@@ -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)