Find all relevant resource event for billing period

There is still work to do there, esp the MongoDB implementation.

diff --git a/src/main/scala/gr/grnet/aquarium/store/ResourceEventStore.scala b/src/main/scala/gr/grnet/aquarium/store/ResourceEventStore.scala
index 908d5c2..5902948 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/store/ResourceEventStore.scala
+++ b/src/main/scala/gr/grnet/aquarium/store/ResourceEventStore.scala
@@ -71,7 +71,7 @@ trait ResourceEventStore {
   /**
    * Finds all relevant resource events for the billing period.
    * The relevant events are those:
-   * a) whose `occurredMillis` is within the given billing period and
+   * a) whose `occurredMillis` is within the given billing period or
    * b) whose `receivedMillis` is within the given billing period.
    *
    * Order them by `occurredMillis`
@@ -79,6 +79,5 @@ trait ResourceEventStore {
    */
   def findAllRelevantResourceEventsForBillingPeriod(userId: String,
                                                     startMillis: Long,
-                                                    stopMillis: Long): List[ResourceEvent] =
-    findResourceEventsForReceivedPeriod(userId, startMillis, stopMillis)
+                                                    stopMillis: Long): List[ResourceEvent]
 }
\ No newline at end of file

diff --git a/src/main/scala/gr/grnet/aquarium/store/memory/MemStore.scala b/src/main/scala/gr/grnet/aquarium/store/memory/MemStore.scala
index 30c932c..d900dae 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/store/memory/MemStore.scala
+++ b/src/main/scala/gr/grnet/aquarium/store/memory/MemStore.scala
@@ -224,8 +224,7 @@ class MemStore extends UserStateStore
                                           stopTimeMillis: Long): List[ResourceEvent] = {
     resourceEventsById.valuesIterator.filter { ev ⇒
       ev.userId == userId &&
-      ev.receivedMillis >= startTimeMillis &&
-      ev.receivedMillis <= stopTimeMillis
+      ev.isReceivedWithinMillis(startTimeMillis, stopTimeMillis)
     }.toList
   }
 

diff --git a/src/main/scala/gr/grnet/aquarium/store/mongodb/MongoDBStore.scala b/src/main/scala/gr/grnet/aquarium/store/mongodb/MongoDBStore.scala
index f3f059c..6648a30 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/store/mongodb/MongoDBStore.scala
+++ b/src/main/scala/gr/grnet/aquarium/store/mongodb/MongoDBStore.scala
@@ -182,6 +182,12 @@ class MongoDBStore(
     }
   }
 
+  def findAllRelevantResourceEventsForBillingPeriod(userId: String,
+                                                    startMillis: Long,
+                                                    stopMillis: Long): List[ResourceEvent] = {
+    // FIXME: Implement
+    Nil
+  }
   //-ResourceEventStore
 
   //+ UserStateStore