From 280fdb3dc1a96ce29b39b1fcf63920d802eca4a0 Mon Sep 17 00:00:00 2001
From: MLenterman <marcellenterman@hotmail.com>
Date: Wed, 7 Jun 2023 17:33:34 +0200
Subject: [PATCH 1/3] refactor: improved feedback on uncaught errors

---
 .../Translate/Common/xsl/BuildError.xsl       | 16 +++++++
 .../Configuration_CreeerZaak_LK01.xml         | 32 +++++++++-----
 .../Configuration_UpdateZaak_LK01.xml         | 24 ++++++++---
 ...Configuration_VoegZaakdocumentToe_Lk01.xml | 43 ++++++++++++-------
 4 files changed, 83 insertions(+), 32 deletions(-)
 create mode 100644 src/main/configurations/Translate/Common/xsl/BuildError.xsl

diff --git a/src/main/configurations/Translate/Common/xsl/BuildError.xsl b/src/main/configurations/Translate/Common/xsl/BuildError.xsl
new file mode 100644
index 000000000..59565bf6c
--- /dev/null
+++ b/src/main/configurations/Translate/Common/xsl/BuildError.xsl
@@ -0,0 +1,16 @@
+<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="details" select="''" as="xs:string" />
+    <xsl:param name="detailsXml" as="node()?" />
+    
+    <xsl:template match="/">
+        <error>
+            <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_CreeerZaak_LK01.xml b/src/main/configurations/Translate/Configuration_CreeerZaak_LK01.xml
index 1967d0d47..0b5e46042 100644
--- a/src/main/configurations/Translate/Configuration_CreeerZaak_LK01.xml
+++ b/src/main/configurations/Translate/Configuration_CreeerZaak_LK01.xml
@@ -13,8 +13,8 @@
 
         <Pipeline>
             <Exits>
-                <Exit name="EXIT" state="SUCCESS"/>
-                <Exit name="EXCEPTION" state="ERROR"/>
+                <Exit name="EXIT" state="SUCCESS" />
+                <Exit name="EXCEPTION" state="ERROR" />
             </Exits>
 
             <SenderPipe
@@ -26,7 +26,7 @@
                     <Param name="ZaakTypeCode" xpathExpression="/zakLk01/object/isVan/gerelateerde/code"/>
                 </IbisLocalSender>
                 <Forward name="success" path="SetZgwZaakType"/>
-                <Forward name="exception" path="EXCEPTION" />
+                <Forward name="exception" path="UncaughtException" />
             </SenderPipe>
 
             <XsltPipe
@@ -41,7 +41,7 @@
                 xpathExpression="count(/ZgwZaakTypen/ZgwZaakType) = 1"
                 >
                 <Forward name="then" path="GetGlobalConfigFromLocalFS"/>
-                <Forward name="else" path="EXCEPTION"/>
+                <Forward name="else" path="UncaughtException"/>
             </XmlIfPipe>
 
             <SenderPipe name="GetGlobalConfigFromLocalFS">
@@ -77,7 +77,7 @@
                     </Param>
                 </IbisLocalSender>
                 <Forward name="success" path="SetRoles"/>
-                <Forward name="exception" path="EXCEPTION" />
+                <Forward name="exception" path="UncaughtException" />
             </SenderPipe>   
 
             <XsltPipe
@@ -104,7 +104,7 @@
                     </Param>
                 </IbisLocalSender>
                 <Forward name="success" path="CreateZaakBody"/>
-                <Forward name="exception" path="EXCEPTION" />
+                <Forward name="exception" path="UncaughtException" />
             </ForEachChildElementPipe>
 
             <XsltPipe
@@ -128,7 +128,7 @@
                     javaListener="PostZaakAdapter">
                 </IbisLocalSender>
                 <Forward name="success" path="PostRolIterator"/>
-                <Forward name="exception" path="EXCEPTION" />
+                <Forward name="exception" path="UncaughtException" />
             </SenderPipe> 
 <!-- Post zaak end -->
             <ForEachChildElementPipe name="PostRolIterator"
@@ -143,7 +143,7 @@
                     </Param>
                 </IbisLocalSender>
                 <Forward name="success" path="CheckForHeeftBetrekkingOpAndere"/>
-                <Forward name="exception" path="EXCEPTION" />
+                <Forward name="exception" path="UncaughtException" />
             </ForEachChildElementPipe>
 
             <XmlIfPipe name="CheckForHeeftBetrekkingOpAndere"
@@ -163,7 +163,7 @@
                     <Param name="PostZgwZaakResult" sessionKey="PostZgwZaakResult" type="DOMDOC"/>
                 </IbisLocalSender>
                 <Forward name="success" path="CallSetResultaatAndStatus"/>
-                <Forward name="exception" path="EXCEPTION" />
+                <Forward name="exception" path="UncaughtException" />
             </ForEachChildElementPipe>
 
             <SenderPipe
@@ -181,8 +181,20 @@
                     </Param>
                 </IbisLocalSender>
                 <Forward name="success" path="EXIT"/>
-                <Forward name="exception" path="EXCEPTION" />
+                <Forward name="exception" path="UncaughtException" />
             </SenderPipe>
+
+            <XsltPipe 
+                name="UncaughtException"
+                emptyInputReplacement="&lt;EmptyInput/&gt;"
+                styleSheetName="Common/xsl/BuildError.xsl">
+                <Param name="code" value="TechnicalError" /> <!-- codes: TechnicalError, TranslationError, ConfigurationError-->
+                <Param name="reason" pattern="Uncaught exception" /> 
+                <!-- <Param name="details" sessionKey="" /> -->
+                <Param name="detailsXml" type="DOMDOC" />
+                <Forward name="success" path="EXCEPTION" />
+                <Forward name="exception" path="EXCEPTION" />
+            </XsltPipe>
         </Pipeline>
     </Adapter>
 </Module>
\ No newline at end of file
diff --git a/src/main/configurations/Translate/Configuration_UpdateZaak_LK01.xml b/src/main/configurations/Translate/Configuration_UpdateZaak_LK01.xml
index b6d11d6ff..136f1718d 100644
--- a/src/main/configurations/Translate/Configuration_UpdateZaak_LK01.xml
+++ b/src/main/configurations/Translate/Configuration_UpdateZaak_LK01.xml
@@ -27,14 +27,14 @@
                     <Param name="Identificatie" xpathExpression="/zakLk01/object[1]/identificatie"/>
                 </IbisLocalSender>
                 <Forward name="success" path="CheckForGetZgwZaakResult"/>
-                <Forward name="exception" path="EXCEPTION" />
+                <Forward name="exception" path="UncaughtException" />
             </SenderPipe>
             
             <XmlIfPipe name="CheckForGetZgwZaakResult"
                 xpathExpression="string-length(ZgwZaken) > 0"
                 >
                 <Forward name="then" path="GetSingleZgwZaakFromZgwZakenList"/>
-                <Forward name="else" path="EXCEPTION"/>
+                <Forward name="else" path="UncaughtException"/>
             </XmlIfPipe>
         
             <XsltPipe
@@ -43,7 +43,7 @@
                 storeResultInSessionKey="GetZgwWasZaakResult"
                 >
                 <Forward name="success" path="RemoveNullNodes"/>
-                <Forward name="error" path="EXCEPTION"/>
+                <Forward name="error" path="UncaughtException"/>
             </XsltPipe>
 
             <XsltPipe name="RemoveNullNodes" 
@@ -73,7 +73,7 @@
                     <Param name="ZaakUrl" xpathExpression="/ZgwZaak/zaaktype" />
                 </IbisLocalSender>
                 <Forward name="success" path="CallGetZdsZaakFromZgw"/>
-                <Forward name="exception" path="EXCEPTION"/>
+                <Forward name="exception" path="UncaughtException"/>
             </SenderPipe>
 
             <SenderPipe
@@ -86,7 +86,7 @@
                     <Param name="ZgwZaakType" sessionKey="GetZgwZaaktypeByUrlResult" type="DOMDOC"/>
                 </IbisLocalSender>
                 <Forward name="success" path="CheckForInputZaakObjectCount"/>
-                <Forward name="exception" path="EXCEPTION" />
+                <Forward name="exception" path="UncaughtException" />
             </SenderPipe>
 
             <XmlIfPipe name="CheckForInputZaakObjectCount"
@@ -121,7 +121,7 @@
                 >
                 <Param name="ZdsWordtZaak" sessionKey="ZdsWordtZaak" type="DOMDOC"/>
                 <Forward name="success" path="CheckForDetectZdsZaakChangesResult"/>
-                <Forward name="error" path="EXCEPTION"/>
+                <Forward name="error" path="UncaughtException"/>
             </XsltPipe>
 
             <XmlIfPipe name="CheckForDetectZdsZaakChangesResult"
@@ -240,6 +240,18 @@
                 <Forward name="success" path="EXIT"/>
                 <Forward name="exception" path="EXCEPTION" />
             </SenderPipe>
+
+            <XsltPipe 
+                name="UncaughtException"
+                emptyInputReplacement="&lt;EmptyInput/&gt;"
+                styleSheetName="Common/xsl/BuildError.xsl">
+                <Param name="code" value="TechnicalError" /> <!-- codes: TechnicalError, TranslationError, ConfigurationError-->
+                <Param name="reason" pattern="Uncaught exception" /> 
+                <!-- <Param name="details" sessionKey="" /> -->
+                <Param name="detailsXml" type="DOMDOC" />
+                <Forward name="success" path="EXCEPTION" />
+                <Forward name="exception" path="EXCEPTION" />
+            </XsltPipe>
         </Pipeline>
     </Adapter>
 </Module>
\ No newline at end of file
diff --git a/src/main/configurations/Translate/Configuration_VoegZaakdocumentToe_Lk01.xml b/src/main/configurations/Translate/Configuration_VoegZaakdocumentToe_Lk01.xml
index cfc44e544..56f0e84bd 100644
--- a/src/main/configurations/Translate/Configuration_VoegZaakdocumentToe_Lk01.xml
+++ b/src/main/configurations/Translate/Configuration_VoegZaakdocumentToe_Lk01.xml
@@ -34,14 +34,14 @@
                     <Param name="Identificatie" xpathExpression="object/isRelevantVoor/gerelateerde/identificatie"/>
                 </IbisLocalSender>
                 <Forward name="success" path="CheckForGetZgwZaakResult"/>
-                <Forward name="exception" path="EXCEPTION" />
+                <Forward name="exception" path="UncaughtException" />
             </SenderPipe>
 
             <XmlIfPipe name="CheckForGetZgwZaakResult"
                 xpathExpression="string-length(ZgwZaken) > 0"
                 >
                 <Forward name="then" path="GetSingleZgwZaakFromZgwZakenList"/>
-                <Forward name="else" path="EXCEPTION"/>
+                <Forward name="else" path="UncaughtException"/>
             </XmlIfPipe>
         
             <XsltPipe
@@ -50,7 +50,7 @@
                 storeResultInSessionKey="ZgwZaak"
                 >
                 <Forward name="success" path="CallGetZgwZaaktypeByUrl"/>
-                <Forward name="error" path="EXCEPTION"/>
+                <Forward name="error" path="UncaughtException"/>
             </XsltPipe>
 
             <SenderPipe
@@ -63,7 +63,7 @@
                     <Param name="ZaakUrl" xpathExpression="ZgwZaak/zaaktype" />
                 </IbisLocalSender>
                 <Forward name="success" path="GetZgwInformatieObjectTypeByOmschrijvingSender"/>
-                <Forward name="exception" path="EXCEPTION"/>
+                <Forward name="exception" path="UncaughtException"/>
             </SenderPipe>
 
             <SenderPipe
@@ -76,7 +76,7 @@
                     <Param name="Omschrijving" xpathExpression="object/dct.omschrijving" />
                 </IbisLocalSender>
                 <Forward name="success" path="GetSingleZgwInformatieObjectTypeFromList"/>
-                <Forward name="exception" path="EXCEPTION"/>
+                <Forward name="exception" path="UncaughtException"/>
             </SenderPipe>
 
             <XsltPipe
@@ -85,7 +85,7 @@
                 storeResultInSessionKey="ZgwInformatieObjectType"
                 >
                 <Forward name="success" path="GetGlobalConfigFromLocalFS"/>
-                <Forward name="error" path="EXCEPTION"/>
+                <Forward name="error" path="UncaughtException"/>
             </XsltPipe>
 
             <SenderPipe name="GetGlobalConfigFromLocalFS">
@@ -124,7 +124,7 @@
                 <Param name="Taal" sessionKey="Taal" />
                 <Forward name="true" path="ConvertISO639TaalSender" />
                 <Forward name="false" path="MapZgwEnkelvoudigInformatieObject" />
-                <Forward name="error" path="EXCEPTION" />
+                <Forward name="error" path="UncaughtException" />
             </XmlSwitchPipe>
 
             <SenderPipe 
@@ -137,7 +137,7 @@
                     <Param name="Alpha2" sessionKey="Taal" />                   
                 </IbisLocalSender>
                 <Forward name="success" path="MapZgwEnkelvoudigInformatieObject"/>
-                <Forward name="exception" path="EXCEPTION" />
+                <Forward name="exception" path="UncaughtException" />
             </SenderPipe>
 
             <XsltPipe
@@ -154,7 +154,7 @@
                 <Param name="IndicatieGebruiksrecht" value="false" />
                 <Param name="Taal" sessionKey="Taal" />
                 <Forward name="success" path="PostZgwEnkelvoudigInformatieObjectSender"/>
-                <Forward name="error" path="EXCEPTION"/>
+                <Forward name="error" path="UncaughtException"/>
             </XsltPipe>
             <SenderPipe
                 name="PostZgwEnkelvoudigInformatieObjectSender"
@@ -166,7 +166,7 @@
                     <Param name="inhoud" sessionKey="ref_inhoud" />
                 </IbisLocalSender>
                 <Forward name="success" path="EnrichZgwEnkelvoudigInformatieObject"/>
-                <Forward name="exception" path="EXCEPTION" />
+                <Forward name="exception" path="UncaughtException" />
             </SenderPipe>
 
             <XsltPipe
@@ -177,7 +177,7 @@
                 >
                 <Param name="ZgwEnkelvoudigInformatieObject" sessionKey="PostZgwEnkelvoudigInformatieObject" type="DOMDOC"/>
                 <Forward name="success" path="MapZgwZaakInformatieObject"/>
-                <Forward name="error" path="EXCEPTION"/>
+                <Forward name="error" path="UncaughtException"/>
             </XsltPipe>
 
             <XsltPipe
@@ -203,7 +203,7 @@
                     javaListener="Zaken_PostZgwZaakInformatieObject">                
                 </IbisLocalSender>
                 <Forward name="success" path="EnrichZgwZaakInformatieObject"/>
-                <Forward name="exception" path="EXCEPTION" />
+                <Forward name="exception" path="UncaughtException" />
             </SenderPipe>
 
             <XsltPipe
@@ -214,7 +214,7 @@
                 >
                 <Param name="ZgwZaakInformatieObject" sessionKey="PostZgwZaakInformatieObject" type="DOMDOC"/>
                 <Forward name="success" path="GetZgwStatusTypeByZaakTypeAndOmschrijvingSender"/>
-                <Forward name="error" path="EXCEPTION"/>
+                <Forward name="error" path="UncaughtException"/>
             </XsltPipe>
 
             <SenderPipe
@@ -231,7 +231,7 @@
                     <Param name="Volgnummer" xpathExpression="object/isRelevantVoor/stt.volgnummer"/>
                 </IbisLocalSender>
                 <Forward name="success" path="CheckForZgwStatusTypeResult"/>
-                <Forward name="exception" path="EXCEPTION" />
+                <Forward name="exception" path="UncaughtException" />
             </SenderPipe>
 
             <XmlIfPipe name="CheckForZgwStatusTypeResult"
@@ -247,7 +247,7 @@
                 storeResultInSessionKey="ZgwStatusType"
                 >
                 <Forward name="success" path="CreateStatusBody"/>
-                <Forward name="error" path="EXCEPTION"/>
+                <Forward name="error" path="UncaughtException"/>
             </XsltPipe>
 
             <XsltPipe
@@ -271,9 +271,20 @@
                     >
                 </IbisLocalSender>
                 <Forward name="success" path="EXIT"/>
-                <Forward name="exception" path="EXCEPTION" />
+                <Forward name="exception" path="UncaughtException" />
             </SenderPipe>
 
+            <XsltPipe 
+                name="UncaughtException"
+                emptyInputReplacement="&lt;EmptyInput/&gt;"
+                styleSheetName="Common/xsl/BuildError.xsl">
+                <Param name="code" value="TechnicalError" /> <!-- codes: TechnicalError, TranslationError, ConfigurationError-->
+                <Param name="reason" pattern="Uncaught exception" /> 
+                <!-- <Param name="details" sessionKey="" /> -->
+                <Param name="detailsXml" type="DOMDOC" />
+                <Forward name="success" path="EXCEPTION" />
+                <Forward name="exception" path="EXCEPTION" />
+            </XsltPipe>
         </Pipeline>
     </Adapter>
 </Module>
\ No newline at end of file

From cf3a7c989ee6b36ce7ad6d28a82abd352603b6ea Mon Sep 17 00:00:00 2001
From: MLenterman <marcellenterman@hotmail.com>
Date: Wed, 7 Jun 2023 17:35:29 +0200
Subject: [PATCH 2/3] fix: missing configuration for the organization in global
 config does not throw error

---
 .../Configuration_CreeerZaak_LK01.xml         | 49 ++++++++++++-----
 .../Configuration_UpdateZaak_LK01.xml         | 54 +++++++++++++------
 ...Configuration_VoegZaakdocumentToe_Lk01.xml | 51 +++++++++++++-----
 .../CreeerZaak_LK01/xsl/CreateZaakBody.xsl    |  7 +--
 .../Translate/CreeerZaak_LK01/xsl/GetRsin.xsl | 14 -----
 .../xsl/CreateUpdateZaakBody.xslt             |  5 +-
 6 files changed, 120 insertions(+), 60 deletions(-)
 delete mode 100644 src/main/configurations/Translate/CreeerZaak_LK01/xsl/GetRsin.xsl

diff --git a/src/main/configurations/Translate/Configuration_CreeerZaak_LK01.xml b/src/main/configurations/Translate/Configuration_CreeerZaak_LK01.xml
index 0b5e46042..084821348 100644
--- a/src/main/configurations/Translate/Configuration_CreeerZaak_LK01.xml
+++ b/src/main/configurations/Translate/Configuration_CreeerZaak_LK01.xml
@@ -44,26 +44,50 @@
                 <Forward name="else" path="UncaughtException"/>
             </XmlIfPipe>
 
-            <SenderPipe name="GetGlobalConfigFromLocalFS">
+            <SenderPipe 
+                name="GetGlobalConfigFromLocalFS"
+                storeResultInSessionKey="GlobalConfig"
+                >
                 <IbisLocalSender
                     name="CallImportFromLocalFS"
-                    javaListener="ImportFromLocalFS">
-                    <Param name="FileName" value="${FilePath_1}"/>                   
+                    javaListener="ImportFromLocalFS"
+                    >
+                    <Param name="FileName" value="${FilePath_1}" />                   
                 </IbisLocalSender>
                 <Forward name="success" path="GetRsin"/>
-                <Forward name="exception" path="EXCEPTION" />
+                <Forward name="exception" path="UncaughtException" />
             </SenderPipe>
 
-            <XsltPipe
+            <PutInSessionPipe
                 name="GetRsin"
-                storeResultInSessionKey="GetRsinResult"
-                skipEmptyTags="true"
-                styleSheetName="CreeerZaak_LK01/xsl/GetRsin.xsl"
                 >
-                <Param name="GemeenteCode" xpathExpression="$OriginalMessage/zakLk01/stuurgegevens/zender/organisatie">
-                    <Param name="OriginalMessage" sessionKey="originalMessage" type="DOMDOC"/>
+                <Param name="Rsin" xpathExpression="/root/organizations[gemeenteCode = $GemeenteCode]/RSIN" defaultValue="&lt;RSIN/&gt;" type="XML">
+                    <Param name="GemeenteCode" sessionKey="originalMessage" xpathExpression="/*/stuurgegevens/zender/organisatie" />
                 </Param>
-                <Forward name="success" path="CallGetZgwRolType"/>
+                <Forward name="success" path="Rsin_NotEmpty"/>
+                <Forward name="exception" path="UncaughtException" />
+            </PutInSessionPipe>
+
+            <XmlIfPipe 
+                name="Rsin_NotEmpty"
+                getInputFromSessionKey="Rsin"
+                xpathExpression="string-length(/RSIN) gt 0"
+                >
+                <Forward name="then" path="CallGetZgwRolType"/>
+                <Forward name="else" path="Rsin_NotEmpty_Exception"/>
+                <Forward name="exception" path="UncaughtException"/>
+            </XmlIfPipe>
+
+            <XsltPipe 
+                name="Rsin_NotEmpty_Exception"
+                styleSheetName="Common/xsl/BuildError.xsl">
+                <Param name="code" value="ConfigurationError" /> <!-- codes: TechnicalError, TranslationError, ConfigurationError-->
+                <Param name="GemeenteCode" sessionKey="originalMessage" xpathExpression="/*/stuurgegevens/zender/organisatie" />
+                <Param name="reason" pattern="No organization configured for gemeente code: [{GemeenteCode}]" ignoreUnresolvablePatternElements="true"/> 
+                <!-- <Param name="details" sessionKey="" /> -->
+                <Param name="detailsXml" sessionKey="GlobalConfig" type="DOMDOC" />
+                <Forward name="success" path="EXCEPTION" />
+                <Forward name="exception" path="UncaughtException" />
             </XsltPipe>
 
             <SenderPipe
@@ -116,7 +140,8 @@
                 styleSheetName="CreeerZaak_LK01/xsl/CreateZaakBody.xsl"
                 >
                 <Param name="GetZaakTypeResult" sessionKey="GetZaakTypeResult" type="DOMDOC"/>
-                <Param name="GetRsinResult" sessionKey="GetRsinResult" type="DOMDOC"/>
+                <Param name="Bronorganisatie" sessionKey="Rsin" xpathExpression="/RSIN" />
+                <Param name="VerantwoordelijkeOrganisatie" sessionKey="Rsin" xpathExpression="/RSIN" />
                 <Forward name="success" path="CallPostZaak"/>
             </XsltPipe>
 
diff --git a/src/main/configurations/Translate/Configuration_UpdateZaak_LK01.xml b/src/main/configurations/Translate/Configuration_UpdateZaak_LK01.xml
index 136f1718d..8e8d37953 100644
--- a/src/main/configurations/Translate/Configuration_UpdateZaak_LK01.xml
+++ b/src/main/configurations/Translate/Configuration_UpdateZaak_LK01.xml
@@ -131,27 +131,50 @@
                 <Forward name="else" path="GetGlobalConfigFromLocalFS"/>
             </XmlIfPipe>
 
-            <SenderPipe name="GetGlobalConfigFromLocalFS"
-                storeResultInSessionKey="GetGlobalConfigResult">
+            <SenderPipe 
+                name="GetGlobalConfigFromLocalFS"
+                storeResultInSessionKey="GlobalConfig"
+                >
                 <IbisLocalSender
                     name="CallImportFromLocalFS"
-                    javaListener="ImportFromLocalFS">
-                    <Param name="FileName" value="${FilePath_1}"/>
+                    javaListener="ImportFromLocalFS"
+                    >
+                    <Param name="FileName" value="${FilePath_1}" />                   
                 </IbisLocalSender>
                 <Forward name="success" path="GetRsin"/>
-                <Forward name="exception" path="EXCEPTION" />
+                <Forward name="exception" path="UncaughtException" />
             </SenderPipe>
 
-            <XsltPipe
+            <PutInSessionPipe
                 name="GetRsin"
-                storeResultInSessionKey="GetRsinResult"
-                skipEmptyTags="true"
-                styleSheetName="CreeerZaak_LK01/xsl/GetRsin.xsl"
                 >
-                <Param name="GemeenteCode" xpathExpression="$OriginalMessage/zakLk01/stuurgegevens/zender/organisatie">
-                    <Param name="OriginalMessage" sessionKey="originalMessage" type="DOMDOC"/>
+                <Param name="Rsin" xpathExpression="/root/organizations[gemeenteCode = $GemeenteCode]/RSIN" defaultValue="&lt;RSIN/&gt;" type="XML">
+                    <Param name="GemeenteCode" sessionKey="originalMessage" xpathExpression="/*/stuurgegevens/zender/organisatie" />
                 </Param>
-                <Forward name="success" path="CreateUpdateZaakBody"/>
+                <Forward name="success" path="Rsin_NotEmpty"/>
+                <Forward name="exception" path="UncaughtException" />
+            </PutInSessionPipe>
+
+            <XmlIfPipe 
+                name="Rsin_NotEmpty"
+                getInputFromSessionKey="Rsin"
+                xpathExpression="string-length(/RSIN) gt 0"
+                >
+                <Forward name="then" path="CreateUpdateZaakBody"/>
+                <Forward name="else" path="Rsin_NotEmpty_Exception"/>
+                <Forward name="exception" path="UncaughtException"/>
+            </XmlIfPipe>
+
+            <XsltPipe 
+                name="Rsin_NotEmpty_Exception"
+                styleSheetName="Common/xsl/BuildError.xsl">
+                <Param name="code" value="ConfigurationError" /> <!-- codes: TechnicalError, TranslationError, ConfigurationError-->
+                <Param name="GemeenteCode" sessionKey="originalMessage" xpathExpression="/*/stuurgegevens/zender/organisatie" />
+                <Param name="reason" pattern="No organization configured for gemeente code: [{GemeenteCode}]" ignoreUnresolvablePatternElements="true"/> 
+                <!-- <Param name="details" sessionKey="" /> -->
+                <Param name="detailsXml" sessionKey="GlobalConfig" type="DOMDOC" />
+                <Forward name="success" path="EXCEPTION" />
+                <Forward name="exception" path="UncaughtException" />
             </XsltPipe>
 
             <XsltPipe
@@ -161,7 +184,8 @@
                 storeResultInSessionKey="UpdateZaakBody"
                 >
                 <Param name="ZgwZaak" sessionKey="GetZgwWasZaakResult" type="DOMDOC"/>
-                <Param name="Rsin" sessionKey="GetRsinResult" type="DOMDOC"/>
+                <Param name="Bronorganisatie" sessionKey="Rsin" xpathExpression="/RSIN"/>
+                <Param name="VerantwoordelijkeOrganisatie" sessionKey="Rsin" xpathExpression="/RSIN"/>
                 <Forward name="success" path="UpdateZgwZaak"/>
                 <Forward name="error" path="EXCEPTION"/>
             </XsltPipe>
@@ -185,7 +209,7 @@
                 skipEmptyTags="true"
                 styleSheetName="UpdateZaak_LK01/xsl/SetRoles.xslt"
                 >
-                <Param name="RolMapping" sessionKey="GetGlobalConfigResult" type="DOMDOC"/>
+                <Param name="RolMapping" sessionKey="GlobalConfig" type="DOMDOC"/>
                 <Forward name="success" path="SetRolesForZdsWordtZaak"/>
             </XsltPipe>
 
@@ -197,7 +221,7 @@
                 skipEmptyTags="true"
                 styleSheetName="UpdateZaak_LK01/xsl/SetRoles.xslt"
                 >
-                <Param name="RolMapping" sessionKey="GetGlobalConfigResult" type="DOMDOC"/>
+                <Param name="RolMapping" sessionKey="GlobalConfig" type="DOMDOC"/>
                 <Forward name="success" path="CallDetectRolChanges"/>
             </XsltPipe>
 
diff --git a/src/main/configurations/Translate/Configuration_VoegZaakdocumentToe_Lk01.xml b/src/main/configurations/Translate/Configuration_VoegZaakdocumentToe_Lk01.xml
index 56f0e84bd..864dcc80c 100644
--- a/src/main/configurations/Translate/Configuration_VoegZaakdocumentToe_Lk01.xml
+++ b/src/main/configurations/Translate/Configuration_VoegZaakdocumentToe_Lk01.xml
@@ -88,25 +88,50 @@
                 <Forward name="error" path="UncaughtException"/>
             </XsltPipe>
 
-            <SenderPipe name="GetGlobalConfigFromLocalFS">
+            <SenderPipe 
+                name="GetGlobalConfigFromLocalFS"
+                storeResultInSessionKey="GlobalConfig"
+                >
                 <IbisLocalSender
                     name="CallImportFromLocalFS"
-                    javaListener="ImportFromLocalFS">
-                    <Param name="FileName" value="${FilePath_1}"/>                   
+                    javaListener="ImportFromLocalFS"
+                    >
+                    <Param name="FileName" value="${FilePath_1}" />                   
                 </IbisLocalSender>
                 <Forward name="success" path="GetRsin"/>
-                <Forward name="exception" path="EXCEPTION" />
+                <Forward name="exception" path="UncaughtException" />
             </SenderPipe>
 
-            <XsltPipe
+            <PutInSessionPipe
                 name="GetRsin"
-                storeResultInSessionKey="Rsin"
-                styleSheetName="CreeerZaak_LK01/xsl/GetRsin.xsl"
                 >
-                <Param name="GemeenteCode" xpathExpression="$OriginalMessage/edcLk01/stuurgegevens/zender/organisatie">
-                    <Param name="OriginalMessage" sessionKey="originalMessage" type="DOMDOC"/>
+                <Param name="Rsin" xpathExpression="/root/organizations[gemeenteCode = $GemeenteCode]/RSIN" defaultValue="&lt;RSIN/&gt;" type="XML">
+                    <Param name="GemeenteCode" sessionKey="originalMessage" xpathExpression="/*/stuurgegevens/zender/organisatie" />
                 </Param>
-                <Forward name="success" path="StoreTaal"/>
+                <Forward name="success" path="Rsin_NotEmpty"/>
+                <Forward name="exception" path="UncaughtException" />
+            </PutInSessionPipe>
+
+            <XmlIfPipe 
+                name="Rsin_NotEmpty"
+                getInputFromSessionKey="Rsin"
+                xpathExpression="string-length(/RSIN) gt 0"
+                >
+                <Forward name="then" path="StoreTaal"/>
+                <Forward name="else" path="Rsin_NotEmpty_Exception"/>
+                <Forward name="exception" path="UncaughtException"/>
+            </XmlIfPipe>
+
+            <XsltPipe 
+                name="Rsin_NotEmpty_Exception"
+                styleSheetName="Common/xsl/BuildError.xsl">
+                <Param name="code" value="ConfigurationError" /> <!-- codes: TechnicalError, TranslationError, ConfigurationError-->
+                <Param name="GemeenteCode" sessionKey="originalMessage" xpathExpression="/*/stuurgegevens/zender/organisatie" />
+                <Param name="reason" pattern="No organization configured for gemeente code: [{GemeenteCode}]" ignoreUnresolvablePatternElements="true"/> 
+                <!-- <Param name="details" sessionKey="" /> -->
+                <Param name="detailsXml" sessionKey="GlobalConfig" type="DOMDOC" />
+                <Forward name="success" path="EXCEPTION" />
+                <Forward name="exception" path="UncaughtException" />
             </XsltPipe>
 
             <PutInSessionPipe 
@@ -148,9 +173,7 @@
                 >
                 <Param name="ZdsZaakDocumentInhoud" sessionKey="ZdsZaakDocumentInhoudDataRef" type="DOMDOC"/>
                 <Param name="ZgwInformatieObjectType" sessionKey="ZgwInformatieObjectType" type="DOMDOC"/>
-                <Param name="Bronorganisatie" xpathExpression="$Rsin/rsin">
-                    <Param name="Rsin" sessionKey="Rsin" type="DOMDOC"/>
-                </Param>
+                <Param name="Bronorganisatie" sessionKey="Rsin" xpathExpression="/RSIN" />
                 <Param name="IndicatieGebruiksrecht" value="false" />
                 <Param name="Taal" sessionKey="Taal" />
                 <Forward name="success" path="PostZgwEnkelvoudigInformatieObjectSender"/>
@@ -191,7 +214,7 @@
                     <Param name="Zaak" sessionKey="ZgwZaak" type="DOMDOC"/>
                 </Param>
                 <Forward name="success" path="PostZgwZaakInformatieObjectSender"/>
-                <Forward name="error" path="EXCEPTION"/>
+                <Forward name="error" path="UncaughtException"/>
             </XsltPipe>
 
             <SenderPipe 
diff --git a/src/main/configurations/Translate/CreeerZaak_LK01/xsl/CreateZaakBody.xsl b/src/main/configurations/Translate/CreeerZaak_LK01/xsl/CreateZaakBody.xsl
index 9e5d46029..7a465a4e5 100644
--- a/src/main/configurations/Translate/CreeerZaak_LK01/xsl/CreateZaakBody.xsl
+++ b/src/main/configurations/Translate/CreeerZaak_LK01/xsl/CreateZaakBody.xsl
@@ -1,6 +1,7 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fn="http://www.w3.org/2005/xpath-functions" xmlns:math="http://www.w3.org/2005/xpath-functions/math" xmlns:array="http://www.w3.org/2005/xpath-functions/array" xmlns:map="http://www.w3.org/2005/xpath-functions/map" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:err="http://www.w3.org/2005/xqt-errors" xmlns:zgw="http://google.com/zgw" exclude-result-prefixes="array fn map math xhtml xs err zgw" version="2.0">
 	<xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes"/>
-    <xsl:param name="GetRsinResult"/>
+    <xsl:param name="Bronorganisatie" select="''" as="xs:string" />
+    <xsl:param name="VerantwoordelijkeOrganisatie" select="''" as="xs:string" />
     <xsl:param name="GetZaakTypeResult"/>
     <xsl:param name="communicatiekanaal" select="''" as="xs:string"/>
     <xsl:param name="productenOfDiensten" select="''" as="xs:string"/>
@@ -17,14 +18,14 @@
 	<xsl:template match="zakLk01/object[@entiteittype='ZAK']">
 		<ZgwZaak>
             <identificatie><xsl:value-of select="identificatie"/></identificatie>
-            <bronorganisatie><xsl:value-of select="$GetRsinResult/rsin"/></bronorganisatie>
+            <bronorganisatie><xsl:value-of select="$Bronorganisatie"/></bronorganisatie>
             <omschrijving><xsl:value-of select="omschrijving"/></omschrijving>
             <toelichting><xsl:value-of select="toelichting"/></toelichting>
             <zaaktype><xsl:value-of select="$GetZaakTypeResult/ZgwZaakTypen/ZgwZaakType/url"/></zaaktype>
             <xsl:if test="string-length(registratiedatum) > 0">
                 <registratiedatum><xsl:value-of select="zgw:convertZdsDateToZgwDate(registratiedatum)"/></registratiedatum>
             </xsl:if>
-            <verantwoordelijkeOrganisatie><xsl:value-of select="$GetRsinResult/rsin"/></verantwoordelijkeOrganisatie>
+            <verantwoordelijkeOrganisatie><xsl:value-of select="$VerantwoordelijkeOrganisatie"/></verantwoordelijkeOrganisatie>
             <xsl:if test="string-length(startdatum) > 0">
                 <startdatum><xsl:value-of select="zgw:convertZdsDateToZgwDate(startdatum)"/></startdatum>
             </xsl:if>
diff --git a/src/main/configurations/Translate/CreeerZaak_LK01/xsl/GetRsin.xsl b/src/main/configurations/Translate/CreeerZaak_LK01/xsl/GetRsin.xsl
deleted file mode 100644
index aa77aafbd..000000000
--- a/src/main/configurations/Translate/CreeerZaak_LK01/xsl/GetRsin.xsl
+++ /dev/null
@@ -1,14 +0,0 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0">
-	<xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes" omit-xml-declaration="yes"/>
-    <xsl:param name="GemeenteCode"/>
-
-    <!-- <xsl:variable name="gemeenteCode"><xsl:value-of select="/Envelope/Body/zakLk01/stuurgegevens/zender/organisatie"/></xsl:variable> -->
-
-    <xsl:template match="/">
-        <xsl:for-each select="root/organizations/gemeenteCode">
-            <xsl:if test="current() = $GemeenteCode">
-                <rsin><xsl:value-of select="../RSIN"/></rsin>
-            </xsl:if>
-        </xsl:for-each>
-	</xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/src/main/configurations/Translate/UpdateZaak_LK01/xsl/CreateUpdateZaakBody.xslt b/src/main/configurations/Translate/UpdateZaak_LK01/xsl/CreateUpdateZaakBody.xslt
index 5d338687d..1fe4e4603 100644
--- a/src/main/configurations/Translate/UpdateZaak_LK01/xsl/CreateUpdateZaakBody.xslt
+++ b/src/main/configurations/Translate/UpdateZaak_LK01/xsl/CreateUpdateZaakBody.xslt
@@ -3,7 +3,8 @@
     <xsl:include href="../../Zgw/ZgwFunctionsBase.xslt" />
 
     <xsl:param name="ZgwZaak"/>
-    <xsl:param name="Rsin"/>
+    <xsl:param name="Bronorganisatie" select="''" as="xs:string" />
+    <xsl:param name="VerantwoordelijkeOrganisatie" select="''" as="xs:string" />
 
     <xsl:function name="zgw:convertZdsArchiefNominatieToZgwArchiefNominatie" as="xs:string">
     	<xsl:param name="zgwArchiefNominatie" as="xs:string"/>
@@ -28,7 +29,7 @@
                 <xsl:when test="string-length(object/identificatie) > 0"><identificatie><xsl:value-of select="object/identificatie"/></identificatie></xsl:when>
                 <xsl:when test="string-length($ZgwZaak/ZgwZaak/identificatie) > 0"><identificatie><xsl:value-of select="$ZgwZaak/ZgwZaak/identificatie"/></identificatie></xsl:when>
             </xsl:choose>
-            <bronorganisatie><xsl:value-of select="$Rsin/rsin"/></bronorganisatie>
+            <bronorganisatie><xsl:value-of select="$Bronorganisatie"/></bronorganisatie>
             <omschrijving><xsl:value-of select="object/omschrijving"/></omschrijving>
             <xsl:choose>
                 <xsl:when test="string-length(object/toelichting) > 0"><toelichting><xsl:value-of select="object/toelichting"/></toelichting></xsl:when>

From dc3dc34ff18441c70639feaee15a5d977eb40ddb Mon Sep 17 00:00:00 2001
From: MLenterman <marcellenterman@hotmail.com>
Date: Wed, 7 Jun 2023 18:17:21 +0200
Subject: [PATCH 3/3] chore(helm): bump chart to 0.7.10 with app 1.12.11

---
 charts/zaakbrug/Chart.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/charts/zaakbrug/Chart.yaml b/charts/zaakbrug/Chart.yaml
index 8ca0bc9ae..928cde411 100644
--- a/charts/zaakbrug/Chart.yaml
+++ b/charts/zaakbrug/Chart.yaml
@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: 1.12.10
-description: Install ZaakBrug (zds-to-zgw) on Haven, powerd by the Frank!Framework
+appVersion: 1.12.11
+description: Install ZaakBrug (zds-to-zgw) on Haven, powered by the Frank!Framework
 name: zaakbrug
 type: application
-version: 0.7.9
+version: 0.7.10
 
 home: https://github.com/ibissource/zaakbrug
 icon: "https://raw.githubusercontent.com/ibissource/zaakbrug/master/zaakbrug-icon.png"