Gt-690 Implement VoegBesluitToe_Di01

charts/zaakbrug/templates/configmap.yaml

@@ -92,24 +92,24 @@ data:
   zaakbrug.zgw.documenten-api.auth-type: {{ .authType }}
   zaakbrug.zgw.documenten-api.auth-alias: {{ .authAlias }}
   {{- end }}
-  {{- with .catalogiApi }}
-  zaakbrug.zgw.catalogi-api.root-url: {{ .rootUrl }}
-  zaakbrug.zgw.catalogi-api.timeout: {{ toString (.timeout | default 20000 | quote) }}
-  zaakbrug.zgw.catalogi-api.auth-type: {{ .authType }}
-  zaakbrug.zgw.catalogi-api.auth-alias: {{ .authAlias }}
-  {{- end }}
   {{- with .besluitenApi }}
   zaakbrug.zgw.besluiten-api.root-url: {{ .rootUrl }}
   zaakbrug.zgw.besluiten-api.timeout: {{ toString (.timeout | default 20000 | quote) }}
   zaakbrug.zgw.besluiten-api.auth-type: {{ .authType }}
   zaakbrug.zgw.besluiten-api.auth-alias: {{ .authAlias }}
   {{- end }}
+  {{- with .catalogiApi }}
+  zaakbrug.zgw.catalogi-api.root-url: {{ .rootUrl }}
+  zaakbrug.zgw.catalogi-api.timeout: {{ toString (.timeout | default 20000 | quote) }}
+  zaakbrug.zgw.catalogi-api.auth-type: {{ .authType }}
+  zaakbrug.zgw.catalogi-api.auth-alias: {{ .authAlias }}
+  {{- end }}
   {{- end }}
   {{- with .Values.staging }}
   zaakbrug.staging.zaken-api.root-url: {{ .zakenApi.rootUrl }}
   zaakbrug.staging.documenten-api.root-url: {{ .documentenApi.rootUrl }}
-  zaakbrug.staging.catalogi-api.root-url: {{ .catalogiApi.rootUrl }}
   zaakbrug.staging.besluiten-api.root-url: {{ .besluitenApi.rootUrl }}
+  zaakbrug.staging.catalogi-api.root-url: {{ .catalogiApi.rootUrl }}
   {{- end }}
 ---
 apiVersion: v1

charts/zaakbrug/values.yaml

@@ -239,10 +239,10 @@ staging:
     rootUrl: http://zaakbrug-staging-nginx.zaakbrug/zaken/api/v1/
   documentenApi:
     rootUrl: http://zaakbrug-staging-nginx.zaakbrug/documenten/api/v1/
-  catalogiApi:
-    rootUrl: http://zaakbrug-staging-nginx.zaakbrug/catalogi/api/v1/
   besluitenApi:
     rootUrl: http://zaakbrug-staging-nginx.zaakbrug/besluiten/api/v1/
+  catalogiApi:
+    rootUrl: http://zaakbrug-staging-nginx.zaakbrug/catalogi/api/v1/
   extraEnvVars:
     - name: NOTIFICATIONS_DISABLED
       value: "yes"

docker-compose.openzaak.dev.yml

@@ -111,8 +111,8 @@ services:
     environment:
       - zaakbrug.zgw.zaken-api.root-url=http://open-zaak.nginx:9001/zaken/api/v1/
       - zaakbrug.zgw.documenten-api.root-url=http://open-zaak.nginx:9001/documenten/api/v1/
-      - zaakbrug.zgw.catalogi-api.root-url=http://open-zaak.nginx:9001/catalogi/api/v1/
       - zaakbrug.zgw.besluiten-api.root-url=http://open-zaak.nginx:9001/besluiten/api/v1/
+      - zaakbrug.zgw.catalogi-api.root-url=http://open-zaak.nginx:9001/catalogi/api/v1/
 
 volumes:
   open-zaak-db:

src/main/configurations/Translate/Common/xsl/CreateGenereerBesluitIdentificatie_Du02Response.xslt

@@ -1,11 +1,11 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:StUF="http://www.egem.nl/StUF/StUF0301" xmlns:ZKN="http://www.stufstandaarden.nl/koppelvlak/zds0120" xmlns:xs="http://www.w3.org/2001/XMLSchema" version="2.0">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:StUF="http://www.egem.nl/StUF/StUF0301" xmlns:ZKN="http://www.egem.nl/StUF/sector/zkn/0310" xmlns:ZDS="http://www.stufstandaarden.nl/koppelvlak/zds0120" xmlns:xs="http://www.w3.org/2001/XMLSchema" version="2.0">
 	<xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes"/>
     <xsl:param name="UnwrapMessageResult" as="node()?" />
     <xsl:param name="Identificatie" select="''" as="xs:string" />
 
 	<xsl:template match="/">
-        <ZKN:genereerBesluitIdentificatie_Du02>
-            <ZKN:stuurgegevens>
+        <ZDS:genereerBesluitIdentificatie_Du02>
+            <ZDS:stuurgegevens>
                 <StUF:berichtcode>Du02</StUF:berichtcode>
                 <StUF:zender>
                     <StUF:organisatie><xsl:value-of select="$UnwrapMessageResult/*/stuurgegevens/ontvanger/organisatie"/></StUF:organisatie>
@@ -20,10 +20,10 @@
                 <StUF:tijdstipBericht><xsl:value-of select="$UnwrapMessageResult/*/stuurgegevens/tijdstipBericht"/></StUF:tijdstipBericht>
                 <StUF:crossRefnummer><xsl:value-of select="$UnwrapMessageResult/*/stuurgegevens/referentienummer"/></StUF:crossRefnummer>
                 <StUF:functie>genereerBesluitidentificatie</StUF:functie>
-            </ZKN:stuurgegevens>
-            <ZKN:besluit StUF:entiteittype="BSL" StUF:functie="entiteit">
+            </ZDS:stuurgegevens>
+            <ZDS:besluit StUF:entiteittype="BSL" StUF:functie="entiteit">
                 <ZKN:identificatie xmlns:ZKN="http://www.egem.nl/StUF/sector/zkn/0310"><xsl:value-of select="$Identificatie"/></ZKN:identificatie>
-            </ZKN:besluit>
-        </ZKN:genereerBesluitIdentificatie_Du02>
+            </ZDS:besluit>
+        </ZDS:genereerBesluitIdentificatie_Du02>
 	</xsl:template>
 </xsl:stylesheet>

src/main/configurations/Translate/Configuration.xml

@@ -14,6 +14,7 @@
   <!ENTITY GeefZaakdocumentLezen_Lv01                     SYSTEM "./Configuration_GeefZaakdocumentLezen_Lv01.xml">
   <!ENTITY GenereerIdentificatieEmulator                  SYSTEM "./Configuration_GenereerIdentificatieEmulator.xml">
   <!ENTITY GetBas64Inhoud                                 SYSTEM "./Configuration_GetBas64Inhoud.xml">
+  <!ENTITY GetBesluitTypenByZaakType                       SYSTEM "./Configuration_GetBesluitTypenByZaakType.xml">
   <!ENTITY GetResultaatTypeByZaakTypeAndOmschrijving      SYSTEM "./Configuration_GetResultaatTypeByZaakTypeAndOmschrijving.xml">
   <!ENTITY GetResultatenByZaakUrl                         SYSTEM "./Configuration_GetResultatenByZaakUrl.xml">
   <!ENTITY GetRolByZaakUrlAndRolTypeUrl                   SYSTEM "./Configuration_GetRolByZaakUrlAndRolTypeUrl.xml">
@@ -46,6 +47,7 @@
   <!ENTITY MapZdsRelevanteAndereZaakFromZgwRelevanteAndereZaken   SYSTEM "./Configuration_MapZdsRelevanteAndereZaakFromZgwRelevanteAndereZaken.xml">
   <!ENTITY MapZdsRolFromZgwRol                            SYSTEM "./Configuration_MapZdsRolFromZgwRol.xml">
   <!ENTITY PatchRelevanteAndereZaak                       SYSTEM "./Configuration_PatchRelevanteAndereZaak.xml">
+  <!ENTITY PostZgwBesluit                                 SYSTEM "./Configuration_PostZgwBesluit.xml">
   <!ENTITY PostResultaat                                  SYSTEM "./Configuration_PostResultaat.xml">
   <!ENTITY Zaken_PostZgwRol                               SYSTEM "./Configuration_Zaken_PostZgwRol.xml">
   <!ENTITY Zaken_PostZgwStatus                            SYSTEM "./Configuration_Zaken_PostZgwStatus.xml">
@@ -63,6 +65,7 @@
   <!ENTITY UpdateZaak_Lk01                                SYSTEM "./Configuration_UpdateZaak_LK01.xml">
   <!ENTITY UpdateZaakDocument_Di02                        SYSTEM "./Configuration_UpdateZaakDocument_Di02.xml">
   <!ENTITY VoegZaakdocumentToe_Lk01                       SYSTEM "./Configuration_VoegZaakdocumentToe_Lk01.xml">
+  <!ENTITY VoegBesluitToe_Di01                            SYSTEM "./Configuration_VoegBesluitToe_Di01.xml">
   <!ENTITY Zaken_PostZgwZaakInformatieObject              SYSTEM "./Configuration_Zaken_PostZgwZaakInformatieObject.xml">
   <!ENTITY Zaken_UpdateZgwZaak                            SYSTEM "./Configuration_Zaken_UpdateZgwZaak.xml">
   <!ENTITY ZdsHeeft                                       SYSTEM "./Configuration_ZdsHeeft.xml">
@@ -84,6 +87,7 @@
   &GeefZaakdocumentLezen_Lv01;
   &GenereerIdentificatieEmulator;
   &GetBas64Inhoud;
+  &GetBesluitTypenByZaakType;
   &GetResultaatTypeByZaakTypeAndOmschrijving;
   &GetResultatenByZaakUrl;
   &GetRolByZaakUrlAndRolTypeUrl;
@@ -116,6 +120,7 @@
   &MapZdsRelevanteAndereZaakFromZgwRelevanteAndereZaken;
   &MapZdsRolFromZgwRol;
   &PatchRelevanteAndereZaak;
+  &PostZgwBesluit;
   &PostResultaat;
   &Zaken_PostZgwRol;
   &Zaken_PostZgwStatus;
@@ -133,6 +138,7 @@
   &UpdateZaak_Lk01;
   &UpdateZaakDocument_Di02;
   &VoegZaakdocumentToe_Lk01;
+  &VoegBesluitToe_Di01;
   &Zaken_PostZgwZaakInformatieObject;
   &Zaken_UpdateZgwZaak;
   &ZdsHeeft;

src/main/configurations/Translate/Configuration_GetBesluitTypenByZaakType.xml

@@ -0,0 +1,55 @@
+<Module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../FrankConfig.xsd">
+    <Adapter name="GetBesluitTypenByZaakType"
+        active="${GetBesluitTypenByZaakType.Active}"
+        description="">
+
+        <Receiver name="GetBesluitTypenByZaakType">
+            <JavaListener name="GetBesluitTypenByZaakType"/>
+        </Receiver>
+
+        <Pipeline>
+            <Exits>
+                <Exit name="EXIT" state="SUCCESS"/>
+                <Exit name="EXCEPTION" state="ERROR"/>
+            </Exits>
+
+			<SenderPipe name="GetZgwBesluitTypenByZaakTypeSender"
+                getInputFromFixedValue="&lt;dummy/&gt;">
+				<HttpSender 
+					name="GetZgwBesluitTypenByZaakTypeHttpSender" 
+					methodType="GET"
+					headersParams="Authorization"
+                    timeout="${zaakbrug.zgw.catalogi-api.timeout}"
+				/>
+                <Param name="url" value="${zaakbrug.zgw.catalogi-api.root-url}besluittypen"/>
+                <Param name="zaaktypen" sessionKey="ZgwZaakTypeUrl"/>
+                <Param name="status" value="definitief"/>
+                <Param name="Authorization" value="Bearer @@catalogi-api.jwt@@"/>
+                <Forward name="success" path="JsonToXml" />
+                <Forward name="exception" path="ErrorJsonToXml" />
+			</SenderPipe>
+            <JsonPipe name="ErrorJsonToXml">
+                <Forward name="success" path="buildErrorMsg" />
+            </JsonPipe>
+            <XsltPipe name="buildErrorMsg"
+                styleSheetName="Common/xsl/ParseNegativeHttpResult.xsl">
+                <Param name="senderPipeName" value="GetBesluitTypenByZaakTypeSender" />
+                <Forward name="success" path="EXCEPTION" />
+            </XsltPipe>
+
+            <JsonPipe name="JsonToXml">
+                <Forward name="success" path="UnwrapOpenZaakApiEnvelopeToSingle"/>
+            </JsonPipe>
+
+            <XsltPipe
+                name="UnwrapOpenZaakApiEnvelopeToSingle"
+                styleSheetName="Common/xsl/UnwrapOpenZaakApiEnvelopeToList.xslt"
+                >
+                <Param name="Type" value="ZgwBesluitType"/>
+                <Param name="List" value="ZgwBesluitTypen"/>
+                <Forward name="success" path="EXIT"/>
+                <Forward name="error" path="EXCEPTION"/>
+            </XsltPipe>
+        </Pipeline>
+    </Adapter>
+</Module>

src/main/configurations/Translate/Configuration_PostZgwBesluit.xml

@@ -0,0 +1,64 @@
+<Module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="../FrankConfig.xsd">
+    <Adapter name="PostZgwBesluitAdapter"
+        active="${PostZgwBesluitAdapter.Active}"
+        description="">
+
+        <Receiver name="PostZgwBesluitAdapter">
+            <JavaListener name="PostZgwBesluitAdapter" />
+        </Receiver>
+
+        <Pipeline>
+            <Exits>
+                <Exit name="EXIT" state="SUCCESS" />
+                <Exit name="EXCEPTION" state="ERROR" />
+            </Exits>
+
+            <SenderPipe name="PostZgwBesluit">
+
+                <Json2XmlInputValidator name="ValidatePost"
+                    schema="Zgw/Besluiten/Model/PostZgwBesluit.xsd"
+                    root="ZgwBesluit"
+                    outputFormat="JSON"
+                    deepSearch="true"
+                    throwException="true"
+                />
+                <HttpSender name="PostZgwBesluitSender"
+                    methodType="POST"
+                    headersParams="Authorization, Accept"
+                    timeout="${zaakbrug.zgw.besluiten-api.timeout}"
+                    maxExecuteRetries="5"
+                    contentType="application/json">
+                    <Param name="url" value="${zaakbrug.zgw.besluiten-api.root-url}besluiten"/>
+                    <Param name="Authorization" value="Bearer @@zaken-api.jwt@@" />
+                    <Param name="Accept" value="application/json" />
+                </HttpSender>
+
+                <Forward name="success" path="JsonToXml" />
+                <Forward name="exception" path="ErrorJsonToXml" />
+            </SenderPipe>
+            <JsonPipe name="ErrorJsonToXml">
+                <Forward name="success" path="buildErrorMsg" />
+            </JsonPipe>
+            <XsltPipe name="buildErrorMsg"
+                styleSheetName="Common/xsl/ParseNegativeHttpResult.xsl">
+                <Param name="senderPipeName" value="PostZgwBesluit" />
+                <Forward name="success" path="EXCEPTION" />
+            </XsltPipe>
+
+            <JsonPipe name="JsonToXml"
+                storeResultInSessionKey="PostZgwBesluitResult">
+                <Forward name="success" path="UnwrapOpenZaakApiEnvelopeToSingle" />
+            </JsonPipe>
+
+            <XsltPipe
+                name="UnwrapOpenZaakApiEnvelopeToSingle"
+                styleSheetName="Common/xsl/UnwrapOpenZaakApiEnvelopeToSingle.xslt"
+            >
+                <Param name="Type" value="ZgwBesluit" />
+                <Forward name="success" path="EXIT" />
+                <Forward name="error" path="EXCEPTION" />
+            </XsltPipe>
+        </Pipeline>
+    </Adapter>
+</Module>