Fix git rebase issues

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

@@ -67,4 +67,5 @@ public class OrderController {
     }
 
 
+
 }

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

@@ -35,7 +35,6 @@ public class Receiver {
     private OrderRepository orderRepository;
 
 
-
     @EventListener(ApplicationStartedEvent.class)
     public void consumeOrderStatus() {
         kafkaReceiver.receive()
@@ -48,11 +47,12 @@ public class Receiver {
 
 
 
-    private void updateOrderStatus(String orderStatusStr) {
+
+    private void updateOrderStatus(String orderObj) {
         try {
             //deserialize kafka message into java object using ObjectMapper
             ObjectMapper objectMapper = new ObjectMapper();
-            Order order = objectMapper.readValue(orderStatusStr, Order.class);
+            Order order = objectMapper.readValue(orderObj, Order.class);
             log.info("ORDER objectMapper {}", order);
             String orderId = order.getId();
 
@@ -67,4 +67,5 @@ public class Receiver {
 
 
 
+
 }

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

@@ -59,5 +59,9 @@ public class OrderService {
     }
 
 
+    public Mono<Void> deleteOrderById(String orderId) {
+        return orderRepository.deleteById(orderId);
+    }
+
 
 }