From ec853e24f0282a95a3c2e3cad8f23f72eab6b544 Mon Sep 17 00:00:00 2001
From: Meric Akgul <meric@wearefrank.nl>
Date: Tue, 3 Dec 2024 23:43:20 +0100
Subject: [PATCH 1/3] fix: update the comparison of the roles for different
 person

---
 ...tZdsRolesFromListWithMatchingIdentity.xslt | 81 +++++++------------
 1 file changed, 31 insertions(+), 50 deletions(-)

diff --git a/src/main/configurations/Translate/Common/xsl/SelectZdsRolesFromListWithMatchingIdentity.xslt b/src/main/configurations/Translate/Common/xsl/SelectZdsRolesFromListWithMatchingIdentity.xslt
index 1f0615c1..7b358434 100644
--- a/src/main/configurations/Translate/Common/xsl/SelectZdsRolesFromListWithMatchingIdentity.xslt
+++ b/src/main/configurations/Translate/Common/xsl/SelectZdsRolesFromListWithMatchingIdentity.xslt
@@ -44,29 +44,23 @@
         <xsl:if test="$debug = 'true'"><xsl:comment expand-text="yes"> currentGerelateerde: [{serialize($currentGerelateerde, $debugSerializeParams)}] </xsl:comment></xsl:if>
 
         <xsl:choose>
-            <xsl:when test="
-                $currentGerelateerde/*:inn.nnpId/text() = $matchWithZdsRolGerelateerde/*:inn.nnpId/text() and 
-                $currentGerelateerde/*:inn.nnpId/text() != ''
-                ">
-                <xsl:copy-of select="." />
+            <xsl:when test="$currentGerelateerde/*:inn.nnpId/text() != '' and $matchWithZdsRolGerelateerde/*:inn.nnpId/text() != ''">
+                <xsl:if test="$currentGerelateerde/*:inn.nnpId/text() = $matchWithZdsRolGerelateerde/*:inn.nnpId/text()">
+                    <xsl:copy-of select="." />
+                </xsl:if>
             </xsl:when>
-            <xsl:when test="
-                $currentGerelateerde/*:ann.identificatie/text() = $matchWithZdsRolGerelateerde/*:ann.identificatie/text() and 
-                $currentGerelateerde/*:ann.identificatie/text() != ''
-                ">
-                <xsl:copy-of select="." />
+            <xsl:when test="$currentGerelateerde/*:ann.identificatie/text() != '' and $matchWithZdsRolGerelateerde/*:ann.identificatie/text() != ''">
+                <xsl:if test="$currentGerelateerde/*:ann.identificatie/text() = $matchWithZdsRolGerelateerde/*:ann.identificatie/text()">
+                    <xsl:copy-of select="." />
+                </xsl:if>
             </xsl:when>
             <!-- The test checks if all of the elements have the same value on both sides as a whole AND checks if atleast 1 of them is not empty.
                 OR statements between () is to prevent positively matching on the absence of all elements on both sides. -->
             <xsl:when test="
                 $currentGerelateerde/*:statutaireNaam/text() = $matchWithZdsRolGerelateerde/*:statutaireNaam/text() and
                 $currentGerelateerde/*:inn.rechtsvorm/text() = $matchWithZdsRolGerelateerde/*:inn.rechtsvorm/text() and
-                $currentGerelateerde/*:bezoekadres = $matchWithZdsRolGerelateerde/*:bezoekadres and
-                $currentGerelateerde/*:sub.verblijfBuitenland = $matchWithZdsRolGerelateerde/*:sub.verblijfBuitenland and
                 ($currentGerelateerde/*:statutaireNaam/text() != '' or 
-                $currentGerelateerde/*:inn.rechtsvorm/text() != '' or 
-                string-length($currentGerelateerde/*:bezoekadres) gt 0 or 
-                string-length($currentGerelateerde/*:sub.verblijfBuitenland) gt 0)
+                $currentGerelateerde/*:inn.rechtsvorm/text() != '' or)
                 ">
                 <xsl:copy-of select="." />
             </xsl:when>
@@ -85,17 +79,15 @@
         <xsl:if test="$debug = 'true'"><xsl:comment expand-text="yes"> currentGerelateerde: [{serialize($currentGerelateerde, $debugSerializeParams)}] </xsl:comment></xsl:if>
 
         <xsl:choose>
-            <xsl:when test="
-                $currentGerelateerde/*:inp.bsn/text() = $matchWithZdsRolGerelateerde/*:inp.bsn/text() and 
-                $currentGerelateerde/*:inp.bsn/text() != ''
-                ">
-                <xsl:copy-of select="." />
+            <xsl:when test="$currentGerelateerde/*:inp.bsn/text() != '' and $matchWithZdsRolGerelateerde/*:inp.bsn/text() != ''">
+                <xsl:if test="$currentGerelateerde/*:inp.bsn/text() = $matchWithZdsRolGerelateerde/*:inp.bsn/text()">
+                    <xsl:copy-of select="." />
+                </xsl:if>
             </xsl:when>
-            <xsl:when test="
-                $currentGerelateerde/*:anp.identificatie/text() = $matchWithZdsRolGerelateerde/*:anp.identificatie/text() and 
-                $currentGerelateerde/*:anp.identificatie/text() != ''
-                ">
-                <xsl:copy-of select="." />
+            <xsl:when test="$currentGerelateerde/*:anp.identificatie/text() != '' and $matchWithZdsRolGerelateerde/*:anp.identificatie/text() != ''">
+                <xsl:if test="$currentGerelateerde/*:anp.identificatie/text() = $matchWithZdsRolGerelateerde/*:anp.identificatie/text()">
+                    <xsl:copy-of select="." />
+                </xsl:if>
             </xsl:when>
             <!-- The test checks if all of the elements have the same value on both sides as a whole AND checks if atleast 1 of them is not empty.
                 OR statements between () is to prevent positively matching on the absence of all elements on both sides. -->
@@ -107,17 +99,13 @@
                 $currentGerelateerde/*:voornamen/text() = $matchWithZdsRolGerelateerde/*:voornamen/text() and
                 $currentGerelateerde/*:geslachtsaanduiding/text() = $matchWithZdsRolGerelateerde/*:geslachtsaanduiding/text() and
                 $currentGerelateerde/*:geboortedatum/text() = $matchWithZdsRolGerelateerde/*:geboortedatum/text() and
-                $currentGerelateerde/*:verblijfsadres = $matchWithZdsRolGerelateerde/*:verblijfsadres and
-                $currentGerelateerde/*:sub.verblijfBuitenland = $matchWithZdsRolGerelateerde/*:sub.verblijfBuitenland and 
                 ($currentGerelateerde/*:inp.a-nummer/text() != '' or
                 $currentGerelateerde/*:geslachtsnaam/text() != '' or 
                 $currentGerelateerde/*:voorvoegselGeslachtsnaam/text() != '' or 
                 $currentGerelateerde/*:voorletters/text() != '' or 
                 $currentGerelateerde/*:voornamen/text() != '' or 
                 $currentGerelateerde/*:geslachtsaanduiding/text() != '' or 
-                $currentGerelateerde/*:geboortedatum/text() != '' or 
-                string-length($currentGerelateerde/*:verblijfsadres) gt 0 or 
-                string-length($currentGerelateerde/*:sub.verblijfBuitenland) gt 0)
+                $currentGerelateerde/*:geboortedatum/text() != '' or)
                 ">
                 <xsl:copy-of select="." />
             </xsl:when>
@@ -136,11 +124,10 @@
         <xsl:if test="$debug = 'true'"><xsl:comment expand-text="yes"> currentGerelateerde: [{serialize($currentGerelateerde, $debugSerializeParams)}] </xsl:comment></xsl:if>
 
         <xsl:choose>
-            <xsl:when test="
-                $currentGerelateerde/*:identificatie/text() = $matchWithZdsRolGerelateerde/*:identificatie/text() and 
-                $currentGerelateerde/*:identificatie/text() != ''
-                ">
-                <xsl:copy-of select="." />
+            <xsl:when test="$currentGerelateerde/*:identificatie/text() != '' and $matchWithZdsRolGerelateerde/*:identificatie/text() != ''">
+                <xsl:if test="$currentGerelateerde/*:identificatie/text() = $matchWithZdsRolGerelateerde/*:identificatie/text()">
+                    <xsl:copy-of select="." />
+                </xsl:if>
             </xsl:when>
             <!-- The test checks if all of the elements have the same value on both sides as a whole AND checks if atleast 1 of them is not empty.
                 OR statements between () is to prevent positively matching on the absence of all elements on both sides. -->
@@ -169,11 +156,10 @@
         <xsl:if test="$debug = 'true'"><xsl:comment expand-text="yes"> currentGerelateerde: [{serialize($currentGerelateerde, $debugSerializeParams)}] </xsl:comment></xsl:if>
 
         <xsl:choose>
-            <xsl:when test="
-                $currentGerelateerde/*:identificatie/text() = $matchWithZdsRolGerelateerde/*:identificatie/text() and 
-                $currentGerelateerde/*:identificatie/text() != ''
-                ">
-                <xsl:copy-of select="." />
+            <xsl:when test="$currentGerelateerde/*:identificatie/text() != '' and $matchWithZdsRolGerelateerde/*:identificatie/text() != ''">
+                <xsl:if test="$currentGerelateerde/*:identificatie/text() = $matchWithZdsRolGerelateerde/*:identificatie/text()">
+                    <xsl:copy-of select="." />
+                </xsl:if>
             </xsl:when>
             <!-- The test checks if all of the elements have the same value on both sides as a whole AND checks if atleast 1 of them is not empty.
                 OR statements between () is to prevent positively matching on the absence of all elements on both sides. -->
@@ -200,21 +186,16 @@
         <xsl:if test="$debug = 'true'"><xsl:comment expand-text="yes"> currentGerelateerde: [{serialize($currentGerelateerde, $debugSerializeParams)}] </xsl:comment></xsl:if>
 
         <xsl:choose>
-            <xsl:when test="
-                $currentGerelateerde/*:vestigingsNummer/text() = $matchWithZdsRolGerelateerde/*:vestigingsNummer/text() and 
-                $currentGerelateerde/*:vestigingsNummer/text() != ''
-                ">
-                <xsl:copy-of select="." />
+            <xsl:when test="$currentGerelateerde/*:vestigingsNummer/text() != '' and $matchWithZdsRolGerelateerde/*:vestigingsNummer/text() != ''">
+                <xsl:if test="$currentGerelateerde/*:vestigingsNummer/text() = $matchWithZdsRolGerelateerde/*:vestigingsNummer/text()">
+                    <xsl:copy-of select="." />
+                </xsl:if>
             </xsl:when>
             <!-- The test checks if all of the elements have the same value on both sides as a whole AND checks if atleast 1 of them is not empty.
                 OR statements between () is to prevent positively matching on the absence of all elements on both sides. -->
             <xsl:when test="
                 $currentGerelateerde/*:handelsnaam/text() = $matchWithZdsRolGerelateerde/*:handelsnaam/text() and
-                $currentGerelateerde/*:verblijfsadres = $matchWithZdsRolGerelateerde/*:verblijfsadres and
-                $currentGerelateerde/*:sub.verblijfBuitenland = $matchWithZdsRolGerelateerde/*:sub.verblijfBuitenland and
-                ($currentGerelateerde/*:handelsnaam/text() != '' or
-                string-length($currentGerelateerde/*:verblijfsadres) gt 0 or
-                string-length($currentGerelateerde/*:sub.verblijfBuitenland) gt 0)
+                $currentGerelateerde/*:handelsnaam/text() != ''
                 ">
                 <xsl:copy-of select="." />
             </xsl:when>

From 4cf7931bd82a20c02b5760b4d664cd4c0d4bd862 Mon Sep 17 00:00:00 2001
From: Meric Akgul <meric@wearefrank.nl>
Date: Wed, 4 Dec 2024 17:04:01 +0100
Subject: [PATCH 2/3] dummy commit to trigger ci

---
 .../configurations/Translate/Configuration_UpdateZaak_LK01.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/configurations/Translate/Configuration_UpdateZaak_LK01.xml b/src/main/configurations/Translate/Configuration_UpdateZaak_LK01.xml
index 0235b59d..189ea0ec 100644
--- a/src/main/configurations/Translate/Configuration_UpdateZaak_LK01.xml
+++ b/src/main/configurations/Translate/Configuration_UpdateZaak_LK01.xml
@@ -343,7 +343,8 @@
             </XsltPipe>
             
             <SenderPipe
-                name="CallPatchAndereZaak" getInputFromSessionKey="GetZgwWasZaakResult">
+                name="CallPatchAndereZaak" 
+                getInputFromSessionKey="GetZgwWasZaakResult">
                 <IbisLocalSender
                     name="CallPatchAndereZaakSender"
                     javaListener="PatchRelevanteAndereZaak"

From 1cd8670485cc57c8a250e8db7f8211b4fca7fe8c Mon Sep 17 00:00:00 2001
From: Meric Akgul <meric@wearefrank.nl>
Date: Wed, 4 Dec 2024 17:34:13 +0100
Subject: [PATCH 3/3] syntax fixed

---
 .../xsl/SelectZdsRolesFromListWithMatchingIdentity.xslt       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/configurations/Translate/Common/xsl/SelectZdsRolesFromListWithMatchingIdentity.xslt b/src/main/configurations/Translate/Common/xsl/SelectZdsRolesFromListWithMatchingIdentity.xslt
index 7b358434..a098f40b 100644
--- a/src/main/configurations/Translate/Common/xsl/SelectZdsRolesFromListWithMatchingIdentity.xslt
+++ b/src/main/configurations/Translate/Common/xsl/SelectZdsRolesFromListWithMatchingIdentity.xslt
@@ -60,7 +60,7 @@
                 $currentGerelateerde/*:statutaireNaam/text() = $matchWithZdsRolGerelateerde/*:statutaireNaam/text() and
                 $currentGerelateerde/*:inn.rechtsvorm/text() = $matchWithZdsRolGerelateerde/*:inn.rechtsvorm/text() and
                 ($currentGerelateerde/*:statutaireNaam/text() != '' or 
-                $currentGerelateerde/*:inn.rechtsvorm/text() != '' or)
+                $currentGerelateerde/*:inn.rechtsvorm/text() != '')
                 ">
                 <xsl:copy-of select="." />
             </xsl:when>
@@ -105,7 +105,7 @@
                 $currentGerelateerde/*:voorletters/text() != '' or 
                 $currentGerelateerde/*:voornamen/text() != '' or 
                 $currentGerelateerde/*:geslachtsaanduiding/text() != '' or 
-                $currentGerelateerde/*:geboortedatum/text() != '' or)
+                $currentGerelateerde/*:geboortedatum/text() != '')
                 ">
                 <xsl:copy-of select="." />
             </xsl:when>