From c091ab5c83fa61aa398e8c4176a7fa5734ced1cd Mon Sep 17 00:00:00 2001 From: hongwei Date: Tue, 22 Oct 2024 17:59:36 +0200 Subject: [PATCH] refactor/removed getTransactionRequestTypesImpl --- .../main/scala/code/bankconnectors/Connector.scala | 10 +--------- .../code/bankconnectors/ConnectorBuilderUtil.scala | 1 - .../code/bankconnectors/LocalMappedConnector.scala | 12 ++---------- .../openbankproject/commons/dto/JsonsTransfer.scala | 5 ----- 4 files changed, 3 insertions(+), 25 deletions(-) diff --git a/obp-api/src/main/scala/code/bankconnectors/Connector.scala b/obp-api/src/main/scala/code/bankconnectors/Connector.scala index 525ecc2bd..f53ce87f4 100644 --- a/obp-api/src/main/scala/code/bankconnectors/Connector.scala +++ b/obp-api/src/main/scala/code/bankconnectors/Connector.scala @@ -892,15 +892,7 @@ trait Connector extends MdcLoggable { def getTransactionRequestTypes(initiator : User, fromAccount : BankAccount, callContext: Option[CallContext]) : Box[List[TransactionRequestType]] = LocalMappedConnector.getTransactionRequestTypes(initiator : User, fromAccount : BankAccount, callContext: Option[CallContext]) - - protected def getTransactionRequestTypesImpl(fromAccount : BankAccount) : Box[List[TransactionRequestType]] = { - //TODO: write logic / data access - // Get Transaction Request Types from Props "transactionRequests_supported_types". Default is empty string - val validTransactionRequestTypes = APIUtil.getPropsValue("transactionRequests_supported_types", "").split(",").map(x => TransactionRequestType(x)).toList - Full(validTransactionRequestTypes) - } - - + //Note: Now we use validateChallengeAnswer instead, new methods validate over kafka, and move the allowed_attempts guard into API level. //It is only used for V140 and V200, has been deprecated from V210. @deprecated diff --git a/obp-api/src/main/scala/code/bankconnectors/ConnectorBuilderUtil.scala b/obp-api/src/main/scala/code/bankconnectors/ConnectorBuilderUtil.scala index 3df9efd3a..4459fdb3e 100644 --- a/obp-api/src/main/scala/code/bankconnectors/ConnectorBuilderUtil.scala +++ b/obp-api/src/main/scala/code/bankconnectors/ConnectorBuilderUtil.scala @@ -419,7 +419,6 @@ object ConnectorBuilderUtil { "makePaymentImpl", "saveTransactionRequestStatusImpl", "getTransactionRequestStatusesImpl", - "getTransactionRequestTypesImpl" ).distinct val omitMethods = List( diff --git a/obp-api/src/main/scala/code/bankconnectors/LocalMappedConnector.scala b/obp-api/src/main/scala/code/bankconnectors/LocalMappedConnector.scala index 5c86261e8..9cbf03843 100644 --- a/obp-api/src/main/scala/code/bankconnectors/LocalMappedConnector.scala +++ b/obp-api/src/main/scala/code/bankconnectors/LocalMappedConnector.scala @@ -4960,17 +4960,9 @@ object LocalMappedConnector extends Connector with MdcLoggable { TransactionRequests.transactionRequestProvider.vend.getTransactionRequest(transactionRequestId).map(transactionRequest => (transactionRequest, callContext)) override def getTransactionRequestTypes(initiator: User, fromAccount: BankAccount, callContext: Option[CallContext]): Box[List[TransactionRequestType]] = { - for { - transactionRequestTypes <- getTransactionRequestTypesImpl(fromAccount) - } yield transactionRequestTypes + Full(APIUtil.getPropsValue("transactionRequests_supported_types", "").split(",").map(x => TransactionRequestType(x)).toList) } - - override def getTransactionRequestTypesImpl(fromAccount: BankAccount): Box[List[TransactionRequestType]] = { - // Get Transaction Request Types from Props "transactionRequests_supported_types". Default is empty string - val validTransactionRequestTypes = APIUtil.getPropsValue("transactionRequests_supported_types", "").split(",").map(x => TransactionRequestType(x)).toList - Full(validTransactionRequestTypes) - } - + //Note: Now we use validateChallengeAnswer instead, new methods validate over kafka, and move the allowed_attempts guard into API level. //It is only used for V140 and V200, has been deprecated from V210. @deprecated diff --git a/obp-commons/src/main/scala/com/openbankproject/commons/dto/JsonsTransfer.scala b/obp-commons/src/main/scala/com/openbankproject/commons/dto/JsonsTransfer.scala index 471fcbe55..38e2bb769 100644 --- a/obp-commons/src/main/scala/com/openbankproject/commons/dto/JsonsTransfer.scala +++ b/obp-commons/src/main/scala/com/openbankproject/commons/dto/JsonsTransfer.scala @@ -1174,11 +1174,6 @@ case class InBoundGetTransactionRequestTypes(status: Status, data: List[Transact override val inboundAdapterCallContext: InboundAdapterCallContext = InboundAdapterCallContext() } -case class OutBoundGetTransactionRequestTypesImpl(fromAccount: BankAccount) extends TopicTrait -case class InBoundGetTransactionRequestTypesImpl(status: Status, data: List[TransactionRequestType]) extends InBoundTrait[List[TransactionRequestType]] { - override val inboundAdapterCallContext: InboundAdapterCallContext = InboundAdapterCallContext() -} - case class OutBoundCreateTransactionAfterChallenge(outboundAdapterCallContext: OutboundAdapterCallContext, initiator: User, transReqId: TransactionRequestId) extends TopicTrait case class InBoundCreateTransactionAfterChallenge(status: Status, data: TransactionRequest) extends InBoundTrait[TransactionRequest] { override val inboundAdapterCallContext: InboundAdapterCallContext = InboundAdapterCallContext()