Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: geefLijstZaakdocumenten should not return an error response when the zaak can't be found #395

Merged
merged 7 commits into from
Jun 25, 2024
Merged

fix: geefLijstZaakdocumenten should not return an error response when the zaak can't be found #395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b18691b
geefLijstZaakDocumenten and geefZaakDetails don't return error but re…
Jun 18, 2024
5fd4944
update other adapters using getZgwZaak adapter. These adapters will g…
Jun 18, 2024
932e72e
testCase added to test if there is no error and object element is emp…
Jun 18, 2024
22ae7b2
Merge branch 'master' into GT-1189-ReturnNoErrorForGeefLijstZaakdocum…
Jun 20, 2024
d97bb01
Merge branch 'master' into GT-1189-ReturnNoErrorForGeefLijstZaakdocum…
Jun 21, 2024
6ac78e3
Merge branch 'master' into GT-1189-ReturnNoErrorForGeefLijstZaakdocum…
Jun 21, 2024
ed5d474
small style edits
MLenterman Jun 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
311 changes: 311 additions & 0 deletions e2e/SoapUI/zaakbrug-e2e-soapui-project.xml
View file
Open in desktop

Large diffs are not rendered by default.

275 changes: 141 additions & 134 deletions src/main/configurations/Translate/Common/xsl/CreateZakLa01Response.xslt
View file
Open in desktop

Large diffs are not rendered by default.

35 changes: 32 additions & 3 deletions src/main/configurations/Translate/Configuration_ActualiseerZaakStatus.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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"
Expand Down
24 changes: 23 additions & 1 deletion src/main/configurations/Translate/Configuration_AndereZaak.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
10 changes: 9 additions & 1 deletion src/main/configurations/Translate/Configuration_GeefLijstZaakdocumenten_Lv01.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
11 changes: 6 additions & 5 deletions src/main/configurations/Translate/Configuration_GeefZaakdetails_Lv01.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
36 changes: 29 additions & 7 deletions src/main/configurations/Translate/Configuration_GetZaakDetailsByRol.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
20 changes: 1 addition & 19 deletions src/main/configurations/Translate/Configuration_GetZgwZaak.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,27 +63,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"
Expand Down
10 changes: 9 additions & 1 deletion src/main/configurations/Translate/Configuration_SoapEndpointRouter_BeantwoordVraag.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
34 changes: 28 additions & 6 deletions src/main/configurations/Translate/Configuration_UpdateZaak_LK01.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
41 changes: 32 additions & 9 deletions src/main/configurations/Translate/Configuration_VoegZaakdocumentToe_Lk01.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading