diff --git a/src/main/scala/code/bankconnectors/LocalMappedConnector.scala b/src/main/scala/code/bankconnectors/LocalMappedConnector.scala index e4f28c4a7..ee76f8e52 100644 --- a/src/main/scala/code/bankconnectors/LocalMappedConnector.scala +++ b/src/main/scala/code/bankconnectors/LocalMappedConnector.scala @@ -1628,8 +1628,7 @@ object LocalMappedConnector extends Connector with MdcLoggable { ) - override def getCustomersByUserIdFuture(userId: String)(session: Option[CallContext]): Future[Box[List[Customer]]] = Future { - Customer.customerProvider.vend.getCustomersByUserIdBox(userId) - } + override def getCustomersByUserIdFuture(userId: String)(session: Option[CallContext]): Future[Box[List[Customer]]] = + Customer.customerProvider.vend.getCustomersByUserIdFuture(userId) } diff --git a/src/main/scala/code/customer/CustomerProvider.scala b/src/main/scala/code/customer/CustomerProvider.scala index d96af7306..25653eacb 100644 --- a/src/main/scala/code/customer/CustomerProvider.scala +++ b/src/main/scala/code/customer/CustomerProvider.scala @@ -28,7 +28,7 @@ trait CustomerProvider { def getCustomersByUserId(userId: String): List[Customer] - def getCustomersByUserIdBox(userId: String): Box[List[Customer]] + def getCustomersByUserIdFuture(userId: String): Future[Box[List[Customer]]] def getCustomerByCustomerId(customerId: String): Box[Customer] diff --git a/src/main/scala/code/customer/MappedCustomerProvider.scala b/src/main/scala/code/customer/MappedCustomerProvider.scala index 7365744c7..130d7644a 100644 --- a/src/main/scala/code/customer/MappedCustomerProvider.scala +++ b/src/main/scala/code/customer/MappedCustomerProvider.scala @@ -52,12 +52,14 @@ object MappedCustomerProvider extends CustomerProvider { MappedCustomer.findAll(ByList(MappedCustomer.mCustomerId, customerIds)) } - def getCustomersByUserIdF(userId: String): Box[List[Customer]] = { + def getCustomersByUserIdBoxed(userId: String): Box[List[Customer]] = { Full(getCustomersByUserId(userId)) } - override def getCustomersByUserIdBox(userId: String): Box[List[Customer]]= { - Full(getCustomersByUserId(userId)) + override def getCustomersByUserIdFuture(userId: String): Future[Box[List[Customer]]]= { + Future { + Full(getCustomersByUserId(userId)) + } } override def getBankIdByCustomerId(customerId: String): Box[String] = { diff --git a/src/main/scala/code/remotedata/RemotedataCustomers.scala b/src/main/scala/code/remotedata/RemotedataCustomers.scala index 397df89f9..4f016b978 100644 --- a/src/main/scala/code/remotedata/RemotedataCustomers.scala +++ b/src/main/scala/code/remotedata/RemotedataCustomers.scala @@ -20,8 +20,8 @@ object RemotedataCustomers extends ObpActorInit with CustomerProvider { def getCustomersByUserId(userId: String): List[Customer] = extractFuture(actor ? cc.getCustomersByUserId(userId)) - def getCustomersByUserIdBox(userId: String): Box[List[Customer]] = - extractFutureToBox(actor ? cc.getCustomersByUserIdFuture(userId)) + def getCustomersByUserIdFuture(userId: String): Future[Box[List[Customer]]] = + (actor ? cc.getCustomersByUserIdFuture(userId)).mapTo[Box[List[Customer]]] def getCustomerByCustomerId(customerId: String) : Box[Customer] = extractFutureToBox(actor ? cc.getCustomerByCustomerId(customerId)) diff --git a/src/main/scala/code/remotedata/RemotedataCustomersActor.scala b/src/main/scala/code/remotedata/RemotedataCustomersActor.scala index b9faeb8cb..610b2e21e 100644 --- a/src/main/scala/code/remotedata/RemotedataCustomersActor.scala +++ b/src/main/scala/code/remotedata/RemotedataCustomersActor.scala @@ -25,7 +25,7 @@ class RemotedataCustomersActor extends Actor with ObpActorHelper with MdcLoggabl case cc.getCustomersByUserIdFuture(userId: String) => logger.debug("getCustomersByUserIdFuture(" + userId + ")") - sender ! (mapper.getCustomersByUserIdF(userId)) + sender ! (mapper.getCustomersByUserIdBoxed(userId)) case cc.getCustomerByCustomerId(customerId: String) => logger.debug("getCustomerByCustomerId(" + customerId + ")")