artin/OBP-API
1
0
Fork 0
mirror of https://github.com/OpenBankProject/OBP-API.git synced 2026-02-06 17:17:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

feature/add asynchronous flattenOBPReturnType method for improved balance retrieval

Browse Source
This commit is contained in:
hongwei 2025-05-22 08:45:22 +02:00
parent 2a51e6b4b1
commit 5a95befbb6
2 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
obp-api/src/main/scala/code/api/berlin/group/v1_3/AccountInformationServiceAISApi.scala
View File

@ -342,13 +342,19 @@ of the PSU at this ASPSP.
attribute.value.equalsIgnoreCase("card")
).isEmpty)
(balances, callContext) <- JSONFactory_BERLIN_GROUP_1_3.flattenOBPReturnType(bankAccountsFiltered.map(bankAccont => code.api.util.newstyle.BankAccountBalanceNewStyle.getBankAccountBalances(
bankAccont.accountId,
callContext
)))
} yield {
(JSONFactory_BERLIN_GROUP_1_3.createAccountListJson(
bankAccountsFiltered,
canReadBalancesAccounts,
canReadTransactionsAccounts,
u,
withBalanceParam
withBalanceParam,
balances
), callContext)
}
}

24
obp-api/src/main/scala/code/api/berlin/group/v1_3/JSONFactory_BERLIN_GROUP_1_3.scala
View File

@ -16,7 +16,8 @@ import net.liftweb.json.{JValue, parse}
import java.text.SimpleDateFormat
import java.util.Date
import scala.concurrent.Future
import com.openbankproject.commons.ExecutionContext.Implicits.global
case class JvalueCaseClass(jvalueToCaseclass: JValue)
object JSONFactory_BERLIN_GROUP_1_3 extends CustomJsonFormats with MdcLoggable{
@ -305,13 +306,24 @@ object JSONFactory_BERLIN_GROUP_1_3 extends CustomJsonFormats with MdcLoggable{
case class UpdatePaymentPsuDataJson(
scaAuthenticationData: String
)
def flattenOBPReturnType(
list: List[OBPReturnType[List[BankAccountBalanceTrait]]]
): OBPReturnType[List[BankAccountBalanceTrait]] = {
Future.sequence(list).map { results =>
val combinedBalances = results.flatMap(_._1) // Combine all balances
val callContext = results.headOption.flatMap(_._2) // Use the first CallContext
(combinedBalances, callContext)
}
}
def createAccountListJson(bankAccounts: List[BankAccount],
canReadBalancesAccounts: List[BankIdAccountId],
canReadTransactionsAccounts: List[BankIdAccountId],
user: User,
withBalanceParam:Option[Boolean]
withBalanceParam:Option[Boolean],
balances: List[BankAccountBalanceTrait]
): CoreAccountsJsonV13 = {
CoreAccountsJsonV13(bankAccounts.map {
x =>
@ -322,9 +334,9 @@ object JSONFactory_BERLIN_GROUP_1_3 extends CustomJsonFormats with MdcLoggable{
val transactionRef = LinkHrefJson(s"/$commonPath/transactions")
val canReadTransactions = canReadTransactionsAccounts.map(_.accountId.value).contains(x.accountId.value)
val accountBalances = if(withBalanceParam == Some(true)){
Some(List(CoreAccountBalanceJson(
balanceAmount = AmountOfMoneyV13(x.currency, x.balance.toString),
balanceType = "openingBooked")))
Some(balances.filter(_.accountId.equals(x.accountId)).map(balance =>(List(CoreAccountBalanceJson(
balanceAmount = AmountOfMoneyV13(x.currency, balance.balanceAmount.toString()),
balanceType = balance.balanceType)))).flatten)
}else{
None
}