Reuse user creation time from user state

diff --git a/src/main/scala/gr/grnet/aquarium/user/UserStateComputations.scala b/src/main/scala/gr/grnet/aquarium/user/UserStateComputations.scala
index dbed853..c76ae85 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/user/UserStateComputations.scala
+++ b/src/main/scala/gr/grnet/aquarium/user/UserStateComputations.scala
@@ -81,7 +81,6 @@ class UserStateComputations extends Loggable {
   def findUserStateAtEndOfBillingMonth(userId: String,
                                        billingMonthInfo: BillingMonthInfo,
                                        storeProvider: StoreProvider,
-                                       userCreationMillis: Long,
                                        currentUserState: UserState,
                                        zeroUserState: UserState, 
                                        defaultResourcesMap: DSLResourcesMap,
@@ -100,7 +99,6 @@ class UserStateComputations extends Loggable {
         userId,
         billingMonthInfo,
         storeProvider,
-        userCreationMillis,
         currentUserState,
         zeroUserState,
         defaultResourcesMap,
@@ -112,6 +110,7 @@ class UserStateComputations extends Loggable {
     val userStateStore = storeProvider.userStateStore
     val resourceEventStore = storeProvider.resourceEventStore
 
+    val userCreationMillis = currentUserState.userCreationMillis
     val userCreationDateCalc = new MutableDateCalc(userCreationMillis)
     val billingMonthStartMillis = billingMonthInfo.startMillis
     val billingMonthStopMillis  = billingMonthInfo.stopMillis
@@ -195,7 +194,6 @@ class UserStateComputations extends Loggable {
   def doFullMonthlyBilling(userId: String,
                            billingMonthInfo: BillingMonthInfo,
                            storeProvider: StoreProvider,
-                           userCreationMillis: Long,
                            currentUserState: UserState,
                            zeroUserState: UserState,
                            defaultResourcesMap: DSLResourcesMap,
@@ -219,7 +217,6 @@ class UserStateComputations extends Loggable {
       userId,
       billingMonthInfo.previousMonth,
       storeProvider,
-      userCreationMillis,
       currentUserState,
       zeroUserState,
       defaultResourcesMap,

diff --git a/src/test/scala/gr/grnet/aquarium/user/UserStateComputationsTest.scala b/src/test/scala/gr/grnet/aquarium/user/UserStateComputationsTest.scala
index a5faaa0..27f0d56 100644 (file)
--- a/src/test/scala/gr/grnet/aquarium/user/UserStateComputationsTest.scala
+++ b/src/test/scala/gr/grnet/aquarium/user/UserStateComputationsTest.scala
@@ -185,7 +185,6 @@ aquariumpolicy:
       UserCKKL.userId,
       billingMonthInfo,
       storeProvider,
-      UserCKKL.userCreationDate.getTime,
       currentUserState,
       initialUserState,
       DefaultResourcesMap,