All Aquarium events have a client defined unique id

diff --git a/logic/src/main/scala/gr/grnet/aquarium/logic/events/AquariumEvent.scala b/logic/src/main/scala/gr/grnet/aquarium/logic/events/AquariumEvent.scala
index 94959a5..c7e30dd 100644 (file)
--- a/logic/src/main/scala/gr/grnet/aquarium/logic/events/AquariumEvent.scala
+++ b/logic/src/main/scala/gr/grnet/aquarium/logic/events/AquariumEvent.scala
@@ -46,7 +46,7 @@ import net.liftweb.json.{Xml, Printer, Extraction, JsonAST}
  * @author Georgios Gousios <gousiosg@gmail.com>
  */
 
-abstract class AquariumEvent(val timestamp: Long) {
+abstract class AquariumEvent(val id: String, val timestamp: Long) {
 
   def validate: Boolean
 

diff --git a/logic/src/main/scala/gr/grnet/aquarium/logic/events/ResourceEvent.scala b/logic/src/main/scala/gr/grnet/aquarium/logic/events/ResourceEvent.scala
index 306f853..354358d 100644 (file)
--- a/logic/src/main/scala/gr/grnet/aquarium/logic/events/ResourceEvent.scala
+++ b/logic/src/main/scala/gr/grnet/aquarium/logic/events/ResourceEvent.scala
@@ -47,13 +47,14 @@ import gr.grnet.aquarium.logic.accounting.Policy
  * @author Georgios Gousios <gousiosg@gmail.com>.
  */
 case class ResourceEvent(
+  override val id: String,
   userId: Long,
   cliendId: Long,
   resource: String,
   override val timestamp: Long,
   eventVersion: Short,
   details: Map[String, String]
-) extends AquariumEvent(timestamp) {
+) extends AquariumEvent(id, timestamp) {
 
   def validate() : Boolean = {
 

diff --git a/logic/src/test/scala/gr/grnet/aquarium/util/RandomEventGenerator.scala b/logic/src/test/scala/gr/grnet/aquarium/util/RandomEventGenerator.scala
index 3617a6d..294eb69 100644 (file)
--- a/logic/src/test/scala/gr/grnet/aquarium/util/RandomEventGenerator.scala
+++ b/logic/src/test/scala/gr/grnet/aquarium/util/RandomEventGenerator.scala
@@ -73,6 +73,7 @@ trait RandomEventGenerator extends AkkaAMQP {
     val ts = tsFrom + (scala.math.random * ((tsTo - tsFrom) + 1)).asInstanceOf[Long]
 
     ResourceEvent(
+      rnd.nextString(35),
       rnd.nextInt(userIds.max),
       rnd.nextInt(clientIds.max),
       res,ts,1,extra)