Merge branch 'new-fetch-status-warehouse' into 'dev'

Clean up code

See merge request !39

src/main/java/com/afp/ordermanagement/controller/OrderController.java

 package com.afp.ordermanagement.controller;
 
 import com.afp.ordermanagement.model.Order;
+import com.afp.ordermanagement.reactivekafkaservice.Receiver;
 import com.afp.ordermanagement.reactivekafkaservice.Sender;
 import com.afp.ordermanagement.service.OrderService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,6 +22,9 @@ public class OrderController {
     @Autowired
     Sender sender;
 
+    @Autowired
+    Receiver receiver;
+
 
     /**
      * DESC -   Persisting order information in the database and sending the
@@ -36,12 +40,14 @@ public class OrderController {
         return orderService.createOrder(orderObject);
     }
 
+
     @GetMapping("/orders")
     @CrossOrigin
     public Flux<Order> getAllOrders(){
         return orderService.getAllOrders();
     }
 
+
     @GetMapping("/orders/{orderId}")
     @CrossOrigin
     public Mono<Order> getOrderById(@PathVariable("orderId") String orderId) {
@@ -65,4 +71,5 @@ public class OrderController {
         orderService.deleteOrderById(orderId);
     }
 
+
 }

src/main/java/com/afp/ordermanagement/model/Item.java

 package com.afp.ordermanagement.model;
 
 import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.util.Objects;
 
 @Data
+@Getter
+@Setter
 public class Item {
     private String itemId, itemName, itemSku;
     private int itemQuantity;

src/main/java/com/afp/ordermanagement/model/Order.java

@@ -8,6 +8,7 @@ import org.springframework.data.mongodb.core.mapping.Document;
 
 import java.util.List;
 
+
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
@@ -17,6 +18,7 @@ public class Order {
         this.orderStatus = status;
     }
 
+
     @Id
     private String id;
 
@@ -32,3 +34,4 @@ public class Order {
 
     private CustomerAddress customerAddress;
 }
+

src/main/java/com/afp/ordermanagement/model/OrderStatus.java

@@ -3,5 +3,5 @@ package com.afp.ordermanagement.model;
 public enum OrderStatus {
     RECEIVED,
     FULFILLED,
-    CANCELLED
+    CANCELLED,
 }

src/main/java/com/afp/ordermanagement/reactivekafkaservice/Receiver.java

 package com.afp.ordermanagement.reactivekafkaservice;
 
+import com.afp.ordermanagement.controller.OrderController;
+import com.afp.ordermanagement.model.Item;
 import com.afp.ordermanagement.model.Order;
 import com.afp.ordermanagement.model.OrderStatus;
+import com.afp.ordermanagement.repository.OrderRepository;
 import com.afp.ordermanagement.service.OrderService;
+import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,11 +17,9 @@ import org.springframework.stereotype.Service;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import reactor.kafka.receiver.KafkaReceiver;
+import reactor.kafka.receiver.ReceiverRecord;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
+import java.util.*;
 
 @Service
 @Slf4j
@@ -29,6 +31,8 @@ public class Receiver {
     @Autowired
     private OrderService orderService;
 
+    @Autowired
+    private OrderRepository orderRepository;
 
 
     @EventListener(ApplicationStartedEvent.class)
@@ -36,55 +40,31 @@ public class Receiver {
         kafkaReceiver.receive()
                 .doOnNext(record -> System.out.println(record))
                 .doOnNext(record -> log.info("record.value(): {} ", record.value()))
-                .doOnNext(record -> onOrderStatusReceived(record.value()))
+                .doOnNext(record -> updateOrderStatus(record.value()))
                 .doOnError(throwable -> System.out.println(throwable.getMessage()))
                 .subscribe();
     }
 
 
 
-    private void onOrderStatusReceived(String orderStatusStr) {
+
+    private void updateOrderStatus(String orderStr) {
         try {
-            //deserialize string into java object using ObjectMapper
             ObjectMapper objectMapper = new ObjectMapper();
-            Map<String, String> orderStatus = objectMapper.readValue(orderStatusStr, Map.class);
-            String id = orderStatus.get("id");
-            String status = orderStatus.get("orderStatus").toUpperCase(Locale.ROOT);
-            updateOrderStatus(id, status);
-            log.info("orderStatus: {}", orderStatus);
-        } catch (Exception e) {
-            log.error("Caught error", e);
-        }
-    }
+            Order order = objectMapper.readValue(orderStr, Order.class);
+            log.info("ORDER objectMapper {}", order);
+            String orderId = order.getId();
 
+            Mono<Order> updated = orderService.updateOrderByOrderId(orderId, order);
+            updated.block();
 
-    private void updateOrderStatus(String orderId, String orderStatus) {
-        if (checkExistingOrder(orderId)) {
-            log.info("Updating {} with status {}", orderId, orderStatus);
-            Order newOrder = new Order(OrderStatus.valueOf(orderStatus));
-            Mono<Order> updateOrder = orderService.updateOrderByOrderId(orderId, newOrder);
-            updateOrder.subscribe();
-//            updateOrder.block(); //subscribe vs block?
+        } catch (Exception e) {
+            log.error("Caught error on UpdateOrderStatus method", e);
+            e.printStackTrace();
         }
     }
 
 
 
-    private boolean checkExistingOrder(String orderId) {
-        Flux<Order> orders = orderService.getAllOrders();
-        List<Order> orderList = orders.collectList().block();
-        Order res = orderList.stream()
-                .filter(order -> orderId.equals(order.getId()))
-                .findAny()
-                .orElse(null);
-
-        if (res == null) {
-            log.error("Order {} not found", orderId);
-            return false;
-        }
-
-        log.info("Order exists on the database");
-        return true;
-    }
 
 }

src/main/java/com/afp/ordermanagement/reactivekafkaservice/Sender.java

@@ -39,11 +39,4 @@ public class Sender {
     }
 
 
-//    public void sendUpdatedStatus(String id, String status) {
-//        log.info(String.format("Sender sending updated status for ordernumber: %s", id));
-//        ProducerRecord<String, String> stat = new ProducerRecord<>(ORDER_TOPIC, status);
-//
-//    }
-
-
 }

src/main/java/com/afp/ordermanagement/repository/OrderRepository.java

@@ -4,9 +4,11 @@ import com.afp.ordermanagement.model.Order;
 import org.springframework.data.mongodb.repository.ReactiveMongoRepository;
 import org.springframework.stereotype.Repository;
 import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 
 
 @Repository
 public interface OrderRepository extends ReactiveMongoRepository<Order, String> {
     Flux<Order> findByCustomerId(String customerId);
+
 }

src/main/java/com/afp/ordermanagement/service/OrderService.java

 package com.afp.ordermanagement.service;
 
+import com.afp.ordermanagement.model.Item;
 import com.afp.ordermanagement.model.Order;
 import com.afp.ordermanagement.model.OrderStatus;
 import com.afp.ordermanagement.repository.OrderRepository;
@@ -8,6 +9,10 @@ import org.springframework.stereotype.Service;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
 @Service
 public class OrderService {
 
@@ -40,6 +45,7 @@ public class OrderService {
     }
 
     public Mono<Order> updateOrderByOrderId(String orderId, Order newOrder){
+
         return orderRepository.findById(orderId)
                 .flatMap(existingOrder -> {
                     existingOrder.setCustomerAddress(newOrder.getCustomerAddress());
@@ -47,6 +53,7 @@ public class OrderService {
                     existingOrder.setOrderTrackingCode(newOrder.getOrderTrackingCode());
                     existingOrder.setOrderItems(newOrder.getOrderItems());
                     existingOrder.setOrderStatus(newOrder.getOrderStatus());
+                    existingOrder.setOrderItems(newOrder.getOrderItems());
                     return orderRepository.save(existingOrder);
                 });
     }