Check initial status

diff --git a/src/main/scala/gr/grnet/aquarium/actor/service/user/UserActor.scala b/src/main/scala/gr/grnet/aquarium/actor/service/user/UserActor.scala
index 5840379..59b52f2 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/actor/service/user/UserActor.scala
+++ b/src/main/scala/gr/grnet/aquarium/actor/service/user/UserActor.scala
@@ -118,6 +118,8 @@ class UserActor extends ReflectiveRoleableActor {
     (this._userStateModel ne null)
   }
 
+  private[this] def isInitial = this._userStateModel.isInitial
+
   /**
    * Creates the agreement history from all the stored IMEvents.
    *
@@ -187,11 +189,32 @@ class UserActor extends ReflectiveRoleableActor {
         this._userStateModel.updateUserAgreementHistoryMsg(historyMsg)
     }
   }
+
+  private[this] def checkInitial(nextThing: () ⇒ Any = () ⇒ {}): Boolean = {
+    if(!isInitial) {
+      return false
+    }
+
+    val (userCreated, imEventsCount) = createUserAgreementHistoryFromIMEvents(userID)
+
+    if(userCreated) {
+      loadLastKnownUserStateAndUpdateAgreements(this._userStateModel.userAgreementHistoryMsg)
+    }
+
+    nextThing()
+
+    true
+  }
+
   /**
    * Processes [[gr.grnet.aquarium.message.avro.gen.IMEventMsg]]s that come directly from the
    * messaging hub (rabbitmq).
    */
   def onIMEventMsg(imEvent: IMEventMsg) {
+    if(checkInitial()) {
+      return
+    }
+
     // Check for out of sync (regarding IMEvents)
     val isOutOfSyncIM = imEvent.getOccurredMillis < this._userStateModel.latestIMEventOccurredMillis
     if(isOutOfSyncIM) {
@@ -221,6 +244,10 @@ class UserActor extends ReflectiveRoleableActor {
   }
 
   def onResourceEventMsg(rcEvent: ResourceEventMsg) {
+    if(checkInitial()) {
+      return
+    }
+
     if(!haveUserCreationEvent) {
       DEBUG("No agreements. Ignoring %s", rcEvent)
 
@@ -249,6 +276,8 @@ class UserActor extends ReflectiveRoleableActor {
   }
 
   def onGetUserBillRequest(event: GetUserBillRequest): Unit = {
+    checkInitial()
+
     try{
       val timeslot = event.timeslot
       val resourceTypes: Map[String, ResourceType] = aquarium.policyStore.
@@ -272,6 +301,8 @@ class UserActor extends ReflectiveRoleableActor {
   }
 
   def onGetUserBalanceRequest(event: GetUserBalanceRequest): Unit = {
+    checkInitial()
+
     val userID = event.userID
 
     (haveAgreements, haveUserState) match {
@@ -309,6 +340,8 @@ class UserActor extends ReflectiveRoleableActor {
   }
 
   def onGetUserStateRequest(event: GetUserStateRequest): Unit = {
+    checkInitial()
+
     haveUserState match {
       case true ⇒
         val realtimeMillis = TimeHelpers.nowMillis()
@@ -326,6 +359,8 @@ class UserActor extends ReflectiveRoleableActor {
   }
 
   def onGetUserWalletRequest(event: GetUserWalletRequest): Unit = {
+    checkInitial()
+
     haveUserState match {
       case true ⇒
         DEBUG("haveWorkingUserState: %s", event)
@@ -377,10 +412,7 @@ class UserActor extends ReflectiveRoleableActor {
       TimeHelpers.nowMillis()
     )
 
-    val (userCreated, imEventsCount) = createUserAgreementHistoryFromIMEvents(userID)
-    if(userCreated) {
-      loadLastKnownUserStateAndUpdateAgreements(this._userStateModel.userAgreementHistoryMsg)
-    }
+    require(this._userStateModel.isInitial, "this._userStateModel.isInitial")
   }
 
   private[this] def D_userID = {

diff --git a/src/main/scala/gr/grnet/aquarium/charging/state/UserStateModel.scala b/src/main/scala/gr/grnet/aquarium/charging/state/UserStateModel.scala
index 99f8e8d..df5fda0 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/charging/state/UserStateModel.scala
+++ b/src/main/scala/gr/grnet/aquarium/charging/state/UserStateModel.scala
@@ -58,6 +58,7 @@ final class UserStateModel(
   require(this._userStateMsg ne null, "this._userStateMsg ne null")
   require(this._userAgreementHistoryMsg ne null, "this._userAgreementHistoryMsg ne null")
 
+  private[this] var _isInitial = true
   private[this] var _latestIMEventOccurredMillis = 0L
   private[this] var _userCreationIMEventMsgOpt: Option[IMEventMsg] = None
 
@@ -90,10 +91,13 @@ final class UserStateModel(
   }
 
   private[this] def updateOtherVars(imEvent: IMEventMsg) {
+    this._isInitial = false
     checkUserCreationIMEvent(imEvent)
     checkLatestIMEventOccurredMillis(imEvent)
   }
 
+  def isInitial = this._isInitial
+
   def userID = this._userAgreementHistoryMsg.getUserID
 
   def latestIMEventOccurredMillis = this._latestIMEventOccurredMillis
@@ -112,12 +116,14 @@ final class UserStateModel(
 
   def updateUserStateMsg(msg: UserStateMsg) {
     this._userStateMsg = msg
+    this._isInitial = false
   }
 
   def userAgreementHistoryMsg = this._userAgreementHistoryMsg
 
   def updateUserAgreementHistoryMsg(msg: UserAgreementHistoryMsg) {
     this._userAgreementHistoryMsg = msg
+    this._isInitial = false
   }
 
   def agreementByTimeslot: immutable.SortedMap[Timeslot, UserAgreementModel] = {