Merge branch 'master' into GT-1159-Replace-Authentication-CustomCode-…

…With-FF-Pipes
wearefrank · Jun 25, 2024 · 624576c · 624576c
2 parents 64db359 + b85182a
commit 624576c
Show file tree

Hide file tree

Showing 13 changed files with 629 additions and 188 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 [![conventional commits](https://img.shields.io/badge/conventional%20commits-1.0.0-yellow.svg)](https://conventionalcommits.org) [![semantic versioning](https://img.shields.io/badge/semantic%20versioning-2.0.0-green.svg)](https://semver.org)
 
+## [1.19.9](https://github.com/wearefrank/zaakbrug/compare/v1.19.8...v1.19.9) (2024-06-25)
+
+### 🐛 Bug Fixes
+
+* geefLijstZaakdocumenten should not return an error response when the zaak can't be found ([#395](https://github.com/wearefrank/zaakbrug/issues/395)) ([d4ce003](https://github.com/wearefrank/zaakbrug/commit/d4ce0037296ca861dfed89df99680fcab7a5633a))
+
 ## [1.19.8](https://github.com/wearefrank/zaakbrug/compare/v1.19.7...v1.19.8) (2024-06-21)
 
 ### 🐛 Bug Fixes

diff --git a/e2e/SoapUI/zaakbrug-e2e-soapui-project.xml b/e2e/SoapUI/zaakbrug-e2e-soapui-project.xml
diff --git a/src/main/configurations/Translate/Common/xsl/CreateZakLa01Response.xslt b/src/main/configurations/Translate/Common/xsl/CreateZakLa01Response.xslt
diff --git a/src/main/configurations/Translate/Configuration_ActualiseerZaakStatus.xml b/src/main/configurations/Translate/Configuration_ActualiseerZaakStatus.xml
@@ -26,14 +26,21 @@
                 <Param name="object" xpathExpression="$originalMessage/zakLk01/object[2]" type="DOMDOC">
                     <Param name="originalMessage" sessionKey="originalMessage" type="DOMDOC"/>
                 </Param>
-                <Forward name="success" path="CallGetZgwZaak" />
+                <Forward name="success" path="StoreZaakIdentificatie" />
             </PutInSessionPipe>
 
             <PutInSessionPipe 
                 name="StoreObject_2">
                 <Param name="object" xpathExpression="$originalMessage/zakLk01/object[1]" type="DOMDOC">
                     <Param name="originalMessage" sessionKey="originalMessage" type="DOMDOC"/>
                 </Param>
+                <Forward name="success" path="StoreZaakIdentificatie" />
+            </PutInSessionPipe>
+
+            <PutInSessionPipe 
+                name="StoreZaakIdentificatie"
+                >
+                <Param name="Identificatie" sessionKey="object" xpathExpression="object/identificatie" />
                 <Forward name="success" path="CallGetZgwZaak" />
             </PutInSessionPipe>
 
@@ -45,12 +52,34 @@
                     name="CallGetZgwZaakSender"
                     javaListener="GetZgwZaak"
                     returnedSessionKeys="Error">
-                    <Param name="Identificatie" sessionKey="object" xpathExpression="object/identificatie"/>
+                    <Param name="Identificatie" sessionKey="Identificatie"/>
                 </IbisLocalSender>
-                <Forward name="success" path="CallGetZaakTypeByZaak"/>
+                <Forward name="success" path="ZaakNotFound_Condition"/>
                 <Forward name="exception" path="EXCEPTION" />
             </SenderPipe>
 
+            <XmlIfPipe
+                name="ZaakNotFound_Condition"
+                xpathExpression="string-length(ZgwZaken) = 0"
+                >
+                <Forward name="then" path="ZaakNotFound_Exception" />
+                <Forward name="else" path="CallGetZaakTypeByZaak" />
+            </XmlIfPipe>
+
+            <XsltPipe
+                name="ZaakNotFound_Exception"
+                getInputFromFixedValue="&lt;dummy/&gt;"
+                styleSheetName="Common/xsl/BuildError.xsl"
+                storeResultInSessionKey="Error"
+                >
+                <Param name="cause" sessionKey="Error" type="DOMDOC" />
+                <Param name="code" value="TechnicalError" /> 
+                <Param name="reason" pattern="No zaak with the identificatie:{Identificatie} is found in GetZgwZaak" ignoreUnresolvablePatternElements="true" />
+                <Param name="detailsXml" type="DOMDOC" />
+                <Forward name="success" path="EXCEPTION" />
+                <Forward name="exception" path="EXCEPTION" />
+            </XsltPipe>
+
             <SenderPipe
                 name="CallGetZaakTypeByZaak"
                 getInputFromSessionKey="originalMessage"

diff --git a/src/main/configurations/Translate/Configuration_AndereZaak.xml b/src/main/configurations/Translate/Configuration_AndereZaak.xml
@@ -23,10 +23,32 @@
                     returnedSessionKeys="Error">
                     <Param name="Identificatie" sessionKey="Identificatie"/>
                 </IbisLocalSender>
-                <Forward name="success" path="GetSingleZgwAndereZaakFromZgwZakenList"/>
+                <Forward name="success" path="ZaakNotFound_Condition"/>
                 <Forward name="exception" path="EXCEPTION" />
             </SenderPipe>
 
+            <XmlIfPipe
+                name="ZaakNotFound_Condition"
+                xpathExpression="string-length(ZgwZaken) = 0"
+                >
+                <Forward name="then" path="ZaakNotFound_Exception" />
+                <Forward name="else" path="GetSingleZgwAndereZaakFromZgwZakenList" />
+            </XmlIfPipe>
+
+            <XsltPipe
+                name="ZaakNotFound_Exception"
+                getInputFromFixedValue="&lt;dummy/&gt;"
+                styleSheetName="Common/xsl/BuildError.xsl"
+                storeResultInSessionKey="Error"
+                >
+                <Param name="cause" sessionKey="Error" type="DOMDOC" />
+                <Param name="code" value="TechnicalError" /> 
+                <Param name="reason" pattern="No zaak with the identificatie:{Identificatie} is found in GetZgwZaak" ignoreUnresolvablePatternElements="true" />
+                <Param name="detailsXml" type="DOMDOC" />
+                <Forward name="success" path="EXCEPTION" />
+                <Forward name="exception" path="EXCEPTION" />
+            </XsltPipe>
+
             <XsltPipe
                 name="GetSingleZgwAndereZaakFromZgwZakenList"
                 storeResultInSessionKey="ZgwAndereZaakResult"

diff --git a/src/main/configurations/Translate/Configuration_GeefLijstZaakdocumenten_Lv01.xml b/src/main/configurations/Translate/Configuration_GeefLijstZaakdocumenten_Lv01.xml
@@ -22,10 +22,18 @@
                     returnedSessionKeys="Error">
                     <Param name="Identificatie" sessionKey="ZaakIdentificatie"/>
                 </IbisLocalSender>
-                <Forward name="success" path="CallGetZaakInformatieObjectenByZaak"/>
+                <Forward name="success" path="ZaakNotFound_Condition" />
                 <Forward name="exception" path="EXCEPTION" />
             </SenderPipe>
 
+            <XmlIfPipe
+                name="ZaakNotFound_Condition"
+                xpathExpression="string-length(ZgwZaken) = 0"
+                >
+                <Forward name="then" path="EXIT" />
+                <Forward name="else" path="CallGetZaakInformatieObjectenByZaak" />
+            </XmlIfPipe>
+
             <SenderPipe
                 name="CallGetZaakInformatieObjectenByZaak"
                 storeResultInSessionKey="GetZaakInformatieObjectenResult">

diff --git a/src/main/configurations/Translate/Configuration_GeefZaakdetails_Lv01.xml b/src/main/configurations/Translate/Configuration_GeefZaakdetails_Lv01.xml
@@ -31,15 +31,16 @@
                     returnedSessionKeys="Error">
                     <Param name="Identificatie" xpathExpression="zakLv01/gelijk/identificatie"/>
                 </IbisLocalSender>
-                <Forward name="success" path="CheckForGetZgwZaakResult"/>
+                <Forward name="success" path="ZaakNotFound_Condition" />
                 <Forward name="exception" path="EXCEPTION" />
             </SenderPipe>
 
-            <XmlIfPipe name="CheckForGetZgwZaakResult"
-                xpathExpression="string-length(ZgwZaken) > 0"
+            <XmlIfPipe
+                name="ZaakNotFound_Condition"
+                xpathExpression="string-length(ZgwZaken) = 0"
                 >
-                <Forward name="then" path="GetSingleZgwZaakFromZgwZakenList"/>
-                <Forward name="else" path="EXCEPTION"/>
+                <Forward name="then" path="EXIT" />
+                <Forward name="else" path="GetSingleZgwZaakFromZgwZakenList" />
             </XmlIfPipe>
 
             <XsltPipe

diff --git a/src/main/configurations/Translate/Configuration_GetZaakDetailsByRol.xml b/src/main/configurations/Translate/Configuration_GetZaakDetailsByRol.xml
@@ -56,29 +56,51 @@
                         <Param name="ZgwRol" sessionKey="originalMessage" type="DOMDOC"/>
                     </Param>
                 </IbisLocalSender>
-                <Forward name="success" path="CallGetZgwZaak"/>
+                <Forward name="success" path="StoreZaakIdentificatie" />
                 <Forward name="exception" path="EXCEPTION" />
             </SenderPipe>
 
+            <PutInSessionPipe 
+                name="StoreZaakIdentificatie"
+                >
+                <Param name="Identificatie" xpathExpression="/ZgwZaak/identificatie" />
+                <Forward name="success" path="CallGetZgwZaak" />
+            </PutInSessionPipe>
+
             <SenderPipe
                 name="CallGetZgwZaak"
                 storeResultInSessionKey="GetZgwZaakResult">
                 <IbisLocalSender
                     name="CallGetZgwZaakSender"
                     javaListener="GetZgwZaak"
                     returnedSessionKeys="Error">
-                    <Param name="Identificatie" xpathExpression="/ZgwZaak/identificatie"/>
+                    <Param name="Identificatie" sessionKey="Identificatie" />
                 </IbisLocalSender>
-                <Forward name="success" path="CheckForGetZgwZaakResult"/>
+                <Forward name="success" path="ZaakNotFound_Condition" />
                 <Forward name="exception" path="EXCEPTION" />
             </SenderPipe>
 
-            <XmlIfPipe name="CheckForGetZgwZaakResult"
-                xpathExpression="string-length(ZgwZaken) > 0"
+            <XmlIfPipe
+                name="ZaakNotFound_Condition"
+                xpathExpression="string-length(ZgwZaken) = 0"
                 >
-                <Forward name="then" path="GetSingleZgwZaakFromZgwZakenList"/>
-                <Forward name="else" path="EXCEPTION"/>
+                <Forward name="then" path="ZaakNotFound_Exception" />
+                <Forward name="else" path="GetSingleZgwZaakFromZgwZakenList" />
             </XmlIfPipe>
+
+            <XsltPipe
+                name="ZaakNotFound_Exception"
+                getInputFromFixedValue="&lt;dummy/&gt;"
+                styleSheetName="Common/xsl/BuildError.xsl"
+                storeResultInSessionKey="Error"
+                >
+                <Param name="cause" sessionKey="Error" type="DOMDOC" />
+                <Param name="code" value="TechnicalError" /> 
+                <Param name="reason" pattern="No zaak with the identificatie:{Identificatie} is found in GetZgwZaak" ignoreUnresolvablePatternElements="true" />
+                <Param name="detailsXml" type="DOMDOC" />
+                <Forward name="success" path="EXCEPTION" />
+                <Forward name="exception" path="EXCEPTION" />
+            </XsltPipe>
 
             <XsltPipe
                 name="GetSingleZgwZaakFromZgwZakenList"

diff --git a/src/main/configurations/Translate/Configuration_GetZgwZaak.xml b/src/main/configurations/Translate/Configuration_GetZgwZaak.xml
@@ -57,27 +57,9 @@
             </XsltPipe>
 
             <JsonPipe name="JsonToXml">
-                <Forward name="success" path="checkCount"/>
+                <Forward name="success" path="UnwrapOpenZaakApiEnvelopeToList" />
             </JsonPipe>
 
-            <XmlIfPipe name="checkCount" xpathExpression="root/count = 0">
-                <Forward name="then" path="BuildErrorMessage" />
-                <Forward name="else" path="UnwrapOpenZaakApiEnvelopeToList" />
-            </XmlIfPipe>
-
-            <XsltPipe
-                name="BuildErrorMessage"
-                getInputFromFixedValue="&lt;dummy/&gt;"
-                styleSheetName="Common/xsl/BuildError.xsl"
-                storeResultInSessionKey="Error">
-                <Param name="cause" sessionKey="Error" type="DOMDOC" />
-                <Param name="code" value="TechnicalError" /> 
-                <Param name="reason" pattern="No zaak with the identificatie:{Identificatie} is found in GetZgwZaakByIdentificatie" />
-                <Param name="detailsXml" type="DOMDOC"/>
-                <Forward name="success" path="EXCEPTION" />
-                <Forward name="exception" path="EXCEPTION" />
-            </XsltPipe>
-
             <XsltPipe
                 name="UnwrapOpenZaakApiEnvelopeToList"
                 styleSheetName="Common/xsl/UnwrapOpenZaakApiEnvelopeToList.xslt"

diff --git a/src/main/configurations/Translate/Configuration_SoapEndpointRouter_BeantwoordVraag.xml b/src/main/configurations/Translate/Configuration_SoapEndpointRouter_BeantwoordVraag.xml
@@ -133,10 +133,18 @@
                     javaListener="GeefZaakdetails_Lv01"
                     returnedSessionKeys="Error">
                 </IbisLocalSender>
-                <Forward name="success" path="ReplaceNulls" />
+                <Forward name="success" path="CheckGeefZaakDetailsResult" />
                 <Forward name="exception" path="BackEndError" />
             </SenderPipe>
 
+            <XmlIfPipe
+                name="CheckGeefZaakDetailsResult" 
+                xpathExpression="string-length(/root) gt 0"
+                >
+                <Forward name="then" path="ReplaceNulls" />
+                <Forward name="else" path="WrapZakLa01Response" />
+            </XmlIfPipe>
+
             <XsltPipe
                 name="ReplaceNulls"
                 styleSheetName="Common/xsl/ReplaceNullStringWithXmlNull.xslt"

diff --git a/src/main/configurations/Translate/Configuration_UpdateZaak_LK01.xml b/src/main/configurations/Translate/Configuration_UpdateZaak_LK01.xml
@@ -13,6 +13,13 @@
                 <Exit name="EXCEPTION" state="ERROR"/>
             </Exits>
 
+            <PutInSessionPipe 
+                name="StoreZaakIdentificatie"
+                >
+                <Param name="Identificatie" xpathExpression="/zakLk01/object[1]/identificatie" />
+                <Forward name="success" path="CallGetZgwZaak" />
+            </PutInSessionPipe>
+
             <!-- Retrieve was zgwZaak -->
             <SenderPipe
                 name="CallGetZgwZaak"
@@ -21,18 +28,33 @@
                     name="CallGetZgwZaakSender"
                     javaListener="GetZgwZaak"
                     returnedSessionKeys="Error">
-                    <Param name="Identificatie" xpathExpression="/zakLk01/object[1]/identificatie"/>
+                    <Param name="Identificatie" sessionKey="Identificatie" />
                 </IbisLocalSender>
-                <Forward name="success" path="CheckForGetZgwZaakResult"/>
+                <Forward name="success" path="ZaakNotFound_Condition" />
                 <Forward name="exception" path="UncaughtException" />
             </SenderPipe>
 
-            <XmlIfPipe name="CheckForGetZgwZaakResult"
-                xpathExpression="string-length(ZgwZaken) > 0"
+            <XmlIfPipe
+                name="ZaakNotFound_Condition"
+                xpathExpression="string-length(ZgwZaken) = 0"
                 >
-                <Forward name="then" path="GetSingleZgwZaakFromZgwZakenList"/>
-                <Forward name="else" path="UncaughtException"/>
+                <Forward name="then" path="ZaakNotFound_Exception" />
+                <Forward name="else" path="GetSingleZgwZaakFromZgwZakenList" />
             </XmlIfPipe>
+
+            <XsltPipe
+                name="ZaakNotFound_Exception"
+                getInputFromFixedValue="&lt;dummy/&gt;"
+                styleSheetName="Common/xsl/BuildError.xsl"
+                storeResultInSessionKey="Error"
+                >
+                <Param name="cause" sessionKey="Error" type="DOMDOC" />
+                <Param name="code" value="TechnicalError" /> 
+                <Param name="reason" pattern="No zaak with the identificatie:{Identificatie} is found in GetZgwZaak" ignoreUnresolvablePatternElements="true" />
+                <Param name="detailsXml" type="DOMDOC" />
+                <Forward name="success" path="EXCEPTION" />
+                <Forward name="exception" path="EXCEPTION" />
+            </XsltPipe>
 
             <XsltPipe
                 name="GetSingleZgwZaakFromZgwZakenList"

diff --git a/src/main/configurations/Translate/Configuration_VoegZaakdocumentToe_Lk01.xml b/src/main/configurations/Translate/Configuration_VoegZaakdocumentToe_Lk01.xml
@@ -16,30 +16,53 @@
             <PutInSessionPipe 
                 name="StoreZdsZaakDocumentInhoud">
                 <Param name="ZdsZaakDocumentInhoud" xpathExpression="edcLk01/object[1]" type="DOMDOC"/>
-                <Forward name="success" path="CallGetZgwZaak" />
+                <Forward name="success" path="StoreZaakIdentificatie" />
             </PutInSessionPipe>
             <!-- <EchoPipe name="StoreDocumentData" elementToMove="inhoud" getInputFromSessionKey="ZdsZaakDocumentInhoud" storeResultInSessionKey="ZdsZaakDocumentInhoudDataRef">
                 <Forward name="success" path="CallGetZgwZaak" />
             </EchoPipe> -->
+
+            <PutInSessionPipe 
+                name="StoreZaakIdentificatie"
+                getInputFromSessionKey="ZdsZaakDocumentInhoud"
+                >
+                <Param name="Identificatie" xpathExpression="object/isRelevantVoor/gerelateerde/identificatie" />
+                <Forward name="success" path="CallGetZgwZaak" />
+            </PutInSessionPipe>
+
             <SenderPipe
-                name="CallGetZgwZaak"
-                getInputFromSessionKey="ZdsZaakDocumentInhoud">
+                name="CallGetZgwZaak">
                 <IbisLocalSender
                     name="CallGetZgwZaakSender"
                     javaListener="GetZgwZaak"
                     returnedSessionKeys="Error">
-                    <Param name="Identificatie" xpathExpression="object/isRelevantVoor/gerelateerde/identificatie"/>
+                    <Param name="Identificatie" sessionKey="Identificatie" />
                 </IbisLocalSender>
-                <Forward name="success" path="CheckForGetZgwZaakResult"/>
+                <Forward name="success" path="ZaakNotFound_Condition" />
                 <Forward name="exception" path="UncaughtException" />
             </SenderPipe>
 
-            <XmlIfPipe name="CheckForGetZgwZaakResult"
-                xpathExpression="string-length(ZgwZaken) > 0"
+            <XmlIfPipe
+                name="ZaakNotFound_Condition"
+                xpathExpression="string-length(ZgwZaken) = 0"
                 >
-                <Forward name="then" path="GetSingleZgwZaakFromZgwZakenList"/>
-                <Forward name="else" path="UncaughtException"/>
+                <Forward name="then" path="ZaakNotFound_Exception" />
+                <Forward name="else" path="GetSingleZgwZaakFromZgwZakenList" />
             </XmlIfPipe>
+
+            <XsltPipe
+                name="ZaakNotFound_Exception"
+                getInputFromFixedValue="&lt;dummy/&gt;"
+                styleSheetName="Common/xsl/BuildError.xsl"
+                storeResultInSessionKey="Error"
+                >
+                <Param name="cause" sessionKey="Error" type="DOMDOC" />
+                <Param name="code" value="TechnicalError" /> 
+                <Param name="reason" pattern="No zaak with the identificatie:{Identificatie} is found in GetZgwZaak" ignoreUnresolvablePatternElements="true" />
+                <Param name="detailsXml" type="DOMDOC"/>
+                <Forward name="success" path="EXCEPTION" />
+                <Forward name="exception" path="EXCEPTION" />
+            </XsltPipe>
 
             <XsltPipe
                 name="GetSingleZgwZaakFromZgwZakenList"

diff --git a/src/main/resources/BuildInfo.properties b/src/main/resources/BuildInfo.properties
@@ -1,2 +1,2 @@
-instance.version=1.19.8
-versionDate_ddmmyyyy=21/06/2024
+instance.version=1.19.9
+versionDate_ddmmyyyy=25/06/2024