From 220c65ef57c967781757a10c95a7e9ef753742c0 Mon Sep 17 00:00:00 2001
From: DelanoWAF <Delano@Wearefrank.nl>
Date: Thu, 25 Jan 2024 13:52:38 +0100
Subject: [PATCH 1/8] test: add delay to prevent inconsistent errors

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

diff --git a/e2e/SoapUI/zaakbrug-e2e-soapui-project.xml b/e2e/SoapUI/zaakbrug-e2e-soapui-project.xml
index 3dd7545b2..14c471c9d 100644
--- a/e2e/SoapUI/zaakbrug-e2e-soapui-project.xml
+++ b/e2e/SoapUI/zaakbrug-e2e-soapui-project.xml
@@ -7861,6 +7861,12 @@ testRunner.testCase.getTestStepByName("Properties").setPropertyValue('DocumentBa
           </con:request>
         </con:config>
       </con:testStep>
+      <con:testStep type="delay" name="Delay" id="0fa7d16e-14dc-42c5-8099-4f14d85a4d31">
+        <con:settings/>
+        <con:config>
+          <delay>1000</delay>
+        </con:config>
+      </con:testStep>
       <con:testStep type="request" id="fbfc19b1-8f1e-48f7-8364-4a9ba2e0bfc9" name="11-zds-updateZaak_Lk01-Einde">
         <con:settings/>
         <con:config xsi:type="con:RequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

From 4e8d1d3203b52d16df72ac9c1819f526d2b8e844 Mon Sep 17 00:00:00 2001
From: DelanoWAF <Delano@Wearefrank.nl>
Date: Fri, 26 Jan 2024 11:15:13 +0100
Subject: [PATCH 2/8] Revert "test: add delay to prevent inconsistent errors"

This reverts commit 220c65ef57c967781757a10c95a7e9ef753742c0.
---
 e2e/SoapUI/zaakbrug-e2e-soapui-project.xml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/e2e/SoapUI/zaakbrug-e2e-soapui-project.xml b/e2e/SoapUI/zaakbrug-e2e-soapui-project.xml
index 14c471c9d..3dd7545b2 100644
--- a/e2e/SoapUI/zaakbrug-e2e-soapui-project.xml
+++ b/e2e/SoapUI/zaakbrug-e2e-soapui-project.xml
@@ -7861,12 +7861,6 @@ testRunner.testCase.getTestStepByName("Properties").setPropertyValue('DocumentBa
           </con:request>
         </con:config>
       </con:testStep>
-      <con:testStep type="delay" name="Delay" id="0fa7d16e-14dc-42c5-8099-4f14d85a4d31">
-        <con:settings/>
-        <con:config>
-          <delay>1000</delay>
-        </con:config>
-      </con:testStep>
       <con:testStep type="request" id="fbfc19b1-8f1e-48f7-8364-4a9ba2e0bfc9" name="11-zds-updateZaak_Lk01-Einde">
         <con:settings/>
         <con:config xsi:type="con:RequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

From af493b4058e8398174a209049e2ff5dacdca6adf Mon Sep 17 00:00:00 2001
From: DelanoWAF <Delano@Wearefrank.nl>
Date: Tue, 30 Jan 2024 14:11:54 +0100
Subject: [PATCH 3/8] refactor: rewrite XSLT condition

---
 .../configurations/Translate/Zgw/Zaken/Model/ZgwStatus.xslt  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/configurations/Translate/Zgw/Zaken/Model/ZgwStatus.xslt b/src/main/configurations/Translate/Zgw/Zaken/Model/ZgwStatus.xslt
index 7f59ed2a4..1fb37ff63 100644
--- a/src/main/configurations/Translate/Zgw/Zaken/Model/ZgwStatus.xslt
+++ b/src/main/configurations/Translate/Zgw/Zaken/Model/ZgwStatus.xslt
@@ -21,9 +21,12 @@
 
     <xsl:variable name="DatumStatusGezetFromParams" as="xs:string">
         <xsl:choose>
-            <xsl:when test="$ZgwStatusType/ZgwStatusType/isEindstatus = 'true' and not($ZdsEinddatum = 'Undefined')">
+            <xsl:when test="$ZgwStatusType/ZgwStatusType/isEindstatus = 'true' and (string-length($ZdsEinddatum) > 0) and (string-length($ZdsStatusDatum) = 0)">
                 <xsl:value-of select="zgw:toZgwDatetime(concat($ZdsEinddatum,'000000'))"/>
             </xsl:when>
+            <xsl:when test="$ZgwStatusType/ZgwStatusType/isEindstatus = 'true'">
+                <xsl:value-of select="zgw:toZgwDatetime($ZdsStatusDatum)"/>
+            </xsl:when>
             <xsl:otherwise>
                 <xsl:value-of select="zgw:toZgwDatetime($ZdsStatusDatum)"/>
             </xsl:otherwise>

From 8d8fff7521a93e0dff214e36f33815a640fa31b8 Mon Sep 17 00:00:00 2001
From: DelanoWAF <Delano@Wearefrank.nl>
Date: Wed, 31 Jan 2024 15:10:44 +0100
Subject: [PATCH 4/8] test: add delay for consistent test results

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

diff --git a/e2e/SoapUI/zaakbrug-e2e-soapui-project.xml b/e2e/SoapUI/zaakbrug-e2e-soapui-project.xml
index 3dd7545b2..f6bf2926a 100644
--- a/e2e/SoapUI/zaakbrug-e2e-soapui-project.xml
+++ b/e2e/SoapUI/zaakbrug-e2e-soapui-project.xml
@@ -7861,6 +7861,12 @@ testRunner.testCase.getTestStepByName("Properties").setPropertyValue('DocumentBa
           </con:request>
         </con:config>
       </con:testStep>
+      <con:testStep type="delay" name="Delay" id="263ac432-edd3-4325-b362-4c29ce563eac">
+        <con:settings/>
+        <con:config>
+          <delay>1000</delay>
+        </con:config>
+      </con:testStep>
       <con:testStep type="request" id="fbfc19b1-8f1e-48f7-8364-4a9ba2e0bfc9" name="11-zds-updateZaak_Lk01-Einde">
         <con:settings/>
         <con:config xsi:type="con:RequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

From e103b121dab2cf7e605a6e425b59df9aac31bb84 Mon Sep 17 00:00:00 2001
From: DelanoWAF <Delano@Wearefrank.nl>
Date: Wed, 31 Jan 2024 15:11:11 +0100
Subject: [PATCH 5/8] refactor: adjust XSLT conditions

---
 .../Translate/Zgw/Zaken/Model/ZgwStatus.xslt              | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/configurations/Translate/Zgw/Zaken/Model/ZgwStatus.xslt b/src/main/configurations/Translate/Zgw/Zaken/Model/ZgwStatus.xslt
index 1fb37ff63..2a2a6c7bf 100644
--- a/src/main/configurations/Translate/Zgw/Zaken/Model/ZgwStatus.xslt
+++ b/src/main/configurations/Translate/Zgw/Zaken/Model/ZgwStatus.xslt
@@ -21,12 +21,12 @@
 
     <xsl:variable name="DatumStatusGezetFromParams" as="xs:string">
         <xsl:choose>
-            <xsl:when test="$ZgwStatusType/ZgwStatusType/isEindstatus = 'true' and (string-length($ZdsEinddatum) > 0) and (string-length($ZdsStatusDatum) = 0)">
+            <xsl:when test="$ZgwStatusType/ZgwStatusType/isEindstatus = 'true' 
+            and (string-length($ZdsEinddatum) > 0) 
+            and (string-length($ZdsStatusDatum) = 0) 
+            and not($ZdsEinddatum = 'Undefined')">
                 <xsl:value-of select="zgw:toZgwDatetime(concat($ZdsEinddatum,'000000'))"/>
             </xsl:when>
-            <xsl:when test="$ZgwStatusType/ZgwStatusType/isEindstatus = 'true'">
-                <xsl:value-of select="zgw:toZgwDatetime($ZdsStatusDatum)"/>
-            </xsl:when>
             <xsl:otherwise>
                 <xsl:value-of select="zgw:toZgwDatetime($ZdsStatusDatum)"/>
             </xsl:otherwise>

From 6904c2d9e450adf2284deaf5b7d23965f7cc9b1c Mon Sep 17 00:00:00 2001
From: DelanoWAF <Delano@Wearefrank.nl>
Date: Thu, 1 Feb 2024 14:40:21 +0100
Subject: [PATCH 6/8] test: send correct code and description

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

diff --git a/e2e/SoapUI/zaakbrug-e2e-soapui-project.xml b/e2e/SoapUI/zaakbrug-e2e-soapui-project.xml
index f6bf2926a..e45002014 100644
--- a/e2e/SoapUI/zaakbrug-e2e-soapui-project.xml
+++ b/e2e/SoapUI/zaakbrug-e2e-soapui-project.xml
@@ -7861,7 +7861,7 @@ testRunner.testCase.getTestStepByName("Properties").setPropertyValue('DocumentBa
           </con:request>
         </con:config>
       </con:testStep>
-      <con:testStep type="delay" name="Delay" id="263ac432-edd3-4325-b362-4c29ce563eac">
+      <con:testStep type="delay" name="Delay" id="c3bf4b94-4ffa-4906-9efa-53aa7dbfad14">
         <con:settings/>
         <con:config>
           <delay>1000</delay>
@@ -7942,10 +7942,10 @@ testRunner.testCase.getTestStepByName("Properties").setPropertyValue('DocumentBa
                   <ZKN:zkt.code>B1026</ZKN:zkt.code>\r
                   <ZKN:zkt.omschrijving>Aanvraag minima</ZKN:zkt.omschrijving>\r
                   <ZKN:volgnummer>0010</ZKN:volgnummer>\r
-                  <ZKN:code>ontv</ZKN:code>
-                  <ZKN:omschrijving>Ontvangen</ZKN:omschrijving>
-<!--                  <ZKN:code>Afgehandeld</ZKN:code>\r-->
-<!--                  <ZKN:omschrijving>Afgehandeld</ZKN:omschrijving>\r-->
+<!--                  <ZKN:code>ontv</ZKN:code>-->
+<!--                  <ZKN:omschrijving>Ontvangen</ZKN:omschrijving>-->
+                  <ZKN:code>Afgehandel</ZKN:code>\r
+                  <ZKN:omschrijving>Afgehandel</ZKN:omschrijving>\r
                   <ZKN:ingangsdatumObject xsi:nil="true" StUF:noValue="geenWaarde"/>\r
                </ZKN:gerelateerde>\r
                <ZKN:datumStatusGezet>${=import java.text.SimpleDateFormat; SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSS"); sdf.setTimeZone(TimeZone.getTimeZone("${#Project#ZdsTimezone}")); sdf.format(new Date());}</ZKN:datumStatusGezet>\r

From a858ef35eea44a3fc7274b7915ac94c1a6cf0461 Mon Sep 17 00:00:00 2001
From: DelanoWAF <Delano@Wearefrank.nl>
Date: Thu, 1 Feb 2024 14:40:53 +0100
Subject: [PATCH 7/8] refactor: add statustype safeguard

---
 .../Translate/Configuration_ZdsHeeft.xml      | 42 ++++++++++++++++---
 1 file changed, 36 insertions(+), 6 deletions(-)

diff --git a/src/main/configurations/Translate/Configuration_ZdsHeeft.xml b/src/main/configurations/Translate/Configuration_ZdsHeeft.xml
index 331073d02..c678c163f 100644
--- a/src/main/configurations/Translate/Configuration_ZdsHeeft.xml
+++ b/src/main/configurations/Translate/Configuration_ZdsHeeft.xml
@@ -109,19 +109,19 @@
                 styleSheetName="CreeerZaak_LK01/xsl/CompareDatumStatusGezet.xsl"
                 >
                 <Param name="StatusBody" sessionKey="StatusBody" type="DOMDOC"/>
-                <Forward name="success" path="CheckForCompareResult"/>
+                <Forward name="success" path="CheckForCompareDatumStatusGezetResult"/>
             </XsltPipe>
 
-            <XmlIfPipe name="CheckForCompareResult"
+            <XmlIfPipe name="CheckForCompareDatumStatusGezetResult"
                 preserveInput="true"
                 xpathExpression="exists(/result/exception)"
                 >
-                <Forward name="then" path="ResultWithErrorMessage"/>
-                <Forward name="else" path="CheckForStatusExists"/>
+                <Forward name="then" path="ResultWithDatumErrorMessage"/>
+                <Forward name="else" path="CompareStatusType"/>
             </XmlIfPipe>
 
             <XsltPipe
-                name="ResultWithErrorMessage"
+                name="ResultWithDatumErrorMessage"
                 styleSheetName="Common/xsl/BuildError.xsl"
                 >
                 <Param name="code" value="TechnicalError" /> <!-- codes: TechnicalError, TranslationError, ConfigurationError-->
@@ -132,9 +132,39 @@
                 <Forward name="exception" path="EXCEPTION" />
             </XsltPipe>
 
+            <XsltPipe
+                name="CompareStatusType"
+                getInputFromSessionKey="ZgwStatussen"
+                storeResultInSessionKey="StatusExists"
+                styleSheetName="CreeerZaak_LK01/xsl/CompareStatusType.xsl"
+                >
+                <Param name="StatusBody" sessionKey="StatusBody" type="DOMDOC"/>
+                <Forward name="success" path="CheckForCompareStatusTypeResult"/>
+            </XsltPipe>
+
+            <XmlIfPipe name="CheckForCompareStatusTypeResult"
+                preserveInput="true"
+                xpathExpression="exists(/result/exception)"
+                >
+                <Forward name="then" path="ResultWithTypeErrorMessage"/>
+                <Forward name="else" path="CheckForStatusExists"/>
+            </XmlIfPipe>
+
+            <XsltPipe
+                name="ResultWithTypeErrorMessage"
+                styleSheetName="Common/xsl/BuildError.xsl"
+                >
+                <Param name="code" value="TechnicalError" /> <!-- codes: TechnicalError, TranslationError, ConfigurationError-->
+                <Param name="reason" pattern="ActualiseerStatus statustype equal to existing status" />
+                <Param name="details" sessionKey="StatusBody" xpathExpression="concat(ZgwStatus/statustype, ' is equal to existing status')"/>
+                <Param name="detailsXml" sessionKey="ZgwStatussen" type="DOMDOC" />
+                <Forward name="success" path="EXCEPTION" />
+                <Forward name="exception" path="EXCEPTION" />
+            </XsltPipe>
+
             <XmlIfPipe name="CheckForStatusExists"
                 emptyInputReplacement="&lt;statusExists&gt;false&lt;/statusExists&gt;"
-                xpathExpression="/statusExists = 'true'"
+                xpathExpression="//statusExists = 'true'"
                 >
                 <Forward name="then" path="EXIT"/>
                 <Forward name="else" path="AddToNewStatuses"/>

From 28814f2a7d68f97319897e7641684c028759b1db Mon Sep 17 00:00:00 2001
From: DelanoWAF <Delano@Wearefrank.nl>
Date: Thu, 1 Feb 2024 14:41:20 +0100
Subject: [PATCH 8/8] refactor: add statustype XSLT check

---
 .../CreeerZaak_LK01/xsl/CompareStatusType.xsl | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 src/main/configurations/Translate/CreeerZaak_LK01/xsl/CompareStatusType.xsl

diff --git a/src/main/configurations/Translate/CreeerZaak_LK01/xsl/CompareStatusType.xsl b/src/main/configurations/Translate/CreeerZaak_LK01/xsl/CompareStatusType.xsl
new file mode 100644
index 000000000..7ecf154b5
--- /dev/null
+++ b/src/main/configurations/Translate/CreeerZaak_LK01/xsl/CompareStatusType.xsl
@@ -0,0 +1,24 @@
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:zgw="http://google.com/zgw" version="2.0">
+    <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes" omit-xml-declaration="yes" />
+    <xsl:param name="StatusBody" />
+    <xsl:param name="Beeindigd" />
+
+    <xsl:template match="/">
+        <result>
+            <xsl:for-each select="ZgwStatussen/ZgwStatus">
+                <xsl:if test="statustype = $StatusBody/ZgwStatus/statustype">
+                    <xsl:choose>
+                        <xsl:when test="$Beeindigd">
+                            <exception>ConverterException</exception>
+                        </xsl:when>
+                        <xsl:otherwise>
+                            <statusExists>true</statusExists>
+                        </xsl:otherwise>
+                    </xsl:choose>
+                </xsl:if>
+            </xsl:for-each>
+        </result>
+    </xsl:template>
+
+</xsl:stylesheet>
\ No newline at end of file