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

Merge remote-tracking branch 'upstream/develop' into develop

Browse Source
This commit is contained in:
Marko Milić 2025-07-03 12:47:55 +02:00
commit e0638c8db1
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -564,6 +564,8 @@ object JSONFactory_BERLIN_GROUP_1_3 extends CustomJsonFormats with MdcLoggable{
val bookedTransactions = transactions.filter(_.status==TransactionRequestStatus.COMPLETED.toString).map(transaction => createTransactionJSON(transaction))
val pendingTransactions = transactions.filter(_.status!=TransactionRequestStatus.COMPLETED.toString).map(transaction => createTransactionJSON(transaction))
logger.debug(s"createTransactionsJson.bookedTransactions = $bookedTransactions")
logger.debug(s"createTransactionsJson.pendingTransactions = $pendingTransactions")
TransactionsJsonV13(
account,

16
obp-api/src/main/scala/code/model/BankingData.scala
View File

@ -26,28 +26,24 @@ TESOBE (http://www.tesobe.com/)
*/
package code.model
import java.util.Date
import code.accountholders.AccountHolders
import code.api.{APIFailureNewStyle, Constant}
import code.api.util.APIUtil.{OBPReturnType, canGrantAccessToView, canGrantAccessToMultipleViews, canRevokeAccessToAllViews, canRevokeAccessToView, unboxFullOrFail}
import code.api.util.APIUtil.{OBPReturnType, canGrantAccessToMultipleViews, canGrantAccessToView, canRevokeAccessToAllViews, canRevokeAccessToView, unboxFullOrFail}
import code.api.util.ErrorMessages._
import code.api.util._
import code.bankconnectors.{Connector, LocalMappedConnector}
import code.bankconnectors.Connector
import code.customer.CustomerX
import code.model.dataAccess.MappedBankAccount
import code.util.Helper
import code.util.Helper.MdcLoggable
import code.views.Views
import code.views.system.AccountAccess
import com.openbankproject.commons.model.{AccountId, AccountRouting, Attribute, Bank, BankAccount, BankAccountCommons, BankId, BankIdAccountId, Counterparty, CounterpartyId, CounterpartyTrait, CreateViewJson, Customer, Permission, TransactionId, UpdateViewJSON, User, UserPrimaryKey, View, ViewId, BankIdAccountIdViewId}
import com.openbankproject.commons.ExecutionContext.Implicits.global
import com.openbankproject.commons.model._
import net.liftweb.common._
import net.liftweb.json.JsonDSL._
import net.liftweb.json.{JArray, JObject}
import java.util.Date
import scala.collection.immutable.{List, Set}
import com.openbankproject.commons.ExecutionContext.Implicits.global
import scala.concurrent.Future
case class BankExtended(bank: Bank) {
@ -342,6 +338,8 @@ case class BankAccountExtended(val bankAccount: BankAccount) extends MdcLoggable
x => (unboxFullOrFail(x._1, callContext, InvalidConnectorResponseForGetTransactions, 400), x._2)
}
} yield {
logger.debug(s"getModeratedTransactionsFuture.view = $view")
logger.debug(s"getModeratedTransactionsFuture.transactions = $transactions")
view.moderateTransactionsWithSameAccount(bank, transactions) match {
case Full(m) => Full((m, callContext))
case _ => Failure("Server error - moderateTransactionsWithSameAccount")