package service
package user
-import gr.grnet.aquarium.util.date.TimeHelpers
-import gr.grnet.aquarium.service.event.BalanceEvent
-import gr.grnet.aquarium.event.model.im.IMEventModel
-import gr.grnet.aquarium.actor.message.config.AquariumPropertiesLoaded
-import gr.grnet.aquarium.actor.message.config.InitializeUserActorState
-import gr.grnet.aquarium.actor.message.event.ProcessIMEvent
-import gr.grnet.aquarium.actor.message.event.ProcessResourceEvent
-import gr.grnet.aquarium.util.{LogHelpers, shortClassNameOf}
import gr.grnet.aquarium.AquariumInternalError
-import gr.grnet.aquarium.computation.BillingMonthInfo
-import gr.grnet.aquarium.charging.state.{WorkingUserState, UserStateModel}
-import gr.grnet.aquarium.policy.PolicyDefinedFullPriceTableRef
-import gr.grnet.aquarium.event.model.resource.{StdResourceEvent, ResourceEventModel}
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.GetUserBillRequest
-import gr.grnet.aquarium.actor.message.GetUserBillResponse
-import gr.grnet.aquarium.actor.message.GetUserBillResponseData
-import gr.grnet.aquarium.charging.state.WorkingAgreementHistory
-import gr.grnet.aquarium.policy.StdUserAgreement
-import gr.grnet.aquarium.charging.state.UserStateBootstrap
-import gr.grnet.aquarium.charging.bill.{AbstractBillEntry, BillEntry}
+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.{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.util.{LogHelpers, shortClassNameOf}
+import gr.grnet.aquarium.policy.{ResourceType, PolicyModel}
+import gr.grnet.aquarium.charging.bill.BillEntryMsg
/**
*
*/
class UserActor extends ReflectiveRoleableActor {
+ private[this] var _rcMsgCount = 0
+ private[this] var _imMsgCount = 0
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 _userState: UserStateModel = _
+ private[this] var _userCreationIMEvent: IMEventMsg = _
+ private[this] var _userAgreementHistoryModel: UserAgreementHistoryModel = _
+ private[this] var _latestIMEventOriginalID: String = ""
+ private[this] var _latestIMEventOccurredMillis: Long = -1L
+ private[this] var _latestResourceEventOriginalID: String = ""
private[this] var _userStateBootstrap: UserStateBootstrap = _
def unsafeUserID = {
private[this] def chargingService = aquarium.chargingService
- private[this] def stdUserStateStoreFunc = (userState: UserStateModel) ⇒ {
+ private[this] def stdUserStateStoreFunc = (userState: UserStateMsg) ⇒ {
aquarium.userStateStore.insertUserState(userState)
}
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
+ (this._userAgreementHistoryModel ne null) && this._userAgreementHistoryModel.size > 0
}
- @inline private[this] def haveWorkingUserState = {
- this._workingUserState ne null
+ @inline private[this] def haveUserState = {
+ this._userState ne null
}
@inline private[this] def haveUserStateBootstrap = {
this._userStateBootstrap ne null
}
- private[this] def updateAgreementHistoryFrom(imEvent: IMEventModel): Unit = {
- if(imEvent.isCreateUser) {
- if(haveUserCreationIMEvent) {
+ private[this] def createUserAgreementHistoryModel(imEvent: IMEventMsg) {
+ assert(MessageHelpers.isIMEventCreate(imEvent))
+ assert(this._userAgreementHistoryModel eq null)
+ assert(this._userCreationIMEvent eq null)
+
+ this._userCreationIMEvent = imEvent
+ this._userAgreementHistoryModel = ModelFactory.newUserAgreementHistoryModelFromIMEvent(
+ imEvent,
+ imEvent.getOriginalID
+ )
+ }
+
+ private[this] def updateAgreementHistoryFrom(imEvent: IMEventMsg): Unit = {
+ val isCreateUser = MessageHelpers.isIMEventCreate(imEvent)
+ if(isCreateUser) {
+ if(haveAgreements) {
throw new AquariumInternalError(
"Got user creation event (id=%s) but I already have one (id=%s)",
- this._userCreationIMEvent.id,
- imEvent.id
+ this._userCreationIMEvent.getOriginalID,
+ imEvent.getOriginalID
)
}
- this._userCreationIMEvent = imEvent
+ createUserAgreementHistoryModel(imEvent) // now we have an agreement history
+ createUserStateBootstrap(imEvent)
}
- val effectiveFromMillis = imEvent.occurredMillis
- val role = imEvent.role
+ val effectiveFromMillis = imEvent.getOccurredMillis
+ val role = imEvent.getRole
// 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()
- )
+ assert(null ne aquarium.unsafeFullPriceTableForRoleAt(role, effectiveFromMillis))
+
+ // add to model (will update the underlying messages as well)
+ val newUserAgreementModel = ModelFactory.newUserAgreementModelFromIMEvent(imEvent, imEvent.getOriginalID)
+ this._userAgreementHistoryModel += newUserAgreementModel
- this._workingAgreementHistory += newAgreement
+ // We assume that we always call this method with in-sync events
+ assert(imEvent.getOccurredMillis >= this._latestIMEventOccurredMillis)
+ updateLatestIMEventStateFrom(imEvent)
}
- private[this] def updateLatestIMEventIDFrom(imEvent: IMEventModel): Unit = {
- this._latestIMEventID = imEvent.id
+// private[this] def updateLatestIMEventIDFrom(imEvent: IMEventMsg): Unit = {
+// this._latestIMEventOriginalID = imEvent.getOriginalID
+// }
+
+ private[this] def updateLatestIMEventStateFrom(imEvent: IMEventMsg) {
+ this._latestIMEventOriginalID = imEvent.getOriginalID
+ this._latestIMEventOccurredMillis = imEvent.getOccurredMillis
+ this._imMsgCount += 1
}
- private[this] def updateLatestResourceEventIDFrom(rcEvent: ResourceEventModel): Unit = {
- this._latestResourceEventID = rcEvent.id
+ private[this] def updateLatestResourceEventIDFrom(rcEvent: ResourceEventMsg): Unit = {
+ this._latestResourceEventOriginalID = rcEvent.getOriginalID
}
/**
* Creates the initial state that is related to IMEvents.
+ *
+ * @return `true` if there was a user CREATE event
*/
- 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 initializeStateOfIMEvents(): Boolean = {
+ DEBUG("initializeStateOfIMEvents()")
- updateAgreementHistoryFrom(imEvent)
- updateLatestIMEventIDFrom(imEvent)
- }
+ // NOTE: this._userID is already set up our caller
+ var _imcounter = 0
- if(haveAgreements) {
- DEBUG("Initial agreement history %s", this._workingAgreementHistory.toJsonString)
- logSeparator()
+ aquarium.imEventStore.foreachIMEventInOccurrenceOrder(this._userID) { imEvent ⇒
+ _imcounter += 1
+ DEBUG("Replaying [%s] %s", _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 {
+ updateAgreementHistoryFrom(imEvent)
+ true
+ }
}
}
- /**
- * Resource events are processed only if the user has been created and has agreements.
- * Otherwise nothing can be computed.
- */
- private[this] def shouldProcessResourceEvents: Boolean = {
- haveUserCreationIMEvent && haveAgreements && haveUserStateBootstrap
- }
-
- private[this] def loadWorkingUserStateAndUpdateAgreementHistory(): Unit = {
+ private[this] def loadUserStateAndUpdateAgreementHistory(): 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)
- )
+ this._userStateBootstrap = aquarium.getUserStateBootstrap(this._userCreationIMEvent)
}
-
+ logger.debug("#### this._userStateBootStrap %s".format(this._userStateBootstrap.toString))
val now = TimeHelpers.nowMillis()
- this._workingUserState = chargingService.replayMonthChargingUpTo(
+ this._userState = chargingService.replayMonthChargingUpTo(
BillingMonthInfo.fromMillis(now),
now,
this._userStateBootstrap,
// 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)
+ if(haveUserState) {
+ this._userState.userAgreementHistoryModel = this._userAgreementHistoryModel
+ DEBUG("Computed working user state %s", AvroHelpers.jsonStringOfSpecificRecord(this._userState.msg))
}
}
- private[this] def initializeStateOfResourceEvents(event: InitializeUserActorState): Unit = {
- if(!this.haveAgreements) {
- DEBUG("Cannot initializeResourceEventsState() from %s. There are no agreements", event)
- return
- }
-
- if(!this.haveUserCreationIMEvent) {
- DEBUG("Cannot initializeResourceEventsState() from %s. I never got a CREATE IMEvent", event)
- return
- }
+ private[this] def initializeStateOfResourceEvents(): Unit = {
+ DEBUG("initializeStateOfResourceEvents()")
+ assert(haveAgreements)
// We will also need this functionality when receiving IMEvents, so we place it in a method
- loadWorkingUserStateAndUpdateAgreementHistory()
+ loadUserStateAndUpdateAgreementHistory()
- if(haveWorkingUserState) {
- DEBUG("Initial working user state %s", this._workingUserState.toJsonString)
+ if(haveUserState) {
+ DEBUG("Initial working user state %s", AvroHelpers.jsonStringOfSpecificRecord(this._userState.msg))
logSeparator()
}
}
- 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.
+ * Initializes the actor state from DB.
*/
- def onProcessIMEvent(processEvent: ProcessIMEvent): Unit = {
- val imEvent = processEvent.imEvent
- val hadUserCreationIMEvent = haveUserCreationIMEvent
+ def initializeUserActorState(userID: String): Boolean = {
+ this._userID = userID
- if(!haveAgreements) {
- // This IMEvent has arrived after any ResourceEvents
- INFO("Arrived after any ResourceEvent: %s", imEvent.toDebugString)
- initializeStateOfIMEvents()
+ if(initializeStateOfIMEvents()) {
+ initializeStateOfResourceEvents()
+ // Even if we have no resource events, the user is at least CREATEd
+ true
}
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
- }
- if(imEvent.isAddCredits) {
- if(!hadUserCreationIMEvent && haveUserCreationIMEvent)
- loadWorkingUserStateAndUpdateAgreementHistory()
- onHandleAddCreditsEvent(imEvent)
-
- } else {
- updateAgreementHistoryFrom(imEvent)
- updateLatestIMEventIDFrom(imEvent)
- }
+ false
}
+ }
- // 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()
- }
+ def createUserStateBootstrap(imEvent: IMEventMsg) {
+ assert(MessageHelpers.isIMEventCreate(imEvent), "MessageHelpers.isIMEventCreate(imEvent)")
+ assert(this._userCreationIMEvent == imEvent, "this._userCreationIMEvent == imEvent")
- logSeparator()
+ this._userStateBootstrap = aquarium.getUserStateBootstrap(this._userCreationIMEvent)
}
- /* Convert astakos message for adding credits
- to a regular RESOURCE message */
- def onHandleAddCreditsEvent(imEvent : IMEventModel) = {
- DEBUG("Got %s", imEvent.toJsonString)
-
- val credits = imEvent.details(IMEventModel.DetailsNames.credits).toInt.toDouble
- val event = new StdResourceEvent(
- imEvent.id,
- imEvent.occurredMillis,
- imEvent.receivedMillis,
- imEvent.userID,
- imEvent.clientID,
- imEvent.eventType,
- imEvent.eventType,
- credits,
- imEvent.eventVersion,
- imEvent.details
- )
- DEBUG("Transformed to %s", event)
- DEBUG("Total credits before: %s", _workingUserState.totalCredits)
- aquarium.resourceEventStore.insertResourceEvent(event)
- onProcessResourceEvent(new ProcessResourceEvent(event))
- DEBUG("Total credits after: %s", _workingUserState.totalCredits)
- //Console.err.println("OK.")
- }
+ /**
+ * Processes [[gr.grnet.aquarium.message.avro.gen.IMEventMsg]]s that come directly from the
+ * messaging hub (rabbitmq).
+ */
+ def onIMEventMsg(imEvent: IMEventMsg) {
+ if(!haveAgreements) {
+ // If we have no agreements so far, then it does not matter what kind of event
+ // this is. So we replay the log (ehm.. store)
+ initializeUserActorState(imEvent.getUserID)
- def onProcessResourceEvent(event: ProcessResourceEvent): Unit = {
- val rcEvent = event.rcEvent
+ return
+ }
- 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()
+ // Check for out of sync (regarding IMEvents)
+ val isOutOfSyncIM = imEvent.getOccurredMillis < this._latestIMEventOccurredMillis
+ if(isOutOfSyncIM) {
+ // clear all resource state
+ // FIXME implement
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()
+ // Check out of sync (regarding ResourceEvents)
+ val isOutOfSyncRC = false // FIXME implement
+ if(isOutOfSyncRC) {
+ // TODO
+
+ return
+ }
+
+ // OK, seems good
+ assert(!MessageHelpers.isIMEventCreate(imEvent), "!MessageHelpers.isIMEventCreate(imEvent)")
+ updateAgreementHistoryFrom(imEvent)
+ }
+
+ def onResourceEventMsg(rcEvent: ResourceEventMsg) {
+ if(!haveAgreements) {
+ DEBUG("No agreement. Ignoring %s", rcEvent)
return
}
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._userState = chargingService.replayMonthChargingUpTo(
nowBillingMonthInfo,
// Take into account that the event may be out-of-sync.
// TODO: Should we use this._latestResourceEventOccurredMillis instead of now?
}
def computeRealtime(): Unit = {
- DEBUG("Going for in sync charging")
+ DEBUG("Going for in sync charging for %s", rcEvent.getOriginalID)
chargingService.processResourceEvent(
rcEvent,
- this._workingUserState,
+ this._userState,
nowBillingMonthInfo,
true
)
}
val oldTotalCredits =
- if(this._workingUserState!=null)
- this._workingUserState.totalCredits
+ if(this._userState!=null)
+ this._userState.totalCredits
else
0.0D
// FIXME check these
- if(nowYear != eventYear || nowMonth != eventMonth) {
+ if(this._userState eq null) {
+ computeBatch()
+ }
+ else if(nowYear != eventYear || nowMonth != eventMonth) {
DEBUG(
"nowYear(%s) != eventYear(%s) || nowMonth(%s) != eventMonth(%s)",
nowYear, eventYear,
)
computeBatch()
}
- else if(this._workingUserState.latestResourceEventOccurredMillis < rcEvent.occurredMillis) {
+ else if(this._userState.latestResourceEventOccurredMillis < rcEvent.getOccurredMillis) {
DEBUG("this._workingUserState.latestResourceEventOccurredMillis < rcEvent.occurredMillis")
DEBUG(
"%s < %s",
- TimeHelpers.toYYYYMMDDHHMMSSSSS(this._workingUserState.latestResourceEventOccurredMillis),
- TimeHelpers.toYYYYMMDDHHMMSSSSS(rcEvent.occurredMillis)
+ TimeHelpers.toYYYYMMDDHHMMSSSSS(this._userState.latestResourceEventOccurredMillis),
+ TimeHelpers.toYYYYMMDDHHMMSSSSS(rcEvent.getOccurredMillis)
)
computeRealtime()
}
else {
+ DEBUG("OUT OF ORDER! this._workingUserState.latestResourceEventOccurredMillis=%s and rcEvent.occurredMillis=%s",
+ TimeHelpers.toYYYYMMDDHHMMSSSSS(this._userState.latestResourceEventOccurredMillis),
+ TimeHelpers.toYYYYMMDDHHMMSSSSS(rcEvent.getOccurredMillis))
+
computeBatch()
}
- val newTotalCredits = this._workingUserState.totalCredits
+ val newTotalCredits = this._userState.totalCredits
if(oldTotalCredits * newTotalCredits < 0)
- aquarium.eventBus ! new BalanceEvent(this._workingUserState.userID,
- newTotalCredits>=0)
- DEBUG("Updated %s", this._workingUserState)
+ aquarium.eventBus ! new BalanceEvent(this._userState.userID,
+ newTotalCredits>=0)
+ DEBUG("Updated %s", this._userState)
logSeparator()
}
def onGetUserBillRequest(event: GetUserBillRequest): Unit = {
try{
val timeslot = event.timeslot
- val state= if(haveWorkingUserState) Some(this._workingUserState) else None
- val billEntry = AbstractBillEntry.fromWorkingUserState(timeslot,this._userID,state)
- val billData = GetUserBillResponseData(this._userID,billEntry)
+ val resourceTypes = 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._userState.msg) 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)
+ 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)
val realtimeMillis = TimeHelpers.nowMillis()
- chargingService.calculateRealtimeWorkingUserState(
- this._workingUserState,
+ chargingService.calculateRealtimeUserState(
+ this._userState,
BillingMonthInfo.fromMillis(realtimeMillis),
realtimeMillis
)
- sender ! GetUserBalanceResponse(Right(GetUserBalanceResponseData(this._userID, this._workingUserState.totalCredits)))
+ sender ! GetUserBalanceResponse(Right(GetUserBalanceResponseData(this._userID, this._userState.totalCredits)))
case (true, false) ⇒
// (User CREATEd, no balance state)
Right(
GetUserBalanceResponseData(
this._userID,
- aquarium.initialUserBalance(this._userCreationIMEvent.role, this._userCreationIMEvent.occurredMillis)
- )))
+ aquarium.initialUserBalance(this._userCreationIMEvent.getRole, this._userCreationIMEvent.getOccurredMillis)
+ )))
case (false, true) ⇒
// (Not CREATEd, with balance state)
}
def onGetUserStateRequest(event: GetUserStateRequest): Unit = {
- haveWorkingUserState match {
+ haveUserState match {
case true ⇒
val realtimeMillis = TimeHelpers.nowMillis()
- chargingService.calculateRealtimeWorkingUserState(
- this._workingUserState,
+ chargingService.calculateRealtimeUserState(
+ this._userState,
BillingMonthInfo.fromMillis(realtimeMillis),
realtimeMillis
)
- sender ! GetUserStateResponse(Right(this._workingUserState))
+ sender ! GetUserStateResponse(Right(this._userState.msg))
case false ⇒
sender ! GetUserStateResponse(Left("No state for user %s [AQU-STA-0006]".format(event.userID)), 404)
}
def onGetUserWalletRequest(event: GetUserWalletRequest): Unit = {
- haveWorkingUserState match {
+ haveUserState match {
case true ⇒
DEBUG("haveWorkingUserState: %s", event)
val realtimeMillis = TimeHelpers.nowMillis()
- chargingService.calculateRealtimeWorkingUserState(
- this._workingUserState,
+ chargingService.calculateRealtimeUserState(
+ this._userState,
BillingMonthInfo.fromMillis(realtimeMillis),
realtimeMillis
)
Right(
GetUserWalletResponseData(
this._userID,
- this._workingUserState.totalCredits,
- this._workingUserState.walletEntries.toList
- )))
+ this._userState.totalCredits,
+ MessageFactory.newWalletEntriesMsg(this._userState.msg.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._userCreationIMEvent.getRole, this._userCreationIMEvent.getOccurredMillis),
+ MessageFactory.newWalletEntriesMsg()
+ )))
case false ⇒
DEBUG("!haveUserCreationIMEvent: %s", event)
projects / aquarium / blobdiff