integration demo changes

frontend/.env

+PORT=3003
\ No newline at end of file

frontend/src/Root.jsx

@@ -7,10 +7,11 @@ const Root = ({ isLoggedIn }) => {
   return (
     <div>
       <Header />
-      {isLoggedIn ? 
+      {/* {isLoggedIn ? 
         <App /> :
         <Login />
-      }
+      } */}
+      <App/>
     </div>
   );
 }

frontend/src/components/filter/Search.jsx

@@ -29,7 +29,7 @@ const Search = ({ orders, setOrdersToShow, setFiltersOn }) => {
       const searchResult = { allIds: [], byId: {} };
       orders.allIds.map(id => {
         const order = orders.byId[id];
-        if (order.orderId.toLowerCase().includes(searchInput.toLowerCase())) {
+        if (order.orderId && order.orderId.toLowerCase().includes(searchInput.toLowerCase())) {
           searchResult.allIds.push(id);
           searchResult.byId[id] = orders.byId[id];
         }

frontend/src/components/order/OrderIndexItem.jsx

@@ -10,8 +10,8 @@ const OrderIndexItem = ({
   setCollapseAll,
   setExpandAll,
 }) => {
-  const { orderId, status } = order;
-  const idToShow = orderId.slice(-7).toUpperCase();
+  // const { orderId, status } = order;
+  // const idToShow = orderId.slice(-7).toUpperCase();
 
   const [showDetails, setShowDetails] = useState(false);
 
@@ -26,6 +26,10 @@ const OrderIndexItem = ({
     setExpandAll(false);
   }, [showDetails, collapseAll, expandAll, setCollapseAll, setExpandAll]);
 
+  if (!order.orderId) return null;
+  const { orderId, status } = order;
+  const idToShow = orderId.slice(-7).toUpperCase();
+
   const handleDropDown = () => {
     setShowDetails(!showDetails);
   };
@@ -45,7 +49,7 @@ const OrderIndexItem = ({
             className={`oii-drop ${showDetails ? "rotate" : ""}`}
             onClick={handleDropDown}
           />
-          <div className="oii-num">{`Order #: ${idToShow}`}</div>
+          <div className="oii-num">{`Order #: ${orderId}`}</div>
         </div>
         {actions}
       </div>

src/main/java/com/ascendfinalproject/warehouse/config/KafkaConfig.java

@@ -32,6 +32,9 @@ public class KafkaConfig {
   @Value("${kafka.consumer.group-id}")
   private String groupId;
 
+  @Value("${kafka.topic.input}")
+  private String omsTopic;
+
 
   @Bean
   public Map<String, Object> consumerFactory() {
@@ -44,10 +47,10 @@ public class KafkaConfig {
   }
 
   @Bean
-  public KafkaReceiver<String, String> kafkaEventReceiver(@Value("OMS_ORDER_UPDATE") String topic) {
+  public KafkaReceiver<String, String> kafkaEventReceiver() {
     ReceiverOptions<String, String> receiverOptions = ReceiverOptions.create(consumerFactory());
     receiverOptions.maxCommitAttempts(5);
-    return KafkaReceiver.create(receiverOptions.addAssignListener(Collection::iterator).subscription(Collections.singleton(topic)));
+    return KafkaReceiver.create(receiverOptions.addAssignListener(Collection::iterator).subscription(Collections.singleton(omsTopic)));
   }
 
 

src/main/java/com/ascendfinalproject/warehouse/controllers/WarehouseController.java

@@ -42,11 +42,11 @@ public class WarehouseController {
             .defaultIfEmpty(ResponseEntity.status(HttpStatus.NOT_FOUND).body(null));
   }
 
-  @CrossOrigin
-  @PostMapping(value = "/kafkaOrders")
-  public void createOrderKafka(@Valid @RequestBody WarehouseOrderRequest order) {
-    sender.sendOrder(order);
-  }
+//  @CrossOrigin
+//  @PostMapping(value = "/kafkaOrders")
+//  public void createOrderKafka(@Valid @RequestBody WarehouseOrderRequest order) {
+//    sender.sendOrder(order);
+//  }
 
   @CrossOrigin
   @PostMapping(value = "/orders")

src/main/java/com/ascendfinalproject/warehouse/kafkaservice/Sender.java

@@ -27,20 +27,20 @@ public class Sender {
 
   private static final String OMS = "OMS_ORDER_UPDATE";
 
-  public void sendOrder(WarehouseOrderRequest currentOrder) {
-    ProducerRecord<String, WarehouseOrderRequest> record = new ProducerRecord<>(TOPIC, currentOrder);
-    Flux<SenderResult<WarehouseOrderRequest>> sendToKafka = kafkaOMSProducer.send(Mono.just(SenderRecord.create(record, currentOrder)))
-            .doOnError(throwable -> System.out.println(throwable))
-            .doOnNext(t -> {
-              if (null != t.exception()) {
-                System.out.println("it works!");
-              }
-            });
-    sendToKafka.doOnError(throwable -> log.error("error")).subscribe();
-  }
+//  public void sendOrder(WarehouseOrderRequest currentOrder) {
+//    ProducerRecord<String, WarehouseOrderRequest> record = new ProducerRecord<>(TOPIC, currentOrder);
+//    Flux<SenderResult<WarehouseOrderRequest>> sendToKafka = kafkaOMSProducer.send(Mono.just(SenderRecord.create(record, currentOrder)))
+//            .doOnError(throwable -> System.out.println(throwable))
+//            .doOnNext(t -> {
+//              if (null != t.exception()) {
+//                System.out.println("it works!");
+//              }
+//            });
+//    sendToKafka.doOnError(throwable -> log.error("error")).subscribe();
+//  }
 
   public void sendUpdatedOrder(WarehouseOrderResponse currentOrder) {
-    ProducerRecord<String, WarehouseOrderResponse> record = new ProducerRecord<>(OMS, currentOrder);
+    ProducerRecord<String, WarehouseOrderResponse> record = new ProducerRecord<>(TOPIC, currentOrder);
     Flux<SenderResult<WarehouseOrderResponse>> sendToKafka = kafkaUpdateEventProducer.send(Mono.just(SenderRecord.create(record, currentOrder)))
             .doOnError(throwable -> System.out.println(throwable))
             .doOnNext(t -> {

src/main/resources/application.properties

@@ -5,7 +5,7 @@ spring.data.mongodb.database=test
 kafka.producer.bootstrap-servers: localhost:9092
 kafka.producer.acks: all
 kafka.consumer.group-id: WAREHOUSE_MANAGEMENT
-kafka.topic.input: WMOS_ORDER_UPDATE
+kafka.topic.input: OMS_ORDER_UPDATE
 #kafka.topic.input: OMS_ORDER_UPDATE