refactor: unwrapping of objects-api envelope

wearefrank · Nov 2, 2023 · 08344ad · 08344ad
1 parent 5b061ba
commit 08344ad
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 17 deletions.
diff --git a/src/main/configurations/Notifications API/configuration_notificaties_notificaties_create.xml b/src/main/configurations/Notifications API/configuration_notificaties_notificaties_create.xml
@@ -61,16 +61,10 @@
 					<Param name="url" xpathExpression="//resourceUrl" />
 					<Param name="Accept-Crs" value="EPSG:4326" />
 				</HttpSender>
-				<Forward name="success" path="ZgwObjectJsonToXml" />
+				<Forward name="success" path="ObjectCreateSender" />
 				<Forward name="Exception" path="InternalServerError" />
 			</SenderPipe>
 
-			<JsonPipe 
-				name="ZgwObjectJsonToXml"
-				>
-                <Forward name="success" path="ObjectCreateSender"/>
-            </JsonPipe>
-
 			<SenderPipe
 				name="ObjectCreateSender"
 				>

diff --git a/src/main/configurations/Objects API/configuration_objects_object_create.xml b/src/main/configurations/Objects API/configuration_objects_object_create.xml
@@ -11,7 +11,7 @@
 			If there are other adapters using the ApiListener then it should likely be kept.
 			Otherwise, a simple JavaListener might be better in it's place. -->
 
-		<!-- <Receiver name="objects_object_create">
+		<Receiver name="objects_object_create">
 			<ApiListener 
 				name="objects_object_create" 
 				method="POST"
@@ -20,7 +20,7 @@
 				produces="JSON"
 				consumes="JSON"
 				/>
-		</Receiver> -->
+		</Receiver>
 		<Receiver name="objects_object_create">
             <JavaListener name="objects_object_create" />
         </Receiver>

diff --git a/src/main/configurations/bpel/Configuration_Bpel_Basic_Aggregator.xml b/src/main/configurations/bpel/Configuration_Bpel_Basic_Aggregator.xml
@@ -15,6 +15,16 @@
                 <Exit name="EXCEPTION" state="ERROR" />
             </Exits>
 
+            <XsltPipe
+                name="UnwrapObjectsApiDataToSingle"
+                styleSheetName="Zgw/UnwrapObjectsApiDataToSingle.xslt"
+                storeResultInSessionKey="UnwrappedMessage"
+                >
+                <Param name="Type" value="ZgwObject"/>
+                <Forward name="success" path="CreateInitiateRequestMessage"/>
+                <Forward name="error" path="InternalServerError"/>
+            </XsltPipe>
+
             <XsltPipe
                 name="CreateInitiateRequestMessage"
                 styleSheetName="Bpel/Basic/Model/InitiateRequestMessage.xslt"
@@ -27,7 +37,7 @@
                 <Param name="Bsn" xpathExpression="/ZgwObject/bsn/text()" />
                 <!-- <Param name="CommercialRegistryNumber" value="''" /> -->
                 <!-- <Param name="Username" sessionKey="Username" defaultValue="dummy" /> -->
-                <Param name="Process" sessionKey="Process" defaultValue="P4_3_VSDB" />
+                <Param name="Process" xpathExpression="/ZgwObject/type/text()" />
                 <Forward name="success" path="BpelBasicPostInitiateSender" />
                 <Forward name="error" path="EXCEPTION" />
             </XsltPipe>
@@ -47,23 +57,23 @@
 
             <XsltPipe
                 name="CreateEmailParameters"
-                getInputFromSessionKey="originalMessage"
+                getInputFromSessionKey="UnwrappedMessage"
                 styleSheetName="Bpel/Basic/Model/EmailParameters.xslt"
                 storeResultInSessionKey="EmailParameters"
                 >
-                <Param name="EmailAddress" xpathExpression="/ZgwObject/data/uw-gegevens/fieldSetMetDigiD/contactgegevensMD/eMailadresPMD" />
-                <Param name="LastName" xpathExpression="concat(/ZgwObject/data/uw-gegevens/fieldSetMetDigiD/contactgegevensMD/tussenvoegselSPMD, /ZgwObject/data/uw-gegevens/fieldSetMetDigiD/contactgegevensMD/achternaamPMD)" />
+                <Param name="EmailAddress" xpathExpression="//fieldSetMetDigiD/contactgegevensMD/eMailadresPMD" />
+                <Param name="LastName" xpathExpression="concat(//fieldSetMetDigiD/contactgegevensMD/tussenvoegselSPMD, //fieldSetMetDigiD/contactgegevensMD/achternaamPMD)" />
                 <Forward name="success" path="CreateCaseParameters" />
                 <Forward name="error" path="EXCEPTION" />
             </XsltPipe>
 
             <XsltPipe
                 name="CreateCaseParameters"
-                getInputFromFixedValue="&lt;dummy/&gt;"
+                getInputFromSessionKey="UnwrappedMessage"
                 styleSheetName="Bpel/Basic/Model/CaseParameters.xslt"
                 storeResultInSessionKey="CaseParameters"
                 >
-                <Param name="ReferenceNumber" value="12345" />
+                <Param name="ReferenceNumber" xpathExpression="/ZgwObject/public_reference/text()" />
                 <Param name="Description" value="dummy" />
                 <Param name="Clarification" value="marcel@wearefrank.nl" />
                 <Param name="Channel" value="WEBFORM" />
@@ -73,7 +83,7 @@
 
             <XsltPipe
                 name="CreateRegisterRequestMessage"
-                getInputFromSessionKey="originalMessage"
+                getInputFromSessionKey="UnwrappedMessage"
                 styleSheetName="Bpel/Basic/Model/RegisterRequestMessage.xslt"
                 storeResultInSessionKey="RegisterRequestMessage"
                 >
@@ -85,7 +95,7 @@
                 <Param name="Bsn" xpathExpression="/ZgwObject/bsn/text()" />
                 <Param name="Summary" xpathExpression="/ZgwObject/data" type="NODE" />
                 <Param name="EmailParameters" sessionKey="EmailParameters" type="DOMDOC" />
-                <Param name="Process" sessionKey="Process" defaultValue="P4_3_VSDB" />
+                <Param name="Process" xpathExpression="/ZgwObject/type/text()" />
                 <Param name="CaseParameters" sessionKey="CaseParameters" type="DOMDOC" />
                 <Forward name="success" path="BpelBasicPostRegisterSender" />
                 <Forward name="error" path="EXCEPTION" />

diff --git a/src/main/configurations/bpel/Zgw/UnwrapObjectsApiDataToSingle.xslt b/src/main/configurations/bpel/Zgw/UnwrapObjectsApiDataToSingle.xslt
@@ -0,0 +1,15 @@
+<xsl:stylesheet exclude-result-prefixes="xsl xs" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xs="http://www.w3.org/2001/XMLSchema" version="2.0">
+    <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes" omit-xml-declaration="yes"/>
+    <xsl:param name="Type" as="xs:string" select="''"/>
+
+    <xsl:template match="/">
+        <xsl:apply-templates select="/ZgwObject/record/data"/>
+    </xsl:template>
+
+    <xsl:template match="ZgwObject/record/data">
+        <xsl:element name="{$Type}">
+            <xsl:copy-of select="*"/>
+        </xsl:element>
+    </xsl:template>
+
+</xsl:stylesheet>