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

refactor/moved getTransactionRequestStatuses to LocalMappedConnectorInternal.scala

Browse Source
This commit is contained in:
hongwei 2024-10-25 00:12:46 +02:00
parent d1db7c3455
commit 0646a60262
5 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
obp-api/src/main/scala/code/bankconnectors/Connector.scala
View File

@ -784,9 +784,7 @@ trait Connector extends MdcLoggable {
def getTransactionRequests(initiator : User, fromAccount : BankAccount, callContext: Option[CallContext]) : Box[List[TransactionRequest]] =Failure(setUnimplementedError(nameOf(getTransactionRequests _)))
def getTransactionRequests210(initiator : User, fromAccount : BankAccount, callContext: Option[CallContext]) : Box[(List[TransactionRequest], Option[CallContext])] = Failure(setUnimplementedError(nameOf(getTransactionRequests210 _)))
def getTransactionRequestStatuses() : Box[TransactionRequestStatus] = Failure(setUnimplementedError(nameOf(getTransactionRequestStatuses _)))
def getTransactionRequestImpl(transactionRequestId: TransactionRequestId, callContext: Option[CallContext]): Box[(TransactionRequest, Option[CallContext])] =
Failure(setUnimplementedError(nameOf(getTransactionRequestImpl _)))

1
obp-api/src/main/scala/code/bankconnectors/ConnectorBuilderUtil.scala
View File

@ -388,7 +388,6 @@ object ConnectorBuilderUtil {
"saveTransactionRequestTransaction",
"saveTransactionRequestChallenge",
"getTransactionRequests",
"getTransactionRequestStatuses",
"getTransactionRequestTypes",
"createTransactionAfterChallenge",
"updateAccountLabel",

4
obp-api/src/main/scala/code/bankconnectors/LocalMappedConnectorInternal.scala
View File

@ -7,7 +7,6 @@ import code.api.util.APIUtil._
import code.api.util.ErrorMessages._
import code.api.util._
import code.branches.MappedBranch
import code.fx.fx
import code.management.ImporterAPI.ImporterTransaction
import code.model.dataAccess.{BankAccountRouting, MappedBank, MappedBankAccount}
import code.model.toBankAccountExtended
@ -16,6 +15,7 @@ import code.transactionrequests._
import com.tesobe.CacheKeyFromArguments
import code.util.Helper
import code.util.Helper._
import com.github.dwickern.macros.NameOf.nameOf
import com.openbankproject.commons.ExecutionContext.Implicits.global
import com.openbankproject.commons.model._
import com.openbankproject.commons.model.enums.{AccountRoutingScheme, PaymentServiceTypes, TransactionRequestStatus, TransactionRequestTypes}
@ -630,5 +630,7 @@ object LocalMappedConnectorInternal extends MdcLoggable {
mappedTransaction.theTransactionId
}
}
def getTransactionRequestStatuses() : Box[TransactionRequestStatus] = Failure(NotImplemented + nameOf(getTransactionRequestStatuses _) )
}

6
obp-api/src/main/scala/code/transactionrequests/MappedTransactionRequestProvider.scala
View File

@ -3,14 +3,12 @@ package code.transactionrequests
import code.api.util.APIUtil.DateWithMsFormat
import code.api.util.CustomJsonFormats
import code.api.util.ErrorMessages._
import code.bankconnectors.Connector
import code.bankconnectors.LocalMappedConnectorInternal
import code.model._
import code.util.{AccountIdString, UUIDString}
import com.openbankproject.commons.model._
import com.openbankproject.commons.model.enums.{AccountRoutingScheme, TransactionRequestStatus}
import com.openbankproject.commons.model.enums.TransactionRequestTypes
import com.openbankproject.commons.model.enums.TransactionRequestTypes._
import com.openbankproject.commons.model.enums.PaymentServiceTypes._
import net.liftweb.common.{Box, Failure, Full, Logger}
import net.liftweb.json
import net.liftweb.json.JsonAST.{JField, JObject, JString}
@ -36,7 +34,7 @@ object MappedTransactionRequestProvider extends TransactionRequestProvider {
override def updateAllPendingTransactionRequests: Box[Option[Unit]] = {
val transactionRequests = MappedTransactionRequest.find(By(MappedTransactionRequest.mStatus, TransactionRequestStatus.PENDING.toString))
logger.debug("Updating status of all pending transactions: ")
val statuses = Connector.connector.vend.getTransactionRequestStatuses
val statuses = LocalMappedConnectorInternal.getTransactionRequestStatuses
transactionRequests.map{ tr =>
for {
transactionRequest <- tr.toTransactionRequest

5
obp-commons/src/main/scala/com/openbankproject/commons/dto/JsonsTransfer.scala
View File

@ -1136,11 +1136,6 @@ case class InBoundGetTransactionRequests(status: Status, data: List[TransactionR
override val inboundAdapterCallContext: InboundAdapterCallContext = InboundAdapterCallContext()
}
case class OutBoundGetTransactionRequestStatuses() extends TopicTrait
case class InBoundGetTransactionRequestStatuses(status: Status, data: TransactionRequestStatusCommons) extends InBoundTrait[TransactionRequestStatusCommons] {
override val inboundAdapterCallContext: InboundAdapterCallContext = InboundAdapterCallContext()
}
case class OutBoundGetTransactionRequestTypes(outboundAdapterCallContext: OutboundAdapterCallContext, initiator: User, fromAccount: BankAccount) extends TopicTrait
case class InBoundGetTransactionRequestTypes(status: Status, data: List[TransactionRequestType]) extends InBoundTrait[List[TransactionRequestType]] {
override val inboundAdapterCallContext: InboundAdapterCallContext = InboundAdapterCallContext()