Add getOrders and getOrder by orderNumber API handler

Author: SuperSection

order-service/src/main/java/com/supersection/bookstore/orders/domain/OrderMapper.java

@@ -1,11 +1,13 @@
 package com.supersection.bookstore.orders.domain;
 
 import com.supersection.bookstore.orders.domain.dtos.CreateOrderRequest;
+import com.supersection.bookstore.orders.domain.dtos.OrderDTO;
 import com.supersection.bookstore.orders.domain.models.OrderItem;
 import com.supersection.bookstore.orders.domain.models.OrderStatus;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.UUID;
+import java.util.stream.Collectors;
 
 class OrderMapper {
 
@@ -32,4 +34,20 @@ static OrderEntity convertToEntity(CreateOrderRequest request) {
         newOrder.setItems(orderItems);
         return newOrder;
     }
+
+    static OrderDTO convertToDTO(OrderEntity order) {
+        Set<OrderItem> orderItems = order.getItems().stream()
+                .map(item -> new OrderItem(item.getCode(), item.getName(), item.getPrice(), item.getQuantity()))
+                .collect(Collectors.toSet());
+
+        return new OrderDTO(
+                order.getOrderNumber(),
+                order.getUserName(),
+                orderItems,
+                order.getCustomer(),
+                order.getDeliveryAddress(),
+                order.getStatus(),
+                order.getComments(),
+                order.getCreatedAt());
+    }
 }

order-service/src/main/java/com/supersection/bookstore/orders/domain/OrderRepository.java

@@ -1,9 +1,11 @@
 package com.supersection.bookstore.orders.domain;
 
 import com.supersection.bookstore.orders.domain.models.OrderStatus;
+import com.supersection.bookstore.orders.domain.models.OrderSummary;
 import java.util.List;
 import java.util.Optional;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
 @Repository
@@ -18,4 +20,20 @@ default void updateOrderStatus(String orderNumber, OrderStatus status) {
         order.setStatus(status);
         this.save(order);
     }
+
+    @Query(
+            """
+            select new com.supersection.bookstore.orders.domain.models.OrderSummary(o.orderNumber, o.status)
+            from OrderEntity o
+            where o.userName = :userName
+            """)
+    List<OrderSummary> findByUserName(String userName);
+
+    @Query(
+            """
+            select distinct o
+            from OrderEntity o left join fetch o.items
+            where o.userName = :userName and o.orderNumber = :orderNumber
+            """)
+    Optional<OrderEntity> findByUserNameAndOrderNumber(String userName, String orderNumber);
 }

order-service/src/main/java/com/supersection/bookstore/orders/domain/OrderService.java

@@ -2,10 +2,13 @@
 
 import com.supersection.bookstore.orders.domain.dtos.CreateOrderRequest;
 import com.supersection.bookstore.orders.domain.dtos.CreateOrderResponse;
+import com.supersection.bookstore.orders.domain.dtos.OrderDTO;
 import com.supersection.bookstore.orders.domain.models.OrderCreatedEvent;
 import com.supersection.bookstore.orders.domain.models.OrderStatus;
+import com.supersection.bookstore.orders.domain.models.OrderSummary;
 import jakarta.validation.Valid;
 import java.util.List;
+import java.util.Optional;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -41,6 +44,16 @@ public CreateOrderResponse createOrder(String userName, @Valid CreateOrderReques
         return new CreateOrderResponse(savedOrder.getOrderNumber());
     }
 
+    public List<OrderSummary> findOrders(String userName) {
+        return orderRepository.findByUserName(userName);
+    }
+
+    public Optional<OrderDTO> findUserOrder(String userName, String orderNumber) {
+        return orderRepository
+                .findByUserNameAndOrderNumber(userName, orderNumber)
+                .map(OrderMapper::convertToDTO);
+    }
+
     public void processNewOrders() {
         List<OrderEntity> orders = orderRepository.findByStatus(OrderStatus.NEW);
         log.info("Found {} new orders to process", orders.size());

order-service/src/main/java/com/supersection/bookstore/orders/web/controllers/OrderController.java

@@ -4,7 +4,11 @@
 import com.supersection.bookstore.orders.domain.SecurityService;
 import com.supersection.bookstore.orders.domain.dtos.CreateOrderRequest;
 import com.supersection.bookstore.orders.domain.dtos.CreateOrderResponse;
+import com.supersection.bookstore.orders.domain.dtos.OrderDTO;
+import com.supersection.bookstore.orders.domain.exception.OrderNotFoundException;
+import com.supersection.bookstore.orders.domain.models.OrderSummary;
 import jakarta.validation.Valid;
+import java.util.List;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpStatus;
@@ -30,4 +34,20 @@ CreateOrderResponse createOrder(@Valid @RequestBody CreateOrderRequest request)
         log.info("Creating order for user: {}", userName);
         return orderService.createOrder(userName, request);
     }
+
+    @GetMapping
+    List<OrderSummary> getOrders() {
+        String userName = securityService.getLoginUserName();
+        log.info("Fetching orders for user: {}", userName);
+        return orderService.findOrders(userName);
+    }
+
+    @GetMapping(value = "/{orderNumber}")
+    OrderDTO getOrder(@PathVariable(value = "orderNumber") String orderNumber) {
+        log.info("Fetching order by id: {}", orderNumber);
+        String userName = securityService.getLoginUserName();
+        return orderService
+                .findUserOrder(userName, orderNumber)
+                .orElseThrow(() -> new OrderNotFoundException(orderNumber));
+    }
 }