Revision d39547f2

b/src/main/scala/gr/grnet/aquarium/store/WalletStore.scala
12 12
 */
13 13
trait WalletStore {
14 14

  
15
  def store(entry: WalletEntry): Maybe[RecordID]
15
  def storeWalletEntry(entry: WalletEntry): Maybe[RecordID]
16 16

  
17
  def findEntryById(id: String): Maybe[WalletEntry]
17
  def findWalletEntryById(id: String): Maybe[WalletEntry]
18 18

  
19
  def findAllUserEntries(userId: String): List[WalletEntry]
19
  def findUserWalletEntries(userId: String): List[WalletEntry]
20 20

  
21
  def findUserEntriesFromTo(userId: String, from: Date, to: Date): List[WalletEntry]
21
  def findUserWalletEntriesFromTo(userId: String, from: Date, to: Date): List[WalletEntry]
22 22
}
b/src/main/scala/gr/grnet/aquarium/store/mongodb/MongoDBStore.scala
202 202
  //-UserStore
203 203

  
204 204
  //+WalletStore
205
  def store(entry: WalletEntry): Maybe[RecordID] = _store(entry, wallets)
205
  def storeWalletEntry(entry: WalletEntry): Maybe[RecordID] = _store(entry, wallets)
206 206

  
207
  def findEntryById(id: String): Maybe[WalletEntry] = MongoDBStore.findById[WalletEntry](id, wallets, MongoDBStore.dbObjectToWalletEntry)
207
  def findWalletEntryById(id: String): Maybe[WalletEntry] = MongoDBStore.findById[WalletEntry](id, wallets, MongoDBStore.dbObjectToWalletEntry)
208 208

  
209
  def findAllUserEntries(userId: String) = findUserEntriesFromTo(userId, new Date(0), new Date(Int.MaxValue))
209
  def findUserWalletEntries(userId: String) = findUserWalletEntriesFromTo(userId, new Date(0), new Date(Int.MaxValue))
210 210

  
211
  def findUserEntriesFromTo(userId: String, from: Date, to: Date) : List[WalletEntry] = {
211
  def findUserWalletEntriesFromTo(userId: String, from: Date, to: Date) : List[WalletEntry] = {
212 212
    val q = new BasicDBObject()
213 213
    // TODO: Is this the correct way for an AND query?
214 214
    q.put(JsonNames.timestamp, new BasicDBObject("$gt", from.getTime))

Also available in: Unified diff