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

# Conflicts:
#   src/main/resources/application.properties

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

@@ -37,8 +37,13 @@ public class OrderController {
     @PostMapping("/orders")
     @ResponseStatus(HttpStatus.CREATED)
     public Mono<Order> getOrderFromEcom(@RequestBody Order orderObject) {
-        sender.sendOrderToWarehouse(orderObject);
-        return orderService.createOrder(orderObject);
+//        Mono<Order> orderCreated = orderService.createOrder(orderObject);
+        return orderService.createOrder(orderObject)
+                .doOnSuccess(order -> {
+                    orderObject.setId(order.getId());
+                    System.out.println("sending order*******************" + orderObject.getId());
+                    sender.sendOrderToTopic(orderObject);
+                });
     }
 
 

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

@@ -23,12 +23,12 @@ public class Sender {
     private KafkaSender<String, Order> kafkaEventProducer;
 
 
-    private static final String ORDER_TOPIC = "orders";
+    private static final String ORDER_TOPIC = "OMS_ORDER_UPDATE";
 
     private static final String WAREHOUSE_TOPIC = "warehouse_management";
 
 
-    public void sendOrderToWarehouse(Order orderObject) {
+    public void sendOrderToTopic(Order orderObject) {
         log.info(String.format("##### -> Sender sending message: %s ", orderObject));
         ProducerRecord<String, Order> record = new ProducerRecord<>(ORDER_TOPIC, orderObject);
         System.out.println("In sendOrderToWarehouse");

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

@@ -28,6 +28,7 @@ public class OrderService {
         newOrder.setOrderTrackingCode(defaultOrderTrackingCode);
         newOrder.setOrderCreatedAt(serviceSystemTime);
         newOrder.setOrderUpdatedAt(serviceSystemTime);
+        //newOrder.setId("abc123");
         //System.out.println(newOrder);
         return orderRepository.save(newOrder);
     }

src/main/resources/application.properties

@@ -3,8 +3,9 @@ kafka.producer.bootstrap-servers=localhost:9092
 kafka.producer.acks=all
 kafka.consumer.bootstrap-servers=localhost:9092
 kafka.consumer.group-id=group_id
-kafka.topic.input=orders
-kafka.topic.output=warehouse_management
+kafka.topic.input=WMOS_ORDER_UPDATE
+
+server.port=8084
 
 # Config for MailTrap SMTP Mail testing service
 spring.mail.protocol=smtp

src/main/resources/kafka.producer.bootstrap-servers

+kafka.producer.bootstrap-servers=localhost:9092
+kafka.producer.acks=all
+kafka.consumer.bootstrap-servers=localhost:9092
+kafka.consumer.group-id=group_id
+kafka.topic.input=orders
\ No newline at end of file