From 5f10200a7157e031d2ce3df59cfc5667a86f742b Mon Sep 17 00:00:00 2001
From: DelanoWAF <Delano@Wearefrank.nl>
Date: Wed, 16 Oct 2024 16:40:31 +0200
Subject: [PATCH 1/8] feat: return resultaat values

---
 .../Translate/Common/xsl/AddResultaat.xsl     | 18 ++++++
 .../Configuration_GetZdsZaakFromZgw.xml       | 56 ++++++++++++++++++-
 .../geefZaakdetails_Lv01/xsl/AddResultaat.xsl | 23 ++++++++
 3 files changed, 96 insertions(+), 1 deletion(-)
 create mode 100644 src/main/configurations/Translate/Common/xsl/AddResultaat.xsl
 create mode 100644 src/main/configurations/Translate/geefZaakdetails_Lv01/xsl/AddResultaat.xsl

diff --git a/src/main/configurations/Translate/Common/xsl/AddResultaat.xsl b/src/main/configurations/Translate/Common/xsl/AddResultaat.xsl
new file mode 100644
index 000000000..19d709d02
--- /dev/null
+++ b/src/main/configurations/Translate/Common/xsl/AddResultaat.xsl
@@ -0,0 +1,18 @@
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xs="http://www.w3.org/2001/XMLSchema" version="2.0">
+    <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes" omit-xml-declaration="yes"/>
+    <xsl:param name="code" select="'TechnicalError'" as="xs:string" />
+    <xsl:param name="reason" select="'Undefined error'" as="xs:string" />
+    <xsl:param name="cause" as="node()?" />
+    <xsl:param name="details" select="''" as="xs:string" />
+    <xsl:param name="detailsXml" as="node()?" />
+    
+    <xsl:template match="/">
+        <error>
+            <cause><xsl:copy-of select="$cause" /></cause>
+            <code><xsl:value-of select="$code" /></code>
+            <reason><xsl:value-of select="$reason" /></reason>
+            <details><xsl:value-of select="$details" /></details>
+            <detailsXml><xsl:copy-of select="$detailsXml"/></detailsXml>
+        </error>
+    </xsl:template>
+</xsl:stylesheet>
diff --git a/src/main/configurations/Translate/Configuration_GetZdsZaakFromZgw.xml b/src/main/configurations/Translate/Configuration_GetZdsZaakFromZgw.xml
index 5e8cf79b5..d1efb7005 100644
--- a/src/main/configurations/Translate/Configuration_GetZdsZaakFromZgw.xml
+++ b/src/main/configurations/Translate/Configuration_GetZdsZaakFromZgw.xml
@@ -250,10 +250,64 @@
                 styleSheetName="Common/xsl/EnrichEntity_ForEachPipeWrapped.xslt"
                 >
                 <Param name="With" sessionKey="ZdsHeeft" type="DOMDOC"/>
-                <Forward name="success" path="EXIT"/>
+                <Forward name="success" path="ResultaatExists"/>
                 <Forward name="error" path="EXCEPTION"/>
             </XsltPipe>
+
+            <XmlIfPipe name="ResultaatExists" getInputFromSessionKey="originalMessage" xpathExpression="//resultaat != ''">
+                <Forward name="then" path="GetAuthorizationHeaderForZakenApi" />
+                <Forward name="else" path="ReturnZdsZaak" />
+            </XmlIfPipe>
+
+            <EchoPipe name="ReturnZdsZaak" getInputFromSessionKey="ZdsZaak">
+                <Forward name="success" path="EXIT" />
+                <Forward name="exception" path="EXCEPTION" />
+            </EchoPipe>
             
+            <SenderPipe name="GetAuthorizationHeaderForZakenApi"
+                getInputFromFixedValue="&lt;dummy/&gt;" storeResultInSessionKey="Authorization">
+                <IbisLocalSender
+                    name="GetAuthorizationHeaderForZakenApiSender"
+                    javaListener="GenerateAuthorizationHeaderForZakenApi"
+                    returnedSessionKeys="Error,Authorization">
+                </IbisLocalSender>
+                <Forward name="success" path="GetResultaatSender" />
+                <Forward name="exception" path="EXCEPTION" />
+            </SenderPipe>
+
+            <SenderPipe
+                name="GetResultaatSender"
+                getInputFromSessionKey="originalMessage"
+            >
+                <HttpSender
+                    name="GetResultaatSender"
+                    methodType="GET"
+                    headersParams="Authorization,Accept-Crs"
+                    timeout="${zaakbrug.zgw.zaken-api.timeout}"
+                    maxExecuteRetries="5"
+                />
+                <Param name="url" sessionKey="ZgwZaak"
+                    xpathExpression="//resultaat"
+                    />
+                <Param name="Accept-Crs" value="EPSG:4326" />
+                <Param name="Authorization"  xpathExpression="concat('Bearer ', $token)">
+                    <Param name="token" sessionKey="Authorization"/>
+                </Param>
+                <Forward name="success" path="Json2XML" />
+                <Forward name="exception" path="EXCEPTION" />
+            </SenderPipe>
+
+            <JsonPipe name="Json2XML" storeResultInSessionKey="Resultaat"/>
+
+            <XsltPipe name="EnrichZdsZaakWithResultaat"
+                getInputFromSessionKey="ZdsZaak"
+                storeResultInSessionKey="ZdsZaak"
+                styleSheetName="geefZaakdetails_Lv01/xsl/AddResultaat.xsl"
+                >
+                <Param name="Resultaat" sessionKey="Resultaat" type="DOMDOC"/>
+                <Forward name="success" path="EXIT"/>
+                <Forward name="error" path="EXCEPTION"/>
+            </XsltPipe>
         </Pipeline>
     </Adapter>
 </Module>
\ No newline at end of file
diff --git a/src/main/configurations/Translate/geefZaakdetails_Lv01/xsl/AddResultaat.xsl b/src/main/configurations/Translate/geefZaakdetails_Lv01/xsl/AddResultaat.xsl
new file mode 100644
index 000000000..1dc51027b
--- /dev/null
+++ b/src/main/configurations/Translate/geefZaakdetails_Lv01/xsl/AddResultaat.xsl
@@ -0,0 +1,23 @@
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:ZKN="http://www.egem.nl/StUF/sector/zkn/0310">
+    <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes" omit-xml-declaration="yes" />
+    <xsl:param name="Resultaat" />
+
+    <xsl:template match="@* | node()">
+        <xsl:copy>
+            <xsl:apply-templates select="@* | node()" />
+        </xsl:copy>
+    </xsl:template>
+
+    <xsl:template match="ZKN:startdatum">
+        <ZKN:resultaat>
+            <ZKN:omschrijving>
+                <xsl:value-of select="$Resultaat/root/toelichting" />
+            </ZKN:omschrijving>
+        </ZKN:resultaat>
+        <xsl:copy>
+            <xsl:apply-templates select="@* | node()" />
+        </xsl:copy>
+    </xsl:template>
+
+</xsl:stylesheet>
\ No newline at end of file

From 3b586f55ca7ad203b031bb4e901a584fa653e74b Mon Sep 17 00:00:00 2001
From: DelanoWAF <Delano@Wearefrank.nl>
Date: Wed, 16 Oct 2024 16:41:15 +0200
Subject: [PATCH 2/8] test: update tests

---
 e2e/SoapUI/zaakbrug-e2e-soapui-project.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/e2e/SoapUI/zaakbrug-e2e-soapui-project.xml b/e2e/SoapUI/zaakbrug-e2e-soapui-project.xml
index bac235844..383089d8e 100644
--- a/e2e/SoapUI/zaakbrug-e2e-soapui-project.xml
+++ b/e2e/SoapUI/zaakbrug-e2e-soapui-project.xml
@@ -8177,6 +8177,9 @@ testRunner.testCase.getTestStepByName("Properties").setPropertyValue('DocumentBa
       <ZKN:kenmerk>273846</ZKN:kenmerk>
       <ZKN:bron>GWS4all</ZKN:bron>
     </ZKN:kenmerk>
+    <ZKN:resultaat>
+            <ZKN:omschrijving>Buiten behandeling g</ZKN:omschrijving>
+    </ZKN:resultaat>
     <ZKN:startdatum>*</ZKN:startdatum>
     <ZKN:registratiedatum>*</ZKN:registratiedatum>
     <ZKN:einddatumGepland>*</ZKN:einddatumGepland>
@@ -16846,6 +16849,9 @@ testRunner.testCase.getTestStepByName("Properties").setPropertyValue( 'JwtToken'
     <ZKN:identificatie>*</ZKN:identificatie>
     <ZKN:omschrijving>Dossiernummer GISVG OV*</ZKN:omschrijving>
     <ZKN:toelichting>Reguliere omgevingsvergunning</ZKN:toelichting>
+    <ZKN:resultaat>
+        <ZKN:omschrijving>Vergunningvrij</ZKN:omschrijving>
+    </ZKN:resultaat>
     <ZKN:startdatum>*</ZKN:startdatum>
     <ZKN:registratiedatum>*</ZKN:registratiedatum>
     <ZKN:einddatum>*</ZKN:einddatum>
@@ -18235,6 +18241,9 @@ testRunner.testCase.getTestStepByName("Properties").setPropertyValue( 'JwtToken'
     <ZKN:identificatie>*</ZKN:identificatie>
     <ZKN:omschrijving>Dossiernummer GISVG OV*</ZKN:omschrijving>
     <ZKN:toelichting>Reguliere omgevingsvergunning</ZKN:toelichting>
+    <ZKN:resultaat>
+       <ZKN:omschrijving>Vergunningvrij</ZKN:omschrijving>
+    </ZKN:resultaat>
     <ZKN:startdatum>*</ZKN:startdatum>
     <ZKN:registratiedatum>*</ZKN:registratiedatum>
     <ZKN:einddatum>*</ZKN:einddatum>
@@ -29264,6 +29273,9 @@ testRunner.testCase.getTestStepByName("Properties").setPropertyValue('DocumentBa
   <ZKN:object StUF:entiteittype="ZAK">
     <ZKN:identificatie>*</ZKN:identificatie>
     <ZKN:omschrijving>Belangrijke gebeurtenissen</ZKN:omschrijving>
+    <ZKN:resultaat>
+       <ZKN:omschrijving>Afgehandeld</ZKN:omschrijving>
+    </ZKN:resultaat>
     <ZKN:startdatum>*</ZKN:startdatum>
     <ZKN:registratiedatum>*</ZKN:registratiedatum>
     <ZKN:einddatum>*</ZKN:einddatum>

From 742f13eac97813ae42daea40725c68ac2cfdc881 Mon Sep 17 00:00:00 2001
From: DelanoWAF <Delano@Wearefrank.nl>
Date: Tue, 22 Oct 2024 13:25:18 +0200
Subject: [PATCH 3/8] refactor: remove excess echopipe

---
 .../Translate/Configuration_GetZdsZaakFromZgw.xml          | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/main/configurations/Translate/Configuration_GetZdsZaakFromZgw.xml b/src/main/configurations/Translate/Configuration_GetZdsZaakFromZgw.xml
index d1efb7005..2ca102810 100644
--- a/src/main/configurations/Translate/Configuration_GetZdsZaakFromZgw.xml
+++ b/src/main/configurations/Translate/Configuration_GetZdsZaakFromZgw.xml
@@ -256,13 +256,8 @@
 
             <XmlIfPipe name="ResultaatExists" getInputFromSessionKey="originalMessage" xpathExpression="//resultaat != ''">
                 <Forward name="then" path="GetAuthorizationHeaderForZakenApi" />
-                <Forward name="else" path="ReturnZdsZaak" />
+                <Forward name="else" path="EXIT" />
             </XmlIfPipe>
-
-            <EchoPipe name="ReturnZdsZaak" getInputFromSessionKey="ZdsZaak">
-                <Forward name="success" path="EXIT" />
-                <Forward name="exception" path="EXCEPTION" />
-            </EchoPipe>
             
             <SenderPipe name="GetAuthorizationHeaderForZakenApi"
                 getInputFromFixedValue="&lt;dummy/&gt;" storeResultInSessionKey="Authorization">

From eaaea22c3f9befcad6085b7e0fcd5b387124c3be Mon Sep 17 00:00:00 2001
From: DelanoWAF <Delano@Wearefrank.nl>
Date: Wed, 30 Oct 2024 15:45:13 +0100
Subject: [PATCH 4/8] test: update tests

---
 ...nfiguration_Zaken_GetZgwResultaatByUrl.xml | 62 +++++++++++++++++
 ...uration_Zaken_GetZgwResultaatTypeByUrl.xml | 67 +++++++++++++++++++
 2 files changed, 129 insertions(+)
 create mode 100644 src/main/configurations/Translate/Configuration_Zaken_GetZgwResultaatByUrl.xml
 create mode 100644 src/main/configurations/Translate/Configuration_Zaken_GetZgwResultaatTypeByUrl.xml

diff --git a/src/main/configurations/Translate/Configuration_Zaken_GetZgwResultaatByUrl.xml b/src/main/configurations/Translate/Configuration_Zaken_GetZgwResultaatByUrl.xml
new file mode 100644
index 000000000..ff085a4a7
--- /dev/null
+++ b/src/main/configurations/Translate/Configuration_Zaken_GetZgwResultaatByUrl.xml
@@ -0,0 +1,62 @@
+<Module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="../FrankConfig.xsd">
+    <Adapter name="Zaken_GetZgwResultaatByUrl"
+        active="${Zaken_GetZgwResultaatByUrl.Active}"
+        description="">
+
+        <Receiver name="Zaken_GetZgwResultaatByUrl">
+            <JavaListener name="Zaken_GetZgwResultaatByUrl" returnedSessionKeys="Error" />
+        </Receiver>
+
+        <Pipeline>
+            <Exits>
+                <Exit name="EXIT" state="SUCCESS" />
+                <Exit name="EXCEPTION" state="ERROR" />
+            </Exits>
+
+            <SenderPipe name="GetAuthorizationHeaderForZakenApi"
+                getInputFromFixedValue="&lt;dummy/&gt;">
+                <IbisLocalSender
+                    name="GetAuthorizationHeaderForZakenApiSender"
+                    javaListener="GenerateAuthorizationHeaderForZakenApi"
+                    returnedSessionKeys="Error,Authorization">
+                </IbisLocalSender>
+                <Forward name="success" path="GetZgwResultaatByUrlSender" />
+                <Forward name="exception" path="ErrorJsonToXml" />
+            </SenderPipe>
+
+
+            <SenderPipe
+                name="GetZgwResultaatByUrlSender"
+                getInputFromFixedValue="&lt;dummy/&gt;">
+                <HttpSender
+                    name="GetZgwResultaatByUrlHttpSender"
+                    methodType="GET"
+                    headersParams="Authorization,Accept-Crs"
+                    timeout="${zaakbrug.zgw.zaken-api.timeout}"
+                    maxExecuteRetries="5"
+                />
+                <Param name="url" sessionKey="url" />
+                <Param name="Accept-Crs" value="EPSG:4326" />
+                <Param name="Authorization" sessionKey="Authorization" />
+                <Forward name="success" path="JsonToXml" />
+                <Forward name="exception" path="ErrorJsonToXml" />
+            </SenderPipe>
+
+
+            <JsonPipe name="ErrorJsonToXml">
+                <Forward name="success" path="buildErrorMsg" />
+            </JsonPipe>
+            <XsltPipe name="buildErrorMsg"
+                styleSheetName="Common/xsl/ParseNegativeHttpResult.xsl">
+                <Param name="senderPipeName" value="GetZgwRolTypeByUrlSender" />
+                <Forward name="success" path="EXCEPTION" />
+            </XsltPipe>
+
+            <JsonPipe
+                name="JsonToXml">
+                <Forward name="success" path="EXIT" />
+            </JsonPipe>
+        </Pipeline>
+    </Adapter>
+</Module>
\ No newline at end of file
diff --git a/src/main/configurations/Translate/Configuration_Zaken_GetZgwResultaatTypeByUrl.xml b/src/main/configurations/Translate/Configuration_Zaken_GetZgwResultaatTypeByUrl.xml
new file mode 100644
index 000000000..5b94bdb72
--- /dev/null
+++ b/src/main/configurations/Translate/Configuration_Zaken_GetZgwResultaatTypeByUrl.xml
@@ -0,0 +1,67 @@
+<Module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../FrankConfig.xsd">
+    <Adapter name="Zaken_GetZgwResultaatTypeByUrl"
+        active="${Zaken_GetZgwResultaatTypeByUrl.Active}"
+        description="">
+
+        <Receiver name="Zaken_GetZgwResultaatTypeByUrl">
+            <JavaListener name="Zaken_GetZgwResultaatTypeByUrl" returnedSessionKeys="Error" />
+        </Receiver>
+
+        <Pipeline>
+            <Exits>
+                <Exit name="EXIT" state="SUCCESS"/>
+                <Exit name="EXCEPTION" state="ERROR"/>
+            </Exits>
+
+            <SenderPipe name="GetAuthorizationHeaderForCatalogiApi"
+                getInputFromFixedValue="&lt;dummy/&gt;">
+                <IbisLocalSender
+                    name="GetAuthorizationHeaderForCatalogiApiSender"
+                    javaListener="GenerateAuthorizationHeaderForCatalogiApi"
+                    returnedSessionKeys="Error,Authorization">
+                </IbisLocalSender>
+                <Forward name="success" path="GetZgwResultaatTypeByUrlSender" />
+                <Forward name="exception" path="EXCEPTION" />
+            </SenderPipe>
+
+			<SenderPipe 
+                name="GetZgwResultaatTypeByUrlSender"
+                getInputFromFixedValue="&lt;dummy/&gt;">
+				<HttpSender 
+					name="GetZgwResultaatTypeByUrlHttpSender" 
+					methodType="GET"
+					headersParams="Authorization,Accept-Crs"
+                    timeout="${zaakbrug.zgw.catalogi-api.timeout}"
+                    maxExecuteRetries="5"
+				/>
+                <Param name="url" sessionKey="url" />
+                <Param name="Accept-Crs" value="EPSG:4326"/>
+                <Param name="Authorization"  sessionKey="Authorization" />
+                <Forward name="success" path="JsonToXml" />
+                <Forward name="exception" path="ErrorJsonToXml" />
+			</SenderPipe>
+            <JsonPipe name="ErrorJsonToXml">
+                <Forward name="success" path="buildErrorMsg" />
+            </JsonPipe>
+            <XsltPipe name="buildErrorMsg"
+                styleSheetName="Common/xsl/ParseNegativeHttpResult.xsl">
+                <Param name="senderPipeName" value="GetZgwResultaatTypeByUrlSender" />
+                <Forward name="success" path="EXCEPTION" />
+            </XsltPipe>
+
+            <JsonPipe 
+                name="JsonToXml">
+                <Forward name="success" path="UnwrapOpenZaakApiEnvelopeToSingle"/>
+            </JsonPipe>
+
+            <XsltPipe
+                name="UnwrapOpenZaakApiEnvelopeToSingle"
+                styleSheetName="Common/xsl/UnwrapOpenZaakApiEnvelopeToSingle.xslt"
+                >
+                <Param name="Type" value="ZgwRolType"/>
+                <Forward name="success" path="EXIT"/>
+                <Forward name="error" path="EXCEPTION"/>
+            </XsltPipe>
+        </Pipeline>
+    </Adapter>
+</Module>
\ No newline at end of file

From 2e96321dc1c646db47960cdf64556d54fce2b8f5 Mon Sep 17 00:00:00 2001
From: DelanoWAF <Delano@Wearefrank.nl>
Date: Wed, 30 Oct 2024 15:45:59 +0100
Subject: [PATCH 5/8] refactor: move resultaat xslt to existing file

---
 .../Translate/Common/xsl/AddResultaat.xsl      | 18 ------------------
 .../Common/xsl/GetZdsZaakFromZgwZaak.xslt      | 12 +++++++++++-
 2 files changed, 11 insertions(+), 19 deletions(-)
 delete mode 100644 src/main/configurations/Translate/Common/xsl/AddResultaat.xsl

diff --git a/src/main/configurations/Translate/Common/xsl/AddResultaat.xsl b/src/main/configurations/Translate/Common/xsl/AddResultaat.xsl
deleted file mode 100644
index 19d709d02..000000000
--- a/src/main/configurations/Translate/Common/xsl/AddResultaat.xsl
+++ /dev/null
@@ -1,18 +0,0 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xs="http://www.w3.org/2001/XMLSchema" version="2.0">
-    <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes" omit-xml-declaration="yes"/>
-    <xsl:param name="code" select="'TechnicalError'" as="xs:string" />
-    <xsl:param name="reason" select="'Undefined error'" as="xs:string" />
-    <xsl:param name="cause" as="node()?" />
-    <xsl:param name="details" select="''" as="xs:string" />
-    <xsl:param name="detailsXml" as="node()?" />
-    
-    <xsl:template match="/">
-        <error>
-            <cause><xsl:copy-of select="$cause" /></cause>
-            <code><xsl:value-of select="$code" /></code>
-            <reason><xsl:value-of select="$reason" /></reason>
-            <details><xsl:value-of select="$details" /></details>
-            <detailsXml><xsl:copy-of select="$detailsXml"/></detailsXml>
-        </error>
-    </xsl:template>
-</xsl:stylesheet>
diff --git a/src/main/configurations/Translate/Common/xsl/GetZdsZaakFromZgwZaak.xslt b/src/main/configurations/Translate/Common/xsl/GetZdsZaakFromZgwZaak.xslt
index b695eafd7..72e7430a0 100644
--- a/src/main/configurations/Translate/Common/xsl/GetZdsZaakFromZgwZaak.xslt
+++ b/src/main/configurations/Translate/Common/xsl/GetZdsZaakFromZgwZaak.xslt
@@ -1,6 +1,8 @@
 <xsl:stylesheet exclude-result-prefixes="#all" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:zgw="http://google.com/zgw" xmlns:StUF="http://www.egem.nl/StUF/StUF0301" xmlns:ZKN="http://www.egem.nl/StUF/sector/zkn/0310" xmlns:BG="http://www.egem.nl/StUF/sector/bg/0310" version="2.0">
     <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes" omit-xml-declaration="yes" />
     <xsl:param name="ZgwZaak"/>
+    <xsl:param name="Resultaat"/>
+    <xsl:param name="ResultaatType"/>
     <xsl:param name="ExtraElementen" as="node()?"><StUF:extraElementen/></xsl:param>
 
     <xsl:function name="zgw:convertZdsDateToZgwDate" as="xs:string">
@@ -41,7 +43,15 @@
             </xsl:if>
             <xsl:apply-templates select="$ZgwZaak/ZgwZaak/kenmerken" />
             <!-- anderZaakObject -->
-            <!-- resultaat -->
+            <xsl:if test="$Resultaat/root/toelichting != ''">
+                <ZKN:resultaat>
+                    <ZKN:omschrijving>
+                        <xsl:value-of select="$ResultaatType/ZgwRolType/omschrijving" />
+                    </ZKN:omschrijving>
+                    <ZKN:toelichting>
+                        <xsl:value-of select="$Resultaat/root/toelichting" />
+                    </ZKN:toelichting>
+                </ZKN:resultaat>            </xsl:if>
             <xsl:if test="$ZgwZaak/ZgwZaak/startdatum != ''">
                 <ZKN:startdatum><xsl:value-of select="zgw:convertZdsDateToZgwDate($ZgwZaak/ZgwZaak/startdatum)" /></ZKN:startdatum>
             </xsl:if>

From 38f8d87affecc009d72767d16da1a91bf5251cc6 Mon Sep 17 00:00:00 2001
From: DelanoWAF <Delano@Wearefrank.nl>
Date: Wed, 30 Oct 2024 15:46:38 +0100
Subject: [PATCH 6/8] refactor: split into multiple configs

---
 src/main/configurations/Translate/Configuration.xml           | 4 ++++
 .../configurations/Translate/DeploymentSpecifics.properties   | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/src/main/configurations/Translate/Configuration.xml b/src/main/configurations/Translate/Configuration.xml
index b8306e29c..dbeb23cf1 100644
--- a/src/main/configurations/Translate/Configuration.xml
+++ b/src/main/configurations/Translate/Configuration.xml
@@ -47,6 +47,8 @@
   <!ENTITY GetZgwZaakByUrl                                SYSTEM "./Configuration_GetZgwZaakByUrl.xml">
   <!ENTITY GetZgwZaakInformatieObjectByEnkelvoudigInformatieObjectUrl      SYSTEM "./Configuration_GetZgwZaakInformatieObjectByEnkelvoudigInformatieObjectUrl.xml">
   <!ENTITY GetZgwZaakTypeByIdentificatie                  SYSTEM "./Configuration_GetZgwZaakTypeByIdentificatie.xml">
+  <!ENTITY GetZgwResultaatByUrl                           SYSTEM "./Configuration_Zaken_GetZgwResultaatByUrl.xml">
+  <!ENTITY GetZgwResultaatTypeByUrl                       SYSTEM "./Configuration_Zaken_GetZgwResultaatTypeByUrl.xml">
   <!ENTITY HandleZgwZaakInformatieObjecten                SYSTEM "./Configuration_HandleZgwZaakInformatieObjecten.xml">
   <!ENTITY ImportFromLocalFS                              SYSTEM "./Configuration_ImportFromLocalFS.xml"> 
   <!ENTITY ApplyTranslationProfileValueOverrides     SYSTEM "./Configuration_ApplyTranslationProfileValueOverrides.xml"> 
@@ -127,6 +129,8 @@
   &GetZgwZaakByUrl;
   &GetZgwZaakInformatieObjectByEnkelvoudigInformatieObjectUrl;
   &GetZgwZaakTypeByIdentificatie;
+  &GetZgwResultaatByUrl;
+  &GetZgwResultaatTypeByUrl;
   &HandleZgwZaakInformatieObjecten;
   &ImportFromLocalFS;
   &ApplyTranslationProfileValueOverrides;
diff --git a/src/main/configurations/Translate/DeploymentSpecifics.properties b/src/main/configurations/Translate/DeploymentSpecifics.properties
index b8c050712..3f3d81357 100644
--- a/src/main/configurations/Translate/DeploymentSpecifics.properties
+++ b/src/main/configurations/Translate/DeploymentSpecifics.properties
@@ -50,6 +50,8 @@ GetZgwInformatieObjectUnlock.Active=true
 GetZgwRolesByZaakUrl.Active=true
 Zaken_GetZgwRolTypeByUrl.Active=true
 Zaken_GetZgwRolTypeByZaakType.Active=true
+Zaken_GetZgwResultaatByUrl.Active=true
+Zaken_GetZgwResultaatTypeByUrl.Active=true
 GetZgwStatusTypeByUrl.Active=true
 GetZgwZaak.Active=true
 GetZgwZaakByUrl.Active=true

From cf108f30e30b1fb087483fb83397192669424655 Mon Sep 17 00:00:00 2001
From: DelanoWAF <Delano@Wearefrank.nl>
Date: Wed, 30 Oct 2024 15:47:16 +0100
Subject: [PATCH 7/8] refactor: relocate pipes

---
 .../Configuration_GetZdsZaakFromZgw.xml       | 76 ++++++-------------
 1 file changed, 23 insertions(+), 53 deletions(-)

diff --git a/src/main/configurations/Translate/Configuration_GetZdsZaakFromZgw.xml b/src/main/configurations/Translate/Configuration_GetZdsZaakFromZgw.xml
index 5b81bda8c..ad57ba2ec 100644
--- a/src/main/configurations/Translate/Configuration_GetZdsZaakFromZgw.xml
+++ b/src/main/configurations/Translate/Configuration_GetZdsZaakFromZgw.xml
@@ -26,15 +26,35 @@
                     <Param name="zaaktype" sessionKey="ZgwZaakType" xpathExpression="/ZgwZaakType/identificatie" />
                     <Param name="valueOverrideKeyRoot" value="zgw.zaken-api.zaken.ZgwZaak" />
                 </IbisLocalSender>
-                <Forward name="success" path="MapZdsZaakFromZgwZaak" />
+                <Forward name="success" path="ResultaatExists" />
             </SenderPipe>
 
-            <XsltPipe name="MapZdsZaakFromZgwZaak"
+            <XmlIfPipe name="ResultaatExists" getInputFromSessionKey="originalMessage" xpathExpression="//resultaat != ''">
+                <Forward name="then" path="GetZgwResultaatByUrlSender" />
+                <Forward name="else" path="MapZdsZaakFromZgwZaak" />
+            </XmlIfPipe>
+
+            <SenderPipe name="GetZgwResultaatByUrlSender" storeResultInSessionKey="Resultaat">
+                <IbisLocalSender name="GetZgwResultaatByUrlLocalSender" javaListener="Zaken_GetZgwResultaatByUrl">
+                    <Param name="url" sessionKey="ZgwZaak"
+                    xpathExpression="ZgwZaak/resultaat" />
+                </IbisLocalSender>
+            </SenderPipe>
+
+            <SenderPipe name="GetZgwResultaatTypeByUrlSender" storeResultInSessionKey="ResultaatType">
+                <IbisLocalSender name="GetZgwResultaatTypeByUrlLocalSender" javaListener="Zaken_GetZgwResultaatTypeByUrl">
+                    <Param name="url" xpathExpression="/root/resultaattype" />
+                </IbisLocalSender>
+            </SenderPipe>
+
+            <XsltPipe name="MapZdsZaakFromZgwZaak" getInputFromSessionKey="ZgwZaak"
                 storeResultInSessionKey="ZdsZaak"
                 styleSheetName="Common/xsl/GetZdsZaakFromZgwZaak.xslt"
                 >
                 <Param name="ZgwZaak" sessionKey="ZgwZaak" type="DOMDOC" />
                 <Param name="ExtraElementen" sessionKey="ExtraElementen" type="DOMDOC" />
+                <Param name="Resultaat" sessionKey="Resultaat" type="DOMDOC" defaultValue="&lt;Dummy/>" />
+                <Param name="ResultaatType" sessionKey="ResultaatType" type="DOMDOC" defaultValue="&lt;Dummy/>" />
                 <Forward name="success" path="GetGlobalConfigFromLocalFS" />
             </XsltPipe>
 
@@ -250,58 +270,8 @@
                 styleSheetName="Common/xsl/EnrichEntity_ForEachPipeWrapped.xslt"
                 >
                 <Param name="With" sessionKey="ZdsHeeft" type="DOMDOC"/>
-                <Forward name="success" path="ResultaatExists"/>
-                <Forward name="error" path="EXCEPTION"/>
-            </XsltPipe>
-
-            <XmlIfPipe name="ResultaatExists" getInputFromSessionKey="originalMessage" xpathExpression="//resultaat != ''">
-                <Forward name="then" path="GetAuthorizationHeaderForZakenApi" />
-                <Forward name="else" path="EXIT" />
-            </XmlIfPipe>
-            
-            <SenderPipe name="GetAuthorizationHeaderForZakenApi"
-                getInputFromFixedValue="&lt;dummy/&gt;" storeResultInSessionKey="Authorization">
-                <IbisLocalSender
-                    name="GetAuthorizationHeaderForZakenApiSender"
-                    javaListener="GenerateAuthorizationHeaderForZakenApi"
-                    returnedSessionKeys="Error,Authorization">
-                </IbisLocalSender>
-                <Forward name="success" path="GetResultaatSender" />
-                <Forward name="exception" path="EXCEPTION" />
-            </SenderPipe>
-
-            <SenderPipe
-                name="GetResultaatSender"
-                getInputFromSessionKey="originalMessage"
-            >
-                <HttpSender
-                    name="GetResultaatSender"
-                    methodType="GET"
-                    headersParams="Authorization,Accept-Crs"
-                    timeout="${zaakbrug.zgw.zaken-api.timeout}"
-                    maxExecuteRetries="5"
-                />
-                <Param name="url" sessionKey="ZgwZaak"
-                    xpathExpression="//resultaat"
-                    />
-                <Param name="Accept-Crs" value="EPSG:4326" />
-                <Param name="Authorization"  xpathExpression="concat('Bearer ', $token)">
-                    <Param name="token" sessionKey="Authorization"/>
-                </Param>
-                <Forward name="success" path="Json2XML" />
-                <Forward name="exception" path="EXCEPTION" />
-            </SenderPipe>
-
-            <JsonPipe name="Json2XML" storeResultInSessionKey="Resultaat"/>
-
-            <XsltPipe name="EnrichZdsZaakWithResultaat"
-                getInputFromSessionKey="ZdsZaak"
-                storeResultInSessionKey="ZdsZaak"
-                styleSheetName="geefZaakdetails_Lv01/xsl/AddResultaat.xsl"
-                >
-                <Param name="Resultaat" sessionKey="Resultaat" type="DOMDOC"/>
                 <Forward name="success" path="EXIT"/>
-                <Forward name="exception" path="EXCEPTION"/>
+                <Forward name="error" path="EXCEPTION"/>
             </XsltPipe>
         </Pipeline>
     </Adapter>

From d6715237d72d5399c4eaef15a48f9399f077ae17 Mon Sep 17 00:00:00 2001
From: DelanoWAF <Delano@Wearefrank.nl>
Date: Mon, 2 Dec 2024 13:49:36 +0100
Subject: [PATCH 8/8] test: update tests

---
 e2e/SoapUI/zaakbrug-e2e-soapui-project.xml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/e2e/SoapUI/zaakbrug-e2e-soapui-project.xml b/e2e/SoapUI/zaakbrug-e2e-soapui-project.xml
index 383089d8e..652ea9d9b 100644
--- a/e2e/SoapUI/zaakbrug-e2e-soapui-project.xml
+++ b/e2e/SoapUI/zaakbrug-e2e-soapui-project.xml
@@ -8179,6 +8179,7 @@ testRunner.testCase.getTestStepByName("Properties").setPropertyValue('DocumentBa
     </ZKN:kenmerk>
     <ZKN:resultaat>
             <ZKN:omschrijving>Buiten behandeling g</ZKN:omschrijving>
+            <ZKN:toelichting>Buiten behandeling g</ZKN:toelichting>
     </ZKN:resultaat>
     <ZKN:startdatum>*</ZKN:startdatum>
     <ZKN:registratiedatum>*</ZKN:registratiedatum>
@@ -16850,7 +16851,8 @@ testRunner.testCase.getTestStepByName("Properties").setPropertyValue( 'JwtToken'
     <ZKN:omschrijving>Dossiernummer GISVG OV*</ZKN:omschrijving>
     <ZKN:toelichting>Reguliere omgevingsvergunning</ZKN:toelichting>
     <ZKN:resultaat>
-        <ZKN:omschrijving>Vergunningvrij</ZKN:omschrijving>
+                  <ZKN:omschrijving>Vergunningvrij</ZKN:omschrijving>
+                  <ZKN:toelichting>Vergunningvrij</ZKN:toelichting>
     </ZKN:resultaat>
     <ZKN:startdatum>*</ZKN:startdatum>
     <ZKN:registratiedatum>*</ZKN:registratiedatum>
@@ -18242,7 +18244,8 @@ testRunner.testCase.getTestStepByName("Properties").setPropertyValue( 'JwtToken'
     <ZKN:omschrijving>Dossiernummer GISVG OV*</ZKN:omschrijving>
     <ZKN:toelichting>Reguliere omgevingsvergunning</ZKN:toelichting>
     <ZKN:resultaat>
-       <ZKN:omschrijving>Vergunningvrij</ZKN:omschrijving>
+                  <ZKN:omschrijving>Vergunningvrij</ZKN:omschrijving>
+                  <ZKN:toelichting>Vergunningvrij</ZKN:toelichting>
     </ZKN:resultaat>
     <ZKN:startdatum>*</ZKN:startdatum>
     <ZKN:registratiedatum>*</ZKN:registratiedatum>
@@ -29274,7 +29277,8 @@ testRunner.testCase.getTestStepByName("Properties").setPropertyValue('DocumentBa
     <ZKN:identificatie>*</ZKN:identificatie>
     <ZKN:omschrijving>Belangrijke gebeurtenissen</ZKN:omschrijving>
     <ZKN:resultaat>
-       <ZKN:omschrijving>Afgehandeld</ZKN:omschrijving>
+                  <ZKN:omschrijving>Afgehandeld</ZKN:omschrijving>
+                  <ZKN:toelichting>Afgehandeld</ZKN:toelichting>
     </ZKN:resultaat>
     <ZKN:startdatum>*</ZKN:startdatum>
     <ZKN:registratiedatum>*</ZKN:registratiedatum>