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

Check translation profile for resultaat value of both eindStatus and eindDatum in case of closing zaak #506

Merged
merged 2 commits into from
Jan 28, 2025
Merged

Check translation profile for resultaat value of both eindStatus and eindDatum in case of closing zaak #506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e64dc8b
fix: if no resultaat in translation profile for eindStatus, then chec…
Jan 23, 2025
7c06d2e
testcase name update
Jan 23, 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
2 changes: 1 addition & 1 deletion e2e/SoapUI/zaakbrug-e2e-soapui-project.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52711,7 +52711,7 @@ testRunner.testCase.getTestStepByName("Properties").setPropertyValue( 'JwtToken'
</con:property>
</con:properties>
</con:testCase>
<con:testCase id="cea69556-bfab-4684-b32b-e72aa04df1eb" failOnError="false" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="ESED-EindDatumAndEindStatusInUpdateZaak-ZaakShouldBeClosed-GithubIssue292" searchProperties="true" timeout="0" wsrmEnabled="false" wsrmVersion="1.0" wsrmAckTo="" amfAuthorisation="false" amfEndpoint="" amfLogin="" amfPassword="" disabled="true">
<con:testCase id="cea69556-bfab-4684-b32b-e72aa04df1eb" failOnError="false" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="ESED-EindDatumAndEindStatusInUpdateZaak-ZaakShouldBeClosed" searchProperties="true" timeout="0" wsrmEnabled="false" wsrmVersion="1.0" wsrmAckTo="" amfAuthorisation="false" amfEndpoint="" amfLogin="" amfPassword="">
<con:settings/>
<con:testStep type="properties" name="Properties" id="10f7e553-56d1-45bb-9f65-d1cca570e66d">
<con:settings/>
Expand Down
3 changes: 1 addition & 2 deletions src/main/configurations/Translate/Configuration_SetResultaatAndStatus.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
<IbisLocalSender
name="CallZdsHeeftAdapter"
javaListener="ZdsHeeftAdapter"
returnedSessionKeys="NewStatuses,Beeindigd,Error">
returnedSessionKeys="NewStatuses,Error">
<Param name="ZgwStatussen" sessionKey="ZgwStatussen" type="DOMDOC"/>
<Param name="ZaakTypeUrl" xpathExpression="$ZgwZaakType/ZgwZaakType/url">
<Param name="ZgwZaakType" sessionKey="ZgwZaakType" type="DOMDOC"/>
Expand All @@ -89,7 +89,6 @@
<Param name="ZgwZaakType" sessionKey="ZgwZaakType" type="DOMDOC"/>
</Param>
<Param name="ZaakUrl" sessionKey="ZaakUrl"/>
<Param name="Beeindigd" sessionKey="Beeindigd"/>
<Param name="Einddatum" xpathExpression="/*/object/einddatum" sessionKey="originalMessage"/>
<Param name="isActualiseerZaakStatusMessage" sessionKey="isActualiseerZaakStatusMessage"/>
</IbisLocalSender>
Expand Down
16 changes: 8 additions & 8 deletions src/main/configurations/Translate/Configuration_ZdsHeeft.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
description="Handle each ZdsHeeft">

<Receiver name="ZdsHeeftAdapter">
<JavaListener name="ZdsHeeftAdapter" returnedSessionKeys="NewStatuses,Beeindigd,Error" />
<JavaListener name="ZdsHeeftAdapter" returnedSessionKeys="NewStatuses,Error" />
</Receiver>

<Pipeline>
Expand Down Expand Up @@ -68,13 +68,13 @@
<Param name="Zaak" sessionKey="ZaakUrl"/>
<Param name="ZdsEinddatum" sessionKey="Einddatum" defaultValue="Undefined"/>
<Param name="ZdsStatusDatum" xpathExpression="heeft/datumStatusGezet"/>
<Forward name="success" path="SetBeeindigdIfIsEindstatus"/>
<Forward name="success" path="SetIfIncomingStatusIsEindstatus"/>
</XsltPipe>

<XsltPipe
name="SetBeeindigdIfIsEindstatus"
storeResultInSessionKey="Beeindigd"
styleSheetName="CreeerZaak_LK01/xsl/SetBeeindigdIfIsEindstatus.xslt"
name="SetIfIncomingStatusIsEindstatus"
storeResultInSessionKey="IsIncomingStatusEindStatus"
styleSheetName="CreeerZaak_LK01/xsl/SetIfIncomingStatusIsEindstatus.xslt"
>
<Param name="IsEindstatus" sessionKey="GetStatusTypeByZaakTypeAndOmschrijvingResult" type="DOMDOC"/>
<Forward name="success" path="PutStatusExistsInSession"/>
Expand All @@ -83,11 +83,11 @@
<PutInSessionPipe name="PutStatusExistsInSession"
sessionKey="StatusExists"
value="&lt;statusExists&gt;false&lt;/statusExists&gt;">
<Forward name="success" path="CheckForBeeindigd" />
<Forward name="success" path="CheckForIncomingStatusIsEindstatus" />
</PutInSessionPipe>

<XmlIfPipe name="CheckForBeeindigd"
getInputFromSessionKey="Beeindigd"
<XmlIfPipe name="CheckForIncomingStatusIsEindstatus"
getInputFromSessionKey="IsIncomingStatusEindStatus"
xpathExpression="/beeindigd = 'true'"
thenForwardName="CheckIfActualiseerZaakStatus"
elseForwardName="CompareDatumStatusGezet">
Expand Down
0 ..._LK01/xsl/SetBeeindigdIfIsEindstatus.xslt → .../xsl/SetIfIncomingStatusIsEindstatus.xslt
View file
Open in desktop
File renamed without changes.
Loading