From 5775b2684beb8db219da505c614dc8ee0867e95e Mon Sep 17 00:00:00 2001
From: MLenterman <marcellenterman@hotmail.com>
Date: Fri, 23 Aug 2024 12:49:26 +0200
Subject: [PATCH] fix: iso639 language code 'eng' should convert to
 country+language code 'en_GB' instead of 'en_EN'

---
 .../openforms2bpel-e2e-soapui-project.xml     |  2 +-
 .../xsl/Alpha2ToCountryAndLanguageCode.xslt   | 19 +++++++++++++++++++
 ...ation_Handler_AddDocumentToCaseCommand.xml | 17 +++++++++++++----
 3 files changed, 33 insertions(+), 5 deletions(-)
 create mode 100644 src/main/configurations/bpel/Common/xsl/Alpha2ToCountryAndLanguageCode.xslt

diff --git a/e2e/SoapUI/openforms2bpel-e2e-soapui-project.xml b/e2e/SoapUI/openforms2bpel-e2e-soapui-project.xml
index 9f5e8b8..9860a3c 100644
--- a/e2e/SoapUI/openforms2bpel-e2e-soapui-project.xml
+++ b/e2e/SoapUI/openforms2bpel-e2e-soapui-project.xml
@@ -20677,7 +20677,7 @@ project.getRestMockServiceByName("Objects API Mock").getMockRunner().stop();</sc
       <con:testStep type="properties" name="Properties" id="5c265a92-0f00-4689-b308-e637ef2e45a7">
         <con:settings/>
         <con:config xsi:type="con:PropertiesStep" saveFirst="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-          <con:target>C:/Projects/openforms2bpel/e2e/SoapUI/test</con:target>
+          <con:target/>
           <con:properties>
             <con:property>
               <con:name>caseReferenceNumber</con:name>
diff --git a/src/main/configurations/bpel/Common/xsl/Alpha2ToCountryAndLanguageCode.xslt b/src/main/configurations/bpel/Common/xsl/Alpha2ToCountryAndLanguageCode.xslt
new file mode 100644
index 0000000..68fbb45
--- /dev/null
+++ b/src/main/configurations/bpel/Common/xsl/Alpha2ToCountryAndLanguageCode.xslt
@@ -0,0 +1,19 @@
+<xsl:stylesheet exclude-result-prefixes="#all" version="3.0"
+    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"
+    >
+    <xsl:output method="text" version="1.0" encoding="UTF-8" indent="yes" omit-xml-declaration="yes" />
+    <xsl:mode on-no-match="deep-skip" on-multiple-match="fail" />
+    <xsl:strip-space elements="*"/>
+
+    <xsl:param name="Alpha2" select="''" as="xs:string" />
+    <xsl:param name="Alpha3" select="''" as="xs:string" />
+
+    <xsl:template match="/">
+        <xsl:choose>
+            <xsl:when test="$Alpha3 = 'eng'"><xsl:value-of select="'en_GB'" /></xsl:when>
+            <xsl:otherwise><xsl:value-of select="concat(concat($Alpha2, '_'), upper-case($Alpha2))" /></xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/src/main/configurations/bpel/Configuration_Handler_AddDocumentToCaseCommand.xml b/src/main/configurations/bpel/Configuration_Handler_AddDocumentToCaseCommand.xml
index e822416..57770ae 100644
--- a/src/main/configurations/bpel/Configuration_Handler_AddDocumentToCaseCommand.xml
+++ b/src/main/configurations/bpel/Configuration_Handler_AddDocumentToCaseCommand.xml
@@ -90,8 +90,19 @@
                     >
                 </IbisLocalSender>
                 <Param name="Alpha3" sessionKey="ZgwEnkelvoudigInformatieObject" xpathExpression="//taal" />
-                <Forward name="success" path="EnrichZgwEnkelvoudigInformatieObject" />
+                <Forward name="success" path="ConvertISO639ToCountryAndLanguageCode" />
             </SenderPipe>
+            
+            <XsltPipe
+                name="ConvertISO639ToCountryAndLanguageCode"
+                getInputFromFixedValue="&lt;dummy/&gt;"
+                styleSheetName="Common/xsl/Alpha2ToCountryAndLanguageCode.xslt"
+                storeResultInSessionKey="CountryAndLanguageCode"
+                >
+                <Param name="Alpha3" sessionKey="ZgwEnkelvoudigInformatieObject" xpathExpression="//taal" />    
+                <Param name="Alpha2" sessionKey="Alpha2" />
+                <Forward name="success" path="EnrichZgwEnkelvoudigInformatieObject"/>
+            </XsltPipe>
 
             <XsltPipe
                 name="EnrichZgwEnkelvoudigInformatieObject"
@@ -99,9 +110,7 @@
                 styleSheetName="Zgw/Documenten/Model/ZgwEnkelvoudigInformatieObject.xslt"
                 storeResultInSessionKey="ZgwEnkelvoudigInformatieObject"
                 >
-                <Param name="Taal" xpathExpression="concat(concat($Alpha2, '_'), upper-case($Alpha2))">
-                    <Param name="Alpha2" sessionKey="Alpha2" />
-                </Param>
+                <Param name="Taal" sessionKey="CountryAndLanguageCode" />
                 <Forward name="success" path="SelectDocumentStateSender"/>
             </XsltPipe>