Skip to content

Commit

Permalink
fix: update payment referencenumber with openforms orderid
Browse files Browse the repository at this point in the history
  • Loading branch information
MLenterman committed Apr 18, 2024
1 parent f7b47ef commit ba0186c
Show file tree
Hide file tree
Showing 6 changed files with 180 additions and 72 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
<xsl:stylesheet exclude-result-prefixes="xs xsl zgw" version="3.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:zgw="http://google.com/zgw"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:payment="http://www.emaxx.org/functional/cases/payment"
xmlns:payments="http://www.emaxx.org/functional/cases/payments"
>
<xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes" omit-xml-declaration="yes" exclude-result-prefixes="xsi"/>
<xsl:strip-space elements="*"/>
<xsl:include href="../../BpelFunctionsBase.xslt" />

<!-- Create/Enrich -->
<xsl:param name="ReferenceNumber" select="''" as="xs:string" />
<xsl:param name="Description" select="''" as="xs:string" />

<xsl:template match="@*|node()">
<xsl:copy>
<xsl:apply-templates select="@*|node()"/>
</xsl:copy>
</xsl:template>

<xsl:template match="/">
<payments:updateDetailedPayment>
<payment:detailedPaymentSaveMessage>
<xsl:apply-templates select="//*:paymentDetailsMessage/*:payments/*:payment"/>
</payment:detailedPaymentSaveMessage>
</payments:updateDetailedPayment>
</xsl:template>

<xsl:template match="*:payment">
<payment:payment>
<xsl:apply-templates select="@*|node()"/>
</payment:payment>
</xsl:template>

<xsl:template match="*:referenceNumber">
<payment:referenceNumber>
<xsl:value-of select="$ReferenceNumber"/>
</payment:referenceNumber>
</xsl:template>

<xsl:template match="*:description">
<payment:description>
<xsl:value-of select="$Description"/>
</payment:description>
</xsl:template>
</xsl:stylesheet>
8 changes: 4 additions & 4 deletions src/main/configurations/bpel/Configuration.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
<!ENTITY Bpel_Documents_UploadAttachments SYSTEM "./Configuration_Bpel_Documents_UploadAttachments.xml">
<!ENTITY Bpel_Mtom_Mock SYSTEM "./Configuration_Bpel_Mtom_Mock.xml">
<!ENTITY Bpel_Mtom_PostAddDocument SYSTEM "./Configuration_Bpel_Mtom_PostAddDocument.xml">
<!ENTITY Bpel_Payment_PostAddPaymentStates SYSTEM "./Configuration_Bpel_Payment_PostAddPaymentStates.xml">
<!ENTITY Bpel_Payment_PostLookUpPayments SYSTEM "./Configuration_Bpel_Payment_PostLookUpPayments.xml">
<!ENTITY Bpel_Payment_Post SYSTEM "./Configuration_Bpel_Payment_Post.xml">
<!ENTITY ConvertISO639Taal SYSTEM "./Configuration_ConvertISO639Taal.xml">
<!ENTITY ImportFromLocalFS SYSTEM "./Configuration_ImportFromLocalFS.xml">
<!ENTITY Notificaties_Subscribe SYSTEM "./Configuration_Notificaties_Subscribe.xml">
<!ENTITY UpdateInitiatorSubjectCommandHandler SYSTEM "./Configuration_UpdateInitiatorSubjectCommandHandler.xml">
<!ENTITY UpdatePaymentCommandHandler SYSTEM "./Configuration_UpdatePaymentCommandHandler.xml">
]>

<configuration name="bpel">
Expand All @@ -40,10 +40,10 @@
&Bpel_Documents_UploadAttachments;
&Bpel_Mtom_Mock;
&Bpel_Mtom_PostAddDocument;
&Bpel_Payment_PostAddPaymentStates;
&Bpel_Payment_PostLookUpPayments;
&Bpel_Payment_Post;
&ConvertISO639Taal;
&ImportFromLocalFS;
&Notificaties_Subscribe;
&UpdateInitiatorSubjectCommandHandler;
&UpdatePaymentCommandHandler;
</configuration>
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@
<Param name="InitiatePayment" sessionKey="HasPayment" />
<Param name="SubscriptionDuration" value="100" />
<Param name="Price" xpathExpression="/ZgwObject/payment/amount" />
<Param name="Description" xpathExpression="/ZgwObject/payment/public_order_ids" />
<Param name="Description" xpathExpression="/ZgwObject/public_reference" />
<Forward name="success" path="CreateRegisterRequestMessage" />
<Forward name="error" path="EXCEPTION" />
</XsltPipe>
Expand Down Expand Up @@ -266,6 +266,7 @@
name="StoreCaseReferenceNumberFromRegisterResponse"
>
<Param name="CaseReferenceNumber" sessionKey="RegisterResponseMessage" xpathExpression="//*:referenceNumber" />
<Param name="PaymentOrderId" sessionKey="UnwrappedMessage" xpathExpression="/ZgwObject/payment/public_order_ids" />
<Forward name="success" path="UpdateInitiatorSubjectCommandSender" />
</PutInSessionPipe>

Expand All @@ -281,68 +282,25 @@
sessionKeys="CaseReferenceNumber"
>
</MessageStoreSender>
<Forward name="success" path="CreateLookUpPaymentsMessage" />
<Forward name="success" path="UpdatePaymentCommandSender" />
</SenderPipe>

<XsltPipe
name="CreateLookUpPaymentsMessage"
getInputFromSessionKey="UnwrappedMessage"
styleSheetName="Bpel/Payment/Model/LookUpPaymentsMessage.xslt"
storeResultInSessionKey="LookUpPaymentsMessage"
onlyIfSessionKey="HasPayment"
onlyIfValue="true"
>
<Param name="ReferenceNumber" sessionKey="CaseReferenceNumber" />
<Forward name="success" path="BpelPaymentPostLookUpPaymentsSender" />
<Forward name="error" path="EXCEPTION" />
</XsltPipe>

<SenderPipe
name="BpelPaymentPostLookUpPaymentsSender"
storeResultInSessionKey="LookUpPaymentsResponseMessage"
onlyIfSessionKey="HasPayment"
onlyIfValue="true"
>
<IbisLocalSender
name="BpelPaymentPostLookUpPaymentsLocalSender"
javaListener="Bpel_Payment_PostLookUpPayments"
>
</IbisLocalSender>
<Forward name="success" path="CreateAddPaymentStatesMessage" />
<Forward name="exception" path="EXCEPTION" />
</SenderPipe>

<XsltPipe
name="CreateAddPaymentStatesMessage"
getInputFromSessionKey="UnwrappedMessage"
styleSheetName="Bpel/Payment/Model/AddPaymentStatesMessage.xslt"
storeResultInSessionKey="AddPaymentStatesMessage"
onlyIfSessionKey="HasPayment"
onlyIfValue="true"
>
<Param name="PaymentId" sessionKey="LookUpPaymentsResponseMessage" xpathExpression="//*[local-name()='paymentId']" />
<Param name="StateCode" value="004" />
<Param name="ExtCode" value="9" />
<Param name="ExtMessage" value="Payment requested" />
<Param name="SetDate" sessionKey="originalMessage" xpathExpression="/ZgwObject/record/startAt" />
<Forward name="success" path="BpelPaymentPostAddPaymentStatesSender" />
<Forward name="error" path="EXCEPTION" />
</XsltPipe>

<SenderPipe
name="BpelPaymentPostAddPaymentStatesSender"
storeResultInSessionKey="AddPaymentStatesResponseMessage"
name="UpdatePaymentCommandSender"
getInputFromSessionKey="UwGegevens"
transactionAttribute="Required"
onlyIfSessionKey="HasPayment"
onlyIfValue="true"
>
<IbisLocalSender
name="BpelPaymentPostAddPaymentStatesLocalSender"
javaListener="Bpel_Payment_PostAddPaymentStates"
>
</IbisLocalSender>
>
<MessageStoreSender
name="UpdatePaymentCommandMessageStoreSender"
slotId="${instance.name}/UpdatePaymentCommand"
onlyStoreWhenMessageIdUnique="true"
sessionKeys="CaseReferenceNumber,PaymentOrderId,PaymentDate"
>
</MessageStoreSender>
<Forward name="success" path="BpelDocumentsUploadAttachmentsSender" />
<Forward name="exception" path="EXCEPTION" />
</SenderPipe>
</SenderPipe>

<SenderPipe
name="BpelDocumentsUploadAttachmentsSender"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,13 @@
-->
<Receiver
name="UpdateInitiatorSubjectCommandHandler"
transactionAttribute="Required"
transactionAttribute="RequiresNew"
pollInterval="1"
maxRetries="0"
maxRetries="1"
>
<MessageStoreListener
name="UpdateInitiatorSubjectCommandHandler"
slotId="${instance.name}/UpdateInitiatorSubjectCommand"
moveToMessageLog="false"
sessionKeys="CaseReferenceNumber"
/>
</Receiver>
Expand All @@ -36,7 +35,6 @@
>
<Param name="ReferenceNumber" sessionKey="CaseReferenceNumber" />
<Forward name="success" path="BpelCasesPostLookUpCaseIdsSender" />
<Forward name="error" path="EXCEPTION" />
</XsltPipe>

<SenderPipe
Expand All @@ -50,7 +48,6 @@
</IbisLocalSender>
<Param name="soapAction" value="cases:lookUpCaseIds" />
<Forward name="success" path="CreateReadCasesRequestMessage" />
<Forward name="exception" path="EXCEPTION" />
</SenderPipe>

<XsltPipe
Expand All @@ -61,7 +58,6 @@
>
<Param name="Id" sessionKey="LookUpCaseIdsResponseMessage" xpathExpression="//*:cases/*:case/*:id" />
<Forward name="success" path="BpelCasesPostReadCasesSender" />
<Forward name="error" path="EXCEPTION" />
</XsltPipe>

<SenderPipe
Expand All @@ -75,7 +71,6 @@
</IbisLocalSender>
<Param name="soapAction" value="cases:readCases" />
<Forward name="success" path="CreateUpdateDetailedCaseMessage" />
<Forward name="exception" path="EXCEPTION" />
</SenderPipe>

<XsltPipe
Expand All @@ -87,7 +82,6 @@
<Param name="EmailAddress" sessionKey="originalMessage" xpathExpression="//*[starts-with(name(), 'contactgegevens')]/*[starts-with(name(), 'eMailadres')]" />
<Param name="TelephoneNumber" sessionKey="originalMessage" xpathExpression="//*[starts-with(name(), 'contactgegevens')]/*[starts-with(name(), 'telefoonnummer')]" />
<Forward name="success" path="BpelCasesPostUpdateDetailedCaseSender" />
<Forward name="error" path="EXCEPTION" />
</XsltPipe>

<SenderPipe
Expand All @@ -101,7 +95,6 @@
</IbisLocalSender>
<Param name="soapAction" value="cases:updateDetailedCase" />
<Forward name="success" path="InitiatorSubjectUpdatedEventSender" />
<Forward name="exception" path="EXCEPTION" />
</SenderPipe>

<SenderPipe
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
<Module
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="../FrankConfig.xsd"
>
<Adapter
name="UpdatePaymentCommandHandler"
active="${UpdatePaymentCommandHandler.Active}"
description=""
>
<!--
message:
sesionKey: CaseReferenceNumber string
sesionKey: PaymentOrderId string
sesionKey: PaymentDate string
-->
<Receiver
name="UpdatePaymentCommandHandler"
transactionAttribute="RequiresNew"
pollInterval="1"
maxRetries="1"
>
<MessageStoreListener
name="UpdatePaymentCommandHandler"
slotId="${instance.name}/UpdatePaymentCommand"
sessionKeys="CaseReferenceNumber,PaymentOrderId,PaymentDate"
/>
</Receiver>

<Pipeline>
<Exits>
<Exit name="EXIT" state="SUCCESS" />
<Exit name="EXCEPTION" state="ERROR" />
</Exits>

<XsltPipe
name="CreateLookUpPaymentsMessage"
getInputFromFixedValue="&lt;dummy/&gt;"
styleSheetName="Bpel/Payment/Model/LookUpPaymentsMessage.xslt"
storeResultInSessionKey="LookUpPaymentsMessage"
>
<Param name="ReferenceNumber" sessionKey="CaseReferenceNumber" />
<Forward name="success" path="BpelPaymentPostLookUpPaymentsSender" />
</XsltPipe>

<SenderPipe
name="BpelPaymentPostLookUpPaymentsSender"
storeResultInSessionKey="LookUpPaymentsResponseMessage"
>
<IbisLocalSender
name="BpelPaymentPostLookUpPaymentsLocalSender"
javaListener="Bpel_Payment_Post"
>
</IbisLocalSender>
<Param name="soapAction" value="payments:lookUpPayments" />
<Forward name="success" path="CreateUpdateDetailedPaymentRequestMessage" />
</SenderPipe>

<XsltPipe
name="CreateUpdateDetailedPaymentRequestMessage"
styleSheetName="Bpel/Payment/Model/UpdateDetailedPaymentRequestMessage.xslt"
storeResultInSessionKey="UpdateDetailedPaymentRequestMessage"
>
<Param name="ReferenceNumber" sessionKey="PaymentOrderId" />
<Param name="Description" sessionKey="CaseReferenceNumber" />
<Forward name="success" path="CreateUpdateDetailedPaymentRequestSender" />
</XsltPipe>

<SenderPipe
name="CreateUpdateDetailedPaymentRequestSender"
storeResultInSessionKey="CreateUpdateDetailedPaymentResponseMessage"
>
<IbisLocalSender
name="CreateUpdateDetailedPaymentRequestLocalSender"
javaListener="Bpel_Payment_Post"
>
</IbisLocalSender>
<Param name="soapAction" value="payments:updateDetailedPayment" />
<Forward name="success" path="CreateAddPaymentStatesMessage" />
</SenderPipe>

<XsltPipe
name="CreateAddPaymentStatesMessage"
styleSheetName="Bpel/Payment/Model/AddPaymentStatesMessage.xslt"
storeResultInSessionKey="AddPaymentStatesMessage"
>
<Param name="PaymentId" sessionKey="LookUpPaymentsResponseMessage" xpathExpression="//*[local-name()='paymentId']" />
<Param name="StateCode" value="004" />
<Param name="ExtCode" value="9" />
<Param name="ExtMessage" value="Payment requested" />
<Param name="SetDate" sessionKey="PaymentDate" />
<Forward name="success" path="BpelPaymentPostAddPaymentStatesSender" />
</XsltPipe>

<SenderPipe
name="BpelPaymentPostAddPaymentStatesSender"
storeResultInSessionKey="AddPaymentStatesResponseMessage"
>
<IbisLocalSender
name="BpelPaymentPostAddPaymentStatesLocalSender"
javaListener="Bpel_Payment_Post"
>
</IbisLocalSender>
<Param name="soapAction" value="payments:addPaymentStates" />
<Forward name="success" path="EXIT" />
</SenderPipe>

</Pipeline>
</Adapter>
</Module>
4 changes: 2 additions & 2 deletions src/main/configurations/bpel/DeploymentSpecifics.properties
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ Bpel_Documents_UploadAttachment.Active=true
Bpel_Documents_UploadAttachments.Active=true
Bpel_Mtom_Mock.Active=true
Bpel_Mtom_PostAddDocument.Active=true
Bpel_Payment_PostAddPaymentStates.Active=true
Bpel_Payment_PostLookUpPayments.Active=true
Bpel_Payment_Post.Active=true
ConvertISO639Taal.Active=true
ImportFromLocalFS.Active=true
Notificaties_Subscribe.Active=true
UpdateInitiatorSubjectCommandHandler.Active=true
UpdatePaymentCommandHandler.Active=true

# suppress warning keys
warnings.suppress.defaultvalue=true
Expand Down

0 comments on commit ba0186c

Please sign in to comment.