refactor: replace get roltypen query by zaaktype with individual call…

…s to roltype by their uuid to make them cachable (#113) * Refactor roltypen query by zaaktype to individual calls to roltype by their uuid * Refactor roltypen query by zaaktype to individual calls to roltype by their uuid * remove UnwrapOpenZaakApiEnvelopeToListRoltypen.xslt * resolve conflicts * fix: update password * revert: zaakbrug-e2e-soapui-project.xml --------- Co-authored-by: INTERPAR\sena <[email protected]> Co-authored-by: MLenterman <[email protected]>
wearefrank · Sep 13, 2023 · 0df9e15 · 0df9e15
1 parent 2a07951
commit 0df9e15
Show file tree

Hide file tree

Showing 4 changed files with 78 additions and 4 deletions.
diff --git a/e2e/SoapUI/zaakbrug-e2e-soapui-project.xml b/e2e/SoapUI/zaakbrug-e2e-soapui-project.xml
@@ -284215,4 +284215,4 @@ loadTestRunner.loadTest.testCase.getTestStepByName("Properties").setPropertyValu
 
       </edcLa01>
    </s:Body>
-</s:Envelope>]]></con:responseContent><con:wsaConfig mustUnderstand="NONE" version="200508"/></con:response><con:dispatchConfig/></con:mockOperation></con:mockService><con:properties><con:property><con:name>ZaakbrugEndpoint</con:name><con:value>http://localhost:8080/services/</con:value></con:property><con:property><con:name>ReplicationZaakIdentiticatie</con:name><con:value>1900214585</con:value></con:property><con:property><con:name>ReplicationLegacyBeantwoorvraag</con:name><con:value>http://localhost:8080/services/</con:value></con:property><con:property><con:name>ReplicationZaakDocumentIdentificatie</con:name><con:value>1900216060</con:value></con:property><con:property><con:name>ZdsTimezone</con:name><con:value>UTC</con:value></con:property><con:property><con:name>jwtClientId</con:name><con:value>ZaakBrug</con:value></con:property><con:property><con:name>jwtSecret</con:name><con:value>secret1234</con:value></con:property><con:property><con:name>OpenZaakCatalogiApiRootUrl</con:name><con:value>http://localhost:9001/zaken/api/v1/</con:value></con:property></con:properties><con:wssContainer/><con:oAuth2ProfileContainer/><con:oAuth1ProfileContainer/><con:sensitiveInformation/></con:soapui-project>
+  </s:Envelope>]]></con:responseContent><con:wsaConfig mustUnderstand="NONE" version="200508"/></con:response><con:dispatchConfig/></con:mockOperation></con:mockService><con:properties><con:property><con:name>ZaakbrugEndpoint</con:name><con:value>http://localhost:8080/services/</con:value></con:property><con:property><con:name>ReplicationZaakIdentiticatie</con:name><con:value>1900214585</con:value></con:property><con:property><con:name>ReplicationLegacyBeantwoorvraag</con:name><con:value>http://localhost:8080/services/</con:value></con:property><con:property><con:name>ReplicationZaakDocumentIdentificatie</con:name><con:value>1900216060</con:value></con:property><con:property><con:name>ZdsTimezone</con:name><con:value>UTC</con:value></con:property><con:property><con:name>jwtClientId</con:name><con:value>ZaakBrug</con:value></con:property><con:property><con:name>jwtSecret</con:name><con:value>secret1234</con:value></con:property><con:property><con:name>OpenZaakCatalogiApiRootUrl</con:name><con:value>http://localhost:9001/zaken/api/v1/</con:value></con:property></con:properties><con:wssContainer/><con:oAuth2ProfileContainer/><con:oAuth1ProfileContainer/><con:sensitiveInformation/></con:soapui-project>
diff --git a/src/main/configurations/Translate/Configuration.xml b/src/main/configurations/Translate/Configuration.xml
@@ -19,6 +19,7 @@
   <!ENTITY GetResultatenByZaakUrl                         SYSTEM "./Configuration_GetResultatenByZaakUrl.xml">
   <!ENTITY GetRolByZaakUrlAndRolTypeUrl                   SYSTEM "./Configuration_GetRolByZaakUrlAndRolTypeUrl.xml">
   <!ENTITY GetRollenByBsn                                 SYSTEM "./Configuration_GetRollenByBsn.xml">
+  <!ENTITY GetRolTypenByUrl                              SYSTEM "./Configuration_GetRolTypenByUrl.xml">
   <!ENTITY GetRsinByGemeenteCode                        SYSTEM "./Configuration_GetRsinByGemeenteCode.xml">
   <!ENTITY Zaken_GetZgwStatusByZaakUrl                    SYSTEM "./Configuration_Zaken_GetZgwStatusByZaakUrl.xml">
   <!ENTITY GetStatusTypeByZaakTypeAndOmschrijving         SYSTEM "./Configuration_GetStatusTypeByZaakTypeAndOmschrijving.xml">
@@ -90,6 +91,7 @@
   &GetResultatenByZaakUrl;
   &GetRolByZaakUrlAndRolTypeUrl;
   &GetRollenByBsn;
+  &GetRolTypenByUrl;
   &GetRsinByGemeenteCode;
   &Zaken_GetZgwStatusByZaakUrl;
   &GetStatusTypeByZaakTypeAndOmschrijving;

diff --git a/src/main/configurations/Translate/Configuration_CreeerZaak_LK01.xml b/src/main/configurations/Translate/Configuration_CreeerZaak_LK01.xml
@@ -66,11 +66,29 @@
                     javaListener="GetRsinByGemeenteCode">
                     <Param name="GemeenteCode" sessionKey="originalMessage" xpathExpression="/*/stuurgegevens/zender/organisatie" />
                 </IbisLocalSender>
-                <Forward name="success" path="CallGetZgwRolType"/>
+                <Forward name="success" path="GetRolTypenByUrl"/>
                 <Forward name="exception" path="UncaughtException"/>
             </SenderPipe>
 
-            <SenderPipe
+            <ForEachChildElementPipe name="GetRolTypenByUrl"
+             storeResultInSessionKey="ZgwRolTypen"
+                elementXPathExpression="ZgwZaakTypen/ZgwZaakType/roltypen"
+                getInputFromSessionKey="GetZaakTypeResult">
+                <IbisLocalSender javaListener="GetRolTypenByUrl">
+                    <Param name="Url" xpathExpression="/roltypen" />
+                </IbisLocalSender>
+            </ForEachChildElementPipe>
+
+            <XsltPipe
+                name="UnwrapOpenZaakApiEnvelopeToList"
+                styleSheetName="Common/xsl/UnwrapForEachChildPipeEnvelopeToList.xslt"
+                >
+                <Param name="List" value="ZgwRolTypen"/>
+                <Forward name="success" path="SetRoles"/>
+                <Forward name="exception" path="UncaughtException" />
+            </XsltPipe>
+
+            <!-- <SenderPipe
                 name="CallGetZgwRolType"
                 storeResultInSessionKey="ZgwRolTypen">
                 <IbisLocalSender
@@ -82,7 +100,7 @@
                 </IbisLocalSender>
                 <Forward name="success" path="SetRoles"/>
                 <Forward name="exception" path="UncaughtException" />
-            </SenderPipe>   
+            </SenderPipe>    -->
 
             <XsltPipe
                 name="SetRoles"

diff --git a/src/main/configurations/Translate/Configuration_GetRolTypenByUrl.xml b/src/main/configurations/Translate/Configuration_GetRolTypenByUrl.xml
@@ -0,0 +1,54 @@
+<Module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="../FrankConfig.xsd">
+    <Adapter name="GetRolTypenByUrl">
+        <Receiver>
+            <JavaListener name="GetRolTypenByUrl" />
+        </Receiver>
+        <Pipeline>
+            <Exits>
+                <Exit name="EXIT" state="SUCCESS" />
+                <Exit name="EXCEPTION" state="ERROR" />
+            </Exits>
+
+            <SenderPipe
+                name="GetRolTypenByUrlSender"
+                getInputFromSessionKey="originalMessage"
+            >
+                <HttpSender
+                    name="GetRolTypenByUrlHttpSender"
+                    methodType="GET"
+                    headersParams="Authorization,Accept-Crs"
+                    timeout="${zaakbrug.zgw.zaken-api.timeout}"
+                    maxExecuteRetries="5"
+                />
+                <Param name="url" sessionKey="Url" />
+                <Param name="Accept-Crs" value="EPSG:4326" />
+                <Param name="Authorization" value="Bearer @@zaken-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="GetZgwRolTypeByUrlSender" />
+                <Forward name="success" path="EXCEPTION" />
+            </XsltPipe>
+
+            <JsonPipe
+                name="JsonToXml">
+                <Forward name="success" path="UnwrapZgwEnkelvoudigInformatieObjectToSingle" />
+            </JsonPipe>
+
+            <XsltPipe
+                name="UnwrapZgwEnkelvoudigInformatieObjectToSingle"
+                styleSheetName="Common/xsl/UnwrapOpenZaakApiEnvelopeToSingle.xslt" >
+                <Param name="Type" value="ZgwEnkelvoudigInformatieObject" />
+                <Forward name="success" path="EXIT" />
+                <Forward name="error" path="EXCEPTION" />
+            </XsltPipe>
+        </Pipeline>
+    </Adapter>
+</Module>