feat: stop bundle creation and validation if csv frictionless validation fail #745

hub-prime/pom.xml

@@ -11,7 +11,7 @@
 	</parent>
 	<groupId>org.techbd</groupId>
 	<artifactId>hub-prime</artifactId>
-	<version>0.406.0</version>
+	<version>0.407.0</version>
 	<packaging>war</packaging>
 	<name>Tech by Design Hub (Prime)</name>
 	<description>Tech by Design Hub (Primary)</description>

hub-prime/src/main/java/org/techbd/model/csv/PayloadAndValidationOutcome.java

@@ -1,6 +1,7 @@
 package org.techbd.model.csv;
 
 import java.util.List;
+import java.util.Map;
 
-public record PayloadAndValidationOutcome(List<FileDetail> fileDetails, boolean isValid,String groupInteractionId) {
+public record PayloadAndValidationOutcome(List<FileDetail> fileDetails, boolean isValid,String groupInteractionId,Map<String,Object> provenance,Map<String,Object> validationResults) {
 }

hub-prime/src/main/java/org/techbd/orchestrate/csv/CsvOrchestrationEngine.java

@@ -23,6 +23,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
 import java.util.regex.Pattern;
@@ -48,6 +49,7 @@
 import org.techbd.udi.auto.jooq.ingress.routines.SatInteractionCsvRequestUpserted;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.nimbusds.oauth2.sdk.util.CollectionUtils;
 
 import jakarta.servlet.http.HttpServletRequest;
@@ -344,35 +346,33 @@ private void saveScreeningGroup(final String groupInteractionId, final HttpServl
             }
         }
 
-        /**
-         * Checks if the "valid" field in "validationResults.report" is true.
-         *
-         * @param jsonMap The input JSON represented as a Map<String, Object>.
-         * @return true if "valid" is true; otherwise, false.
-         */
-        public static boolean isValid(final Map<String, Object> csvValidationResult) {
-            if (csvValidationResult == null || !csvValidationResult.containsKey("validationResults")) {
+        public static boolean extractValidValue(Map<String, Object> input) {
+            if (input == null || !input.containsKey("validationResults")) {
                 return false;
             }
 
-            final Object validationResults = csvValidationResult.get("validationResults");
-            if (!(validationResults instanceof Map<?, ?>)) {
-                return false;
-            }
+            Object validationResults = input.get("validationResults");
 
-            @SuppressWarnings("unchecked")
-            final Map<String, Object> validationResultsMap = (Map<String, Object>) validationResults;
-            final Object report = validationResultsMap.get("report");
+            if (validationResults instanceof ObjectNode) {
+                ObjectNode validationResultsNode = (ObjectNode) validationResults;
 
-            if (!(report instanceof Map<?, ?>)) {
-                return false;
-            }
+                // Check if errorSummary exists and is empty
+                JsonNode errorsSummaryNode = validationResultsNode.get("errorsSummary");
+                if (errorsSummaryNode != null && errorsSummaryNode.isArray() && errorsSummaryNode.size() > 0) {
+                    return false; // Return false if errorsSummary is not empty
+                }
 
-            @SuppressWarnings("unchecked")
-            final Map<String, Object> reportMap = (Map<String, Object>) report;
-            final Object valid = reportMap.get("valid");
+                // Check the "report" node
+                JsonNode reportNode = validationResultsNode.get("report");
+                if (reportNode != null && reportNode.isObject()) {
+                    JsonNode validNode = reportNode.get("valid");
+                    if (validNode != null && validNode.isBoolean()) {
+                        return validNode.asBoolean();
+                    }
+                }
+            }
 
-            return Boolean.TRUE.equals(valid);
+            return false;
         }
 
         private void saveValidationResults(final Map<String, Object> validationResults,
@@ -400,7 +400,7 @@ private void saveValidationResults(final Map<String, Object> validationResults,
                 initRIHR.setPayload((JsonNode) Configuration.objectMapper.valueToTree(validationResults));
                 initRIHR.setPayload((JsonNode) Configuration.objectMapper.valueToTree(validationResults));
                 initRIHR.setFromState("CSV_ACCEPT");
-                if (isValid(validationResults)) {
+                if (extractValidValue(validationResults)) {
                     initRIHR.setToState("VALIDATION_SUCCESS");
                 } else {
                     initRIHR.setToState("VALIDATION_FAILED");
@@ -457,6 +457,20 @@ private void saveCombinedValidationResults(final Map<String, Object> combinedVal
             }
         }
 
+        /**
+         * Extracts the "provenance" object from the provided map.
+         *
+         * @param operationOutcomeForThisGroup A map containing operation outcome
+         *                                     details.
+         * @return A map representing the "provenance" object, or an empty map if
+         *         "provenance" is not found.
+         */
+        public static Map<String, Object> extractProvenance(Map<String, Object> operationOutcomeForThisGroup) {
+            return Optional.ofNullable(operationOutcomeForThisGroup)
+                    .map(map -> (Map<String, Object>) map.get("provenance"))
+                    .orElse(Map.of());
+        }
+
         private static Map<String, Object> createOperationOutcome(final String masterInteractionId,
                 final String groupInteractionId,
                 final String validationResults,
@@ -607,7 +621,8 @@ public Map<String, Object> processScreenings(final String masterInteractionId, f
                     Map<String, Object> operationOutcomeForThisGroup;
                     final String groupInteractionId = UUID.randomUUID().toString();
                     if (isGroupComplete(fileDetails)) {
-                        operationOutcomeForThisGroup = validateScreeningGroup(groupInteractionId,groupKey, fileDetails, originalFileName);
+                        operationOutcomeForThisGroup = validateScreeningGroup(groupInteractionId, groupKey, fileDetails,
+                                originalFileName);
                     } else {
                         // Incomplete group - generate error operation outcome
                         operationOutcomeForThisGroup = createIncompleteGroupOperationOutcome(
@@ -617,7 +632,12 @@ public Map<String, Object> processScreenings(final String masterInteractionId, f
 
                     combinedValidationResults.add(operationOutcomeForThisGroup);
                     if (generateBundle) {
-                        this.payloadAndValidationOutcomes.put(groupKey, new PayloadAndValidationOutcome(fileDetails, isValid(operationOutcomeForThisGroup),groupInteractionId));
+                        this.payloadAndValidationOutcomes.put(groupKey,
+                                new PayloadAndValidationOutcome(fileDetails,
+                                        isGroupComplete(fileDetails) ? extractValidValue(operationOutcomeForThisGroup)
+                                                : false,
+                                        groupInteractionId, extractProvenance(operationOutcomeForThisGroup),
+                                        operationOutcomeForThisGroup));
                     }
                 }
                 Instant completedAt = Instant.now();
@@ -729,7 +749,8 @@ private Map<String, Object> createIncompleteGroupOperationOutcome(
             return operationOutcome;
         }
 
-        private Map<String, Object> validateScreeningGroup(String groupInteractionId,String groupKey, List<FileDetail> fileDetails,
+        private Map<String, Object> validateScreeningGroup(String groupInteractionId, String groupKey,
+                List<FileDetail> fileDetails,
                 String originalFileName) throws Exception {
             Instant initiatedAtForThisGroup = Instant.now();