Implement Once behavior with the new scheme. Refactor in the process

[aquarium] / src / main / scala / gr / grnet / aquarium / charging / state / StdUserState.scala

diff --git a/src/main/scala/gr/grnet/aquarium/charging/state/StdUserState.scala b/src/main/scala/gr/grnet/aquarium/charging/state/StdUserState.scala
index e1e594f..e75f47c 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/charging/state/StdUserState.scala
+++ b/src/main/scala/gr/grnet/aquarium/charging/state/StdUserState.scala
@@ -36,7 +36,6 @@
 package gr.grnet.aquarium.charging.state
 
 import gr.grnet.aquarium.policy.UserAgreementModel
-import gr.grnet.aquarium.event.model.resource.ResourceEventModel
 import gr.grnet.aquarium.charging.wallet.WalletEntry
 import gr.grnet.aquarium.charging.reason.{InitialUserStateSetup, ChargingReason}
 import gr.grnet.aquarium.AquariumInternalError
@@ -58,10 +57,7 @@ final case class StdUserState(
     billingYear: Int,
     billingMonth: Int,
     chargingReason: ChargingReason,
-    previousResourceEvents: List[ResourceEventModel],
-    implicitlyIssuedStartEvents: List[ResourceEventModel],
-    accumulatingAmountOfResourceInstance: Map[String, Double],
-    chargingDataOfResourceInstance: Map[String, Map[String, Any]],
+    stateOfResources: Map[String, ResourcesChargingState],
     billingPeriodOutOfSyncResourceEventsCounter: Long,
     agreementHistory: AgreementHistory,
     walletEntries: List[WalletEntry]
@@ -122,9 +118,6 @@ final object StdUserState {
       bmi.year,
       bmi.month,
       chargingReason,
-      Nil,
-      Nil,
-      Map(),
       Map(),
       0L,
       AgreementHistory.initial(initialAgreement),