WIP: New state machine for message processing

[aquarium] / src / main / scala / gr / grnet / aquarium / charging / ChargingBehavior.scala

diff --git a/src/main/scala/gr/grnet/aquarium/charging/ChargingBehavior.scala b/src/main/scala/gr/grnet/aquarium/charging/ChargingBehavior.scala
index 316ed67..e6a1aeb 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/charging/ChargingBehavior.scala
+++ b/src/main/scala/gr/grnet/aquarium/charging/ChargingBehavior.scala
@@ -36,14 +36,11 @@
 package gr.grnet.aquarium.charging
 
 import gr.grnet.aquarium.Aquarium
-import gr.grnet.aquarium.charging.state.{WorkingResourceInstanceChargingState, AgreementHistoryModel, WorkingResourcesChargingState}
-import gr.grnet.aquarium.charging.wallet.WalletEntry
+import gr.grnet.aquarium.charging.state.UserAgreementHistoryModel
 import gr.grnet.aquarium.computation.BillingMonthInfo
-import gr.grnet.aquarium.event.model.resource.ResourceEventModel
-import gr.grnet.aquarium.logic.accounting.dsl.Timeslot
-import gr.grnet.aquarium.policy.{ResourceType, EffectivePriceTable, FullPriceTable}
-import gr.grnet.aquarium.uid.{PrefixedUIDGenerator, ConcurrentVMLocalUIDGenerator, UIDGenerator}
-import scala.collection.mutable
+import gr.grnet.aquarium.event.{CreditsModel, DetailsModel}
+import gr.grnet.aquarium.message.avro.gen.{UserStateMsg, WalletEntryMsg, ResourcesChargingStateMsg, ResourceTypeMsg, ResourceInstanceChargingStateMsg, ResourceEventMsg}
+import gr.grnet.aquarium.policy.{EffectivePriceTableModel, FullPriceTableModel}
 
 /**
  * A charging behavior indicates how charging for a resource will be done
@@ -57,26 +54,28 @@ trait ChargingBehavior {
 
   /**
    * Provides some initial charging details that will be part of the mutable charging state
-   * ([[gr.grnet.aquarium.charging.state.WorkingResourcesChargingState]]).
+   * ([[gr.grnet.aquarium.message.avro.gen.ResourcesChargingStateMsg]]).
    */
-  def initialChargingDetails: Map[String, Any]
+  def initialChargingDetails: DetailsModel.Type
 
   def computeSelectorPath(
-      workingChargingBehaviorDetails: mutable.Map[String, Any],
-      workingResourceInstanceChargingState: WorkingResourceInstanceChargingState,
-      currentResourceEvent: ResourceEventModel,
-      referenceTimeslot: Timeslot,
-      totalCredits: Double
+      ChargingBehaviorDetails: DetailsModel.Type,
+      resourceInstanceChargingState: ResourceInstanceChargingStateMsg,
+      currentResourceEvent: ResourceEventMsg,
+      referenceStartMillis: Long,
+      referenceStopMillis: Long,
+      totalCredits: CreditsModel.Type
   ): List[String]
 
-  def selectEffectivePriceTable(
-      fullPriceTable: FullPriceTable,
-      workingChargingBehaviorDetails: mutable.Map[String, Any],
-      workingResourceInstanceChargingState: WorkingResourceInstanceChargingState,
-      currentResourceEvent: ResourceEventModel,
-      referenceTimeslot: Timeslot,
+  def selectEffectivePriceTableModel(
+      fullPriceTable: FullPriceTableModel,
+      chargingBehaviorDetails: DetailsModel.Type,
+      resourceInstanceChargingState: ResourceInstanceChargingStateMsg,
+      currentResourceEvent: ResourceEventMsg,
+      referenceStartMillis: Long,
+      referenceStopMillis: Long,
       totalCredits: Double
-  ): EffectivePriceTable
+  ): EffectivePriceTableModel
 
   /**
    *
@@ -85,40 +84,36 @@ trait ChargingBehavior {
    */
   def processResourceEvent(
       aquarium: Aquarium,
-      currentResourceEvent: ResourceEventModel,
-      resourceType: ResourceType,
+      resourceEvent: ResourceEventMsg,
+      resourceType: ResourceTypeMsg,
       billingMonthInfo: BillingMonthInfo,
-      workingResourcesChargingState: WorkingResourcesChargingState,
-      userAgreements: AgreementHistoryModel,
-      totalCredits: Double,
-      walletEntryRecorder: WalletEntry ⇒ Unit
-  ): (Int, Double)
+      resourcesChargingState: ResourcesChargingStateMsg,
+      userAgreementHistoryModel: UserAgreementHistoryModel,
+      userStateMsg: UserStateMsg,
+      walletEntryRecorder: WalletEntryMsg ⇒ Unit
+  ): (Int, CreditsModel.Type)
 
   def computeCreditsToSubtract(
-      workingResourceInstanceChargingState: WorkingResourceInstanceChargingState,
-      oldCredits: Double,
+      resourceInstanceChargingState: ResourceInstanceChargingStateMsg,
+      oldCredits: CreditsModel.Type,
       timeDeltaMillis: Long,
       unitPrice: Double
-  ): (Double /* credits */, String /* explanation */)
+  ): (CreditsModel.Type, String /* explanation */)
 
   /**
    * Given the charging state of a resource instance and the details of the incoming message, compute the new
    * accumulating amount.
    */
   def computeNewAccumulatingAmount(
-      workingResourceInstanceChargingState: WorkingResourceInstanceChargingState,
-      eventDetails: Map[String, String]
-  ): Double
+      resourceInstanceChargingState: ResourceInstanceChargingStateMsg,
+      eventDetails: DetailsModel.Type
+  ): CreditsModel.Type
 
   def createVirtualEventsForRealtimeComputation(
       userID: String,
       resourceTypeName: String,
       resourceInstanceID: String,
       eventOccurredMillis: Long,
-      workingResourceInstanceChargingState: WorkingResourceInstanceChargingState
-  ): List[ResourceEventModel]
+      resourceInstanceChargingState: ResourceInstanceChargingStateMsg
+  ): List[ResourceEventMsg]
 }
-
-object ChargingBehavior {
-  final val VirtualEventsIDGen = new PrefixedUIDGenerator("virt-", new ConcurrentVMLocalUIDGenerator(0L))
-}
\ No newline at end of file