Skip to content

Commit

Permalink
refactor: scaffold zds 1.2 soap-endpoint OntvangAsynchroonMutatie v2 (#…
Browse files Browse the repository at this point in the history
…136)

* Implement "genereerBesluitIdentificatie_Di02" SOAP-action

* add besluit to configmap and add soapTestCase

* refactor VrijeBerichten_v2 soapendpointrouter to use new template

* Base new structure has been added

* Update on VrijeBerichten_V2

* removed redundant comments

* Base files and configs have been added.

* Typo

* changes after the review

* yaml's are updated for ontvangAsynchroonMutatie_v2

* Sender and SoapWrapper pipes've been removed.

* deleted file, will be added again

* readding the file

* Handling UnsupportedSoapActionError

* removed voegBesluitToe from configs

* update configmap

* error path changed

* back slashes changed to forward slashes in wsdl

* reoginising the confog files

---------

Co-authored-by: Mike <M.J.J.S.Erkemeij@student.tudelft.nl>
Co-authored-by: Meric Akgul <meric@wearefrank.nl>
  • Loading branch information
3 people authored Jul 31, 2023
1 parent 41be024 commit e0a14f8
Show file tree
Hide file tree
Showing 5 changed files with 127 additions and 6 deletions.
13 changes: 9 additions & 4 deletions charts/zaakbrug/templates/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,17 +51,22 @@ data:
zaakbrug.soap.beantwoord-vraag.endpoint: {{ .endpoint }}
zaakbrug.soap.beantwoord-vraag.validation-soft-fail: "{{ .validationSoftFail }}"
{{- end }}
{{- with .beantwoordVraag_v2 }}
zaakbrug.soap.beantwoord-vraag.v2.endpoint: {{ .endpoint }}
zaakbrug.soap.beantwoord-vraag.v2.validation-soft-fail: "{{ .validationSoftFail }}"
{{- end }}
{{- with .ontvangAsynchroon }}
zaakbrug.soap.ontvang-asynchroon.endpoint: {{ .endpoint }}
zaakbrug.soap.ontvang-asynchroon.validation-soft-fail: "{{ .validationSoftFail }}"
{{- end }}
{{- with .ontvangAsynchroonMutatie_v2 }}
zaakbrug.soap.ontvang-asynchroon-mutatie.v2.endpoint: {{ .endpoint }}
zaakbrug.soap.ontvang-asynchroon-mutatie.v2.validation-soft-fail: "{{ .validationSoftFail }}"
{{- end }}
{{- with .ontvangAsynchroonOverdragen_v2 }}
zaakbrug.soap.ontvang-asynchroon-overdragen.v2.endpoint: {{ .endpoint }}
zaakbrug.soap.ontvang-asynchroon-overdragen.v2.validation-soft-fail: "{{ .validationSoftFail }}"
{{- end }}
{{- with .ontvangAsynchroon_v2 }}
zaakbrug.soap.ontvang-asynchroon.v2.endpoint: {{ .endpoint }}
zaakbrug.soap.ontvang-asynchroon.v2.validation-soft-fail: "{{ .validationSoftFail }}"
{{- end }}
{{- with .vrijeBerichten }}
zaakbrug.soap.vrije-berichten.endpoint: {{ .endpoint }}
zaakbrug.soap.vrije-berichten.validation-soft-fail: "{{ .validationSoftFail }}"
Expand Down
3 changes: 3 additions & 0 deletions charts/zaakbrug/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,9 @@ zaakbrug:
ontvangAsynchroon:
endpoint: "translate/generic/zds/OntvangAsynchroon"
validationSoftFail: false
ontvangAsynchroonMutatie_v2:
endpoint: "translate/generic/zds/v2/OntvangAsynchroonMutatie"
validationSoftFail: false
ontvangAsynchroonOverdragen_v2:
endpoint: "translate/generic/zds/v2/OntvangAsynchroonOverdragen"
validationSoftFail: false
Expand Down
6 changes: 4 additions & 2 deletions src/main/configurations/Translate/Configuration.xml
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,9 @@
<!ENTITY SetResultaatAndStatus SYSTEM "./Configuration_SetResultaatAndStatus.xml">
<!ENTITY SoapEndpointRouter_BeantwoordVraag SYSTEM "./Configuration_SoapEndpointRouter_BeantwoordVraag.xml">
<!ENTITY SoapEndpointRouter_BeantwoordVraag_v2 SYSTEM "./Configuration_SoapEndpointRouter_BeantwoordVraag_v2.xml">
<!ENTITY SoapEndpointRouter_OntvangAsynchroon_Overdragen_v2 SYSTEM "./Configuration_SoapEndpointRouter_OntvangAsynchroon_Overdragen_v2.xml">
<!ENTITY SoapEndpointRouter_OntvangAsynchroon SYSTEM "./Configuration_SoapEndpointRouter_OntvangAsynchroon.xml">
<!ENTITY SoapEndpointRouter_OntvangAsynchroon_Mutatie_v2 SYSTEM "./Configuration_SoapEndpointRouter_OntvangAsynchroon_Mutatie_v2.xml">
<!ENTITY SoapEndpointRouter_OntvangAsynchroon_Overdragen_v2 SYSTEM "./Configuration_SoapEndpointRouter_OntvangAsynchroon_Overdragen_v2.xml">
<!ENTITY SoapEndpointRouter_VrijeBerichten SYSTEM "./Configuration_SoapEndpointRouter_VrijeBerichten.xml">
<!ENTITY SoapEndpointRouter_VrijeBerichten_v2 SYSTEM "./Configuration_SoapEndpointRouter_VrijeBerichten_v2.xml">
<!ENTITY UpdateZaak_Lk01 SYSTEM "./Configuration_UpdateZaak_LK01.xml">
Expand Down Expand Up @@ -122,8 +123,9 @@
&SetResultaatAndStatus;
&SoapEndpointRouter_BeantwoordVraag;
&SoapEndpointRouter_BeantwoordVraag_v2;
&SoapEndpointRouter_OntvangAsynchroon_Overdragen_v2;
&SoapEndpointRouter_OntvangAsynchroon;
&SoapEndpointRouter_OntvangAsynchroon_Mutatie_v2;
&SoapEndpointRouter_OntvangAsynchroon_Overdragen_v2;
&SoapEndpointRouter_VrijeBerichten;
&SoapEndpointRouter_VrijeBerichten_v2;
&UpdateZaak_Lk01;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
<Module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../FrankConfig.xsd">
<Adapter name="SoapEndpointRouter_OntvangAsynchroon_Mutatie_v2"
active="${SoapEndpointRouter_OntvangAsynchroon_Mutatie_v2.Active}"
description="">
<Receiver name="SoapEndpointRouter_OntvangAsynchroon_Mutatie_v2">
<WebServiceListener name="SoapEndpointRouter_OntvangAsynchroon_Mutatie_v2" address="${zaakbrug.soap.ontvang-asynchroon-mutatie.v2.endpoint}" soap="false"/>
<JdbcErrorStorage
name="JdbcErrorStorage"
datasourceName="jdbc/${database.instance.name}"
slotId="${instance.name}/ontvangAsynchroonMutatie_v2"/>
</Receiver>
<Pipeline>
<Exits>
<Exit name="EXIT" state="SUCCESS"/>
<Exit name="EXCEPTION" state="ERROR"/>
</Exits>

<WsdlXmlValidatorPipe
name="ValidateInput"
wsdl="Common/xsd/Zaak-_Documentservices_1_2/zds0120/berichten/zds0120_ontvangAsynchroon_mutatie_zs-dms.wsdl"
>
<Forward name="success" path="UnwrapSoapMessage"/>
<Forward name="failure" path="WsdlValidationSoftFailForwarder"/>
</WsdlXmlValidatorPipe>

<XmlSwitchPipe
name="WsdlValidationSoftFailForwarder"
xpathExpression="$SoftFail = true()"
>
<Param name="SoftFail" value="${zaakbrug.soap.ontvang-asynchroon-mutatie.v2.validation-soft-fail}" type="BOOLEAN"/>
<Forward name="true" path="UnwrapSoapMessage" />
<Forward name="false" path="InvalidXml" />
</XmlSwitchPipe>

<SoapWrapperPipe
name="UnwrapSoapMessage"
storeResultInSessionKey="UnwrapMessageResult"
direction="UNWRAP"
removeOutputNamespaces="true">
<Forward name="success" path="SanitizeSoapAction"/>
</SoapWrapperPipe>

<XsltPipe
name="SanitizeSoapAction"
xpathExpression="replace($Action, '/', '_')"
storeResultInSessionKey="SanitizedSoapAction"
preserveInput="true"
>
<Param name="Action" sessionKey="SOAPAction"/>
<Forward name="success" path="ActionSwitch"/>
<Forward name="error" path="BackEndError"/>
</XsltPipe>

<XmlSwitchPipe name="ActionSwitch"
forwardNameSessionKey="SanitizedSoapAction"
notFoundForwardName="UnsupportedSoapActionError"
/>

<!-- SenderPipes -->

<!-- SoapWrapperPipes -->

<!-- ERRORS -->
<XsltPipe
name="UnsupportedSoapActionError"
emptyInputReplacement="&lt;EmptyInput/&gt;"
styleSheetName="Common/xsl/BuildError.xsl"
>
<Param name="code" value="TechnicalError" /> <!-- codes: TechnicalError, TranslationError, ConfigurationError-->
<Param name="reason" pattern="Unsupported SOAP-action. No implementation found for: {SOAPAction}" />
<!-- <Param name="details" sessionKey="" /> -->
<!-- <Param name="detailsXml" type="DOMDOC" /> -->
<Forward name="success" path="BackEndError" />
<Forward name="exception" path="BackEndError" />
</XsltPipe>
<PutInSessionPipe name="InvalidXml">
<Param name="errorCode" value="INVALID_XML"/>
<Param name="errorReason" value="XML was invalid"/>
<Forward name="success" path="WrapFo03Response" />
</PutInSessionPipe>
<PutInSessionPipe name="NotWellFormed">
<Param name="errorCode" value="NOT_WELL_FORMED_XML"/>
<Param name="errorReason" value="XML was not according to xsd"/>
<Forward name="success" path="WrapFo03Response"/>
</PutInSessionPipe>
<PutInSessionPipe name="BackEndError" unlessSessionKey="errorCode">
<Param name="errorCode" styleSheetName="Common/xsl/BackEndError.xsl"/>
<Param name="errorReason" xpathExpression="/error/reason"/>
<Param name="errorDetailText" xpathExpression="concat(/error/code, ' ', /error/reason, ' ', /error/details)"/>
<Param name="errorDetailXML" xpathExpression="/error/detailsXml" type="DOMDOC" />
<Forward name="success" path="WrapFo03Response"/>
</PutInSessionPipe>
<SoapWrapperPipe
name="WrapFo03Response"
soapBodyStyleSheet="Common/xsl/CreateFo03Response.xslt"
>
<Param name="UnwrapMessageResult" sessionKey="UnwrapMessageResult" type="DOMDOC"/>
<Param name="errorCode" sessionKey="errorCode"/>
<Param name="errorReason" sessionKey="errorReason"/>
<Param name="errorDetailText" sessionKey="errorDetailText"/>
<Param name="errorDetailXML" sessionKey="errorDetailXML" type="DOMDOC"/>
<Forward name="success" path="EXIT"/>
</SoapWrapperPipe>
</Pipeline>
</Adapter>
</Module>
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ SoapEndpointRouter_BeantwoordVraag.Active=true
SoapEndpointRouter_BeantwoordVraag_v2.Active=true
SoapEndpointRouter_OntvangAsynchroon_Overdragen_v2.Active=true
SoapEndpointRouter_OntvangAsynchroon.Active=true
SoapEndpointRouter_OntvangAsynchroon_Mutatie_v2.Active=true
SoapEndpointRouter_VrijeBerichten.Active=true
SoapEndpointRouter_VrijeBerichten_v2.Active=true
UpdateZaak_Lk01.Active=true
Expand Down Expand Up @@ -107,6 +108,9 @@ zaakbrug.soap.beantwoord-vraag.v2.validation-soft-fail=false
zaakbrug.soap.ontvang-asynchroon.endpoint=translate/generic/zds/OntvangAsynchroon
zaakbrug.soap.ontvang-asynchroon.validation-soft-fail=false

zaakbrug.soap.ontvang-asynchroon-mutatie.v2.endpoint=translate/generic/zds/v2/OntvangAsynchroonMutatie
zaakbrug.soap.ontvang-asynchroon-mutatie.v2.validation-soft-fail=false

zaakbrug.soap.ontvang-asynchroon-overdragen.v2.endpoint=translate/generic/zds/v2/OntvangAsynchroonOverdragen
zaakbrug.soap.ontvang-asynchroon-overdragen.v2.validation-soft-fail=false

Expand All @@ -116,6 +120,7 @@ zaakbrug.soap.vrije-berichten.validation-soft-fail=false
zaakbrug.soap.vrije-berichten.v2.endpoint=translate/generic/zds/v2/VrijBericht
zaakbrug.soap.vrije-berichten.v2.validation-soft-fail=false


# Not needed anymore with custom Parameter.java
# JwtToken=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJ0ZXN0IiwiaWF0IjoxNjYzODUzNzAxLCJjbGllbnRfaWQiOiJ0ZXN0IiwidXNlcl9pZCI6IiIsInVzZXJfcmVwcmVzZW50YXRpb24iOiIifQ.JRTMevrNIotrpFTPbxxq-hU-UMlhQV-dFO0pKb5QIbY

Expand Down

0 comments on commit e0a14f8

Please sign in to comment.