Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: remove bezoekadres/verblijfadres from role matching between ZDS and ZGW due to situational dataloss in translation #478

Merged
merged 4 commits into from
Dec 6, 2024
Merged

fix: remove bezoekadres/verblijfadres from role matching between ZDS and ZGW due to situational dataloss in translation #478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ec853e2
fix: update the comparison of the roles for different person
Dec 3, 2024
4cf7931
dummy commit to trigger ci
Dec 4, 2024
1cd8670
syntax fixed
Dec 4, 2024
ae5cf2b
Merge branch 'master' into WS-88-FixComparisonExistingAndIncomingRole
MLenterman Dec 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 31 additions & 50 deletions src/main/configurations/Translate/Common/xsl/SelectZdsRolesFromListWithMatchingIdentity.xslt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() != '')
">
<xsl:copy-of select="." />
</xsl:when>
Expand All @@ -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. -->
Expand All @@ -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() != '')
">
<xsl:copy-of select="." />
</xsl:when>
Expand All @@ -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. -->
Expand Down Expand Up @@ -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. -->
Expand All @@ -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>
Expand Down
3 changes: 2 additions & 1 deletion src/main/configurations/Translate/Configuration_UpdateZaak_LK01.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,8 @@
</XsltPipe>

<SenderPipe
name="CallPatchAndereZaak" getInputFromSessionKey="GetZgwWasZaakResult">
name="CallPatchAndereZaak"
getInputFromSessionKey="GetZgwWasZaakResult">
<IbisLocalSender
name="CallPatchAndereZaakSender"
javaListener="PatchRelevanteAndereZaak"
Expand Down
Loading