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

Refactor code. #47

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
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
33 changes: 30 additions & 3 deletions order/src/main/java/om/order/controller/OrderController.java
Original file line number Diff line number Diff line change
@@ -1,28 +1,55 @@
package om.order.controller;

import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import om.order.config.Constants;
import om.order.dto.OrderReq;
import om.order.dto.OrderResp;
import om.order.service.IOrderService;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseStatus;
import org.springframework.web.bind.annotation.RestController;

import java.util.List;

@RequiredArgsConstructor
@RestController @Slf4j
@RequestMapping("/api/v1/orders")
@RequestMapping(value = "/api/orders",headers = "Accept-Version=v1")

public class OrderController {
private final IOrderService orderService;

// modern way to write Controller Endpoints. Older way is depicted in ResponseEntity<List<ProductResp>> ProductController.getAllProducts()
@PostMapping
@ResponseStatus(HttpStatus.CREATED) // modern method to specify Status Code
public String createOrder(@RequestBody OrderReq orderReq) {
@ResponseStatus(HttpStatus.CREATED) // 201
public String createOrder(@Valid @RequestBody OrderReq orderReq) {
orderService.createOrder(orderReq);
log.debug(Constants.newOrderPlaced);
return Constants.newOrderPlaced;
}

//TODO add getOrders()
@GetMapping
@ResponseStatus(HttpStatus.OK)
public List<OrderResp> getOrders(
@RequestParam(defaultValue = "0") int pageNumber,
@RequestParam(defaultValue = "5") int pageSize
) {
Pageable pageable = PageRequest.of(pageNumber, pageSize);
return orderService.getOrders(pageable);
}

//TODO add getOrderByOrderNumber()

//TODO add getOrderByUserEmail()

//TODO add getOrderByUserName()
}
1 change: 0 additions & 1 deletion order/src/main/java/om/order/dto/OrderReq.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@

public record OrderReq(Long id, String orderNumber, String itemSkuCode,
BigDecimal pricePerItem,Integer quantity,UserDetails userDetails) {
public record UserDetails(String emailAddress, String name) {}
}
7 changes: 7 additions & 0 deletions order/src/main/java/om/order/dto/OrderResp.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package om.order.dto;

import java.math.BigDecimal;

public record OrderResp(Long id, String orderNumber, String itemSkuCode,
BigDecimal pricePerItem, Integer quantity, UserDetails userDetails) {
}
3 changes: 3 additions & 0 deletions order/src/main/java/om/order/dto/UserDetails.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
package om.order.dto;
public record UserDetails(String emailAddress, String name) {}

Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.ControllerAdvice;
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.RestControllerAdvice;
import org.springframework.web.context.request.WebRequest;

import java.time.LocalDateTime;

@ControllerAdvice
@RestControllerAdvice
public class OrderExceptionHandler /*extends ResponseEntityExceptionHandler*/ {

@ExceptionHandler({InventoryShortOfStockException.class})
Expand Down
6 changes: 6 additions & 0 deletions order/src/main/java/om/order/service/IOrderService.java
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
package om.order.service;

import om.order.dto.OrderReq;
import om.order.dto.OrderResp;
import org.springframework.data.domain.Pageable;

import java.util.List;

public interface IOrderService {

public void createOrder(OrderReq orderReq);

public List<OrderResp> getOrders(Pageable pageable);

/*
** To check items from shopping card out **
* 1. View the list of items I am buying.
Expand Down
8 changes: 8 additions & 0 deletions order/src/main/java/om/order/service/OrderServiceImpl.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,16 @@
import om.order.config.Constants;
import om.order.dao.OrderRepo;
import om.order.dto.OrderReq;
import om.order.dto.OrderResp;
import om.order.entity.Order;
import om.order.event.OrderPlacedEvent;
import org.springframework.data.domain.Pageable;
import org.springframework.kafka.core.KafkaTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
@Transactional
@Service @RequiredArgsConstructor @Slf4j
Expand Down Expand Up @@ -49,4 +53,8 @@ public void createOrder(OrderReq orderReq) {
throw new InventoryShortOfStockException(orderReq.itemSkuCode(), orderReq.quantity());
}
}

@Override
public List<OrderResp> getOrders(Pageable pageable){return new ArrayList<>();}

}
5 changes: 5 additions & 0 deletions order/src/test/java/om/order/OrderApplicationTests.java
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,11 @@ void shouldSubmitOrder() {
assertThat(responseBodyString, Matchers.is(Constants.newOrderPlaced));
}

@Test
void shouldReturnOrders() {

}

@Test
void contextLoads() {
}
Expand Down
Loading