1 files changed, 25 insertions, 10 deletions
diff --git a/src/main/java/at/gv/egiz/moazs/preprocess/DeliveryRequestAugmenter.java b/src/main/java/at/gv/egiz/moazs/preprocess/DeliveryRequestAugmenter.java
index aea01bb..37dbdc5 100644
--- a/src/main/java/at/gv/egiz/moazs/preprocess/DeliveryRequestAugmenter.java
+++ b/src/main/java/at/gv/egiz/moazs/preprocess/DeliveryRequestAugmenter.java
@@ -1,5 +1,6 @@
 package at.gv.egiz.moazs.preprocess;
 
+import at.gv.egiz.moazs.mzs.MzsValidator;
 import at.gv.zustellung.app2mzs.xsd.ConfigType;
 import at.gv.zustellung.app2mzs.xsd.DeliveryRequestType;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,7 +16,10 @@ public class DeliveryRequestAugmenter {
 
     private final ConfigUtil util;
     private final Map<String, ConfigType> configs;
+    private final MzsValidator validator;
 
+    private static final String INCOMPLETE_TNVZ_ERROR_MESSAGE = "mzs:DeliveryRequest is incomplete because mandatory " +
+            "fields for sending a tnvz:QueryPersonRequest are missing.";
     private static final String INCOMPLETE_CONFIG_ERROR_MESSAGE = "Could not find a profile for " +
             "the delivery request configuration, and the configuration attached to mzs:DeliveryRequest is incomplete.";
     private static final String INCOMPLETE_MERGED_CONFIG_ERROR_MESSAGE = "I merged parameters from " +
@@ -23,9 +27,10 @@ public class DeliveryRequestAugmenter {
             "configuration is incomplete.";
 
     @Autowired
-    public DeliveryRequestAugmenter(Map<String, ConfigType> deliveryRequestConfigs, ConfigUtil util) {
+    public DeliveryRequestAugmenter(Map<String, ConfigType> deliveryRequestConfigs, ConfigUtil util, MzsValidator validator) {
         this.configs = deliveryRequestConfigs;
         this.util = util;
+        this.validator = validator;
     }
 
     /**
@@ -33,7 +38,7 @@ public class DeliveryRequestAugmenter {
      *
      * @param request
      * @throws at.gv.egiz.moazs.MoaZSException
-     * @return augmented request
+     * @return augmented request and validated
      */
     public DeliveryRequestType augment(DeliveryRequestType request) {
 
@@ -43,10 +48,13 @@ public class DeliveryRequestAugmenter {
 
         if (fallbackConfig == null) {
 
-            if (util.isComplete(requestConfig))
-                return request;
-            else
+            if (!validator.isConfigProfileComplete(request.getConfig())) {
                 throw moaZSException(INCOMPLETE_CONFIG_ERROR_MESSAGE);
+            } else if (!validator.isTnvzComplete(request)) {
+                throw moaZSException(INCOMPLETE_TNVZ_ERROR_MESSAGE);
+            } else {
+                return request;
+            }
 
         } else {
 
@@ -54,13 +62,20 @@ public class DeliveryRequestAugmenter {
                     ? fallbackConfig
                     : util.merge(requestConfig, fallbackConfig);
 
-            if (util.isComplete(mergedConfig)) {
-                return deliveryRequestTypeBuilder(request)
-                        .withConfig(mergedConfig)
-                        .build();
-            } else {
+            if (!validator.isConfigProfileComplete(mergedConfig)) {
                 throw moaZSException(INCOMPLETE_MERGED_CONFIG_ERROR_MESSAGE, fallbackProfileId);
             }
+
+            var mergedRequest = deliveryRequestTypeBuilder(request)
+                    .withConfig(mergedConfig)
+                    .build();
+
+            if (!validator.isTnvzComplete(mergedRequest)) {
+                throw moaZSException(INCOMPLETE_TNVZ_ERROR_MESSAGE);
+            }
+
+            return mergedRequest;
+
         }
     }