Merge pull request #14 from freekh/freekh-minor-code-fixes

misc minor code fixes
This commit is contained in:
Ayoub Benali 2013-01-25 06:44:32 -08:00
commit d568e93455

View File

@ -95,15 +95,14 @@ class Account extends MongoRecord[Account] with ObjectIdPk[Account] {
def envelopes(queryParams: OBPQueryParam*): List[OBPEnvelope] = {
val DefaultSortField = "obp_transaction.details.completed"
//This is ugly with the casts but it is a similar approach to mongo's .findAll implementation
val limit = queryParams.find(q => q.isInstanceOf[OBPLimit]).asInstanceOf[Option[OBPLimit]].map(x => x.value).getOrElse(50)
val offset = queryParams.find(q => q.isInstanceOf[OBPOffset]).asInstanceOf[Option[OBPOffset]].map(x => x.value).getOrElse(0)
val orderingParams = queryParams.find(q => q.isInstanceOf[OBPOrdering]).
asInstanceOf[Option[OBPOrdering]].map(x => x).
getOrElse(OBPOrdering(Some(DefaultSortField), OBPDescending))
val fromDate = queryParams.find(q => q.isInstanceOf[OBPFromDate]).asInstanceOf[Option[OBPFromDate]]
val toDate = queryParams.find(q => q.isInstanceOf[OBPToDate]).asInstanceOf[Option[OBPToDate]]
val limit = queryParams.collect { case OBPLimit(value) => value }.headOption.getOrElse(50)
val offset = queryParams.collect { case OBPOffset(value) => value }.headOption.getOrElse(0)
val orderingParams = queryParams.collect { case param: OBPOrdering => param}.headOption
.getOrElse(OBPOrdering(Some(DefaultSortField), OBPDescending))
val fromDate = queryParams.collect { case param: OBPFromDate => param }.headOption
val toDate = queryParams.collect { case param: OBPFromDate => param }.headOption
val mongoParams = {
val start = transactionsForAccount