feature/added futureWithLimits function - use 503 for ServiceIsTooBusy

OpenBankProject · Aug 24, 2023 · 6adb007 · 6adb007
1 parent 7fc63dc
commit 6adb007
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/obp-api/src/main/scala/code/api/v3_0_0/APIMethods300.scala b/obp-api/src/main/scala/code/api/v3_0_0/APIMethods300.scala
@@ -25,7 +25,7 @@ import code.scope.Scope
 import code.search.elasticsearchWarehouse
 import code.users.Users
 import code.util.Helper
-import code.util.Helper.booleanToBox
+import code.util.Helper.{booleanToBox, booleanToFuture}
 import code.views.Views
 import code.views.system.ViewDefinition
 import com.github.dwickern.macros.NameOf.nameOf
@@ -2378,13 +2378,10 @@ trait APIMethods300 {
         cc =>
           for {
             (_, callContext) <- anonymousAccess(cc)
-            (banks, callContext) <- if(canOpenFuture("NewStyle.function.getBanks")) {
-              FutureUtil.futureWithLimits(NewStyle.function.getBanks(callContext), "NewStyle.function.getBanks")
-            } else {
-              Future {
-                throw new RuntimeException(ServiceIsTooBusy +"Current Service(NewStyle.function.getBanks) ")
-              }
+            _ <- booleanToFuture(ServiceIsTooBusy +"Current Service(NewStyle.function.getBanks)", 503, callContext) {
+              canOpenFuture("NewStyle.function.getBanks")
             }
+            (banks, callContext) <- FutureUtil.futureWithLimits(NewStyle.function.getBanks(callContext), "NewStyle.function.getBanks")
           } yield 
             (JSONFactory300.createBanksJson(banks), HttpCode.`200`(callContext))
       }