Cache resource mapping
[aquarium] / src / main / scala / gr / grnet / aquarium / actor / service / user / UserActor.scala
index f933964..b19a4da 100644 (file)
@@ -37,21 +37,30 @@ package gr.grnet.aquarium.actor
 package service
 package user
 
-import gr.grnet.aquarium.actor._
-
-import gr.grnet.aquarium.actor.message.event.{ProcessResourceEvent, ProcessIMEvent}
-import gr.grnet.aquarium.actor.message.config.{InitializeUserActorState, AquariumPropertiesLoaded}
+import gr.grnet.aquarium.AquariumInternalError
+import gr.grnet.aquarium.actor.message.GetUserBalanceRequest
+import gr.grnet.aquarium.actor.message.GetUserBalanceResponse
+import gr.grnet.aquarium.actor.message.GetUserBalanceResponseData
+import gr.grnet.aquarium.actor.message.GetUserBillRequest
+import gr.grnet.aquarium.actor.message.GetUserBillResponse
+import gr.grnet.aquarium.actor.message.GetUserBillResponseData
+import gr.grnet.aquarium.actor.message.GetUserStateRequest
+import gr.grnet.aquarium.actor.message.GetUserStateResponse
+import gr.grnet.aquarium.actor.message.GetUserWalletRequest
+import gr.grnet.aquarium.actor.message.GetUserWalletResponse
+import gr.grnet.aquarium.actor.message.GetUserWalletResponseData
+import gr.grnet.aquarium.actor.message.config.AquariumPropertiesLoaded
+import gr.grnet.aquarium.charging.state.{UserStateModel, UserAgreementHistoryModel, UserStateBootstrap}
+import gr.grnet.aquarium.computation.BillingMonthInfo
+import gr.grnet.aquarium.message.avro.gen.{ResourceTypeMsg, UserAgreementHistoryMsg, IMEventMsg, ResourceEventMsg, UserStateMsg}
+import gr.grnet.aquarium.message.avro.{ModelFactory, MessageFactory, MessageHelpers, AvroHelpers}
+import gr.grnet.aquarium.service.event.BalanceEvent
 import gr.grnet.aquarium.util.date.TimeHelpers
-import gr.grnet.aquarium.event.model.im.IMEventModel
-import gr.grnet.aquarium.actor.message.{GetUserWalletResponseData, GetUserWalletResponse, GetUserWalletRequest, GetUserStateResponse, GetUserBalanceResponseData, GetUserBalanceResponse, GetUserStateRequest, GetUserBalanceRequest}
 import gr.grnet.aquarium.util.{LogHelpers, shortClassNameOf}
-import gr.grnet.aquarium.{Aquarium, AquariumInternalError}
-import gr.grnet.aquarium.computation.BillingMonthInfo
-import gr.grnet.aquarium.charging.state.UserStateBootstrap
-import gr.grnet.aquarium.charging.state.{WorkingAgreementHistory, WorkingUserState, UserStateModel}
-import gr.grnet.aquarium.charging.reason.{InitialUserActorSetup, RealtimeChargingReason}
-import gr.grnet.aquarium.policy.{PolicyDefinedFullPriceTableRef, StdUserAgreement}
-import gr.grnet.aquarium.event.model.resource.ResourceEventModel
+import gr.grnet.aquarium.policy.{ResourceType, PolicyModel}
+import gr.grnet.aquarium.charging.bill.BillEntryMsg
+import gr.grnet.aquarium.event.CreditsModel
+import java.util
 
 /**
  *
@@ -59,13 +68,11 @@ import gr.grnet.aquarium.event.model.resource.ResourceEventModel
  */
 
 class UserActor extends ReflectiveRoleableActor {
-  private[this] var _userID: String = "<?>"
-  private[this] var _workingUserState: WorkingUserState = _
-  private[this] var _userCreationIMEvent: IMEventModel = _
-  private[this] val _workingAgreementHistory: WorkingAgreementHistory = new WorkingAgreementHistory
-  private[this] var _latestIMEventID: String = ""
-  private[this] var _latestResourceEventID: String = ""
-  private[this] var _userStateBootstrap: UserStateBootstrap = _
+  private[this] var _rcMsgCount = 0
+  private[this] var _imMsgCount = 0
+  private[this] var _userID: String = "???"
+  private[this] var _userStateMsg: UserStateMsg = _
+  private[this] var _userAgreementHistoryModel: UserAgreementHistoryModel = _
 
   def unsafeUserID = {
     if(!haveUserID) {
@@ -97,270 +104,172 @@ class UserActor extends ReflectiveRoleableActor {
 
   private[this] def chargingService = aquarium.chargingService
 
-  private[this] def stdUserStateStoreFunc = (userState: UserStateModel) ⇒ {
+  private[this] def stdUserStateStoreFunc = (userState: UserStateMsg) ⇒ {
     aquarium.userStateStore.insertUserState(userState)
   }
 
-  @inline private[this] def haveUserID = {
-    this._userID ne null
-  }
-
-  @inline private[this] def haveUserCreationIMEvent = {
-    this._userCreationIMEvent ne null
-  }
-
   def onAquariumPropertiesLoaded(event: AquariumPropertiesLoaded): Unit = {
   }
 
-  @inline private[this] def haveAgreements = {
-    this._workingAgreementHistory.size > 0
-  }
-
-  @inline private[this] def haveWorkingUserState = {
-    this._workingUserState ne null
-  }
-
-  @inline private[this] def haveUserStateBootstrap = {
-    this._userStateBootstrap ne null
-  }
+  private[this] def haveUserID = this._userID ne null
+  private[this] def unsafeUserCreationIMEventMsg = this._userAgreementHistoryModel.unsafeUserCreationIMEvent
+  private[this] def haveAgreements = this._userAgreementHistoryModel ne null
+  private[this] def isUserCreated = haveAgreements && this._userAgreementHistoryModel.hasUserCreationEvent
+  private[this] def haveUserState = this._userStateMsg ne null
 
-  private[this] def updateAgreementHistoryFrom(imEvent: IMEventModel): Unit = {
-    if(imEvent.isCreateUser) {
-      if(haveUserCreationIMEvent) {
-        throw new AquariumInternalError(
-          "Got user creation event (id=%s) but I already have one (id=%s)",
-            this._userCreationIMEvent.id,
-            imEvent.id
-        )
-      }
+  private[this] def createInitialUserStateMsgFromCreateIMEvent() {
+    assert(haveAgreements, "haveAgreements")
+    assert(isUserCreated, "isUserCreated")
+    assert(this._userAgreementHistoryModel.hasUserCreationEvent, "this._userAgreementHistoryModel.hasUserCreationEvent")
 
-      this._userCreationIMEvent = imEvent
-    }
+    val userCreationIMEventMsg = unsafeUserCreationIMEventMsg
+    val userStateBootstrap = aquarium.getUserStateBootstrap(userCreationIMEventMsg)
 
-    val effectiveFromMillis = imEvent.occurredMillis
-    val role = imEvent.role
-    // calling unsafe just for the side-effect
-    assert(null ne aquarium.unsafePriceTableForRoleAt(role, effectiveFromMillis))
-
-    val newAgreement = StdUserAgreement(
-      imEvent.id,
-      Some(imEvent.id),
-      effectiveFromMillis,
-      Long.MaxValue,
-      role,
-      PolicyDefinedFullPriceTableRef
+    this._userStateMsg = MessageFactory.newInitialUserStateMsg(
+      this._userID,
+      CreditsModel.from(0.0),
+      TimeHelpers.nowMillis()
     )
-
-    this._workingAgreementHistory += newAgreement
-  }
-
-  private[this] def updateLatestIMEventIDFrom(imEvent: IMEventModel): Unit = {
-    this._latestIMEventID = imEvent.id
-  }
-
-  private[this] def updateLatestResourceEventIDFrom(rcEvent: ResourceEventModel): Unit = {
-    this._latestResourceEventID = rcEvent.id
   }
 
   /**
-   * Creates the initial state that is related to IMEvents.
+   * Creates the agreement history from all the stored IMEvents.
+   *
+   * @return (`true` iff there was a user CREATE event, the number of events processed)
    */
-  private[this] def initializeStateOfIMEvents(): Unit = {
-    // NOTE: this._userID is already set up by onInitializeUserActorState()
-    aquarium.imEventStore.foreachIMEventInOccurrenceOrder(this._userID) { imEvent ⇒
-      DEBUG("Replaying %s", imEvent)
+  private[this] def createUserAgreementHistoryFromStoredIMEvents(): (Boolean, Int) = {
+    DEBUG("createUserAgreementHistoryFromStoredIMEvents()")
+    val historyMsg = MessageFactory.newUserAgreementHistoryMsg(this._userID)
+    this._userAgreementHistoryModel = ModelFactory.newUserAgreementHistoryModel(historyMsg)
+
+    var _imcounter = 0
+
+    val hadCreateEvent = aquarium.imEventStore.foreachIMEventInOccurrenceOrder(this._userID) { imEvent ⇒
+      _imcounter += 1
+      DEBUG("Replaying [%s/%s] %s", shortClassNameOf(imEvent), _imcounter, imEvent)
+
+      if(_imcounter == 1 && !MessageHelpers.isIMEventCreate(imEvent)) {
+        // The very first event must be a CREATE event. Otherwise we abort initialization.
+        // This will normally happen during devops :)
+        INFO("Ignoring first %s since it is not CREATE", shortClassNameOf(imEvent))
+        false
+      }
+      else {
+        val effectiveFromMillis = imEvent.getOccurredMillis
+        val role = imEvent.getRole
+        // calling unsafe just for the side-effect
+        assert(
+          aquarium.unsafeFullPriceTableForRoleAt(role, effectiveFromMillis) ne null,
+          "aquarium.unsafeFullPriceTableForRoleAt(%s, %s) ne null".format(role, effectiveFromMillis)
+        )
 
-      updateAgreementHistoryFrom(imEvent)
-      updateLatestIMEventIDFrom(imEvent)
+        this._userAgreementHistoryModel.insertUserAgreementMsgFromIMEvent(imEvent)
+        true
+      }
     }
 
-    if(haveAgreements) {
-      DEBUG("Initial agreement history %s", this._workingAgreementHistory.toJsonString)
-      logSeparator()
-    }
+    DEBUG("Agreements: %s", this._userAgreementHistoryModel)
+    (hadCreateEvent, _imcounter)
   }
 
   /**
-   * Resource events are processed only if the user has been created and has agreements.
-   * Otherwise nothing can be computed.
+   * Processes [[gr.grnet.aquarium.message.avro.gen.IMEventMsg]]s that come directly from the
+   * messaging hub (rabbitmq).
    */
-  private[this] def shouldProcessResourceEvents: Boolean = {
-    haveUserCreationIMEvent && haveAgreements && haveUserStateBootstrap
-  }
-
-  private[this] def loadWorkingUserStateAndUpdateAgreementHistory(): Unit = {
-    assert(this.haveAgreements, "this.haveAgreements")
-    assert(this.haveUserCreationIMEvent, "this.haveUserCreationIMEvent")
-
-    val userCreationMillis = this._userCreationIMEvent.occurredMillis
-    val userCreationRole = this._userCreationIMEvent.role // initial role
-    val userCreationIMEventID = this._userCreationIMEvent.id
-
-    if(!haveUserStateBootstrap) {
-      this._userStateBootstrap = UserStateBootstrap(
-        this._userID,
-        userCreationMillis,
-        aquarium.initialUserAgreement(userCreationRole, userCreationMillis, Some(userCreationIMEventID)),
-        aquarium.initialUserBalance(userCreationRole, userCreationMillis)
-      )
-    }
-
-    val now = TimeHelpers.nowMillis()
-    this._workingUserState = chargingService.replayMonthChargingUpTo(
-      BillingMonthInfo.fromMillis(now),
-      now,
-      this._userStateBootstrap,
-      aquarium.currentResourceTypesMap,
-      InitialUserActorSetup(),
-      aquarium.userStateStore.insertUserState,
-      None
-    )
-
-    // Final touch: Update agreement history in the working user state.
-    // The assumption is that all agreement changes go via IMEvents, so the
-    // state this._workingAgreementHistory is always the authoritative source.
-    if(haveWorkingUserState) {
-      this._workingUserState.workingAgreementHistory.setFrom(this._workingAgreementHistory)
-      DEBUG("Computed working user state %s", this._workingUserState.toJsonString)
-    }
-  }
-
-  private[this] def initializeStateOfResourceEvents(event: InitializeUserActorState): Unit = {
-    if(!this.haveAgreements) {
-      DEBUG("Cannot initializeResourceEventsState() from %s. There are no agreements", event)
-      return
-    }
+  def onIMEventMsg(imEvent: IMEventMsg) {
+    if(!isUserCreated && MessageHelpers.isIMEventCreate(imEvent)) {
+      assert(this._imMsgCount == 0, "this._imMsgCount == 0")
+      // Create the full agreement history from the original sources (IMEvents)
+      val (userCreated, imEventsCount) = createUserAgreementHistoryFromStoredIMEvents()
 
-    if(!this.haveUserCreationIMEvent) {
-      DEBUG("Cannot initializeResourceEventsState() from %s. I never got a CREATE IMEvent", event)
+      this._imMsgCount = imEventsCount
       return
     }
 
-    // We will also need this functionality when receiving IMEvents, so we place it in a method
-    loadWorkingUserStateAndUpdateAgreementHistory()
+    // Check for out of sync (regarding IMEvents)
+    val isOutOfSyncIM = imEvent.getOccurredMillis < this._userAgreementHistoryModel.latestIMEventOccurredMillis
+    if(isOutOfSyncIM) {
+      // clear all resource state
+      // FIXME implement
 
-    if(haveWorkingUserState) {
-      DEBUG("Initial working user state %s", this._workingUserState.toJsonString)
-      logSeparator()
+      return
     }
-  }
-
-  def onInitializeUserActorState(event: InitializeUserActorState): Unit = {
-    this._userID = event.userID
-    DEBUG("Got %s", event)
-
-    initializeStateOfIMEvents()
-    initializeStateOfResourceEvents(event)
-  }
 
-  /**
-   * Process [[gr.grnet.aquarium.event.model.im.IMEventModel]]s.
-   * When this method is called, we assume that all proper checks have been made and it
-   * is OK to proceed with the event processing.
-   */
-  def onProcessIMEvent(processEvent: ProcessIMEvent): Unit = {
-    val imEvent = processEvent.imEvent
-    val hadUserCreationIMEvent = haveUserCreationIMEvent
-
-    if(!haveAgreements) {
-      // This IMEvent has arrived after any ResourceEvents
-      INFO("Arrived after any ResourceEvent: %s", imEvent.toDebugString)
-      initializeStateOfIMEvents()
-    }
-    else {
-      if(this._latestIMEventID == imEvent.id) {
-        // This happens when the actor is brought to life, then immediately initialized, and then
-        // sent the first IM event. But from the initialization procedure, this IM event will have
-        // already been loaded from DB!
-        INFO("Ignoring first %s", imEvent.toDebugString)
-        logSeparator()
-
-        //this._latestIMEventID = imEvent.id
-        return
-      }
+    // Check out of sync (regarding ResourceEvents)
+    val isOutOfSyncRC = false // FIXME implement
+    if(isOutOfSyncRC) {
+      // TODO
 
-      updateAgreementHistoryFrom(imEvent)
-      updateLatestIMEventIDFrom(imEvent)
+      return
     }
 
-    // Must also update user state if we know when in history the life of a user begins
-    if(!hadUserCreationIMEvent && haveUserCreationIMEvent) {
-      INFO("Processing user state, since we had a CREATE IMEvent")
-      loadWorkingUserStateAndUpdateAgreementHistory()
-    }
+    // OK, seems good
+    assert(!MessageHelpers.isIMEventCreate(imEvent), "!MessageHelpers.isIMEventCreate(imEvent)")
 
-    logSeparator()
+    // Make new agreement
+    this._userAgreementHistoryModel.insertUserAgreementMsgFromIMEvent(imEvent)
+    this._imMsgCount += 1
+    DEBUG("Agreements: %s", this._userAgreementHistoryModel)
   }
 
-  def onProcessResourceEvent(event: ProcessResourceEvent): Unit = {
-    val rcEvent = event.rcEvent
-
-    if(!shouldProcessResourceEvents) {
-      // This means the user has not been created (at least, as far as Aquarium is concerned).
-      // So, we do not process any resource event
-      DEBUG("Not processing %s", rcEvent.toJsonString)
-      logSeparator()
-
-      return
-    }
-
-    // Since the latest resource event per resource is recorded in the user state,
-    // we do not need to query the store. Just query the in-memory state.
-    // Note: This is a similar situation with the first IMEvent received right after the user
-    //       actor is created.
-    if(this._latestResourceEventID == rcEvent.id) {
-      INFO("Ignoring first %s", rcEvent.toDebugString)
-      logSeparator()
+  def onResourceEventMsg(rcEvent: ResourceEventMsg) {
+    if(!isUserCreated) {
+      DEBUG("No agreements. Ignoring %s", rcEvent)
 
       return
     }
 
     val now = TimeHelpers.nowMillis()
-    val currentResourcesMap = aquarium.currentResourceTypesMap
-    val chargingReason = RealtimeChargingReason(None, now)
+    val resourceMapping = aquarium.resourceMappingAtMillis(now)
 
     val nowBillingMonthInfo = BillingMonthInfo.fromMillis(now)
     val nowYear = nowBillingMonthInfo.year
     val nowMonth = nowBillingMonthInfo.month
 
-    val eventOccurredMillis = rcEvent.occurredMillis
+    val eventOccurredMillis = rcEvent.getOccurredMillis
     val eventBillingMonthInfo = BillingMonthInfo.fromMillis(eventOccurredMillis)
     val eventYear = eventBillingMonthInfo.year
     val eventMonth = eventBillingMonthInfo.month
 
     def computeBatch(): Unit = {
-      DEBUG("Going for out of sync charging")
-      this._workingUserState = chargingService.replayMonthChargingUpTo(
+      DEBUG("Going for out of sync charging for %s", rcEvent.getOriginalID)
+
+      this._userStateMsg = chargingService.replayMonthChargingUpTo(
+        this._userAgreementHistoryModel,
         nowBillingMonthInfo,
         // Take into account that the event may be out-of-sync.
         // TODO: Should we use this._latestResourceEventOccurredMillis instead of now?
         now max eventOccurredMillis,
-        this._userStateBootstrap,
-        currentResourcesMap,
-        chargingReason,
-        stdUserStateStoreFunc,
-        None
+        resourceMapping,
+        stdUserStateStoreFunc
       )
 
-      updateLatestResourceEventIDFrom(rcEvent)
     }
 
     def computeRealtime(): Unit = {
-      DEBUG("Going for in sync charging")
+      DEBUG("Going for in sync charging for %s", rcEvent.getOriginalID)
       chargingService.processResourceEvent(
         rcEvent,
-        this._workingUserState,
-        chargingReason,
+        this._userAgreementHistoryModel,
+        this._userStateMsg,
         nowBillingMonthInfo,
-        None,
-        true
+        true,
+        resourceMapping
       )
 
-      updateLatestResourceEventIDFrom(rcEvent)
+      this._rcMsgCount += 1
     }
 
+    val oldTotalCredits =
+      if(this._userStateMsg!=null)
+        this._userStateMsg.totalCredits
+      else
+        0.0D
     // FIXME check these
-    if(nowYear != eventYear || nowMonth != eventMonth) {
+    if(this._userStateMsg eq null) {
+      computeBatch()
+    }
+    else if(nowYear != eventYear || nowMonth != eventMonth) {
       DEBUG(
         "nowYear(%s) != eventYear(%s) || nowMonth(%s) != eventMonth(%s)",
         nowYear, eventYear,
@@ -368,33 +277,69 @@ class UserActor extends ReflectiveRoleableActor {
       )
       computeBatch()
     }
-    else if(this._workingUserState.latestResourceEventOccurredMillis < rcEvent.occurredMillis) {
+    else if(this._userStateMsg.latestResourceEventOccurredMillis < rcEvent.getOccurredMillis) {
       DEBUG("this._workingUserState.latestResourceEventOccurredMillis < rcEvent.occurredMillis")
       DEBUG(
         "%s < %s",
-        TimeHelpers.toYYYYMMDDHHMMSSSSS(this._workingUserState.latestResourceEventOccurredMillis),
-        TimeHelpers.toYYYYMMDDHHMMSSSSS(rcEvent.occurredMillis)
+        TimeHelpers.toYYYYMMDDHHMMSSSSS(this._userStateMsg.latestResourceEventOccurredMillis),
+        TimeHelpers.toYYYYMMDDHHMMSSSSS(rcEvent.getOccurredMillis)
       )
       computeRealtime()
     }
     else {
+      DEBUG("OUT OF ORDER! this._workingUserState.latestResourceEventOccurredMillis=%s  and rcEvent.occurredMillis=%s",
+        TimeHelpers.toYYYYMMDDHHMMSSSSS(this._userStateMsg.latestResourceEventOccurredMillis),
+        TimeHelpers.toYYYYMMDDHHMMSSSSS(rcEvent.getOccurredMillis))
+
       computeBatch()
     }
-    aquarium(Aquarium.EnvKeys.rabbitMQProducer).
-    sendMessage("{userid: \"%s\", state: %s}".
-                  format(this._userID,
-                  this._workingUserState.totalCredits >= 0.0))
-    DEBUG("Updated %s", this._workingUserState)
+    val newTotalCredits = this._userStateMsg.totalCredits
+    if(oldTotalCredits * newTotalCredits < 0)
+      aquarium.eventBus ! new BalanceEvent(this._userStateMsg.userID,
+        newTotalCredits>=0)
+    DEBUG("Updated %s", this._userStateMsg)
     logSeparator()
   }
 
+  def onGetUserBillRequest(event: GetUserBillRequest): Unit = {
+    try{
+      val timeslot = event.timeslot
+      val resourceTypes: Map[String, ResourceType] = aquarium.policyStore.
+                          loadSortedPolicyModelsWithin(timeslot.from.getTime,
+                                                       timeslot.to.getTime).
+                          values.headOption match {
+          case None => Map[String,ResourceType]()
+          case Some(policy:PolicyModel) => policy.resourceTypesMap
+      }
+      val state= if(haveUserState) Some(this._userStateMsg) else None
+      val billEntryMsg = BillEntryMsg.fromWorkingUserState(timeslot,this._userID,state,resourceTypes)
+      //val billEntryMsg = MessageFactory.createBillEntryMsg(billEntry)
+      //logger.debug("BILL ENTRY MSG: " + billEntryMsg.toString)
+      val billData = GetUserBillResponseData(this._userID,billEntryMsg)
+      sender ! GetUserBillResponse(Right(billData))
+    } catch {
+      case e:Exception =>
+        e.printStackTrace()
+        sender ! GetUserBillResponse(Left("Internal Server Error [AQU-BILL-0001]"), 500)
+    }
+  }
+
   def onGetUserBalanceRequest(event: GetUserBalanceRequest): Unit = {
     val userID = event.userID
 
-    (haveUserCreationIMEvent, haveWorkingUserState) match {
+    (haveAgreements, haveUserState) match {
       case (true, true) ⇒
         // (User CREATEd, with balance state)
-        sender ! GetUserBalanceResponse(Right(GetUserBalanceResponseData(this._userID, this._workingUserState.totalCredits)))
+        val realtimeMillis = TimeHelpers.nowMillis()
+        chargingService.calculateRealtimeUserState(
+          this._userAgreementHistoryModel,
+          this._userStateMsg,
+          BillingMonthInfo.fromMillis(realtimeMillis),
+          aquarium.resourceMappingAtMillis(realtimeMillis),
+          realtimeMillis
+        )
+
+        sender ! GetUserBalanceResponse(Right(GetUserBalanceResponseData(this._userID, this._userStateMsg.totalCredits)))
 
       case (true, false) ⇒
         // (User CREATEd, no balance state)
@@ -403,8 +348,8 @@ class UserActor extends ReflectiveRoleableActor {
           Right(
             GetUserBalanceResponseData(
               this._userID,
-              aquarium.initialUserBalance(this._userCreationIMEvent.role, this._userCreationIMEvent.occurredMillis)
-        )))
+              aquarium.initialUserBalance(this.unsafeUserCreationIMEventMsg.getRole, this.unsafeUserCreationIMEventMsg.getOccurredMillis)
+            )))
 
       case (false, true) ⇒
         // (Not CREATEd, with balance state)
@@ -419,9 +364,18 @@ class UserActor extends ReflectiveRoleableActor {
   }
 
   def onGetUserStateRequest(event: GetUserStateRequest): Unit = {
-    haveWorkingUserState match {
+    haveUserState match {
       case true ⇒
-        sender ! GetUserStateResponse(Right(this._workingUserState))
+        val realtimeMillis = TimeHelpers.nowMillis()
+        chargingService.calculateRealtimeUserState(
+          this._userAgreementHistoryModel,
+          this._userStateMsg,
+          BillingMonthInfo.fromMillis(realtimeMillis),
+          aquarium.resourceMappingAtMillis(realtimeMillis),
+          realtimeMillis
+        )
+
+        sender ! GetUserStateResponse(Right(this._userStateMsg))
 
       case false ⇒
         sender ! GetUserStateResponse(Left("No state for user %s [AQU-STA-0006]".format(event.userID)), 404)
@@ -429,29 +383,38 @@ class UserActor extends ReflectiveRoleableActor {
   }
 
   def onGetUserWalletRequest(event: GetUserWalletRequest): Unit = {
-    haveWorkingUserState match {
+    haveUserState match {
       case true ⇒
         DEBUG("haveWorkingUserState: %s", event)
+        val realtimeMillis = TimeHelpers.nowMillis()
+        chargingService.calculateRealtimeUserState(
+          this._userAgreementHistoryModel,
+          this._userStateMsg,
+          BillingMonthInfo.fromMillis(realtimeMillis),
+          aquarium.resourceMappingAtMillis(realtimeMillis),
+          realtimeMillis
+        )
+
         sender ! GetUserWalletResponse(
           Right(
             GetUserWalletResponseData(
               this._userID,
-              this._workingUserState.totalCredits,
-              this._workingUserState.walletEntries.toList
-        )))
+              this._userStateMsg.totalCredits,
+              MessageFactory.newWalletEntriesMsg(this._userStateMsg.getWalletEntries)
+            )))
 
       case false ⇒
         DEBUG("!haveWorkingUserState: %s", event)
-        haveUserCreationIMEvent match {
+        haveAgreements match {
           case true ⇒
-            DEBUG("haveUserCreationIMEvent: %s", event)
+            DEBUG("haveAgreements: %s", event)
             sender ! GetUserWalletResponse(
               Right(
                 GetUserWalletResponseData(
                   this._userID,
-                  aquarium.initialUserBalance(this._userCreationIMEvent.role, this._userCreationIMEvent.occurredMillis),
-                  Nil
-            )))
+                  aquarium.initialUserBalance(this.unsafeUserCreationIMEventMsg.getRole, this.unsafeUserCreationIMEventMsg.getOccurredMillis),
+                  MessageFactory.newWalletEntriesMsg()
+                )))
 
           case false ⇒
             DEBUG("!haveUserCreationIMEvent: %s", event)
@@ -460,6 +423,10 @@ class UserActor extends ReflectiveRoleableActor {
     }
   }
 
+  def onSetUserActorUserID(userID: String) {
+    this._userID = userID
+  }
+
   private[this] def D_userID = {
     this._userID
   }