Clearer toString message with parameters of event

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

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

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

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

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()+" : Credit an account 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

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

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

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

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

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

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

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

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

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

services/src/main/java/ch/hepia/event/EventOrderPrepared.java

@@ -9,7 +9,9 @@ public class EventOrderPrepared extends Event{
 
     public EventOrderPrepared(int id, String msg, int idAccount, double price){
         super(id, msg);
+        this.idAccount = idAccount;
         this.price = price;
+        
     }
 
     public int idAccount(){ return this.idAccount; }
@@ -17,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

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

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

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

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

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