data-validation-engine 0.7.3__tar.gz → 0.7.4__tar.gz

{data_validation_engine-0.7.3 → data_validation_engine-0.7.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: data-validation-engine
-Version: 0.7.3
+Version: 0.7.4
 Summary: `nhs data validation engine` is a framework used to validate data
 License-Expression: MIT
 License-File: LICENSE

{data_validation_engine-0.7.3 → data_validation_engine-0.7.4}/pyproject.toml

@@ -24,7 +24,7 @@ Issues = "https://github.com/NHSDigital/data-validation-engine/issues"
 Changelog = "https://github.com/NHSDigital/data-validation-engine/blob/main/CHANGELOG.md"
 
 [tool.poetry]
-version = "0.7.3"
+version = "0.7.4"
 packages = [
     { include = "dve", from = "src" },
 ]

{data_validation_engine-0.7.3 → data_validation_engine-0.7.4}/src/dve/pipeline/foundry_ddb_pipeline.py

@@ -152,6 +152,9 @@ class FoundryDDBPipeline(DDBDVEPipeline):
                 )
                 if sub_stats:
                     self._audit_tables.add_submission_statistics_records(sub_stats=[sub_stats])
+            else:
+                self._audit_tables.mark_failed(submissions=[sub_id])
+
         except Exception as err:  # pylint: disable=W0718
             self._logger.exception(
                 f"During processing of submission_id: {sub_id}, this exception was raised:"

{data_validation_engine-0.7.3 → data_validation_engine-0.7.4}/src/dve/pipeline/pipeline.py

@@ -527,7 +527,7 @@ class BaseDVEPipeline:
 
         return processed_files, failed_processing
 
-    def apply_business_rules(
+    def apply_business_rules(   # pylint: disable=R0914
         self, submission_info: SubmissionInfo, submission_status: Optional[SubmissionStatus] = None
     ) -> tuple[SubmissionInfo, SubmissionStatus]:
         """Apply the business rules to a given submission, the submission may have failed at the
@@ -581,15 +581,23 @@ class BaseDVEPipeline:
 
         key_fields = {model: conf.reporting_fields for model, conf in model_config.items()}
 
-        self.step_implementations.apply_rules(working_directory, entity_manager, rules, key_fields)  # type: ignore
+        _errors_uri, rules_success = self.step_implementations.apply_rules(  # type: ignore
+            working_directory,
+            entity_manager,
+            rules,
+            key_fields
+        )
 
         rule_messages = load_feedback_messages(
             get_feedback_errors_uri(working_directory, "business_rules")
         )
-        submission_status.validation_failed = (
+        if (
             any(not rule_message.is_informational for rule_message in rule_messages)
             or submission_status.validation_failed
-        )
+        ):
+            submission_status.validation_failed = True
+        elif not rules_success:
+            submission_status.processing_failed = True
 
         for entity_name, entity in entity_manager.entities.items():
             projected = self._step_implementations.write_parquet(  # type: ignore