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

feature/Tweak Berlin Grop endpoint cancelPayment

Browse Source
This commit is contained in:
Marko Milić 2020-10-26 13:24:19 +01:00
parent 851f3c117b
commit 79c5a7a6ac
2 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
obp-api/src/main/scala/code/api/berlin/group/v1_3/PaymentInitiationServicePISApi.scala
View File

@ -8,6 +8,7 @@ import code.api.util.ApiTag._
import code.api.util.ErrorMessages._
import code.api.util.NewStyle.HttpCode
import code.api.util.{ApiRole, ApiTag, NewStyle}
import code.bankconnectors.Connector
import code.consent.ConsentStatus
import code.database.authorisation.Authorisations
import code.fx.fx
@ -27,6 +28,7 @@ import scala.collection.immutable.Nil
import scala.collection.mutable.ArrayBuffer
import com.openbankproject.commons.ExecutionContext.Implicits.global
import com.openbankproject.commons.model.enums.{ChallengeType, StrongCustomerAuthenticationStatus}
import com.openbankproject.commons.model.enums.TransactionRequestStatus._
import scala.concurrent.Future
@ -111,25 +113,31 @@ or * access method is generally applicable, but further authorisation processes
currency = transactionRequest.body.value.currency
(createdTransactionRequest,callContext) <- transactionRequestTypes match {
case TransactionRequestTypes.SEPA_CREDIT_TRANSFERS => {
for {
(createdTransactionRequest, callContext) <- NewStyle.function.createTransactionRequestv400(
u,
ViewId("Owner"),//This is the default
fromAccount,
toAccount,
TransactionRequestType(transactionRequestTypes.toString),
TransactionRequestCommonBodyJSONCommons(
AmountOfMoneyJsonV121(negativeAmount.toString, currency),
""
),
"",
"",
None,
None,
None,
callContext
) //in SANDBOX_TAN, ChargePolicy set default "SHARED"
} yield (createdTransactionRequest, callContext)
transactionRequest.status.toUpperCase() match {
case "COMPLETED" =>
for {
(createdTransactionRequest, callContext) <- NewStyle.function.createTransactionRequestv400(
u,
ViewId("Owner"),//This is the default
fromAccount,
toAccount,
TransactionRequestType(transactionRequestTypes.toString),
TransactionRequestCommonBodyJSONCommons(
AmountOfMoneyJsonV121(negativeAmount.toString, currency),
""
),
"",
"",
None,
None,
None,
callContext
)
} yield (createdTransactionRequest, callContext)
case "INITIATED" =>
Connector.connector.vend.saveTransactionRequestStatusImpl(transactionRequest.id, CANCELLED.toString)
NewStyle.function.getTransactionRequestImpl(TransactionRequestId(paymentId), callContext)
}
}
}
} yield {

2
obp-commons/src/main/scala/com/openbankproject/commons/model/enums/Enumerations.scala
View File

@ -190,7 +190,7 @@ object AttributeCategory extends OBPEnumeration[AttributeCategory]{
object TransactionRequestStatus extends Enumeration {
type TransactionRequestStatus = Value
val INITIATED, PENDING, NEXT_CHALLENGE_PENDING, FAILED, COMPLETED, FORWARDED, REJECTED = Value
val INITIATED, PENDING, NEXT_CHALLENGE_PENDING, FAILED, COMPLETED, FORWARDED, REJECTED, CANCELLED = Value
}
object AccountRoutingScheme extends Enumeration {