feat: add ability to include documents to PostTaak

wearefrank · Aug 15, 2024 · 7e08d8a · 7e08d8a
1 parent 962bda0
commit 7e08d8a
Show file tree

Hide file tree

Showing 3 changed files with 77 additions and 4 deletions.
diff --git a/src/main/configurations/morcoreMessageProcessor/Configuration_ToMorCore.xml b/src/main/configurations/morcoreMessageProcessor/Configuration_ToMorCore.xml
@@ -110,6 +110,39 @@
         </Pipeline>
     </Adapter>
 
+    <Adapter name="MorCore_GetBijlage">
+        <Receiver name="MorCore_GetBijlage">
+            <JavaListener name="MorCore_GetBijlage" />
+        </Receiver>
+
+        <Pipeline>
+
+            <Exits>
+                <Exit name="Exit" state="SUCCESS" />
+                <Exit name="Exception" state="ERROR" />
+                <Exit name="Reject" state="REJECTED" />
+            </Exits>
+
+            <SenderPipe name="CallMorCore_GetToken" storeResultInSessionKey="MorCoreToken">
+                <IbisLocalSender name="CallMorCore_GetToken" javaListener="MorCore_GetToken" />
+                <Forward name="success" path="Send2MorCore" />
+                <Forward name="exception" path="Exception" />
+            </SenderPipe>
+
+            <SenderPipe name="Send2MorCore" getInputFromSessionKey="originalMessage" emptyInputReplacement="&lt;NoInput/>">
+                <HttpSender name="Send2MorCore" methodType="GET" headersParams="Authorization" />
+                <Param name="url" sessionKey="bijlageUrl" />
+                <Param name="Authorization" xpathExpression="concat('Token ', $MorCoreToken)">
+                    <Param name="MorCoreToken" sessionKey="MorCoreToken" xpathExpression="//token" />
+                </Param>
+                <Forward name="success" path="Encode" />
+                <Forward name="exception" path="Exception" />
+            </SenderPipe>
+
+            <Base64Pipe name="Encode" direction="ENCODE"/>
+
+        </Pipeline>
+    </Adapter>
 
     <!-- Disabled as at this time there is no situation in which we create a case in MorCore. -->
     <Adapter name="MorCore_PostTaak" active="false">

diff --git a/src/main/configurations/morcoreMessageProcessor/Configuration_ToUltimo.xml b/src/main/configurations/morcoreMessageProcessor/Configuration_ToUltimo.xml
@@ -137,6 +137,32 @@
                 <Forward name="exception" path="exception" />
             </JsonPipe>
 
+            <XmlIfPipe name="IfBijlage1Exists" xpathExpression="boolean(//bijlagen[1]/bestand)">
+                <Forward name="then" path="GetBijlage1" />
+                <Forward name="else" path="RequestOpdrachtInfo" />
+            </XmlIfPipe>
+
+            <SenderPipe name="GetBijlage1" storeResultInSessionKey="bijlage1" getInputFromSessionKey="originalMessage">
+                <IbisLocalSender name="GetBijlage1" javaListener="MorCore_GetBijlage">
+                    <Param name="bijlageUrl" xpathExpression="//bijlagen[1]/bestand"></Param>    
+                </IbisLocalSender>
+                <Forward name="success" path="IfBijlage2Exists" />
+                <Forward name="exception" path="exception" />
+            </SenderPipe>
+
+            <XmlIfPipe name="IfBijlage2Exists" xpathExpression="boolean(//bijlagen[2]/bestand)">
+                <Forward name="then" path="GetBijlage2" />
+                <Forward name="else" path="RequestOpdrachtInfo" />
+            </XmlIfPipe>
+
+            <SenderPipe name="GetBijlage2" storeResultInSessionKey="bijlage2" getInputFromSessionKey="originalMessage">
+                <IbisLocalSender name="GetBijlage1" javaListener="MorCore_GetBijlage">
+                    <Param name="bijlageUrl" xpathExpression="//bijlagen[2]/bestand"></Param>    
+                </IbisLocalSender>
+                <Forward name="success" path="RequestOpdrachtInfo" />
+                <Forward name="exception" path="exception" />
+            </SenderPipe>
+
             <SenderPipe name="RequestOpdrachtInfo" storeResultInSessionKey="opdrachtInfo" getInputFromSessionKey="originalMessage">
                 <IbisLocalSender name="RequestGetMelding" javaListener="MorCore_GetTaakOpdracht"/>
                 <Forward name="success" path="MakeOpdrachtInfoXML" />
@@ -157,6 +183,8 @@
                 getInputFromSessionKey="originalMessage">
                 <Param name="systemDate" sessionKey="systemDate" />
                 <Param name="meldingInfo" sessionKey="meldingInfo" type="DOMDOC" />
+                <Param name="bijlage1" sessionKey="bijlage1" type="STRING" />
+                <Param name="bijlage2" sessionKey="bijlage2" type="STRING" />
                 <Param name="taaktype" sessionKey="Taaktype" type="DOMDOC" />
                 <Param name="opdrachtInfo" sessionKey="opdrachtInfo" type="DOMDOC" />
             </XsltPipe>

diff --git a/src/main/configurations/morcoreMessageProcessor/xsl/Ultimo/PostZaakRequest.xsl b/src/main/configurations/morcoreMessageProcessor/xsl/Ultimo/PostZaakRequest.xsl
@@ -6,6 +6,8 @@
     <xsl:param name="meldingInfo" />
     <xsl:param name="opdrachtInfo" />
     <xsl:param name="systemDate" />
+    <xsl:param name="bijlage1" />
+    <xsl:param name="bijlage2" />
     <xsl:param name="taaktype" />
     <xsl:param name="MorCoreRootUrl" />
 
@@ -65,10 +67,20 @@
             </y>
 
             <!-- These 4 values might come from GetMeldingInfo -->
-            <foto1></foto1>
-            <foto1_filename></foto1_filename>
-            <foto2></foto2>
-            <foto2_filename></foto2_filename>
+            <foto1>
+                <xsl:value-of
+                    select="$bijlage1" />
+            </foto1>
+            <foto1_filename>
+                <xsl:value-of select="substring(substring-after(//bijlagen[1]/bestand, 'media/bestanden/'), 11)"/>
+            </foto1_filename>
+            <foto2>
+                <xsl:value-of
+                    select="$bijlage2" />
+            </foto2>
+            <foto2_filename>
+                <xsl:value-of select="substring(substring-after(//bijlagen[2]/bestand, 'media/bestanden/'), 11)"/>
+            </foto2_filename>
         </root>
     </xsl:template>
 </xsl:stylesheet>