From 3ccc27f2d72318ea08960d9a65fdf604d5330839 Mon Sep 17 00:00:00 2001 From: constantine2nd Date: Thu, 8 Feb 2018 15:20:58 +0100 Subject: [PATCH] Endpoint getCurrentFxRate fixed --- src/main/scala/code/api/v2_2_0/APIMethods220.scala | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/scala/code/api/v2_2_0/APIMethods220.scala b/src/main/scala/code/api/v2_2_0/APIMethods220.scala index 56689096a..fe79a226c 100644 --- a/src/main/scala/code/api/v2_2_0/APIMethods220.scala +++ b/src/main/scala/code/api/v2_2_0/APIMethods220.scala @@ -250,13 +250,13 @@ trait APIMethods220 { List(apiTagFx)) lazy val getCurrentFxRate: OBPEndpoint = { - case "banks" :: BankId(bankid) :: "fx" :: fromCurrencyCode :: toCurrencyCode :: Nil JsonGet json => { + case "banks" :: BankId(bankId) :: "fx" :: fromCurrencyCode :: toCurrencyCode :: Nil JsonGet json => { cc => for { - bank <- Bank(bankId)?~! BankNotFound - isValidCurrencyISOCodeFrom <- tryo(assert(isValidCurrencyISOCode(fromCurrencyCode))) ?~! ErrorMessages.InvalidISOCurrencyCode - isValidCurrencyISOCodeTo <- tryo(assert(isValidCurrencyISOCode(toCurrencyCode))) ?~! ErrorMessages.InvalidISOCurrencyCode - u <- cc.user ?~! UserNotLoggedIn + _ <- Bank(bankId)?~! BankNotFound + _ <- tryo(assert(isValidCurrencyISOCode(fromCurrencyCode))) ?~! ErrorMessages.InvalidISOCurrencyCode + _ <- tryo(assert(isValidCurrencyISOCode(toCurrencyCode))) ?~! ErrorMessages.InvalidISOCurrencyCode + _ <- cc.user ?~! UserNotLoggedIn fxRate <- tryo(Connector.connector.vend.getCurrentFxRate(bankId, fromCurrencyCode, toCurrencyCode).openOrThrowException(attemptedToOpenAnEmptyBox)) ?~! ErrorMessages.FXCurrencyCodeCombinationsNotSupported } yield { val viewJSON = JSONFactory220.createFXRateJSON(fxRate)