From b9273e96d66a39edcc4a95fd64883d52785c6fd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Meri=C3=A7=20Akg=C3=BCl?= <39882155+mericakgul@users.noreply.github.com> Date: Fri, 25 Oct 2024 10:26:55 +0200 Subject: [PATCH] fix: use identificatie from genereerDocumentIdentificatie in voegZaakdocumentToe request & add dct.omschrijving to voegZaakdocumentToe request with value from property (#23) * feat: genereerDocumentIdentificatie request added and the identificatie generated is used in voegZaakDocumentToe message * chor: forgot to comment out * feat: add dct.omschrijving to voegZaakdocumentToe request with value from property * remove redundant check for identification in xslt and change the default value for document omschrijving --------- Co-authored-by: Meric Akgul --- .../openforms2xxllnc-e2e-soapui-project.xml | 77 +++++++++++++++++-- ...reerDocumentIdentificatie_Di02Request.xslt | 10 +++ .../xxllnc/Common/xsl/CreateObjectLk01.xslt | 10 +-- .../Common/xsl/CreateStuurgegevens.xslt | 10 ++- .../configurations/xxllnc/Configuration.xml | 2 + ...ation_Handler_AddDocumentToCaseCommand.xml | 55 ++++++++++++- .../Configuration_WrapEdcLk01Request.xml | 2 + ...ereerDocumentIdentificatie_Di02Request.xml | 49 ++++++++++++ .../xxllnc/DeploymentSpecifics.properties | 1 + .../resources/DeploymentSpecifics.properties | 2 + 10 files changed, 203 insertions(+), 15 deletions(-) create mode 100644 src/main/configurations/xxllnc/Common/xsl/CreateGenereerDocumentIdentificatie_Di02Request.xslt create mode 100644 src/main/configurations/xxllnc/Configuration_WrapGenereerDocumentIdentificatie_Di02Request.xml diff --git a/e2e/SoapUI/openforms2xxllnc-e2e-soapui-project.xml b/e2e/SoapUI/openforms2xxllnc-e2e-soapui-project.xml index ccb1cc2..ecda7f0 100644 --- a/e2e/SoapUI/openforms2xxllnc-e2e-soapui-project.xml +++ b/e2e/SoapUI/openforms2xxllnc-e2e-soapui-project.xml @@ -3130,6 +3130,27 @@ should be used. If `height` is nested inside `dimensions` attribute, query shoul + + + + http://example.com/VrijeBerichten + + + + + + + + + + + + + + + + + SEQUENTIAL @@ -5001,7 +5022,7 @@ casesServiceMock.setPropertyValue("initiatingSubjectCitizenNumber", initiatingSu - + @@ -5290,7 +5311,7 @@ casesServiceMock.setPropertyValue("initiatingSubjectCitizenNumber", initiatingSu - + @@ -5320,7 +5341,7 @@ casesServiceMock.setPropertyValue("initiatingSubjectCitizenNumber", '123456789') - + <xml-fragment/> @@ -6133,7 +6154,7 @@ casesServiceMock.setPropertyValue("initiatingSubjectCitizenNumber", '123456789') - + @@ -6416,7 +6437,7 @@ casesServiceMock.setPropertyValue("initiatingSubjectCitizenNumber", '123456789') - + @@ -6705,7 +6726,7 @@ casesServiceMock.setPropertyValue("initiatingSubjectCitizenNumber", initiatingSu - + @@ -6994,7 +7015,7 @@ casesServiceMock.setPropertyValue("initiatingSubjectCitizenNumber", initiatingSu - + @@ -7372,6 +7393,44 @@ casesServiceMock.setPropertyValue("initiatingSubjectCitizenNumber", initiatingSu + + + false + + + + + Response 1 + SEQUENCE + + + + + Du02 + + 1900 + zs-dms + + + 1900 + Openforms2xxllnc + + + ac150004-579477bd_192bb3d0d17_-7fcf + 20241023232701 + ac150004-579477bd_192bb3d0d17_-7fcf + genereerDocumentidentificatie + + + ${#Project#documentIdentificatie} + + +]]> + + + + + @@ -8099,6 +8158,10 @@ if( requestBody.contains("some data") ) initiatingSubjectKvkNumber 823288444 + + documentIdentificatie + DC2024-00001 + diff --git a/src/main/configurations/xxllnc/Common/xsl/CreateGenereerDocumentIdentificatie_Di02Request.xslt b/src/main/configurations/xxllnc/Common/xsl/CreateGenereerDocumentIdentificatie_Di02Request.xslt new file mode 100644 index 0000000..ea58648 --- /dev/null +++ b/src/main/configurations/xxllnc/Common/xsl/CreateGenereerDocumentIdentificatie_Di02Request.xslt @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/src/main/configurations/xxllnc/Common/xsl/CreateObjectLk01.xslt b/src/main/configurations/xxllnc/Common/xsl/CreateObjectLk01.xslt index 79a3d2d..f783cb1 100644 --- a/src/main/configurations/xxllnc/Common/xsl/CreateObjectLk01.xslt +++ b/src/main/configurations/xxllnc/Common/xsl/CreateObjectLk01.xslt @@ -1,5 +1,7 @@ + + @@ -8,12 +10,8 @@ - - - - - - Brief + + diff --git a/src/main/configurations/xxllnc/Common/xsl/CreateStuurgegevens.xslt b/src/main/configurations/xxllnc/Common/xsl/CreateStuurgegevens.xslt index d4c8567..0456402 100644 --- a/src/main/configurations/xxllnc/Common/xsl/CreateStuurgegevens.xslt +++ b/src/main/configurations/xxllnc/Common/xsl/CreateStuurgegevens.xslt @@ -7,6 +7,7 @@ + @@ -21,7 +22,14 @@ - + + + + + + + + diff --git a/src/main/configurations/xxllnc/Configuration.xml b/src/main/configurations/xxllnc/Configuration.xml index a90ca39..0804007 100644 --- a/src/main/configurations/xxllnc/Configuration.xml +++ b/src/main/configurations/xxllnc/Configuration.xml @@ -13,6 +13,7 @@ + ]> @@ -30,4 +31,5 @@ &WorkflowSelector; &WrapEdcLk01Request; &WrapZakLv01Request; + &WrapDi02Request; diff --git a/src/main/configurations/xxllnc/Configuration_Handler_AddDocumentToCaseCommand.xml b/src/main/configurations/xxllnc/Configuration_Handler_AddDocumentToCaseCommand.xml index 7d56b50..412a065 100644 --- a/src/main/configurations/xxllnc/Configuration_Handler_AddDocumentToCaseCommand.xml +++ b/src/main/configurations/xxllnc/Configuration_Handler_AddDocumentToCaseCommand.xml @@ -90,9 +90,61 @@ lineLength="0" storeResultInSessionKey="ZgwEnkelvoudigInformatieObjectInhoud" > - + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/configurations/xxllnc/Configuration_WrapEdcLk01Request.xml b/src/main/configurations/xxllnc/Configuration_WrapEdcLk01Request.xml index b97c00e..4b87317 100644 --- a/src/main/configurations/xxllnc/Configuration_WrapEdcLk01Request.xml +++ b/src/main/configurations/xxllnc/Configuration_WrapEdcLk01Request.xml @@ -50,6 +50,8 @@ styleSheetName="Common/xsl/CreateObjectLk01.xslt" storeResultInSessionKey="Object" > + + diff --git a/src/main/configurations/xxllnc/Configuration_WrapGenereerDocumentIdentificatie_Di02Request.xml b/src/main/configurations/xxllnc/Configuration_WrapGenereerDocumentIdentificatie_Di02Request.xml new file mode 100644 index 0000000..9a7fbf5 --- /dev/null +++ b/src/main/configurations/xxllnc/Configuration_WrapGenereerDocumentIdentificatie_Di02Request.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/configurations/xxllnc/DeploymentSpecifics.properties b/src/main/configurations/xxllnc/DeploymentSpecifics.properties index 324ef78..7c7f92d 100644 --- a/src/main/configurations/xxllnc/DeploymentSpecifics.properties +++ b/src/main/configurations/xxllnc/DeploymentSpecifics.properties @@ -21,6 +21,7 @@ Workflow_TwoWayCommunication.Active: true WorkflowSelector.Active: true WrapEdcLk01Request.Active: true WrapZakLv01Request.Active: true +WrapGenereerDocumentIdentificatie_Di02Request.Active: true loadBalancer.url: # suppress warning keys diff --git a/src/main/resources/DeploymentSpecifics.properties b/src/main/resources/DeploymentSpecifics.properties index 37bc1f9..bd20984 100644 --- a/src/main/resources/DeploymentSpecifics.properties +++ b/src/main/resources/DeploymentSpecifics.properties @@ -8,6 +8,7 @@ openforms2xxllnc.workflows.stuurgegevens.zender.organisatie=1900 openforms2xxllnc.workflows.stuurgegevens.zender.applicatie=${instance.name} openforms2xxllnc.workflows.stuurgegevens.ontvanger.organisatie=1900 openforms2xxllnc.workflows.stuurgegevens.ontvanger.applicatie=zs-dms +openforms2xxllnc.workflows.object.dct.omschrijving=Bijlage webformulier application.security.jwt.allowWeakSecrets=true soap.bus.org.apache.cxf.stax.maxTextLength=1000000000 @@ -48,6 +49,7 @@ openforms2xxllnc.connections.ontvang-asynchroon.endpoint: http://host.docker.int openforms2xxllnc.connections.ontvang-asynchroon.timeout: 60000 openforms2xxllnc.connections.ontvang-asynchroon.auth-alias: zaakdms-api openforms2xxllnc.connections.vrije-berichten.endpoint: http://host.docker.internal:8080/services/translate/generic/zds/VrijBericht +# openforms2xxllnc.connections.vrije-berichten.endpoint: http://host.docker.internal:8097/mock/services/translate/generic/zds/VrijBericht openforms2xxllnc.connections.vrije-berichten.timeout: 60000 openforms2xxllnc.connections.vrije-berichten.auth-alias: zaakdms-api ## @param openforms2xxllnc.connections.notificatiesApi.rootUrl [string] Root url of the 'Notificaties API' that is used to subscribe at.