Correctly store and send user events

diff --git a/doc/manual/source/devguide.rst b/doc/manual/source/devguide.rst
index 647c822..75cdede 100644 (file)
--- a/doc/manual/source/devguide.rst
+++ b/doc/manual/source/devguide.rst
@@ -21,7 +21,8 @@ After you install them, you can do the following:
 
 - ``mvn install``: To compile Aquarium and run the tests. This will also create 
   the file ``target/aquarium-<ver>-jar-with-dependencies.jar`` which can be
-  used to start Aquarium from the command line
+  used to start Aquarium from the command line. To skip the tests while compiling,
+  run ``mvn install --skipTests=true``.
 - ``mvn deploy``:  To deploy the Aquarium libraries to the remote Maven repository
 - ``mvn release:prepare``, ``mvn release:perform``: To prepare a release,
   tag a new version and start the next development version

diff --git a/src/main/scala/gr/grnet/aquarium/logic/events/UserEvent.scala b/src/main/scala/gr/grnet/aquarium/logic/events/UserEvent.scala
index abaa834..cb6a536 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/logic/events/UserEvent.scala
+++ b/src/main/scala/gr/grnet/aquarium/logic/events/UserEvent.scala
@@ -121,6 +121,16 @@ object UserEvent {
 
   object JsonNames {
     final val _id = "_id"
-    final val userId = "userId"
+    final val id = "id"
+
+    final val occurredMillis = "occurredMillis"
+    final val receivedMillis = "receivedMillis"
+    final val userID = "userID"
+    final val clientID = "clientID"
+    final val isActive = "isActive"
+    final val role = "role"
+    final val eventVersion = "eventVersion"
+    final val eventType = "eventType"
+    final val details = "details"
   }
 }

diff --git a/src/main/scala/gr/grnet/aquarium/store/mongodb/MongoDBStore.scala b/src/main/scala/gr/grnet/aquarium/store/mongodb/MongoDBStore.scala
index 5cb84d5..b9223ee 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/store/mongodb/MongoDBStore.scala
+++ b/src/main/scala/gr/grnet/aquarium/store/mongodb/MongoDBStore.scala
@@ -307,7 +307,7 @@ class MongoDBStore(
 
   //+UserEventStore
   def storeUserEvent(event: UserEvent): Maybe[RecordID] =
-    MongoDBStore.storeAny[UserEvent](event, userEvents, UserEventJsonNames.userId,
+    MongoDBStore.storeAny[UserEvent](event, userEvents, UserEventJsonNames.userID,
       _.userID, MongoDBStore.jsonSupportToDBObject)
 
 
@@ -315,7 +315,7 @@ class MongoDBStore(
     MongoDBStore.findById[UserEvent](id, userEvents, MongoDBStore.dbObjectToUserEvent)
 
   def findUserEventsByUserId(userId: String): List[UserEvent] = {
-    val query = new BasicDBObject(UserEventJsonNames.userId, userId)
+    val query = new BasicDBObject(UserEventJsonNames.userID, userId)
     MongoDBStore.runQuery(query, userEvents)(MongoDBStore.dbObjectToUserEvent)(Some(_sortByTimestampAsc))
   }
   //-UserEventStore

diff --git a/src/main/scala/gr/grnet/aquarium/util/RandomEventGenerator.scala b/src/main/scala/gr/grnet/aquarium/util/RandomEventGenerator.scala
index cee21a1..b1044c0 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/util/RandomEventGenerator.scala
+++ b/src/main/scala/gr/grnet/aquarium/util/RandomEventGenerator.scala
@@ -91,7 +91,7 @@ trait RandomEventGenerator extends AkkaAMQP {
     (1 to num).foreach {
       n =>
         var event = nextUserEvent()
-        publisher ! Message(event.toBytes, "")
+        publisher ! Message(event.toBytes, "astakos.user")
     }
   }
 
@@ -113,10 +113,10 @@ trait RandomEventGenerator extends AkkaAMQP {
           isActive = rnd.nextBoolean,
           role = Array("PROF", "STUDENT", "ADMIN").apply(rnd.nextInt(3)),
           eventVersion = 1,
-          eventType = "ACTIVE",
+          eventType = "CREATE",
           details = Map()
         )
-        publisher ! Message(user.toBytes, "%s.%s".format(im_exchanges(0),"CREATED"))
+        publisher ! Message(user.toBytes, "astakos.user")
     }
   }