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

Jump to bottom

fix: having both einddatum and resultaat but no eindstatus in updateZaak does not close zaak based on einddatum #440

Merged
merged 6 commits into from
Sep 13, 2024
Merged

fix: having both einddatum and resultaat but no eindstatus in updateZaak does not close zaak based on einddatum #440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1751ae2
fix: having both eindDatum and resultaat but no eindstatus in updateZ…
MLenterman Sep 12, 2024
2270ae8
chore: update all greater than signs
Sep 12, 2024
635dcfc
chore: typo
Sep 12, 2024
bca8c39
chore:typo
Sep 12, 2024
79baf98
chore: update testcase names
Sep 12, 2024
718e72f
Merge branch 'master' into einddatum-and-resultaat-but-no-eindstatus-fix
MLenterman Sep 13, 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
39 changes: 31 additions & 8 deletions e2e/SoapUI/zaakbrug-e2e-soapui-project.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16684,6 +16684,7 @@ testRunner.testCase.getTestStepByName("Properties").setPropertyValue( 'JwtToken'
<ZKN:toelichting>Reguliere omgevingsvergunning</ZKN:toelichting>
<ZKN:startdatum>*</ZKN:startdatum>
<ZKN:registratiedatum>*</ZKN:registratiedatum>
<ZKN:einddatum>*</ZKN:einddatum>
<ZKN:opschorting>
<ZKN:indicatie>N</ZKN:indicatie>
<ZKN:reden/>
Expand Down Expand Up @@ -16730,6 +16731,15 @@ testRunner.testCase.getTestStepByName("Properties").setPropertyValue( 'JwtToken'
<ZKN:datumStatusGezet>*</ZKN:datumStatusGezet>
<ZKN:indicatieLaatsteStatus>N</ZKN:indicatieLaatsteStatus>
</ZKN:heeft>
<ZKN:heeft StUF:entiteittype="ZAKSTT">
<ZKN:gerelateerde StUF:entiteittype="STT">
<ZKN:zkt.code>B1210</ZKN:zkt.code>
<ZKN:zkt.omschrijving>Omgevingsvergunning</ZKN:zkt.omschrijving>
<ZKN:omschrijving>Afgehandeld</ZKN:omschrijving>
</ZKN:gerelateerde>
<ZKN:datumStatusGezet>*</ZKN:datumStatusGezet>
<ZKN:indicatieLaatsteStatus>J</ZKN:indicatieLaatsteStatus>
</ZKN:heeft>
</ZKN:object>
</ZKN:antwoord>]]></content>
<allowWildcards>true</allowWildcards>
Expand Down Expand Up @@ -18066,10 +18076,11 @@ testRunner.testCase.getTestStepByName("Properties").setPropertyValue( 'JwtToken'
<content><![CDATA[<ZKN:antwoord xmlns:BG="http://www.egem.nl/StUF/sector/bg/0310" xmlns:StUF="http://www.egem.nl/StUF/StUF0301" xmlns:ZKN="http://www.egem.nl/StUF/sector/zkn/0310" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">
<ZKN:object StUF:entiteittype="ZAK">
<ZKN:identificatie>*</ZKN:identificatie>
<ZKN:omschrijving>Dossiernummer GISVG OVZK*</ZKN:omschrijving>
<ZKN:omschrijving>Dossiernummer GISVG OV*</ZKN:omschrijving>
<ZKN:toelichting>Reguliere omgevingsvergunning</ZKN:toelichting>
<ZKN:startdatum>*</ZKN:startdatum>
<ZKN:registratiedatum>*</ZKN:registratiedatum>
<ZKN:einddatum>*</ZKN:einddatum>
<ZKN:opschorting>
<ZKN:indicatie>N</ZKN:indicatie>
<ZKN:reden/>
Expand Down Expand Up @@ -18124,6 +18135,15 @@ testRunner.testCase.getTestStepByName("Properties").setPropertyValue( 'JwtToken'
<ZKN:datumStatusGezet>*</ZKN:datumStatusGezet>
<ZKN:indicatieLaatsteStatus>N</ZKN:indicatieLaatsteStatus>
</ZKN:heeft>
<ZKN:heeft StUF:entiteittype="ZAKSTT">
<ZKN:gerelateerde StUF:entiteittype="STT">
<ZKN:zkt.code>B1210</ZKN:zkt.code>
<ZKN:zkt.omschrijving>Omgevingsvergunning</ZKN:zkt.omschrijving>
<ZKN:omschrijving>Afgehandeld</ZKN:omschrijving>
</ZKN:gerelateerde>
<ZKN:datumStatusGezet>*</ZKN:datumStatusGezet>
<ZKN:indicatieLaatsteStatus>J</ZKN:indicatieLaatsteStatus>
</ZKN:heeft>
</ZKN:object>
</ZKN:antwoord>]]></content>
<allowWildcards>true</allowWildcards>
Expand Down Expand Up @@ -35031,7 +35051,7 @@ testRunner.testCase.getTestStepByName("Properties").setPropertyValue( 'JwtToken'
</con:property>
</con:properties>
</con:testCase>
<con:testCase id="934a275a-b169-40b1-b52d-288c6ab7af45" failOnError="false" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="EDRLS-BothEindDatumAndResultaatInUpdateZaak-ZaakNotBeClosed-GithubIssues293And295" searchProperties="true" timeout="0" wsrmEnabled="false" wsrmVersion="1.0" wsrmAckTo="" amfAuthorisation="false" amfEndpoint="" amfLogin="" amfPassword="" disabled="true">
<con:testCase id="934a275a-b169-40b1-b52d-288c6ab7af45" failOnError="false" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="EDRLS-BothEindDatumAndResultaatInUpdateZaak-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="dbe9530c-a1ac-4e26-83ce-ae66971f0558">
<con:settings/>
Expand Down Expand Up @@ -35620,7 +35640,7 @@ testRunner.testCase.getTestStepByName("Properties").setPropertyValue( 'JwtToken'
</con:property>
</con:properties>
</con:testCase>
<con:testCase id="a39a33c8-063c-4330-b051-449c01530ebc" failOnError="false" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="EDRLS-FirstResultaatThenEindDatumInUpdateZaak-ZaakShouldBeClosed-GithubIssue295" searchProperties="true" timeout="0" wsrmEnabled="false" wsrmVersion="1.0" wsrmAckTo="" amfAuthorisation="false" amfEndpoint="" amfLogin="" amfPassword="" disabled="true">
<con:testCase id="a39a33c8-063c-4330-b051-449c01530ebc" failOnError="false" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="EDRLS-FirstResultaatThenEindDatumInUpdateZaak-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="eba3feb9-9464-4908-996c-51ca864ba528">
<con:settings/>
Expand Down Expand Up @@ -35923,6 +35943,9 @@ testRunner.testCase.getTestStepByName("Properties").setPropertyValue( 'JwtToken'
<ZKN:object StUF:sleutelVerzendend="${Properties#ZaakIdentificatie}" StUF:entiteittype="ZAK" StUF:verwerkingssoort="W">
<ZKN:identificatie>${Properties#ZaakIdentificatie}</ZKN:identificatie>
<ZKN:omschrijving>Aanvraag omgevingsvergunning</ZKN:omschrijving>
<ZKN:resultaat>
<ZKN:omschrijving>Ingetrokken</ZKN:omschrijving>
</ZKN:resultaat>
<ZKN:startdatum>${=import java.text.SimpleDateFormat; new SimpleDateFormat("yyyyMMdd").format(new Date())}</ZKN:startdatum>
<ZKN:registratiedatum>${=import java.text.SimpleDateFormat; new SimpleDateFormat("yyyyMMdd").format(new Date())}</ZKN:registratiedatum>
<ZKN:einddatum>${=import java.text.SimpleDateFormat; new SimpleDateFormat("yyyyMMdd").format(new Date())}</ZKN:einddatum>
Expand Down Expand Up @@ -39996,7 +40019,7 @@ testRunner.testCase.getTestStepByName("Properties").setPropertyValue( 'JwtToken'
</con:testStep>
<con:properties/>
</con:testCase>
<con:testCase id="e28f01cf-a818-4a50-9bcd-942f42ca3761" failOnError="false" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="EndCaseEndDateInProfileJson(ESED)-BothEindDatumAndResultaatInUpdateZaak-ZaakShouldBeClosed-GithubIssue293" searchProperties="true" timeout="0" wsrmEnabled="false" wsrmVersion="1.0" wsrmAckTo="" amfAuthorisation="false" amfEndpoint="" amfLogin="" amfPassword="" disabled="true">
<con:testCase id="e28f01cf-a818-4a50-9bcd-942f42ca3761" failOnError="false" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="EndCaseEndDateInProfileJson(ESED)-BothEindDatumAndResultaatInUpdateZaak-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="3dc315ef-fdb0-499e-ba8d-c7a50f96a4fb">
<con:settings/>
Expand Down Expand Up @@ -41313,7 +41336,7 @@ testRunner.testCase.getTestStepByName("Properties").setPropertyValue( 'JwtToken'
</con:property>
</con:properties>
</con:testCase>
<con:testCase id="7ed79a4e-4506-4129-b638-586a4b0ad666" failOnError="false" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="ESED-FirstResultaatThenBothEindDatumAndResultaatInUpdateZaak-ZaakShouldBeClosed-GithubIssue293" searchProperties="true" timeout="0" wsrmEnabled="false" wsrmVersion="1.0" wsrmAckTo="" amfAuthorisation="false" amfEndpoint="" amfLogin="" amfPassword="" disabled="true">
<con:testCase id="7ed79a4e-4506-4129-b638-586a4b0ad666" failOnError="false" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="ESED-FirstResultaatThenBothEindDatumAndResultaatInUpdateZaak-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="f811eb02-8e29-4e9b-846f-88d37fab50f2">
<con:settings/>
Expand Down Expand Up @@ -49296,7 +49319,7 @@ testRunner.testCase.getTestStepByName("Properties").setPropertyValue( 'JwtToken'
</con:testStep>
<con:properties/>
</con:testCase>
<con:testCase id="1ec9a4e5-6dc7-463a-8250-e292608f973c" failOnError="false" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="SetUp-IEIAZS-B" searchProperties="true" timeout="0" wsrmEnabled="false" wsrmVersion="1.0" wsrmAckTo="" amfAuthorisation="false" amfEndpoint="" amfLogin="" amfPassword="" disabled="true">
<con:testCase id="1ec9a4e5-6dc7-463a-8250-e292608f973c" failOnError="false" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="SetUp-IEIAZS-B" searchProperties="true" timeout="0" wsrmEnabled="false" wsrmVersion="1.0" wsrmAckTo="" amfAuthorisation="false" amfEndpoint="" amfLogin="" amfPassword="">
<con:settings/>
<con:testStep type="properties" name="Properties" id="af768f15-7271-4d71-ad20-c153fda162c5">
<con:settings/>
Expand Down Expand Up @@ -49795,7 +49818,7 @@ testRunner.testCase.getTestStepByName("Properties").setPropertyValue( 'JwtToken'
</con:testStep>
<con:properties/>
</con:testCase>
<con:testCase id="cf38e58b-1024-468b-be6d-717bf62e7dbe" failOnError="false" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="IEIAZS-B-EndDateAndResultInUpdateZaak-UpdateZaakShouldCloseCaseByCreatingEndStatusFromEndDate" searchProperties="true" timeout="0" wsrmEnabled="false" wsrmVersion="1.0" wsrmAckTo="" amfAuthorisation="false" amfEndpoint="" amfLogin="" amfPassword="" disabled="true">
<con:testCase id="cf38e58b-1024-468b-be6d-717bf62e7dbe" failOnError="false" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="IEIAZS-B-EndDateAndResultInUpdateZaak-UpdateZaakShouldCloseCaseByCreatingEndStatusFromEndDate" searchProperties="true" timeout="0" wsrmEnabled="false" wsrmVersion="1.0" wsrmAckTo="" amfAuthorisation="false" amfEndpoint="" amfLogin="" amfPassword="">
<con:settings/>
<con:testStep type="properties" name="Properties" id="ccfc0c12-6823-4dd2-9f22-79d19dd4c43c">
<con:settings/>
Expand Down Expand Up @@ -50459,7 +50482,7 @@ testRunner.testCase.getTestStepByName("Properties").setPropertyValue( 'JwtToken'
</con:property>
</con:properties>
</con:testCase>
<con:testCase id="2999e6d9-ad31-484c-828b-08da6cb4e38b" failOnError="false" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="TearDown-IEIAZS-B" searchProperties="true" timeout="0" wsrmEnabled="false" wsrmVersion="1.0" wsrmAckTo="" amfAuthorisation="false" amfEndpoint="" amfLogin="" amfPassword="" disabled="true">
<con:testCase id="2999e6d9-ad31-484c-828b-08da6cb4e38b" failOnError="false" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="TearDown-IEIAZS-B" searchProperties="true" timeout="0" wsrmEnabled="false" wsrmVersion="1.0" wsrmAckTo="" amfAuthorisation="false" amfEndpoint="" amfLogin="" amfPassword="">
<con:settings/>
<con:testStep type="properties" name="Properties" id="deccaf96-69f5-4196-bf2c-56843830a9db">
<con:settings/>
Expand Down
58 changes: 50 additions & 8 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 @@ -99,7 +99,7 @@

<XmlIfPipe name="CheckForResultaat"
getInputFromSessionKey="originalMessage"
xpathExpression="string-length(/*/object/resultaat/omschrijving) > 0"
xpathExpression="string-length(/*/object/resultaat/omschrijving) gt 0"
thenForwardName="CallGetResultaatTypeByZaakTypeAndOmschrijving_1"
elseForwardName="CheckForEndStatusType">
</XmlIfPipe>
Expand Down Expand Up @@ -183,15 +183,57 @@
</Param>
<Param name="Toelichting" xpathExpression="/*/object/resultaat/omschrijving"/>
</IbisLocalSender>
<Forward name="success" path="PostStatusIterator"/>
<Forward name="success" path="SelectEndStatusFromNewStatusses"/>
<Forward name="exception" path="EXCEPTION" />
</SenderPipe>

<XsltPipe
name="SelectEndStatusFromNewStatusses"
getInputFromFixedValue="&lt;dummy/&gt;"
styleSheetName="CreeerZaak_LK01/xsl/SetNewEndStatus.xsl"
storeResultInSessionKey="EndStatusFromNewStatusses"
>
<Param name="NewStatuses" sessionKey="NewStatuses" type="DOMDOC" />
<Param name="EndStatusType" sessionKey="SetEndStatusTypeResult" type="DOMDOC" />
<Forward name="success" path="EinddatumAndResultaatButNoEndStatus"/>
</XsltPipe>

<XmlIfPipe
name="EinddatumAndResultaatButNoEndStatus"
xpathExpression="string-length($EndStatusFromNewStatusses/ZgwStatus) = 0 and $Beeindigd/beeindigd = 'false' and string-length($Einddatum) gt 0"
thenForwardName="CreateNewEndStatusFromEinddatum"
elseForwardName="PostStatusIterator"
>
<Param name="Beeindigd" sessionKey="Beeindigd" type="DOMDOC" />
<Param name="EndStatusFromNewStatusses" sessionKey="EndStatusFromNewStatusses" type="DOMDOC" />
<Param name="Einddatum" xpathExpression="/*/object/einddatum" sessionKey="originalMessage" />
</XmlIfPipe>

<XsltPipe
name="CreateNewEndStatusFromEinddatum"
getInputFromSessionKey="originalMessage"
styleSheetName="Zgw/Zaken/Model/ZgwStatus.xslt"
>
<Param name="Zaak" sessionKey="ZaakUrl" />
<Param name="ZgwStatusType" sessionKey="SetEndStatusTypeResult" type="DOMDOC" />
<Param name="ZdsEinddatum" xpathExpression="/*/object/einddatum" />
<Forward name="success" path="AddNewEndStatusFromEinddatumToNewStatusses" />
</XsltPipe>

<XsltPipe
name="AddNewEndStatusFromEinddatumToNewStatusses"
storeResultInSessionKey="NewStatuses"
styleSheetName="CreeerZaak_LK01/xsl/AddToNewStatuses.xsl"
>
<Forward name="success" path="PostStatusIterator"/>
</XsltPipe>

<XmlIfPipe name="CheckForEndStatusType"
getInputFromSessionKey="SetEndStatusTypeResult"
xpathExpression="string-length(/ZgwStatusType) > 0"
xpathExpression="string-length(/ZgwStatusType) gt 0"
thenForwardName="SetNewEndStatus"
elseForwardName="CheckForNewEndStatus">
elseForwardName="CheckForNewEndStatus"
>
</XmlIfPipe>

<XsltPipe
Expand All @@ -204,7 +246,7 @@
</XsltPipe>

<XmlIfPipe name="CheckForNewEndStatus"
xpathExpression="string-length(/ZgwStatus) > 0"
xpathExpression="string-length(/ZgwStatus) gt 0"
thenForwardName="CallGetResultatenByZaakUrl_2"
elseForwardName="CheckForEindDatum">
</XmlIfPipe>
Expand Down Expand Up @@ -248,7 +290,7 @@
</XsltPipe>

<XmlIfPipe name="CheckForCoalesceResultaat_1"
xpathExpression="string-length(/result/coalesceResultaat) > 0"
xpathExpression="string-length(/result/coalesceResultaat) gt 0"
thenForwardName="CallGetResultaatTypeByZaakTypeAndOmschrijving_2"
elseForwardName="CheckForEindDatum">
</XmlIfPipe>
Expand Down Expand Up @@ -286,7 +328,7 @@

<XmlIfPipe name="CheckForEindDatum"
getInputFromSessionKey="originalMessage"
xpathExpression="string-length(/*/object/einddatum) > 0 and $Beeindigd/beeindigd = 'false'"
xpathExpression="string-length(/*/object/einddatum) gt 0 and $Beeindigd/beeindigd = 'false'"
thenForwardName="GetResolveProfileValuesSender_2"
elseForwardName="PostStatusIterator">
<Param name="Beeindigd" sessionKey="Beeindigd" type="DOMDOC"/>
Expand All @@ -313,7 +355,7 @@
</XsltPipe>

<XmlIfPipe name="CheckForCoalesceResultaat_2"
xpathExpression="string-length(/result/coalesceResultaat) > 0"
xpathExpression="string-length(/result/coalesceResultaat) gt 0"
thenForwardName="CallGetResultatenByZaakUrl_3"
elseForwardName="PostStatusIterator">
</XmlIfPipe>
Expand Down
Loading