WIP: Remodeling UserState store mechanics

[aquarium] / src / main / scala / gr / grnet / aquarium / user / UserState.scala

diff --git a/src/main/scala/gr/grnet/aquarium/user/UserState.scala b/src/main/scala/gr/grnet/aquarium/user/UserState.scala
index bc4806c..a382e0f 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/user/UserState.scala
+++ b/src/main/scala/gr/grnet/aquarium/user/UserState.scala
@@ -43,6 +43,7 @@ import gr.grnet.aquarium.event.{NewWalletEntry, WalletEntry}
 import gr.grnet.aquarium.converter.{JsonTextFormat, StdConverters}
 import gr.grnet.aquarium.AquariumException
 import gr.grnet.aquarium.event.im.IMEventModel
+import org.bson.types.ObjectId
 
 
 /**
@@ -59,7 +60,7 @@ import gr.grnet.aquarium.event.im.IMEventModel
  *          This is communicated to Aquarium from the `IM` system.
  *
  *
- * @param userId
+ * @param userID
  *          The user ID. $communicatedByIM
  * @param userCreationMillis
  *          When the user was created.
@@ -96,7 +97,7 @@ import gr.grnet.aquarium.event.im.IMEventModel
  * @author Christos KK Loverdos <loverdos@gmail.com>
  */
 case class UserState(
-    userId: String,
+    userID: String,
 
     userCreationMillis: Long,
 
@@ -171,7 +172,7 @@ case class UserState(
     // The user state we used to compute this one. Normally the (cached)
     // state at the beginning of the billing period.
     parentUserStateId: Option[String] = None,
-    id: String = ""
+    _id: ObjectId = new ObjectId()
 ) extends JsonSupport {
 
   private[this] def _allSnapshots: List[Long] = {
@@ -188,11 +189,9 @@ case class UserState(
 
   def newestSnapshotTime: Long  = _allSnapshots max
 
-  def _id = id
   def idOpt: Option[String] = _id match {
     case null ⇒ None
-    case ""   ⇒ None
-    case _id  ⇒ Some(_id)
+    case _id  ⇒ Some(_id.toString)
   }
 
 //  def userCreationDate = new Date(userCreationMillis)
@@ -204,7 +203,7 @@ case class UserState(
       case snapshot @ AgreementSnapshot(data, _) ⇒
         snapshot.getAgreement(at)
       case _ ⇒
-       Failed(new AquariumException("No agreement snapshot found for user %s".format(userId)))
+       Failed(new AquariumException("No agreement snapshot found for user %s".format(userID)))
     }
   }
 
@@ -250,7 +249,7 @@ object UserState {
 
   object JsonNames {
     final val _id = "_id"
-    final val userId = "userId"
+    final val userID = "userID"
   }
 }