fix: return error closest to the source and return all nested errors (#…

…416)
wearefrank · Jul 10, 2024 · c8c35a8 · c8c35a8
1 parent 74652fa
commit c8c35a8
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 19 deletions.
diff --git a/src/main/configurations/Translate/Common/xsl/BackEndError.xsl b/src/main/configurations/Translate/Common/xsl/BackEndError.xsl
@@ -2,12 +2,13 @@
     <xsl:output method="text" version="1.0" encoding="UTF-8" omit-xml-declaration="yes"/>
 
     <xsl:template match="/">
-        <xsl:apply-templates select="error" />
+        <xsl:apply-templates select="(//error)[last()]" />
     </xsl:template>
     <xsl:template match="error">
         <xsl:choose>
             <xsl:when test="code='TechnicalError'">500</xsl:when>
             <xsl:when test="code='TranslationError'">400</xsl:when>
+            <xsl:when test="code='ConfigurationError'">500</xsl:when>
         </xsl:choose>
     </xsl:template>
 </xsl:stylesheet>
diff --git a/src/main/configurations/Translate/Configuration_SoapEndpointRouter_BeantwoordVraag.xml b/src/main/configurations/Translate/Configuration_SoapEndpointRouter_BeantwoordVraag.xml
@@ -235,13 +235,17 @@
                 <Forward name="success" path="WrapFo03Response"/>
             </PutInSessionPipe>
 
-            <PutInSessionPipe name="BackEndError" unlessSessionKey="errorCode">
-                <Param name="errorCode" styleSheetName="Common/xsl/BackEndError.xsl"/>
-                <Param name="errorReason" xpathExpression="/error/reason"/>
-                <Param name="errorDetailText" xpathExpression="concat(/error/code, ' ', /error/reason, ' ', /error/details)"/>
-                <Param name="errorDetailXML" xpathExpression="/error/detailsXml" type="DOMDOC" />
-                <Forward name="success" path="WrapFo03Response"/>
+            <PutInSessionPipe
+                name="BackEndError"
+                unlessSessionKey="errorCode"
+                >
+                <Param name="errorCode" styleSheetName="Common/xsl/BackEndError.xsl" />
+                <Param name="errorReason" xpathExpression="(//error)[last()]/reason" />
+                <Param name="errorDetailText" xpathExpression="(//error)[last()]/details" />
+                <Param name="errorDetailXML" xpathExpression="/error" type="DOMDOC" />
+                <Forward name="success" path="WrapFo03Response" />
             </PutInSessionPipe>
+
             <SoapWrapperPipe
                 name="WrapFo03Response"
                 soapBodyStyleSheet="Common/xsl/CreateFo03Response.xslt"

diff --git a/src/main/configurations/Translate/Configuration_SoapEndpointRouter_OntvangAsynchroon.xml b/src/main/configurations/Translate/Configuration_SoapEndpointRouter_OntvangAsynchroon.xml
@@ -183,12 +183,15 @@
                 <Forward name="success" path="WrapFo03Response"/>
             </PutInSessionPipe>
 
-            <PutInSessionPipe name="BackEndError" unlessSessionKey="errorCode">
-                <Param name="errorCode" styleSheetName="Common/xsl/BackEndError.xsl"/>
-                <Param name="errorReason" xpathExpression="/error/reason"/>
-                <Param name="errorDetailText" xpathExpression="concat(/error/code, ' ', /error/reason, ' ', /error/details)"/>
-                <Param name="errorDetailXML" xpathExpression="/error/detailsXml" type="DOMDOC" />
-                <Forward name="success" path="WrapFo03Response"/>
+            <PutInSessionPipe
+                name="BackEndError"
+                unlessSessionKey="errorCode"
+                >
+                <Param name="errorCode" styleSheetName="Common/xsl/BackEndError.xsl" />
+                <Param name="errorReason" xpathExpression="(//error)[last()]/reason" />
+                <Param name="errorDetailText" xpathExpression="(//error)[last()]/details" />
+                <Param name="errorDetailXML" xpathExpression="/error" type="DOMDOC" />
+                <Forward name="success" path="WrapFo03Response" />
             </PutInSessionPipe>
 
             <SoapWrapperPipe

diff --git a/src/main/configurations/Translate/Configuration_SoapEndpointRouter_VrijeBerichten.xml b/src/main/configurations/Translate/Configuration_SoapEndpointRouter_VrijeBerichten.xml
@@ -311,12 +311,15 @@
                 <Forward name="success" path="WrapFo03Response"/>
             </PutInSessionPipe>
 
-            <PutInSessionPipe name="BackEndError" unlessSessionKey="errorCode">
-                <Param name="errorCode" styleSheetName="Common/xsl/BackEndError.xsl"/>
-                <Param name="errorReason" xpathExpression="/error/reason"/>
-                <Param name="errorDetailText" xpathExpression="concat(/error/code, ' ', /error/reason, ' ', /error/details)"/>
-                <Param name="errorDetailXML" xpathExpression="/error/detailsXml" type="DOMDOC" />
-                <Forward name="success" path="WrapFo03Response"/>
+            <PutInSessionPipe
+                name="BackEndError"
+                unlessSessionKey="errorCode"
+                >
+                <Param name="errorCode" styleSheetName="Common/xsl/BackEndError.xsl" />
+                <Param name="errorReason" xpathExpression="(//error)[last()]/reason" />
+                <Param name="errorDetailText" xpathExpression="(//error)[last()]/details" />
+                <Param name="errorDetailXML" xpathExpression="/error" type="DOMDOC" />
+                <Forward name="success" path="WrapFo03Response" />
             </PutInSessionPipe>
 
             <SoapWrapperPipe