Commit 2e140675 authored by Shanelle Valencia's avatar Shanelle Valencia

[AFP-53] 🚧 Fix status update issues to update all other fields of order [@svalencia]

parent cbe6c7cf
...@@ -52,14 +52,12 @@ public class Receiver { ...@@ -52,14 +52,12 @@ public class Receiver {
try { try {
//deserialize kafka message into java object using ObjectMapper //deserialize kafka message into java object using ObjectMapper
ObjectMapper objectMapper = new ObjectMapper(); ObjectMapper objectMapper = new ObjectMapper();
//Map<String, String> orderStatus = objectMapper.readValue(orderStatusStr, Map.class);
Order order = objectMapper.readValue(orderStatusStr, Order.class); Order order = objectMapper.readValue(orderStatusStr, Order.class);
log.info("ORDER objectMapper {}", order); log.info("ORDER objectMapper {}", order);
String orderId = order.getId(); String orderId = order.getId();
Mono<Order> updated = orderService.updateOrderByOrderId(orderId, order); Mono<Order> updated = orderService.updateOrderByOrderId(orderId, order);
updated.block(); updated.block();
} catch (Exception e) { } catch (Exception e) {
log.error("Caught error", e); log.error("Caught error", e);
} }
...@@ -67,16 +65,23 @@ public class Receiver { ...@@ -67,16 +65,23 @@ public class Receiver {
private boolean checkExistingOrder(String orderId) { private boolean checkExistingOrder(String orderId) {
Flux<Order> orders = orderService.getAllOrders(); // Flux<Order> orders = orderService.getAllOrders();
List<Order> orderList = orders.collectList().block(); // List<Order> orderList = orders.collectList().block();
Order res = orderList.stream() // Order res = orderList.stream()
.filter(order -> orderId.equals(order.getId())) // .filter(order -> orderId.equals(order.getId()))
.findAny() // .findAny()
.orElse(null); // .orElse(null);
if (res == null) { // if (res == null) {
// log.error("Order {} not found", orderId);
// return false;
// }
Mono<Order> order = orderRepository.findById(orderId);
if (order == null) {
log.error("Order {} not found", orderId); log.error("Order {} not found", orderId);
return false; return false;
} }
......
...@@ -53,6 +53,7 @@ public class OrderService { ...@@ -53,6 +53,7 @@ public class OrderService {
existingOrder.setOrderTrackingCode(newOrder.getOrderTrackingCode()); existingOrder.setOrderTrackingCode(newOrder.getOrderTrackingCode());
existingOrder.setOrderItems(newOrder.getOrderItems()); existingOrder.setOrderItems(newOrder.getOrderItems());
existingOrder.setOrderStatus(newOrder.getOrderStatus()); existingOrder.setOrderStatus(newOrder.getOrderStatus());
existingOrder.setOrderItems(newOrder.getOrderItems());
return orderRepository.save(existingOrder); return orderRepository.save(existingOrder);
}); });
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment