Merge branch 'AFP-66-kafka-consumers' into 'dev'

Fixes product stock adjustment

See merge request !13

src/main/java/com/nisum/ascend/inventory/service/ProductService.java

@@ -59,55 +59,36 @@ public class ProductService {
 
     public Mono<Product> updateProductInventoryBySkuWareHouse(String sku, String status, int itemQuantity) {
         System.out.printf("sku = %s, status = %s, itemquanity = %d \n", sku, status, itemQuantity);
-
         if (status.equals("CANCELLED")) {
-             return productRepository.findBySku(sku)
+            return productRepository.findBySku(sku)
                     .flatMap(dbProduct -> {
+                        dbProduct.setBlockedStock(dbProduct.getBlockedStock() - itemQuantity);
                         dbProduct.setAvailableStock(dbProduct.getAvailableStock() + itemQuantity);
                         return productRepository.save(dbProduct);
                     });
-        } else if (status.equals("RECEIVED")) {
-             return productRepository.findBySku(sku)
+        }
+        else if (status.equals("FULFILLED")){
+            return productRepository.findBySku(sku)
                     .flatMap(dbProduct -> {
-                        dbProduct.setBlockedStock(dbProduct.getBlockedStock() + itemQuantity);
+                        dbProduct.setBlockedStock(dbProduct.getBlockedStock() - itemQuantity);
+                        dbProduct.setFulfilledStock(dbProduct.getFulfilledStock() + itemQuantity);
                         return productRepository.save(dbProduct);
                     });
-        } else { // if status.equals("FULFILLED")
-             return productRepository.findBySku(sku)
+        }
+        else return productRepository.findBySku(sku);
+    }
+
+    public Mono<Product> updateProductInventoryBySkuOrder(String sku, String status, int itemQuantity) {
+        System.out.printf("sku = %s, status = %s, itemquanity = %d \n", sku, status, itemQuantity);
+        // should only process RECEIVED
+        if (status.equals("RECEIVED")) {
+            return productRepository.findBySku(sku)
                     .flatMap(dbProduct -> {
                         dbProduct.setAvailableStock(dbProduct.getAvailableStock() - itemQuantity);
-                        dbProduct.setFulfilledStock(dbProduct.getFulfilledStock() + itemQuantity);
-                        dbProduct.setBlockedStock(dbProduct.getBlockedStock() - itemQuantity);
+                        dbProduct.setBlockedStock(dbProduct.getBlockedStock() + itemQuantity);
                         return productRepository.save(dbProduct);
                     });
         }
+        else return productRepository.findBySku(sku);
     }
-
-        public Mono<Product> updateProductInventoryBySkuOrder(String sku, String status, int itemQuantity) {
-            System.out.printf("sku = %s, status = %s, itemquanity = %d \n", sku, status, itemQuantity);
-
-            if (status.equals("CANCELLED")){
-                return productRepository.findBySku(sku)
-                        .flatMap(dbProduct -> {
-                            dbProduct.setAvailableStock(dbProduct.getAvailableStock() + itemQuantity);
-                            dbProduct.setBlockedStock(dbProduct.getBlockedStock() - itemQuantity);
-                            return productRepository.save(dbProduct);
-                        });
-            }
-            else if (status.equals("RECEIVED")){
-                return productRepository.findBySku(sku)
-                        .flatMap(dbProduct -> {
-                            dbProduct.setBlockedStock(dbProduct.getBlockedStock() + itemQuantity);
-                            return productRepository.save(dbProduct);
-                        });
-            }
-            else { // if status.equals("FULFILLED")
-                return productRepository.findBySku(sku)
-                        .flatMap(dbProduct -> {
-                            return productRepository.save(dbProduct);
-                        });
-            }
-    }
-
-
 }