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

refactor/update initiator parameter to be optional in transaction request methods

Browse Source
This commit is contained in:
hongwei 2025-06-16 11:08:54 +02:00
parent 8f390ad4d0
commit e9576c80fa
10 changed files with 73 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,7 +18,6 @@ import com.openbankproject.commons.model._
import com.openbankproject.commons.model.enums.TransactionRequestStatus._
import com.openbankproject.commons.model.enums.TransactionRequestTypes._
import com.openbankproject.commons.model.enums.{TransactionRequestStatus, _}
import com.openbankproject.commons.util.ApiVersion
import net.liftweb
import net.liftweb.common.Box.tryo
import net.liftweb.common.Full
@ -560,7 +559,7 @@ Check the transaction status of a payment initiation.""",
case TransactionRequestTypes.SEPA_CREDIT_TRANSFERS => {
for {
(createdTransactionRequest, callContext) <- NewStyle.function.createTransactionRequestBGV1(
initiator = u,
initiator = Some(u),
paymentServiceType,
transactionRequestType,
transactionRequestBody = sepaCreditTransfersBerlinGroupV13,

82
obp-api/src/main/scala/code/api/util/NewStyle.scala
View File

@ -1,91 +1,67 @@
package code.api.util
import java.util.Date
import java.util.UUID.randomUUID
import akka.http.scaladsl.model.HttpMethod
import code.DynamicEndpoint.{DynamicEndpointProvider, DynamicEndpointT}
import code.api.{APIFailureNewStyle, Constant, JsonResponseException}
import code.api.Constant.{SYSTEM_READ_ACCOUNTS_BERLIN_GROUP_VIEW_ID, SYSTEM_READ_BALANCES_BERLIN_GROUP_VIEW_ID}
import code.api.builder.PaymentInitiationServicePISApi.APIMethods_PaymentInitiationServicePISApi.checkPaymentServerTypeError
import code.api.cache.Caching
import code.api.dynamic.endpoint.helper.DynamicEndpointHelper
import code.api.dynamic.entity.helper.{DynamicEntityHelper, DynamicEntityInfo}
import code.api.util.APIUtil._
import code.api.util.ApiRole.canCreateAnyTransactionRequest
import code.api.util.ErrorMessages.{InsufficientAuthorisationToCreateTransactionRequest, _}
import code.api.ResourceDocs1_4_0.ResourceDocs140.ImplementationsResourceDocs
import code.api.v1_2_1.OBPAPI1_2_1.Implementations1_2_1
import code.api.v1_4_0.OBPAPI1_4_0.Implementations1_4_0
import code.api.v2_0_0.OBPAPI2_0_0.Implementations2_0_0
import code.api.v2_1_0.OBPAPI2_1_0.Implementations2_1_0
import code.api.v2_2_0.OBPAPI2_2_0.Implementations2_2_0
import code.api.{APIFailureNewStyle, Constant, JsonResponseException}
import code.apicollection.{ApiCollectionTrait, MappedApiCollectionsProvider}
import code.apicollectionendpoint.{ApiCollectionEndpointTrait, MappedApiCollectionEndpointsProvider}
import code.atmattribute.AtmAttribute
import code.authtypevalidation.{AuthenticationTypeValidationProvider, JsonAuthTypeValidation}
import code.bankattribute.BankAttribute
import code.bankconnectors.Connector
import code.branches.Branches.{Branch, DriveUpString, LobbyString}
import code.connectormethod.{ConnectorMethodProvider, JsonConnectorMethod}
import code.consumer.Consumers
import com.openbankproject.commons.model.DirectDebitTrait
import code.crm.CrmEvent
import code.crm.CrmEvent.CrmEvent
import code.dynamicEntity.{DynamicEntityProvider, DynamicEntityT}
import code.dynamicMessageDoc.{DynamicMessageDocProvider, JsonDynamicMessageDoc}
import code.dynamicResourceDoc.{DynamicResourceDocProvider, JsonDynamicResourceDoc}
import code.endpointMapping.{EndpointMappingProvider, EndpointMappingT}
import code.entitlement.Entitlement
import code.entitlementrequest.EntitlementRequest
import code.fx.{MappedFXRate, fx}
import com.openbankproject.commons.model.FXRate
import code.metadata.counterparties.Counterparties
import code.methodrouting.{MethodRoutingCommons, MethodRoutingProvider, MethodRoutingT}
import code.model._
import code.apicollectionendpoint.{ApiCollectionEndpointTrait, MappedApiCollectionEndpointsProvider}
import code.apicollection.{ApiCollectionTrait, MappedApiCollectionsProvider}
import code.model.dataAccess.{AuthUser, BankAccountRouting}
import com.openbankproject.commons.model.StandingOrderTrait
import code.usercustomerlinks.UserCustomerLink
import code.users.{UserAgreement, UserAgreementProvider, UserAttribute, UserInvitation, UserInvitationProvider, Users}
import code.users._
import code.util.Helper
import com.openbankproject.commons.util.{ApiVersion, JsonUtils}
import code.util.Helper.MdcLoggable
import code.validation.{JsonSchemaValidationProvider, JsonValidation}
import code.views.Views
import code.webhook.AccountWebhook
import com.github.dwickern.macros.NameOf.nameOf
import com.openbankproject.commons.dto.{CustomerAndAttribute, GetProductsParam, ProductCollectionItemsTree}
import com.openbankproject.commons.model._
import com.openbankproject.commons.model.enums.StrongCustomerAuthentication.SCA
import com.openbankproject.commons.model.enums.StrongCustomerAuthenticationStatus.SCAStatus
import com.openbankproject.commons.model.enums.TransactionRequestTypes._
import com.openbankproject.commons.model.enums.PaymentServiceTypes._
import com.openbankproject.commons.model.enums._
import com.openbankproject.commons.model.{AccountApplication, Bank, Customer, CustomerAddress, Product, ProductCollection, ProductCollectionItem, TaxResidence, UserAuthContext, UserAuthContextUpdate, _}
import com.openbankproject.commons.model.enums.{SuppliedAnswerType, _}
import com.openbankproject.commons.util.JsonUtils
import com.tesobe.CacheKeyFromArguments
import net.liftweb.common.{Box, Empty, Failure, Full, ParamFailure}
import net.liftweb.common._
import net.liftweb.http.JsonResponse
import net.liftweb.http.provider.HTTPParam
import net.liftweb.json.JsonDSL._
import net.liftweb.json.{JField, JInt, JNothing, JNull, JObject, JString, JValue, _}
import net.liftweb.json._
import net.liftweb.util.Helpers.tryo
import net.liftweb.util.Props
import org.apache.commons.lang3.StringUtils
import java.security.AccessControlException
import scala.collection.immutable.{List, Nil}
import java.util.Date
import java.util.UUID.randomUUID
import scala.concurrent.Future
import scala.math.BigDecimal
import scala.reflect.runtime.universe.MethodSymbol
import code.validation.{JsonSchemaValidationProvider, JsonValidation}
import net.liftweb.http.JsonResponse
import net.liftweb.util.Props
import code.api.JsonResponseException
import code.api.builder.PaymentInitiationServicePISApi.APIMethods_PaymentInitiationServicePISApi.{checkPaymentProductError, checkPaymentServerTypeError, checkPaymentServiceType}
import code.api.dynamic.endpoint.helper.DynamicEndpointHelper
import code.api.v4_0_0.JSONFactory400
import code.api.dynamic.endpoint.helper.DynamicEndpointHelper
import code.api.dynamic.entity.helper.{DynamicEntityHelper, DynamicEntityInfo}
import code.atmattribute.AtmAttribute
import code.bankattribute.BankAttribute
import code.connectormethod.{ConnectorMethodProvider, JsonConnectorMethod}
import code.counterpartylimit.CounterpartyLimit
import com.openbankproject.commons.model.CounterpartyLimitTrait
import code.crm.CrmEvent
import code.crm.CrmEvent.CrmEvent
import com.openbankproject.commons.model.{AgentAccountLinkTrait, CustomerAccountLinkTrait}
import code.dynamicMessageDoc.{DynamicMessageDocProvider, JsonDynamicMessageDoc}
import code.dynamicResourceDoc.{DynamicResourceDocProvider, JsonDynamicResourceDoc}
import code.endpointMapping.{EndpointMappingProvider, EndpointMappingT}
import com.openbankproject.commons.model.EndpointTagT
import code.util.Helper.MdcLoggable
import code.views.system.AccountAccess
import com.openbankproject.commons.model.enums.SuppliedAnswerType
import net.liftweb.mapper.By
object NewStyle extends MdcLoggable{
@ -1204,7 +1180,7 @@ object NewStyle extends MdcLoggable{
}
def createTransactionRequestBGV1(
initiator: User,
initiator: Option[User],
paymentServiceType: PaymentServiceTypes,
transactionRequestType: TransactionRequestTypes,
transactionRequestBody: BerlinGroupTransactionRequestCommonBodyJson,
@ -1212,7 +1188,7 @@ object NewStyle extends MdcLoggable{
): OBPReturnType[TransactionRequestBGV1] = {
val response = if(paymentServiceType.equals(PaymentServiceTypes.payments)){
Connector.connector.vend.createTransactionRequestSepaCreditTransfersBGV1(
initiator: User,
initiator: Option[User],
paymentServiceType: PaymentServiceTypes,
transactionRequestType: TransactionRequestTypes,
transactionRequestBody.asInstanceOf[SepaCreditTransfersBerlinGroupV13],
@ -1220,7 +1196,7 @@ object NewStyle extends MdcLoggable{
)
}else if(paymentServiceType.equals(PaymentServiceTypes.periodic_payments)){
Connector.connector.vend.createTransactionRequestPeriodicSepaCreditTransfersBGV1(
initiator: User,
initiator: Option[User],
paymentServiceType: PaymentServiceTypes,
transactionRequestType: TransactionRequestTypes,
transactionRequestBody.asInstanceOf[PeriodicSepaCreditTransfersBerlinGroupV13],

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

@ -772,7 +772,7 @@ trait Connector extends MdcLoggable {
def createTransactionRequestSepaCreditTransfersBGV1(
initiator: User,
initiator: Option[User],
paymentServiceType: PaymentServiceTypes,
transactionRequestType: TransactionRequestTypes,
transactionRequestBody: SepaCreditTransfersBerlinGroupV13,
@ -780,7 +780,7 @@ trait Connector extends MdcLoggable {
): OBPReturnType[Box[TransactionRequestBGV1]] = Future{(Failure(setUnimplementedError(nameOf(createTransactionRequestSepaCreditTransfersBGV1 _))), callContext)}
def createTransactionRequestPeriodicSepaCreditTransfersBGV1(
initiator: User,
initiator: Option[User],
paymentServiceType: PaymentServiceTypes,
transactionRequestType: TransactionRequestTypes,
transactionRequestBody: PeriodicSepaCreditTransfersBerlinGroupV13,

10
obp-api/src/main/scala/code/bankconnectors/LocalMappedConnector.scala
View File

@ -4762,14 +4762,14 @@ object LocalMappedConnector extends Connector with MdcLoggable {
}
override def createTransactionRequestSepaCreditTransfersBGV1(
initiator: User,
initiator: Option[User],
paymentServiceType: PaymentServiceTypes,
transactionRequestType: TransactionRequestTypes,
transactionRequestBody: SepaCreditTransfersBerlinGroupV13,
callContext: Option[CallContext]
): OBPReturnType[Box[TransactionRequestBGV1]] = {
LocalMappedConnectorInternal.createTransactionRequestBGInternal(
initiator: User,
LocalMappedConnectorInternal.createTransactionRequestBGInternal(
initiator: Option[User],
paymentServiceType: PaymentServiceTypes,
transactionRequestType: TransactionRequestTypes,
transactionRequestBody: SepaCreditTransfersBerlinGroupV13,
@ -4778,14 +4778,14 @@ object LocalMappedConnector extends Connector with MdcLoggable {
}
override def createTransactionRequestPeriodicSepaCreditTransfersBGV1(
initiator: User,
initiator: Option[User],
paymentServiceType: PaymentServiceTypes,
transactionRequestType: TransactionRequestTypes,
transactionRequestBody: PeriodicSepaCreditTransfersBerlinGroupV13,
callContext: Option[CallContext]
): OBPReturnType[Box[TransactionRequestBGV1]] = {
LocalMappedConnectorInternal.createTransactionRequestBGInternal(
initiator: User,
initiator: Option[User],
paymentServiceType: PaymentServiceTypes,
transactionRequestType: TransactionRequestTypes,
transactionRequestBody: PeriodicSepaCreditTransfersBerlinGroupV13,

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

@ -1,6 +1,5 @@
package code.bankconnectors
import code.fx.fx.TTL
import code.api.Constant._
import code.api.berlin.group.v1_3.model.TransactionStatus.mapTransactionStatus
import code.api.cache.Caching
@ -8,22 +7,23 @@ import code.api.util.APIUtil._
import code.api.util.ErrorMessages._
import code.api.util._
import code.branches.MappedBranch
import code.fx.fx.TTL
import code.management.ImporterAPI.ImporterTransaction
import code.model.dataAccess.{BankAccountRouting, MappedBank, MappedBankAccount}
import code.model.toBankAccountExtended
import code.transaction.MappedTransaction
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}
import com.tesobe.CacheKeyFromArguments
import net.liftweb.common._
import net.liftweb.json.Serialization.write
import net.liftweb.json.{NoTypeHints, Serialization}
import net.liftweb.mapper.{Ascending, By, By_<=, By_>=, Descending, OrderBy, QueryParam}
import net.liftweb.mapper._
import net.liftweb.util.Helpers.{now, tryo}
import java.util.Date
@ -39,13 +39,17 @@ import scala.util.Random
object LocalMappedConnectorInternal extends MdcLoggable {
def createTransactionRequestBGInternal(
initiator: User,
initiator: Option[User],
paymentServiceType: PaymentServiceTypes,
transactionRequestType: TransactionRequestTypes,
transactionRequestBody: BerlinGroupTransactionRequestCommonBodyJson,
callContext: Option[CallContext]
): Future[(Full[TransactionRequestBGV1], Option[CallContext])] = {
for {
user <- NewStyle.function.tryons(s"$UnknownError Can not get user for mapped createTransactionRequestBGInternal method ", 400, callContext) {
initiator.head
}
transDetailsSerialized <- NewStyle.function.tryons(s"$UnknownError Can not serialize in request Json ", 400, callContext) {
write(transactionRequestBody)(Serialization.formats(NoTypeHints))
}
@ -63,7 +67,7 @@ object LocalMappedConnectorInternal extends MdcLoggable {
viewId = ViewId(SYSTEM_INITIATE_PAYMENTS_BERLIN_GROUP_VIEW_ID)
fromBankIdAccountId = BankIdAccountId(fromAccount.bankId, fromAccount.accountId)
view <- NewStyle.function.checkAccountAccessAndGetView(viewId, fromBankIdAccountId, Full(initiator), callContext)
view <- NewStyle.function.checkAccountAccessAndGetView(viewId, fromBankIdAccountId, Full(user), callContext)
_ <- Helper.booleanToFuture(InsufficientAuthorisationToCreateTransactionRequest, cc = callContext) {
view.canAddTransactionRequestToAnyAccount
}
@ -74,8 +78,8 @@ object LocalMappedConnectorInternal extends MdcLoggable {
viewId.value,
transactionRequestType.toString,
transactionRequestBody.instructedAmount.currency,
initiator.userId,
initiator.name,
user.userId,
user.name,
callContext
) map { i =>
(unboxFullOrFail(i._1, callContext, s"$InvalidConnectorResponseForGetPaymentLimit ", 400), i._2)
@ -104,7 +108,8 @@ object LocalMappedConnectorInternal extends MdcLoggable {
viewId.value,
transactionRequestType.toString,
transactionRequestBody.instructedAmount.currency,
initiator.userId, initiator.name,
user.userId,
user.name,
callContext
) map { i =>
(unboxFullOrFail(i._1, callContext, s"$InvalidConnectorResponseForGetChallengeThreshold ", 400), i._2)
@ -122,8 +127,8 @@ object LocalMappedConnectorInternal extends MdcLoggable {
BankId(fromAccount.bankId.value),
AccountId(fromAccount.accountId.value),
viewId,
initiator.userId,
initiator.name,
user.userId,
user.name,
transactionRequestType.toString,
transactionRequestBody.instructedAmount.currency,
transactionRequestBody.instructedAmount.amount,

12
obp-api/src/main/scala/code/bankconnectors/rabbitmq/RabbitMQConnector_vOct2024.scala
View File

@ -2568,7 +2568,7 @@ trait RabbitMQConnector_vOct2024 extends Connector with MdcLoggable {
inboundTopic = None,
exampleOutboundMessage = (
OutBoundCreateTransactionRequestSepaCreditTransfersBGV1(outboundAdapterCallContext=MessageDocsSwaggerDefinitions.outboundAdapterCallContext,
initiator= UserCommons(userPrimaryKey=UserPrimaryKey(123),
initiator= Some(UserCommons(userPrimaryKey=UserPrimaryKey(123),
userId=userIdExample.value,
idGivenByProvider="string",
provider=providerExample.value,
@ -2577,7 +2577,7 @@ trait RabbitMQConnector_vOct2024 extends Connector with MdcLoggable {
createdByConsentId=Some("string"),
createdByUserInvitationId=Some("string"),
isDeleted=Some(true),
lastMarketingAgreementSignedDate=Some(toDate(dateExample))),
lastMarketingAgreementSignedDate=Some(toDate(dateExample)))),
paymentServiceType=com.openbankproject.commons.model.enums.PaymentServiceTypes.example,
transactionRequestType=com.openbankproject.commons.model.enums.TransactionRequestTypes.example,
transactionRequestBody= SepaCreditTransfersBerlinGroupV13(endToEndIdentification=Some("string"),
@ -2617,7 +2617,7 @@ trait RabbitMQConnector_vOct2024 extends Connector with MdcLoggable {
adapterImplementation = Some(AdapterImplementation("- Core", 1))
)
override def createTransactionRequestSepaCreditTransfersBGV1(initiator: User, paymentServiceType: PaymentServiceTypes, transactionRequestType: TransactionRequestTypes, transactionRequestBody: SepaCreditTransfersBerlinGroupV13, callContext: Option[CallContext]): OBPReturnType[Box[TransactionRequestBGV1]] = {
override def createTransactionRequestSepaCreditTransfersBGV1(initiator: Option[User], paymentServiceType: PaymentServiceTypes, transactionRequestType: TransactionRequestTypes, transactionRequestBody: SepaCreditTransfersBerlinGroupV13, callContext: Option[CallContext]): OBPReturnType[Box[TransactionRequestBGV1]] = {
import com.openbankproject.commons.dto.{InBoundCreateTransactionRequestSepaCreditTransfersBGV1 => InBound, OutBoundCreateTransactionRequestSepaCreditTransfersBGV1 => OutBound}
val req = OutBound(callContext.map(_.toOutboundAdapterCallContext).orNull, initiator, paymentServiceType, transactionRequestType, transactionRequestBody)
val response: Future[Box[InBound]] = sendRequest[InBound]("obp_create_transaction_request_sepa_credit_transfers_bgv1", req, callContext)
@ -2633,7 +2633,7 @@ trait RabbitMQConnector_vOct2024 extends Connector with MdcLoggable {
inboundTopic = None,
exampleOutboundMessage = (
OutBoundCreateTransactionRequestPeriodicSepaCreditTransfersBGV1(outboundAdapterCallContext=MessageDocsSwaggerDefinitions.outboundAdapterCallContext,
initiator= UserCommons(userPrimaryKey=UserPrimaryKey(123),
initiator= Some(UserCommons(userPrimaryKey=UserPrimaryKey(123),
userId=userIdExample.value,
idGivenByProvider="string",
provider=providerExample.value,
@ -2642,7 +2642,7 @@ trait RabbitMQConnector_vOct2024 extends Connector with MdcLoggable {
createdByConsentId=Some("string"),
createdByUserInvitationId=Some("string"),
isDeleted=Some(true),
lastMarketingAgreementSignedDate=Some(toDate(dateExample))),
lastMarketingAgreementSignedDate=Some(toDate(dateExample)))),
paymentServiceType=com.openbankproject.commons.model.enums.PaymentServiceTypes.example,
transactionRequestType=com.openbankproject.commons.model.enums.TransactionRequestTypes.example,
transactionRequestBody= PeriodicSepaCreditTransfersBerlinGroupV13(endToEndIdentification=Some("string"),
@ -2687,7 +2687,7 @@ trait RabbitMQConnector_vOct2024 extends Connector with MdcLoggable {
adapterImplementation = Some(AdapterImplementation("- Core", 1))
)
override def createTransactionRequestPeriodicSepaCreditTransfersBGV1(initiator: User, paymentServiceType: PaymentServiceTypes, transactionRequestType: TransactionRequestTypes, transactionRequestBody: PeriodicSepaCreditTransfersBerlinGroupV13, callContext: Option[CallContext]): OBPReturnType[Box[TransactionRequestBGV1]] = {
override def createTransactionRequestPeriodicSepaCreditTransfersBGV1(initiator: Option[User], paymentServiceType: PaymentServiceTypes, transactionRequestType: TransactionRequestTypes, transactionRequestBody: PeriodicSepaCreditTransfersBerlinGroupV13, callContext: Option[CallContext]): OBPReturnType[Box[TransactionRequestBGV1]] = {
import com.openbankproject.commons.dto.{InBoundCreateTransactionRequestPeriodicSepaCreditTransfersBGV1 => InBound, OutBoundCreateTransactionRequestPeriodicSepaCreditTransfersBGV1 => OutBound}
val req = OutBound(callContext.map(_.toOutboundAdapterCallContext).orNull, initiator, paymentServiceType, transactionRequestType, transactionRequestBody)
val response: Future[Box[InBound]] = sendRequest[InBound]("obp_create_transaction_request_periodic_sepa_credit_transfers_bgv1", req, callContext)

12
obp-api/src/main/scala/code/bankconnectors/rest/RestConnector_vMar2019.scala
View File

@ -2511,7 +2511,7 @@ trait RestConnector_vMar2019 extends Connector with MdcLoggable {
inboundTopic = None,
exampleOutboundMessage = (
OutBoundCreateTransactionRequestSepaCreditTransfersBGV1(outboundAdapterCallContext=MessageDocsSwaggerDefinitions.outboundAdapterCallContext,
initiator= UserCommons(userPrimaryKey=UserPrimaryKey(123),
initiator= Some(UserCommons(userPrimaryKey=UserPrimaryKey(123),
userId=userIdExample.value,
idGivenByProvider="string",
provider=providerExample.value,
@ -2520,7 +2520,7 @@ trait RestConnector_vMar2019 extends Connector with MdcLoggable {
createdByConsentId=Some("string"),
createdByUserInvitationId=Some("string"),
isDeleted=Some(true),
lastMarketingAgreementSignedDate=Some(toDate(dateExample))),
lastMarketingAgreementSignedDate=Some(toDate(dateExample)))),
paymentServiceType=com.openbankproject.commons.model.enums.PaymentServiceTypes.example,
transactionRequestType=com.openbankproject.commons.model.enums.TransactionRequestTypes.example,
transactionRequestBody= SepaCreditTransfersBerlinGroupV13(endToEndIdentification=Some("string"),
@ -2560,7 +2560,7 @@ trait RestConnector_vMar2019 extends Connector with MdcLoggable {
adapterImplementation = Some(AdapterImplementation("- Core", 1))
)
override def createTransactionRequestSepaCreditTransfersBGV1(initiator: User, paymentServiceType: PaymentServiceTypes, transactionRequestType: TransactionRequestTypes, transactionRequestBody: SepaCreditTransfersBerlinGroupV13, callContext: Option[CallContext]): OBPReturnType[Box[TransactionRequestBGV1]] = {
override def createTransactionRequestSepaCreditTransfersBGV1(initiator: Option[User], paymentServiceType: PaymentServiceTypes, transactionRequestType: TransactionRequestTypes, transactionRequestBody: SepaCreditTransfersBerlinGroupV13, callContext: Option[CallContext]): OBPReturnType[Box[TransactionRequestBGV1]] = {
import com.openbankproject.commons.dto.{InBoundCreateTransactionRequestSepaCreditTransfersBGV1 => InBound, OutBoundCreateTransactionRequestSepaCreditTransfersBGV1 => OutBound}
val req = OutBound(callContext.map(_.toOutboundAdapterCallContext).orNull, initiator, paymentServiceType, transactionRequestType, transactionRequestBody)
val response: Future[Box[InBound]] = sendRequest[InBound](getUrl(callContext, "createTransactionRequestSepaCreditTransfersBGV1"), HttpMethods.POST, req, callContext)
@ -2576,7 +2576,7 @@ trait RestConnector_vMar2019 extends Connector with MdcLoggable {
inboundTopic = None,
exampleOutboundMessage = (
OutBoundCreateTransactionRequestPeriodicSepaCreditTransfersBGV1(outboundAdapterCallContext=MessageDocsSwaggerDefinitions.outboundAdapterCallContext,
initiator= UserCommons(userPrimaryKey=UserPrimaryKey(123),
initiator= Some(UserCommons(userPrimaryKey=UserPrimaryKey(123),
userId=userIdExample.value,
idGivenByProvider="string",
provider=providerExample.value,
@ -2585,7 +2585,7 @@ trait RestConnector_vMar2019 extends Connector with MdcLoggable {
createdByConsentId=Some("string"),
createdByUserInvitationId=Some("string"),
isDeleted=Some(true),
lastMarketingAgreementSignedDate=Some(toDate(dateExample))),
lastMarketingAgreementSignedDate=Some(toDate(dateExample)))),
paymentServiceType=com.openbankproject.commons.model.enums.PaymentServiceTypes.example,
transactionRequestType=com.openbankproject.commons.model.enums.TransactionRequestTypes.example,
transactionRequestBody= PeriodicSepaCreditTransfersBerlinGroupV13(endToEndIdentification=Some("string"),
@ -2630,7 +2630,7 @@ trait RestConnector_vMar2019 extends Connector with MdcLoggable {
adapterImplementation = Some(AdapterImplementation("- Core", 1))
)
override def createTransactionRequestPeriodicSepaCreditTransfersBGV1(initiator: User, paymentServiceType: PaymentServiceTypes, transactionRequestType: TransactionRequestTypes, transactionRequestBody: PeriodicSepaCreditTransfersBerlinGroupV13, callContext: Option[CallContext]): OBPReturnType[Box[TransactionRequestBGV1]] = {
override def createTransactionRequestPeriodicSepaCreditTransfersBGV1(initiator: Option[User], paymentServiceType: PaymentServiceTypes, transactionRequestType: TransactionRequestTypes, transactionRequestBody: PeriodicSepaCreditTransfersBerlinGroupV13, callContext: Option[CallContext]): OBPReturnType[Box[TransactionRequestBGV1]] = {
import com.openbankproject.commons.dto.{InBoundCreateTransactionRequestPeriodicSepaCreditTransfersBGV1 => InBound, OutBoundCreateTransactionRequestPeriodicSepaCreditTransfersBGV1 => OutBound}
val req = OutBound(callContext.map(_.toOutboundAdapterCallContext).orNull, initiator, paymentServiceType, transactionRequestType, transactionRequestBody)
val response: Future[Box[InBound]] = sendRequest[InBound](getUrl(callContext, "createTransactionRequestPeriodicSepaCreditTransfersBGV1"), HttpMethods.POST, req, callContext)

12
obp-api/src/main/scala/code/bankconnectors/storedprocedure/StoredProcedureConnector_vDec2019.scala
View File

@ -2492,7 +2492,7 @@ trait StoredProcedureConnector_vDec2019 extends Connector with MdcLoggable {
inboundTopic = None,
exampleOutboundMessage = (
OutBoundCreateTransactionRequestSepaCreditTransfersBGV1(outboundAdapterCallContext=MessageDocsSwaggerDefinitions.outboundAdapterCallContext,
initiator= UserCommons(userPrimaryKey=UserPrimaryKey(123),
initiator= Some(UserCommons(userPrimaryKey=UserPrimaryKey(123),
userId=userIdExample.value,
idGivenByProvider="string",
provider=providerExample.value,
@ -2501,7 +2501,7 @@ trait StoredProcedureConnector_vDec2019 extends Connector with MdcLoggable {
createdByConsentId=Some("string"),
createdByUserInvitationId=Some("string"),
isDeleted=Some(true),
lastMarketingAgreementSignedDate=Some(toDate(dateExample))),
lastMarketingAgreementSignedDate=Some(toDate(dateExample)))),
paymentServiceType=com.openbankproject.commons.model.enums.PaymentServiceTypes.example,
transactionRequestType=com.openbankproject.commons.model.enums.TransactionRequestTypes.example,
transactionRequestBody= SepaCreditTransfersBerlinGroupV13(endToEndIdentification=Some("string"),
@ -2541,7 +2541,7 @@ trait StoredProcedureConnector_vDec2019 extends Connector with MdcLoggable {
adapterImplementation = Some(AdapterImplementation("- Core", 1))
)
override def createTransactionRequestSepaCreditTransfersBGV1(initiator: User, paymentServiceType: PaymentServiceTypes, transactionRequestType: TransactionRequestTypes, transactionRequestBody: SepaCreditTransfersBerlinGroupV13, callContext: Option[CallContext]): OBPReturnType[Box[TransactionRequestBGV1]] = {
override def createTransactionRequestSepaCreditTransfersBGV1(initiator: Option[User], paymentServiceType: PaymentServiceTypes, transactionRequestType: TransactionRequestTypes, transactionRequestBody: SepaCreditTransfersBerlinGroupV13, callContext: Option[CallContext]): OBPReturnType[Box[TransactionRequestBGV1]] = {
import com.openbankproject.commons.dto.{InBoundCreateTransactionRequestSepaCreditTransfersBGV1 => InBound, OutBoundCreateTransactionRequestSepaCreditTransfersBGV1 => OutBound}
val req = OutBound(callContext.map(_.toOutboundAdapterCallContext).orNull, initiator, paymentServiceType, transactionRequestType, transactionRequestBody)
val response: Future[Box[InBound]] = sendRequest[InBound]("obp_create_transaction_request_sepa_credit_transfers_bgv1", req, callContext)
@ -2557,7 +2557,7 @@ trait StoredProcedureConnector_vDec2019 extends Connector with MdcLoggable {
inboundTopic = None,
exampleOutboundMessage = (
OutBoundCreateTransactionRequestPeriodicSepaCreditTransfersBGV1(outboundAdapterCallContext=MessageDocsSwaggerDefinitions.outboundAdapterCallContext,
initiator= UserCommons(userPrimaryKey=UserPrimaryKey(123),
initiator= Some(UserCommons(userPrimaryKey=UserPrimaryKey(123),
userId=userIdExample.value,
idGivenByProvider="string",
provider=providerExample.value,
@ -2566,7 +2566,7 @@ trait StoredProcedureConnector_vDec2019 extends Connector with MdcLoggable {
createdByConsentId=Some("string"),
createdByUserInvitationId=Some("string"),
isDeleted=Some(true),
lastMarketingAgreementSignedDate=Some(toDate(dateExample))),
lastMarketingAgreementSignedDate=Some(toDate(dateExample)))),
paymentServiceType=com.openbankproject.commons.model.enums.PaymentServiceTypes.example,
transactionRequestType=com.openbankproject.commons.model.enums.TransactionRequestTypes.example,
transactionRequestBody= PeriodicSepaCreditTransfersBerlinGroupV13(endToEndIdentification=Some("string"),
@ -2611,7 +2611,7 @@ trait StoredProcedureConnector_vDec2019 extends Connector with MdcLoggable {
adapterImplementation = Some(AdapterImplementation("- Core", 1))
)
override def createTransactionRequestPeriodicSepaCreditTransfersBGV1(initiator: User, paymentServiceType: PaymentServiceTypes, transactionRequestType: TransactionRequestTypes, transactionRequestBody: PeriodicSepaCreditTransfersBerlinGroupV13, callContext: Option[CallContext]): OBPReturnType[Box[TransactionRequestBGV1]] = {
override def createTransactionRequestPeriodicSepaCreditTransfersBGV1(initiator: Option[User], paymentServiceType: PaymentServiceTypes, transactionRequestType: TransactionRequestTypes, transactionRequestBody: PeriodicSepaCreditTransfersBerlinGroupV13, callContext: Option[CallContext]): OBPReturnType[Box[TransactionRequestBGV1]] = {
import com.openbankproject.commons.dto.{InBoundCreateTransactionRequestPeriodicSepaCreditTransfersBGV1 => InBound, OutBoundCreateTransactionRequestPeriodicSepaCreditTransfersBGV1 => OutBound}
val req = OutBound(callContext.map(_.toOutboundAdapterCallContext).orNull, initiator, paymentServiceType, transactionRequestType, transactionRequestBody)
val response: Future[Box[InBound]] = sendRequest[InBound]("obp_create_transaction_request_periodic_sepa_credit_transfers_bgv1", req, callContext)

BIN
obp-api/src/test/scala/code/connector/RestConnector_vMar2019_frozen_meta_data
View File

Binary file not shown.

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

@ -1185,7 +1185,8 @@ case class OutBoundCreateTransactionRequestv400(outboundAdapterCallContext: Outb
case class InBoundCreateTransactionRequestv400(inboundAdapterCallContext: InboundAdapterCallContext, status: Status, data: TransactionRequest) extends InBoundTrait[TransactionRequest]
case class OutBoundCreateTransactionRequestSepaCreditTransfersBGV1(
outboundAdapterCallContext: OutboundAdapterCallContext, initiator: User,
outboundAdapterCallContext: OutboundAdapterCallContext,
initiator: Option[User],
paymentServiceType: PaymentServiceTypes.Value,
transactionRequestType: TransactionRequestTypes.Value,
transactionRequestBody: SepaCreditTransfersBerlinGroupV13,
@ -1194,7 +1195,7 @@ case class OutBoundCreateTransactionRequestSepaCreditTransfersBGV1(
case class InBoundCreateTransactionRequestSepaCreditTransfersBGV1(inboundAdapterCallContext: InboundAdapterCallContext, status: Status, data: TransactionRequestBGV1) extends InBoundTrait[TransactionRequestBGV1]
case class OutBoundCreateTransactionRequestPeriodicSepaCreditTransfersBGV1(
outboundAdapterCallContext: OutboundAdapterCallContext, initiator: User,
outboundAdapterCallContext: OutboundAdapterCallContext, initiator: Option[User],
paymentServiceType: PaymentServiceTypes.Value,
transactionRequestType: TransactionRequestTypes.Value,
transactionRequestBody: PeriodicSepaCreditTransfersBerlinGroupV13,