From 1f9c01c7b4523c630952f9160b095a98fe2e3965 Mon Sep 17 00:00:00 2001 From: MLenterman Date: Mon, 11 Nov 2024 11:55:41 +0100 Subject: [PATCH 1/3] test(e2e): add testcase to test updateZaak deleting and adding a role with the same roltype when role to be deleted cannot be found. --- e2e/SoapUI/zaakbrug-e2e-soapui-project.xml | 714 ++++++++++++++++++++- 1 file changed, 711 insertions(+), 3 deletions(-) diff --git a/e2e/SoapUI/zaakbrug-e2e-soapui-project.xml b/e2e/SoapUI/zaakbrug-e2e-soapui-project.xml index bac23584..f4d9f3f6 100644 --- a/e2e/SoapUI/zaakbrug-e2e-soapui-project.xml +++ b/e2e/SoapUI/zaakbrug-e2e-soapui-project.xml @@ -21754,6 +21754,10 @@ testRunner.testCase.getTestStepByName("Properties").setPropertyValue( 'JwtToken' JwtToken + + RolUrl + + @@ -22166,7 +22170,7 @@ testRunner.testCase.getTestStepByName("Properties").setPropertyValue( 'JwtToken' - + - + @@ -22277,7 +22281,7 @@ testRunner.testCase.getTestStepByName("Properties").setPropertyValue( 'JwtToken' - + @@ -24345,6 +24349,710 @@ testRunner.testCase.getTestStepByName("Properties").setPropertyValue( 'JwtToken' + + + + + + + + ZaakIdentificatie + + + + DocumentIdentificatie + + + + ZaakUrl + + + + JwtToken + + + + RolUrl + + + + + + + + + ZdsVrijeBerichten + genereerZaakIdentificatie_Di02 + + + <xml-fragment/> + + + UTF-8 + ${#Project#ZaakbrugEndpoint}translate/generic/zds/VrijBericht + \r + \r + \r + \r + Di02\r + \r + 1900\r + GISVG\r + \r + \r + 1900\r + ZDS\r + \r + ${=java.util.UUID.randomUUID().toString() }\r + ${=import java.text.SimpleDateFormat; SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSS"); sdf.setTimeZone(TimeZone.getTimeZone("${#Project#ZdsTimezone}")); sdf.format(new Date());}\r + genereerZaakidentificatie\r + \r + \r + \r +]]> + + + + + + + No Authorization + + + + + + + + + + + + + TransferZaakIdentificatie + Response + 01-zds-genereerZaakIdentificatie_Di02 + declare namespace ZKN="http://www.egem.nl/StUF/sector/zkn/0310"; +//ZKN:identificatie[1] + ZaakIdentificatie + Properties + + XPATH + true + + + + + + + ZdsOntvangAsynchroon + creeerZaak_Lk01 + + + <xml-fragment/> + + + UTF-8 + ${#Project#ZaakbrugEndpoint}translate/generic/zds/OntvangAsynchroon + \r + \r + \r + \r + Lk01\r + \r + 1900\r + GISVG\r + \r + \r + 1900\r + ZDS\r + \r + ${=java.util.UUID.randomUUID().toString() }\r + ${=import java.text.SimpleDateFormat; SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSS"); sdf.setTimeZone(TimeZone.getTimeZone("${#Project#ZdsTimezone}")); sdf.format(new Date());}\r + ZAK\r + \r + \r + T\r + I\r + \r + \r + ${Properties#ZaakIdentificatie}\r + Dossiernummer GISVG OV${Properties#ZaakIdentificatie}\r + Reguliere omgevingsvergunning\r + ${=import java.text.SimpleDateFormat; new SimpleDateFormat("yyyyMMdd").format(new Date())}\r + ${=import java.text.SimpleDateFormat; new SimpleDateFormat("yyyyMMdd").format(new Date())}\r + N\r + 1\r + N\r + \r + \r + Aanvraag omgevingsvergunning\r + B1210\r + \r + \r + \r + \r + \r + \r + 0091200000046730\r + J\r + Sneek\r + Marktstraat\r + 15\r + \r + \r + 8601CR\r + \r + \r + zaak object omschrijving\r + \r + \r + \r + \r + 111111110\r + J\r + Precies\r + \r + P.J.\r + Piet Je\r + V\r + 19500101\r + \r + 0091200000046730\r + J\r + Sneek\r + Marktstraat\r + Marktstraat\r + 8601CR\r + 15\r + \r + \r + \r + \r + \r + \r + B1210\r + Rolomschrijving\r + Roltoelichting\r + \r + \r + \r + B1210\r + Aanvraag omgevingsvergunning\r + 1\r + 160\r + \r + \r + \r + StatusZaakToelichting nog aanleveren vanuit GISVG\r + ${=import java.text.SimpleDateFormat; new SimpleDateFormat("yyyyMMdd").format(new Date())}000000000\r + \r + \r + \r + Med75\r + Administratie\r + \r + \r + \r + \r + \r + Uitvoerder\r + \r + \r + \r + \r + \r +]]> + + + + + + + No Authorization + + + + + + + + + + + + + + + + + + + <xml-fragment/> + + ${#Project#OpenZaakZakenApiRootUrl}/zaken + + + + $.results[0].omschrijving + Dossiernummer GISVG OV${Properties#ZaakIdentificatie} + false + false + false + + + + No Authorization + + + + + + Accept-Crs + EPSG:4326 + HEADER + EPSG:4326 + + + + + Content-Crs + EPSG:4326 + HEADER + EPSG:4326 + + + + + Authorization + ${Properties#JwtToken} + HEADER + ${Properties#JwtToken} + + + + + identificatie + ${Properties#ZaakIdentificatie} + QUERY + + + + + + + + + TransferZaakUrl + Response + 03b-zgw-getZaakByIdentificatie + $.results[0].url + ZaakUrl + Properties + JSONPATH + JSONPATH + true + + + + + + + + <xml-fragment/> + + ${#Project#OpenZaakZakenApiRootUrl}/rollen + + + + 200 + + + + No Authorization + + + + + + Accept-Crs + EPSG:4326 + HEADER + EPSG:4326 + + + + + Content-Crs + EPSG:4326 + HEADER + EPSG:4326 + + + + + Authorization + ${Properties#JwtToken} + HEADER + ${Properties#JwtToken} + + + + + zaak + ${Properties#ZaakUrl} + QUERY + + + betrokkeneIdentificatie__natuurlijkPersoon__inpBsn + 111111110 + QUERY + + + + + + + + + TransferZaakUrl + Response + 04a-zgw-getRolByZaakUrlAndInpBsn + $.results[0].url + RolUrl + Properties + JSONPATH + JSONPATH + true + + + + + + + + <xml-fragment/> + + ${Properties#RolUrl} + + + + 204 + + + + No Authorization + + + + + + Authorization + ${Properties#JwtToken} + HEADER + ${Properties#JwtToken} + + + + + + + + + + ZdsOntvangAsynchroon + updateZaak_Lk01 + + + <xml-fragment/> + + + UTF-8 + ${#Project#ZaakbrugEndpoint}translate/generic/zds/OntvangAsynchroon + \r + \r + \r + \r + Lk01\r + \r + 1900\r + GISVG\r + \r + \r + 1900\r + ZDS\r + \r + ${=java.util.UUID.randomUUID().toString() }\r + ${=import java.text.SimpleDateFormat; SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSS"); sdf.setTimeZone(TimeZone.getTimeZone("${#Project#ZdsTimezone}")); sdf.format(new Date());}\r + ZAK\r + \r + \r + W\r + I\r + \r + \r + ${Properties#ZaakIdentificatie}\r + Dossiernummer GISVG OV${Properties#ZaakIdentificatie}\r + \r + \r + Vergunningvrij\r + \r + + N\r + \r + \r + Aanvraag omgevingsvergunning\r + B1210\r + \r + \r + \r + + + + 111111110 + J + Precies + + P.J. + Piet Je + V + 19500101 + + 0091200000046730 + J + Sneek + Marktstraat + Marktstraat + 8601CR + 15 + + + + + + + B1210 + Rolomschrijving + Roltoelichting + + \r + \r + ${Properties#ZaakIdentificatie}\r + Dossiernummer GISVG OV${Properties#ZaakIdentificatie}\r + \r + \r + Vergunningvrij\r + \r + 20210402\r + N\r + \r + \r + Aanvraag omgevingsvergunning\r + B1210\r + \r + \r + \r + + + + 000021774684 + N + Gemeente Súdwest-Fryslân + + 0091200000046730 + J + Sneek + Marktstraat + Marktstraat + 8601CR + 15 + + + + + + + + \r + \r + \r +]]> + + + + + + + No Authorization + + + + + + + + + + + + ZdsBeantwoordVraag + geefZaakdetails_Lv01 + + + <xml-fragment/> + + UTF-8 + ${#Project#ZaakbrugEndpoint}translate/generic/zds/BeantwoordVraag + \r + \r + \r + \r + Lv01\r + \r + 1900\r + GISVG\r + \r + \r + 1900\r + ZDS\r + \r + ${=java.util.UUID.randomUUID().toString() }\r + ${=import java.text.SimpleDateFormat; SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSS"); sdf.setTimeZone(TimeZone.getTimeZone("${#Project#ZdsTimezone}")); sdf.format(new Date());}\r + ZAK\r + \r + \r + 0\r + false\r + \r + \r + ${Properties#ZaakIdentificatie}\r + \r + \r + \r + \r + \r + \r +]]> + + + + + + + + string-length(//*:object/*:heeftAlsInitiator/*:gerelateerde/*:natuurlijkPersoon/*:inp.bsn) + 0 + false + false + false + + + + + //*:object/*:heeftAlsInitiator/*:gerelateerde/*:vestiging/*:vestigingsNummer + 000021774684 + false + false + false + + + + No Authorization + + + + + + + + + + + + + <xml-fragment/> + + ${Properties#ZaakUrl} + + + + 204 + + + + No Authorization + + + + + + Authorization + ${Properties#JwtToken} + HEADER + ${Properties#JwtToken} + + + + + + + + + DocumentSizeKb + 0.1 + + + CatalogusUrl From 995e600d8f894382dd1c44cf312fb115e16f0e8b Mon Sep 17 00:00:00 2001 From: MLenterman Date: Mon, 11 Nov 2024 11:57:38 +0100 Subject: [PATCH 2/3] fix: updateZaak incorrectly adds the be deleted rol when updateZaak message deletes and adds a role with the same roltype when the to be deleted role cannot be found. --- .../Translate/Configuration_DetectRolChanges.xml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/configurations/Translate/Configuration_DetectRolChanges.xml b/src/main/configurations/Translate/Configuration_DetectRolChanges.xml index e28193c8..4f1f45ad 100644 --- a/src/main/configurations/Translate/Configuration_DetectRolChanges.xml +++ b/src/main/configurations/Translate/Configuration_DetectRolChanges.xml @@ -164,10 +164,18 @@ - + + + + + + - + From 665f63c49cbf99fb09d0647a2319f3ef0b97fa3f Mon Sep 17 00:00:00 2001 From: MLenterman Date: Mon, 11 Nov 2024 12:54:12 +0100 Subject: [PATCH 3/3] fix testcase order --- e2e/SoapUI/zaakbrug-e2e-soapui-project.xml | 192 ++++++++++----------- 1 file changed, 96 insertions(+), 96 deletions(-) diff --git a/e2e/SoapUI/zaakbrug-e2e-soapui-project.xml b/e2e/SoapUI/zaakbrug-e2e-soapui-project.xml index f4d9f3f6..a5086d2d 100644 --- a/e2e/SoapUI/zaakbrug-e2e-soapui-project.xml +++ b/e2e/SoapUI/zaakbrug-e2e-soapui-project.xml @@ -24253,102 +24253,6 @@ testRunner.testCase.getTestStepByName("Properties").setPropertyValue( 'JwtToken' - - - - - - - - JwtToken - - - - - - - - - - - - - - - - <xml-fragment/> - - ${#TestSuite#ZaakTypeOmgevingsvergunningUrl} - - - No Authorization - - - - - - Authorization - ${Properties#JwtToken} - HEADER - ${Properties#JwtToken} - - - - - - - - @@ -25053,6 +24957,102 @@ testRunner.testCase.getTestStepByName("Properties").setPropertyValue( 'JwtToken' + + + + + + + + JwtToken + + + + + + + + + + + + + + + + <xml-fragment/> + + ${#TestSuite#ZaakTypeOmgevingsvergunningUrl} + + + No Authorization + + + + + + Authorization + ${Properties#JwtToken} + HEADER + ${Properties#JwtToken} + + + + + + + + CatalogusUrl