Merged conflicts

services/src/main/java/ch/hepia/order/http.java

@@ -77,11 +77,20 @@ public class http {
 
 
     @RequestMapping("/createProduct")
-    public Product createProduct(@RequestParam(value = "name", defaultValue = "poire") String name,
+    public Product createProduct(
+        @RequestParam(value = "name", defaultValue = "poire") String name,
         @RequestParam(value = "price", defaultValue = "1") double price) {
         http.incrementId();
         stockService.send(new EventCreateProduct(http.getId(), "Creating the product", name, price));
+        return null;
+    }
 
+    @RequestMapping("/supplyStock")
+    public Product supplyStock(
+        @RequestParam(value = "idProduct", defaultValue = "1") int idProduct,
+        @RequestParam(value = "quantity", defaultValue = "10") int quantity) {
+        http.incrementId();
+        stockService.send(new EventAddProductQuantity(http.getId(), "Supplying ", idProduct, quantity));
         return null;
     }
 

services/src/main/java/ch/hepia/stock/StockService.java

@@ -93,6 +93,12 @@ public class StockService {
                                 send(new EventProductQuantityAdded(e.id(), "Quantity added to the stock"));
                                 System.out.println(e.toString());
                             }
+
+                            if(obj instanceof EventProductQuantityAdded){
+                                EventProductQuantityAdded e = (EventProductQuantityAdded) obj;
+                                System.out.println(e.toString());
+                            }
+
                             // ------------------------------------------
                             if (obj instanceof EventOrderCreated) {
                                 EventOrderCreated e = (EventOrderCreated) obj;

services/src/main/resources/static/demo.html

@@ -14,14 +14,18 @@
     <hr>
 
     <h2>Products</h2>
-    <p>Create a product with default values <a href="/createProduct">/createProduct</a></p>
-    <p>Create a product that is an apple that costs 1.3 <a href="/createProduct?name=apple&price=1.3">/createProduct?name=apple&price=1.3</a></p>
+    <p>DEFAULT: Create a product with default values (name = poire) <a href="/createProduct">/createProduct</a></p>
+    <p>GET: Create a product that is an apple that costs 1.3 <a href="/createProduct?name=apple&price=1.3">/createProduct?name=apple&price=1.3</a></p>
     
     <h2>Accounts</h2>
-    <p>Create an account with default value (name=Orphée) <a href="/createAccount">/createAccount</a></p>
-    <p>Create an account with name Ovide <a href="/createAccount?name=Ovide">/createAccount?name=Ovide</a></p>
+    <p>DEFAULT: Create an account with default value (name = Orphée) <a href="/createAccount">/createAccount</a></p>
+    <p>GET: Create an account with name Ovide <a href="/createAccount?name=Ovide">/createAccount?name=Ovide</a></p>
     <p>Credit 50.- to account with id 1 <a href="/creditAccount?idAccount=1&amount=50">/creditAccount?idAccount=1&amount=50</a></p>
     
+    <h2>Stock</h2> 
+    <p>DEFAULT: Supply with default values (idProduct = 1, quantity = 50) <a href="/supplyStock">/supplyStock</a></p>
+    <p>GET: Supply with desired values <a href="/supplyStock?idProduct=1&quantity=30">/supplyStock?idProduct=1&quantity=30</a></p>
+      
     <h2>Orders</h2>
     <!-- <p>Order 2 units of product with id = 1 <a href="/order?idProduct=1&quantity=2">/order?idProduct=1&quantity=2</a></p> -->
     <p>Demo 0: order 2 units of product with id = 1 <a href="/order?idProduct=1&quantity=2">/order?idProduct=1&quantity=2</a></p>