From cddadabe859e7ec1521a677ffdcd38eff242d1eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Mili=C4=87?= Date: Wed, 15 Jan 2025 10:09:25 +0100 Subject: [PATCH] docfix/Enhance error handling at function createBerlinGroupConsentJWT --- obp-api/src/main/scala/code/api/constant/constant.scala | 1 + obp-api/src/main/scala/code/api/util/ConsentUtil.scala | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/obp-api/src/main/scala/code/api/constant/constant.scala b/obp-api/src/main/scala/code/api/constant/constant.scala index a32f0e612..07c0bd025 100644 --- a/obp-api/src/main/scala/code/api/constant/constant.scala +++ b/obp-api/src/main/scala/code/api/constant/constant.scala @@ -50,6 +50,7 @@ object Constant extends MdcLoggable { final val SYSTEM_STANDARD_VIEW_ID = "standard" final val SYSTEM_STAGE_ONE_VIEW_ID = "StageOne" final val SYSTEM_MANAGE_CUSTOM_VIEWS_VIEW_ID = "ManageCustomViews" + // UK Open Banking final val SYSTEM_READ_ACCOUNTS_BASIC_VIEW_ID = "ReadAccountsBasic" final val SYSTEM_READ_ACCOUNTS_DETAIL_VIEW_ID = "ReadAccountsDetail" final val SYSTEM_READ_BALANCES_VIEW_ID = "ReadBalances" diff --git a/obp-api/src/main/scala/code/api/util/ConsentUtil.scala b/obp-api/src/main/scala/code/api/util/ConsentUtil.scala index 8b77ae465..99fa1f568 100644 --- a/obp-api/src/main/scala/code/api/util/ConsentUtil.scala +++ b/obp-api/src/main/scala/code/api/util/ConsentUtil.scala @@ -692,9 +692,10 @@ object Consent extends MdcLoggable { val accounts: List[Future[ConsentView]] = consent.access.accounts.getOrElse(Nil) map { account => Connector.connector.vend.getBankAccountByIban(account.iban.getOrElse(""), callContext) map { bankAccount => logger.debug(s"createBerlinGroupConsentJWT.accounts.bankAccount: $bankAccount") + val error = s"${InvalidConnectorResponse} IBAN: ${account.iban.getOrElse("")} ${handleBox(bankAccount._1)}" ConsentView( bank_id = bankAccount._1.map(_.bankId.value).getOrElse(""), - account_id = bankAccount._1.map(_.accountId.value).getOrElse(""), + account_id = bankAccount._1.map(_.accountId.value).openOrThrowException(error), view_id = Constant.SYSTEM_READ_ACCOUNTS_BERLIN_GROUP_VIEW_ID ) } @@ -702,9 +703,10 @@ object Consent extends MdcLoggable { val balances: List[Future[ConsentView]] = consent.access.balances.getOrElse(Nil) map { account => Connector.connector.vend.getBankAccountByIban(account.iban.getOrElse(""), callContext) map { bankAccount => logger.debug(s"createBerlinGroupConsentJWT.balances.bankAccount: $bankAccount") + val error = s"${InvalidConnectorResponse} IBAN: ${account.iban.getOrElse("")} ${handleBox(bankAccount._1)}" ConsentView( bank_id = bankAccount._1.map(_.bankId.value).getOrElse(""), - account_id = bankAccount._1.map(_.accountId.value).getOrElse(""), + account_id = bankAccount._1.map(_.accountId.value).openOrThrowException(error), view_id = Constant.SYSTEM_READ_BALANCES_BERLIN_GROUP_VIEW_ID ) } @@ -712,9 +714,10 @@ object Consent extends MdcLoggable { val transactions: List[Future[ConsentView]] = consent.access.transactions.getOrElse(Nil) map { account => Connector.connector.vend.getBankAccountByIban(account.iban.getOrElse(""), callContext) map { bankAccount => logger.debug(s"createBerlinGroupConsentJWT.transactions.bankAccount: $bankAccount") + val error = s"${InvalidConnectorResponse} IBAN: ${account.iban.getOrElse("")} ${handleBox(bankAccount._1)}" ConsentView( bank_id = bankAccount._1.map(_.bankId.value).getOrElse(""), - account_id = bankAccount._1.map(_.accountId.value).getOrElse(""), + account_id = bankAccount._1.map(_.accountId.value).openOrThrowException(error), view_id = Constant.SYSTEM_READ_TRANSACTIONS_BERLIN_GROUP_VIEW_ID ) }