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

refactor: match zds and zgw roles on the zgw side instead of the zds side due to valueoverrides being applied on the zgw side aswell #499

Merged
merged 5 commits into from
Jan 20, 2025
Merged

refactor: match zds and zgw roles on the zgw side instead of the zds side due to valueoverrides being applied on the zgw side aswell #499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b3c901c
fix: The cases from zds and zgw sides are now compared with their zgw…
Jan 16, 2025
079bf32
rename param name
Jan 17, 2025
639c87f
rename the file names
Jan 17, 2025
e66b0e8
update tagname
Jan 20, 2025
2248e48
update larva tests
Jan 20, 2025
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
220 changes: 0 additions & 220 deletions src/main/configurations/Translate/Common/xsl/SelectZdsRolesFromListWithMatchingIdentity.xslt
View file
Open in desktop

This file was deleted.

220 changes: 220 additions & 0 deletions src/main/configurations/Translate/Common/xsl/SelectZgwRolesFromListWithMatchingIdentity.xslt
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions src/main/configurations/Translate/Configuration_CheckZgwRol.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,18 @@
</Exits>

<XsltPipe
name="SelectZdsRolesFromListWithMatchingIdentity"
styleSheetName="Common/xsl/SelectZdsRolesFromListWithMatchingIdentity.xslt"
name="SelectZgwRolesFromListWithMatchingIdentity"
styleSheetName="Common/xsl/SelectZgwRolesFromListWithMatchingIdentity.xslt"
>
<Param name="MatchWithZdsRol" sessionKey="MatchWithZdsRol" type="DOMDOC" />
<Param name="MatchWithZgwRol" sessionKey="MatchWithZgwRol" type="DOMDOC" />
<Param name="debug" value="true" />
<Forward name="success" path="ZdsRolMatchesExactlyOneZdsRolInList" />
<Forward name="success" path="ZgwRolMatchesExactlyOneZgwRolInList" />
<Forward name="exception" path="EXCEPTION" />
</XsltPipe>

<XmlIfPipe
name="ZdsRolMatchesExactlyOneZdsRolInList"
xpathExpression="count(/roles/*) = 1"
name="ZgwRolMatchesExactlyOneZgwRolInList"
xpathExpression="count(/ZgwRollen/*) = 1"
>
<Forward name="then" path="exists" />
<Forward name="else" path="NOTFOUND" />
Expand Down
4 changes: 3 additions & 1 deletion src/main/configurations/Translate/Configuration_CreeerZaak_LK01.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,9 @@
elementXPathExpression="ZgwZaakTypen/ZgwZaakType/roltypen"
getInputFromSessionKey="GetZaakTypeResult"
>
<IbisLocalSender javaListener="GetRolTypenByUrl" returnedSessionKeys="Error">
<IbisLocalSender
javaListener="GetRolTypenByUrl"
returnedSessionKeys="Error">
<Param name="Url" xpathExpression="/roltypen" />
</IbisLocalSender>
</ForEachChildElementPipe>
Expand Down
26 changes: 4 additions & 22 deletions src/main/configurations/Translate/Configuration_DetectRolChanges.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,26 +12,9 @@
<Exit name="EXIT" state="SUCCESS"/>
<Exit name="EXCEPTION" state="ERROR"/>
</Exits>

<SenderPipe
name="CallGetZgwRolType"
getInputFromFixedValue="&lt;dummy/&gt;"
storeResultInSessionKey="ZgwRolTypen"
>
<IbisLocalSender
name="GetZgwRolTypeByZaakTypeLocalSender"
javaListener="Zaken_GetZgwRolTypeByZaakType"
returnedSessionKeys="Error"
>
<Param name="ZaakTypeUrl" sessionKey="ZaakTypeUrl" />
</IbisLocalSender>
<Forward name="success" path="CallAddRolToZgw" />
<Forward name="exception" path="EXCEPTION" />
</SenderPipe>

<SenderPipe
name="CallAddRolToZgw"
getInputFromSessionKey="originalMessage"
storeResultInSessionKey="AddRolResult"
>
<IbisLocalSender
Expand All @@ -40,7 +23,6 @@
returnedSessionKeys="Error"
>
<Param name="ZgwRolTypen" sessionKey="ZgwRolTypen" type="DOMDOC" />
<Param name="ZaakTypeUrl" sessionKey="ZaakTypeUrl" />
<Param name="ZaakType" sessionKey="ZaakType" xpathExpression="/ZgwZaakType/identificatie" />
<Param name="RolMapping" sessionKey="RolMapping" type="DOMDOC" />
</IbisLocalSender>
Expand Down Expand Up @@ -100,14 +82,14 @@

<SenderPipe
name="CheckZgwRolNew"
getInputFromSessionKey="ZdsWasZaakRol"
getInputFromSessionKey="ZgwWasZaakRollen"
storeResultInSessionKey="CheckCheck"
>
<IbisLocalSender
name="CallCheckZgwRolSender"
javaListener="CheckZgwRol"
>
<Param name="MatchWithZdsRol" sessionKey="ZdsRol" type="DOMDOC" />
<Param name="MatchWithZgwRol" sessionKey="AddRolResult" type="DOMDOC" />
</IbisLocalSender>
<Forward name="success" path="LogWarningNew" />
<Forward name="404" path="CallPostRol" /> <!-- Rol should not be found -->
Expand All @@ -125,14 +107,14 @@

<SenderPipe
name="CheckZgwRol"
getInputFromSessionKey="ZdsWasZaakRol"
getInputFromSessionKey="ZgwWasZaakRollen"
storeResultInSessionKey="CheckCheck"
>
<IbisLocalSender
name="CallCheckZgwRolSender"
javaListener="CheckZgwRol"
>
<Param name="MatchWithZdsRol" sessionKey="ZdsRol" type="DOMDOC" />
<Param name="MatchWithZgwRol" sessionKey="AddRolResult" type="DOMDOC" />
</IbisLocalSender>
<Forward name="success" path="EXIT" /> <!-- Rol should be found -->
<Forward name="404" path="LogWarningCheck" />
Expand Down
55 changes: 52 additions & 3 deletions 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 @@ -231,7 +231,54 @@
storeResultInSessionKey="ZdsWasZaakRol"
styleSheetName="Common/xsl/SelectZdsRoles.xslt"
>
<Forward name="success" path="SelectZdsRolesFromZdsWordtZaak" />
<Forward name="success" path="CallGetZgwRolTypeByZaakType" />
</XsltPipe>

<SenderPipe
name="CallGetZgwRolTypeByZaakType"
getInputFromFixedValue="&lt;dummy/&gt;"
storeResultInSessionKey="ZgwRolTypen"
>
<IbisLocalSender
name="GetZgwRolTypeByZaakTypeLocalSender"
javaListener="Zaken_GetZgwRolTypeByZaakType"
returnedSessionKeys="Error"
>
<Param name="ZaakTypeUrl" xpathExpression="$GetZgwZaaktypeByUrlResult/ZgwZaakType/url">
<Param name="GetZgwZaaktypeByUrlResult" sessionKey="GetZgwZaaktypeByUrlResult" type="DOMDOC"/>
</Param>
</IbisLocalSender>
<Forward name="success" path="CallAddRolToZgwForExistingRoles" />
<Forward name="exception" path="EXCEPTION" />
</SenderPipe>

<ForEachChildElementPipe
name="CallAddRolToZgwForExistingRoles"
getInputFromSessionKey="ZdsWasZaakRol"
elementXPathExpression="/roles/*"
storeResultInSessionKey="ZgwWasZaakRollen"
>
<IbisLocalSender
name="CallAddRolToZgwSender"
javaListener="AddRolToZgw"
returnedSessionKeys="Error"
>
<Param name="ZgwRolTypen" sessionKey="ZgwRolTypen" type="DOMDOC" />
<Param name="ZaakType" sessionKey="GetZgwZaaktypeByUrlResult" xpathExpression="/ZgwZaakType/identificatie" />
<Param name="RolMapping" sessionKey="GlobalConfig" type="DOMDOC" />
</IbisLocalSender>
<Forward name="success" path="UnwrapOpenZaakApiEnvelopeToList" />
<Forward name="exception" path="EXCEPTION" />
</ForEachChildElementPipe>

<XsltPipe
name="UnwrapOpenZaakApiEnvelopeToList"
styleSheetName="Common/xsl/UnwrapForEachChildPipeEnvelopeToList.xslt"
storeResultInSessionKey="ZgwWasZaakRollen"
>
<Param name="List" value="ZgwRollen"/>
<Forward name="success" path="SelectZdsRolesFromZdsWordtZaak"/>
<Forward name="exception" path="UncaughtException" />
</XsltPipe>

<XsltPipe
Expand All @@ -251,12 +298,13 @@
name="CallDetectRolChangesDeleteSender"
javaListener="DetectRolChanges"
returnedSessionKeys="Error">
<Param name="ZdsWasZaakRol" sessionKey="ZdsWasZaakRol" type="DOMDOC"/>
<Param name="ZgwWasZaakRollen" sessionKey="ZgwWasZaakRollen" type="DOMDOC"/>
<Param name="ZgwZaakUrl" sessionKey="ZgwZaakUrl"/>
<Param name="ZaakTypeUrl" xpathExpression="$GetZgwZaaktypeByUrlResult/ZgwZaakType/url">
<Param name="GetZgwZaaktypeByUrlResult" sessionKey="GetZgwZaaktypeByUrlResult" type="DOMDOC"/>
</Param>
<Param name="ZaakType" sessionKey="GetZgwZaaktypeByUrlResult" type="DOMDOC" />
<Param name="ZgwRolTypen" sessionKey="ZgwRolTypen" type="DOMDOC" />
<Param name="RolMapping" sessionKey="GlobalConfig" type="DOMDOC" />
</IbisLocalSender>
<Forward name="success" path="CallDetectRolChanges"/>
Expand All @@ -272,12 +320,13 @@
name="CallDetectRolChangesSender"
javaListener="DetectRolChanges"
returnedSessionKeys="Error">
<Param name="ZdsWasZaakRol" sessionKey="ZdsWasZaakRol" type="DOMDOC"/>
<Param name="ZgwWasZaakRollen" sessionKey="ZgwWasZaakRollen" type="DOMDOC"/>
<Param name="ZgwZaakUrl" sessionKey="ZgwZaakUrl"/>
<Param name="ZaakTypeUrl" xpathExpression="$GetZgwZaaktypeByUrlResult/ZgwZaakType/url">
<Param name="GetZgwZaaktypeByUrlResult" sessionKey="GetZgwZaaktypeByUrlResult" type="DOMDOC"/>
</Param>
<Param name="ZaakType" sessionKey="GetZgwZaaktypeByUrlResult" type="DOMDOC" />
<Param name="ZgwRolTypen" sessionKey="ZgwRolTypen" type="DOMDOC" />
<Param name="RolMapping" sessionKey="GlobalConfig" type="DOMDOC" />
</IbisLocalSender>
<Forward name="success" path="WrapZdsWordtZaak"/>
Expand Down
14 changes: 0 additions & 14 deletions ...tWithMatchingIdentity/NNPWithMatchingOnlyIAnn.identificatieShouldResultInMatch.properties
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions ...hingIdentity/NNPWithMatchingOnlyIAnn.identificatieShouldResultInMatch/MatchWithZdsRol.xml
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions ...mListWithMatchingIdentity/NNPWithMatchingOnlyIAnn.identificatieShouldResultInMatch/in.xml
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions ...ListWithMatchingIdentity/NNPWithMatchingOnlyIAnn.identificatieShouldResultInMatch/out.xml
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions ...esFromListWithMatchingIdentity/NNPWithMatchingOnlyInn.nnpIdShouldResultInMatch.properties
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions ...tWithMatchingIdentity/NNPWithMatchingOnlyInn.nnpIdShouldResultInMatch/MatchWithZdsRol.xml
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions ...sRolesFromListWithMatchingIdentity/NNPWithMatchingOnlyInn.nnpIdShouldResultInMatch/in.xml
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions ...RolesFromListWithMatchingIdentity/NNPWithMatchingOnlyInn.nnpIdShouldResultInMatch/out.xml
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions ...stWithMatchingIdentity/NNPWithMatchingRemainingKerngegevensShouldResultInMatch.properties
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions ...chingIdentity/NNPWithMatchingRemainingKerngegevensShouldResultInMatch/MatchWithZdsRol.xml
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions ...omListWithMatchingIdentity/NNPWithMatchingRemainingKerngegevensShouldResultInMatch/in.xml
View file
Open in desktop

This file was deleted.

Loading
Loading