From 296d842878e530ee819fa2f58012665b76e2e670 Mon Sep 17 00:00:00 2001
From: Christof Rabensteiner <christof.rabensteiner@iaik.tugraz.at>
Date: Tue, 30 Apr 2019 11:00:46 +0200
Subject: Add Optional mzs:DeliveryRequest/Config & Validate / Augment It

Add Optional "Config" to MZS Schema:
- Add mzs:DeliveryRequest/Config Element with a
  "PerformQueryPersonRequest" node
- The config element contains parameters that are interpreted by
  moa-zs and not forwarded to the ZD
- The boolean PerformQueryPersonRequest tells moa-zs if moa-zs should
  perform a QueryPersonRequest towards the TNVZ.
- If config is missing, moa-zs augments the delivery request with
  parameters from the app's configuartion or the default configuartion

Other Changes:
- Validate and augment incoming requests with the
  DeliveryPreprocessor.
- Add stub for TlnvzClient.
- Remove some leftover ObjectFactory imports (because of the builder
  they are not needed anymore)

Fixes
- Fixed incorrect API usage of Messageformat.format: format string
  needs an index.

pom.xml
- Add Hamcrest Dependency (for writing more expressive tests)
- Add copy constructor to JAXB Builder

Testing
- Test validation of incoming request
- Refactor testcases to improve readability
---
 .../formallyIncorrectDeliveryRequest.soap          |  2 +-
 .../App2MzsServiceTest/missingAppDeliveryId.soap   | 48 ++++++++++++++++++++++
 .../moazs/App2MzsServiceTest/missingMetaData.soap  | 47 +++++++++++++++++++++
 .../App2MzsServiceTest/validDeliveryRequest.soap   |  2 +-
 4 files changed, 97 insertions(+), 2 deletions(-)
 create mode 100644 src/test/resources/at/gv/egiz/moazs/App2MzsServiceTest/missingAppDeliveryId.soap
 create mode 100644 src/test/resources/at/gv/egiz/moazs/App2MzsServiceTest/missingMetaData.soap

(limited to 'src/test/resources/at/gv/egiz')

diff --git a/src/test/resources/at/gv/egiz/moazs/App2MzsServiceTest/formallyIncorrectDeliveryRequest.soap b/src/test/resources/at/gv/egiz/moazs/App2MzsServiceTest/formallyIncorrectDeliveryRequest.soap
index e8bd7f2..0570005 100644
--- a/src/test/resources/at/gv/egiz/moazs/App2MzsServiceTest/formallyIncorrectDeliveryRequest.soap
+++ b/src/test/resources/at/gv/egiz/moazs/App2MzsServiceTest/formallyIncorrectDeliveryRequest.soap
@@ -30,7 +30,7 @@
     </p:PostalAddress>
   </mzs:Receiver>
   <mzs:MetaData>
-    <mzs:AppDeliveryID>asd</mzs:AppDeliveryID>
+    <mzs:AppDeliveryID>formally-incorrect-delivery-request-id</mzs:AppDeliveryID>
     <mzs:DeliveryQuality>nonRSa</mzs:DeliveryQuality>
     <mzs:RequiresEncryption>false</mzs:RequiresEncryption>
   </mzs:MetaData>
diff --git a/src/test/resources/at/gv/egiz/moazs/App2MzsServiceTest/missingAppDeliveryId.soap b/src/test/resources/at/gv/egiz/moazs/App2MzsServiceTest/missingAppDeliveryId.soap
new file mode 100644
index 0000000..e981b31
--- /dev/null
+++ b/src/test/resources/at/gv/egiz/moazs/App2MzsServiceTest/missingAppDeliveryId.soap
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<soapenv:Envelope
+		xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
+		xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+		xmlns:mzs="http://reference.e-government.gv.at/namespace/zustellung/mzs/app2mzs#"
+		xmlns:p="http://reference.e-government.gv.at/namespace/zustellung/mzs/persondata#"
+		xmlns:msg="http://reference.e-government.gv.at/namespace/zustellung/msg/phase2/20181206#"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<soapenv:Body>
+		<mzs:DeliveryRequest>
+			<mzs:Sender>
+				<p:CorporateBody>
+					<p:FullName>Bundesministerium für Testzwecke</p:FullName>
+				</p:CorporateBody>
+				<mzs:WebserviceURL>https://authority.gv.at/delivery_notification</mzs:WebserviceURL>
+			</mzs:Sender>
+			<mzs:Receiver>
+				<p:PhysicalPerson>
+					<p:Name>
+						<p:GivenName>Maxi</p:GivenName>
+						<p:FamilyName>Mustermann1</p:FamilyName>
+					</p:Name>
+					<p:DateOfBirth>1984-01-24</p:DateOfBirth>
+				</p:PhysicalPerson>
+				<p:PostalAddress>
+					<p:CountryCode>AT</p:CountryCode>
+					<p:PostalCode>1010</p:PostalCode>
+					<p:Municipality>Wien</p:Municipality>
+					<p:DeliveryAddress>
+						<p:StreetName>Muststrasse</p:StreetName>
+						<p:BuildingNumber>10</p:BuildingNumber>
+					</p:DeliveryAddress>
+				</p:PostalAddress>
+			</mzs:Receiver>
+			<msg:MetaData />
+			<mzs:Payload>
+				<mzs:DocumentReference>https://authority.gv.at/files/73bdf969781ba41fa07df1ff8439cf685c0db1c3</mzs:DocumentReference>
+				<mzs:FileName>brief.xml</mzs:FileName>
+				<mzs:MIMEType>text/xml</mzs:MIMEType>
+				<msg:CheckSum>
+					<msg:AlgorithmID>SHA1</msg:AlgorithmID>
+					<msg:Value>9b972c70fdaf5e1b26b3387c87b0ffb72e5940b6</msg:Value>
+				</msg:CheckSum>
+				<mzs:Size>123401</mzs:Size>
+			</mzs:Payload>
+		</mzs:DeliveryRequest>
+	</soapenv:Body>
+</soapenv:Envelope>
diff --git a/src/test/resources/at/gv/egiz/moazs/App2MzsServiceTest/missingMetaData.soap b/src/test/resources/at/gv/egiz/moazs/App2MzsServiceTest/missingMetaData.soap
new file mode 100644
index 0000000..4a1e02d
--- /dev/null
+++ b/src/test/resources/at/gv/egiz/moazs/App2MzsServiceTest/missingMetaData.soap
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<soapenv:Envelope
+		xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
+		xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+		xmlns:mzs="http://reference.e-government.gv.at/namespace/zustellung/mzs/app2mzs#"
+		xmlns:p="http://reference.e-government.gv.at/namespace/zustellung/mzs/persondata#"
+		xmlns:msg="http://reference.e-government.gv.at/namespace/zustellung/msg/phase2/20181206#"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<soapenv:Body>
+		<mzs:DeliveryRequest>
+			<mzs:Sender>
+				<p:CorporateBody>
+					<p:FullName>Bundesministerium für Testzwecke</p:FullName>
+				</p:CorporateBody>
+				<mzs:WebserviceURL>https://authority.gv.at/delivery_notification</mzs:WebserviceURL>
+			</mzs:Sender>
+			<mzs:Receiver>
+				<p:PhysicalPerson>
+					<p:Name>
+						<p:GivenName>Maxi</p:GivenName>
+						<p:FamilyName>Mustermann1</p:FamilyName>
+					</p:Name>
+					<p:DateOfBirth>1984-01-24</p:DateOfBirth>
+				</p:PhysicalPerson>
+				<p:PostalAddress>
+					<p:CountryCode>AT</p:CountryCode>
+					<p:PostalCode>1010</p:PostalCode>
+					<p:Municipality>Wien</p:Municipality>
+					<p:DeliveryAddress>
+						<p:StreetName>Muststrasse</p:StreetName>
+						<p:BuildingNumber>10</p:BuildingNumber>
+					</p:DeliveryAddress>
+				</p:PostalAddress>
+			</mzs:Receiver>
+			<mzs:Payload>
+				<mzs:DocumentReference>https://authority.gv.at/files/73bdf969781ba41fa07df1ff8439cf685c0db1c3</mzs:DocumentReference>
+				<mzs:FileName>brief.xml</mzs:FileName>
+				<mzs:MIMEType>text/xml</mzs:MIMEType>
+				<msg:CheckSum>
+					<msg:AlgorithmID>SHA1</msg:AlgorithmID>
+					<msg:Value>9b972c70fdaf5e1b26b3387c87b0ffb72e5940b6</msg:Value>
+				</msg:CheckSum>
+				<mzs:Size>123401</mzs:Size>
+			</mzs:Payload>
+		</mzs:DeliveryRequest>
+	</soapenv:Body>
+</soapenv:Envelope>
diff --git a/src/test/resources/at/gv/egiz/moazs/App2MzsServiceTest/validDeliveryRequest.soap b/src/test/resources/at/gv/egiz/moazs/App2MzsServiceTest/validDeliveryRequest.soap
index d71939b..dcd8c5f 100644
--- a/src/test/resources/at/gv/egiz/moazs/App2MzsServiceTest/validDeliveryRequest.soap
+++ b/src/test/resources/at/gv/egiz/moazs/App2MzsServiceTest/validDeliveryRequest.soap
@@ -33,7 +33,7 @@
 				</p:PostalAddress>
 			</mzs:Receiver>
 			<msg:MetaData>
-				<msg:AppDeliveryID>asd</msg:AppDeliveryID>
+				<msg:AppDeliveryID>valid-delivery-request-id</msg:AppDeliveryID>
 				<msg:Subject>WichtigeMitteilung</msg:Subject>
 				<msg:DeliveryQuality>RSa</msg:DeliveryQuality>
 			</msg:MetaData>
-- 
cgit v1.2.3