diff --git a/services/src/main/java/ch/hepia/event/Event.java b/services/src/main/java/ch/hepia/event/Event.java
index ed4720ee84c0f99880523e26a625b58b3f293cb0..6af206ec27c129d90a7fa959354aea68f2282f92 100644
--- a/services/src/main/java/ch/hepia/event/Event.java
+++ b/services/src/main/java/ch/hepia/event/Event.java
@@ -23,6 +23,6 @@ public abstract class Event implements Serializable{
@Override
public String toString(){
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy/MM/dd hh:mm:ss");
- return dateFormat.format(this.date).toString();
+ return dateFormat.format(this.date).toString() + " " + this.getClass().getSimpleName() + " n°(" + this.id +")";
}
}
\ No newline at end of file
diff --git a/services/src/main/java/ch/hepia/event/EventAccountCreated.java b/services/src/main/java/ch/hepia/event/EventAccountCreated.java
index 75fe2dfbb3322cdeb61c335577ca5d8b840b2f65..9e64965fd947e0757e9c1af7ac88d9babcfdc085 100644
--- a/services/src/main/java/ch/hepia/event/EventAccountCreated.java
+++ b/services/src/main/java/ch/hepia/event/EventAccountCreated.java
@@ -10,6 +10,6 @@ public class EventAccountCreated extends Event{
@Override
public String toString(){
- return "\n"+super.toString()+" : Account created n°(" + this.id +"): "+this.msg+"\n";
+ return "\n"+super.toString()+" : "+this.msg+"\n";
}
}
\ No newline at end of file
diff --git a/services/src/main/java/ch/hepia/event/EventAccountCredited.java b/services/src/main/java/ch/hepia/event/EventAccountCredited.java
index 03b66ad2888cd758a0d450658781706244c38de7..033b5f882df868a8749bcc9079422b122ea8c1d6 100644
--- a/services/src/main/java/ch/hepia/event/EventAccountCredited.java
+++ b/services/src/main/java/ch/hepia/event/EventAccountCredited.java
@@ -10,6 +10,6 @@ public class EventAccountCredited extends Event{
@Override
public String toString(){
- return "\n"+super.toString()+" : Account credited n°(" + this.id +"): "+this.msg+"\n";
+ return "\n"+super.toString()+" : "+this.msg+"\n";
}
}
\ No newline at end of file
diff --git a/services/src/main/java/ch/hepia/event/EventAccountDoesntExist.java b/services/src/main/java/ch/hepia/event/EventAccountDoesntExist.java
index b80ebabe347ef0237b19ce9cb26c9e1b1aaf6d78..b7bf980628a4009fff374ce24088eb9fe565fd79 100644
--- a/services/src/main/java/ch/hepia/event/EventAccountDoesntExist.java
+++ b/services/src/main/java/ch/hepia/event/EventAccountDoesntExist.java
@@ -10,6 +10,6 @@ public class EventAccountDoesntExist extends Event{
@Override
public String toString(){
- return "\n"+super.toString()+" : Account n°(" + this.id +"): "+this.msg+"\n";
+ return "\n"+super.toString()+" : "+this.msg+"\n";
}
}
\ No newline at end of file
diff --git a/services/src/main/java/ch/hepia/event/EventAddProductQuantity.java b/services/src/main/java/ch/hepia/event/EventAddProductQuantity.java
index eba60c3bc48f0463774ee52cba2aff9eccda1880..a224dd12994b17bcb471c3839c7727b4def46397 100644
--- a/services/src/main/java/ch/hepia/event/EventAddProductQuantity.java
+++ b/services/src/main/java/ch/hepia/event/EventAddProductQuantity.java
@@ -19,6 +19,6 @@ public class EventAddProductQuantity extends Event{
@Override
public String toString(){
- return "\n"+super.toString()+" : Product supplying n°(" + this.id +"): "+this.msg+"\n";
+ return "\n"+super.toString()+" : "+this.msg+" ( product id =" + this.idProduct+", quantity ordered = "+this.quantity+" )\n";
}
}
\ No newline at end of file
diff --git a/services/src/main/java/ch/hepia/event/EventCreateAccount.java b/services/src/main/java/ch/hepia/event/EventCreateAccount.java
index cf61df29d77bf076a1ae10999a0c0a2320cb6b60..18fd0c32dd1f5940940cdff778a28bc657863591 100644
--- a/services/src/main/java/ch/hepia/event/EventCreateAccount.java
+++ b/services/src/main/java/ch/hepia/event/EventCreateAccount.java
@@ -15,6 +15,6 @@ public class EventCreateAccount extends Event{
@Override
public String toString(){
- return "\n"+super.toString()+" : Create Account n°(" + this.id +"): "+this.msg+"\n";
+ return "\n"+super.toString()+" : "+this.msg+ " ( account name = "+this.name+" )\n";
}
}
\ No newline at end of file
diff --git a/services/src/main/java/ch/hepia/event/EventCreateProduct.java b/services/src/main/java/ch/hepia/event/EventCreateProduct.java
index fe435bb89b48f29ce096b611ea69522170fb1fd7..b75e87766a101312282e2281029702c2cc936176 100644
--- a/services/src/main/java/ch/hepia/event/EventCreateProduct.java
+++ b/services/src/main/java/ch/hepia/event/EventCreateProduct.java
@@ -18,6 +18,6 @@ public class EventCreateProduct extends Event{
@Override
public String toString(){
- return "\n"+super.toString()+" : Product created n°(" + this.id +"): "+this.msg+"\n";
+ return "\n"+super.toString()+" : "+this.msg+ " ( name of product = "+this.name+", price of product = "+this.price+" )\n";
}
}
\ No newline at end of file
diff --git a/services/src/main/java/ch/hepia/event/EventCreditAccepted.java b/services/src/main/java/ch/hepia/event/EventCreditAccepted.java
index 7c37679f094fd39acb2a6d6595ee235c3cb42869..351f316afea5aae497c8b5bda883405651bdee68 100644
--- a/services/src/main/java/ch/hepia/event/EventCreditAccepted.java
+++ b/services/src/main/java/ch/hepia/event/EventCreditAccepted.java
@@ -21,6 +21,6 @@ public class EventCreditAccepted extends Event{
@Override
public String toString(){
- return "\n"+super.toString()+" : Credit accepted n°(" + this.id +"): "+this.msg+"\n";
+ return "\n"+super.toString()+" : "+this.msg+ " ( id of account = "+this.idAccount+", price of product = "+this.price+" )\n";
}
}
\ No newline at end of file
diff --git a/services/src/main/java/ch/hepia/event/EventCreditAnAccount.java b/services/src/main/java/ch/hepia/event/EventCreditAnAccount.java
index f7e3ba6627f3e7f24f7f3185464db58167235758..a25165efb617e9fb24c78ed7a304e82170fb8089 100644
--- a/services/src/main/java/ch/hepia/event/EventCreditAnAccount.java
+++ b/services/src/main/java/ch/hepia/event/EventCreditAnAccount.java
@@ -18,6 +18,6 @@ public class EventCreditAnAccount extends Event{
@Override
public String toString(){
- return "\n"+super.toString()+" : Credit an account n°(" + this.id +"): "+this.msg+"\n";
+ return "\n"+super.toString()+" : "+this.msg+" ( id of account = "+this.idAccount+", amount credited = "+this.amount+" )\n";
}
}
\ No newline at end of file
diff --git a/services/src/main/java/ch/hepia/event/EventCreditRefused.java b/services/src/main/java/ch/hepia/event/EventCreditRefused.java
index b29a7034a27adede48232858f03fe740d520ff6b..dc383ef27f3d2a7b144d11b9c95b13225da61fa1 100644
--- a/services/src/main/java/ch/hepia/event/EventCreditRefused.java
+++ b/services/src/main/java/ch/hepia/event/EventCreditRefused.java
@@ -10,6 +10,6 @@ public class EventCreditRefused extends Event{
@Override
public String toString(){
- return "\n"+super.toString()+" : Credit refused n°(" + this.id +"): "+this.msg+"\n";
+ return "\n"+super.toString()+" : "+this.msg+"\n";
}
}
\ No newline at end of file
diff --git a/services/src/main/java/ch/hepia/event/EventCreditWithdrawn.java b/services/src/main/java/ch/hepia/event/EventCreditWithdrawn.java
index 04603009ec910abdf6f597cadd3946c9a39c5dbe..6e29ab55cc0d2c3bc77ebe69b9e927452794fb45 100644
--- a/services/src/main/java/ch/hepia/event/EventCreditWithdrawn.java
+++ b/services/src/main/java/ch/hepia/event/EventCreditWithdrawn.java
@@ -10,6 +10,6 @@ public class EventCreditWithdrawn extends Event{
@Override
public String toString(){
- return "\n"+super.toString()+" : Credit withdrawn n°(" + this.id +"): "+this.msg+"\n";
+ return "\n"+super.toString()+" : "+this.msg+"\n";
}
}
\ No newline at end of file
diff --git a/services/src/main/java/ch/hepia/event/EventOrderCancelled.java b/services/src/main/java/ch/hepia/event/EventOrderCancelled.java
index 849ad2c72733d6d1bf0cc8de7ff4ec853781faf2..8a5ec43c05fd65739d37d1ecfd5c5042684f3625 100644
--- a/services/src/main/java/ch/hepia/event/EventOrderCancelled.java
+++ b/services/src/main/java/ch/hepia/event/EventOrderCancelled.java
@@ -10,6 +10,6 @@ public class EventOrderCancelled extends Event{
@Override
public String toString(){
- return "\n"+super.toString()+" : Order cancelled n°(" + this.id +"): "+this.msg+"\n";
+ return "\n"+super.toString()+" : "+this.msg+"\n";
}
}
\ No newline at end of file
diff --git a/services/src/main/java/ch/hepia/event/EventOrderCreated.java b/services/src/main/java/ch/hepia/event/EventOrderCreated.java
index dd665011d56e78a66704c00b292a9eedf1140374..748627803099b69dd106a50489e902ddaab6e1da 100644
--- a/services/src/main/java/ch/hepia/event/EventOrderCreated.java
+++ b/services/src/main/java/ch/hepia/event/EventOrderCreated.java
@@ -18,6 +18,6 @@ public class EventOrderCreated extends Event{
@Override
public String toString(){
- return "\n"+super.toString()+" : Order created n°(" + this.id +"): "+this.msg+"\n";
+ return "\n"+super.toString()+" : "+this.msg+" ( id of account = "+this.idAccount+" )\n";
}
}
\ No newline at end of file
diff --git a/services/src/main/java/ch/hepia/event/EventOrderPlaced.java b/services/src/main/java/ch/hepia/event/EventOrderPlaced.java
index 501deda554e2e16776792ca698447c4a24c2f84e..1947d72fcddd578ef9b5e562008b252d29d3d6f8 100644
--- a/services/src/main/java/ch/hepia/event/EventOrderPlaced.java
+++ b/services/src/main/java/ch/hepia/event/EventOrderPlaced.java
@@ -21,6 +21,6 @@ public class EventOrderPlaced extends Event{
@Override
public String toString(){
- return "\n"+super.toString()+" : Order placed n°(" + this.id +"): "+this.msg+"\n";
+ return "\n"+super.toString()+" : "+this.msg+" ( id of account = "+this.idAccount+", price of order = "+this.price+" )\n";
}
}
\ No newline at end of file
diff --git a/services/src/main/java/ch/hepia/event/EventOrderPrepared.java b/services/src/main/java/ch/hepia/event/EventOrderPrepared.java
index 87bd37375dc25664fd376f634bea155784d54291..439498b2f647a5d763cb840e1ea4822dddeed443 100644
--- a/services/src/main/java/ch/hepia/event/EventOrderPrepared.java
+++ b/services/src/main/java/ch/hepia/event/EventOrderPrepared.java
@@ -11,6 +11,7 @@ public class EventOrderPrepared extends Event{
super(id, msg);
this.idAccount = idAccount;
this.price = price;
+
}
public int idAccount(){ return this.idAccount; }
@@ -18,6 +19,6 @@ public class EventOrderPrepared extends Event{
@Override
public String toString(){
- return "\n"+super.toString()+" : Order prepared n°(" + this.id +"): "+this.msg+"\n";
+ return "\n"+super.toString()+" : "+this.msg+" ( id of account = "+this.idAccount+", price of order = "+this.price+" )\n";
}
}
\ No newline at end of file
diff --git a/services/src/main/java/ch/hepia/event/EventOrderSent.java b/services/src/main/java/ch/hepia/event/EventOrderSent.java
index 2d14230e333275497e13e1c30de1aafcfd82957c..db5a8817789e1a4b616b8df8833664825e56ab43 100644
--- a/services/src/main/java/ch/hepia/event/EventOrderSent.java
+++ b/services/src/main/java/ch/hepia/event/EventOrderSent.java
@@ -10,6 +10,6 @@ public class EventOrderSent extends Event{
@Override
public String toString(){
- return "\n"+super.toString()+" : Order sent n°(" + this.id +"): "+this.msg+"\n";
+ return "\n"+super.toString()+" : "+this.msg+"\n";
}
}
\ No newline at end of file
diff --git a/services/src/main/java/ch/hepia/event/EventProductCreated.java b/services/src/main/java/ch/hepia/event/EventProductCreated.java
index 7a9bcaf0a405481bbbd205cf39f478f9f754d501..0c71ace9a1b39804dd4a69515185521cc3c25a59 100644
--- a/services/src/main/java/ch/hepia/event/EventProductCreated.java
+++ b/services/src/main/java/ch/hepia/event/EventProductCreated.java
@@ -10,6 +10,6 @@ public class EventProductCreated extends Event{
@Override
public String toString(){
- return "\n"+super.toString()+" : Product created n°(" + this.id +"): "+this.msg+"\n";
+ return "\n"+super.toString()+" : "+this.msg+"\n";
}
}
\ No newline at end of file
diff --git a/services/src/main/java/ch/hepia/event/EventProductDoesntExist.java b/services/src/main/java/ch/hepia/event/EventProductDoesntExist.java
index 49889ab51e308520b9cbe0128715dc9d86cb2358..960db2b486dde9075846784dbce879d74f7cad51 100644
--- a/services/src/main/java/ch/hepia/event/EventProductDoesntExist.java
+++ b/services/src/main/java/ch/hepia/event/EventProductDoesntExist.java
@@ -10,6 +10,6 @@ public class EventProductDoesntExist extends Event{
@Override
public String toString(){
- return "\n"+super.toString()+" : Product n°(" + this.id +"): "+this.msg+"\n";
+ return "\n"+super.toString()+" : "+this.msg+"\n";
}
}
\ No newline at end of file
diff --git a/services/src/main/java/ch/hepia/event/EventProductOutOfStock.java b/services/src/main/java/ch/hepia/event/EventProductOutOfStock.java
index 2dd89c8cc6026fb59437600df6d0cff3f8115fd9..8dbdf790481c92748ca99a6e1d0f3ac69bc7f87c 100644
--- a/services/src/main/java/ch/hepia/event/EventProductOutOfStock.java
+++ b/services/src/main/java/ch/hepia/event/EventProductOutOfStock.java
@@ -10,6 +10,6 @@ public class EventProductOutOfStock extends Event{
@Override
public String toString(){
- return "\n"+super.toString()+" : Product is out of stock n°(" + this.id +"): "+this.msg+"\n";
+ return "\n"+super.toString()+" : "+this.msg+"\n";
}
}
\ No newline at end of file
diff --git a/services/src/main/java/ch/hepia/event/EventProductQuantityAdded.java b/services/src/main/java/ch/hepia/event/EventProductQuantityAdded.java
index 9bcfa3cd196b46d61ccca3a305f4edc6ef97e84b..da457d81127dfab95502605b9bdb2b85063ffbe2 100644
--- a/services/src/main/java/ch/hepia/event/EventProductQuantityAdded.java
+++ b/services/src/main/java/ch/hepia/event/EventProductQuantityAdded.java
@@ -10,6 +10,6 @@ public class EventProductQuantityAdded extends Event{
@Override
public String toString(){
- return "\n"+super.toString()+" : Product quantity added n°(" + this.id +"): "+this.msg+"\n";
+ return "\n"+super.toString()+" : "+this.msg+"\n";
}
}
\ No newline at end of file
diff --git a/services/src/main/java/ch/hepia/order/http.java b/services/src/main/java/ch/hepia/order/http.java
index 8f630b32c529200fedb1e486359f29f468cec061..7420d904d1a62b7725eba5fe5a6ff02a4f24abe2 100644
--- a/services/src/main/java/ch/hepia/order/http.java
+++ b/services/src/main/java/ch/hepia/order/http.java
@@ -19,22 +19,27 @@ public class http {
private static OrderService orderService;
private static AccountService accountService;
private static StockService stockService;
+ private static int idService;
public static void main(String[] args) {
http.orderService = new OrderService("localhost");
http.accountService = new AccountService("localhost");
http.stockService = new StockService("localhost");
+ http.idService = 0;
SpringApplication.run(http.class, args);
}
+ public static int getId() { return http.idService; }
+ public static void incrementId() { http.idService++; }
+
@RequestMapping("/order")
public Order order(
@RequestParam(value = "idAccount", defaultValue = "1") int idAccount,
@RequestParam(value = "idProduct", defaultValue = "1") int idProduct,
@RequestParam(value = "quantity", defaultValue = "1") int quantity ) {
- int idOrder = 5;
- Order o = new Order(idOrder, idAccount);
+ http.incrementId();
+ Order o = new Order(http.getId(), idAccount);
o.addProduct(idProduct, quantity);
Event oc = new EventOrderCreated(o.id(), "hello", idAccount, o.getProducts());
@@ -45,8 +50,8 @@ public class http {
@RequestMapping("/orderNotExistingProducts")
public Order orderNotExistingProducts() {
int idAccount = 1;
- int idOrder = 5;
- Order o = new Order(idOrder, idAccount);
+ http.incrementId();
+ Order o = new Order(http.getId(), idAccount);
o.addProduct(1, 4);
o.addProduct(999, 4);
Event oc = new EventOrderCreated(o.id(), "hello", idAccount, o.getProducts());
@@ -56,7 +61,8 @@ public class http {
@RequestMapping("/createAccount")
public String createAccount(@RequestParam(value = "name", defaultValue = "Orphée") String name) {
- accountService.send(new EventCreateAccount(1, "Creating the account", name));
+ http.incrementId();
+ accountService.send(new EventCreateAccount(http.getId(), "Creating the account", name));
return name;
}
@@ -64,7 +70,8 @@ public class http {
public String createAccount(
@RequestParam(value = "idAccount", defaultValue = "1") int idAccount,
@RequestParam(value = "amount", defaultValue = "1") double amount) {
- accountService.send(new EventCreditAnAccount(5, "Crediting account", idAccount, amount));
+ http.incrementId();
+ accountService.send(new EventCreditAnAccount(http.getId(), "Crediting account", idAccount, amount));
return null;
}
@@ -73,8 +80,8 @@ public class http {
public Product createProduct(
@RequestParam(value = "name", defaultValue = "poire") String name,
@RequestParam(value = "price", defaultValue = "1") double price) {
-
- stockService.send(new EventCreateProduct(1, "Creating the product", name, price));
+ http.incrementId();
+ stockService.send(new EventCreateProduct(http.getId(), "Creating the product", name, price));
return null;
}
@@ -82,8 +89,8 @@ public class http {
public Product supplyStock(
@RequestParam(value = "idProduct", defaultValue = "1") int idProduct,
@RequestParam(value = "quantity", defaultValue = "10") int quantity) {
-
- stockService.send(new EventAddProductQuantity(1, "Supplying ", idProduct, quantity));
+ http.incrementId();
+ stockService.send(new EventAddProductQuantity(http.getId(), "Supplying ", idProduct, quantity));
return null;
}