Merge branch 'release_v072' of https://github.com/NHSDigital/data-validation-engine into bug/sr_1089_1139

Author: georgeRobertson

src/dve/reporting/excel_report.py

@@ -135,8 +135,11 @@ def _add_submission_info(self, status: str, summary: Worksheet):
         if "Status" not in self.summary_dict:
             summary.append(["", "Status", status])
 
+        _key_renames = {
+            "File Size": "File Size (Bytes)",
+        }
         for key, value in self.summary_dict.items():
-            summary.append(["", key, str(value)])
+            summary.append(["", _key_renames.get(key, key), str(value)])
 
         summary.append(["", ""])
 

tests/test_core_engine/test_backends/test_implementations/test_duckdb/test_audit_ddb.py

@@ -423,25 +423,22 @@ def test_get_submission_status(ddb_audit_manager_threaded: DDBAuditingManager):
             SubmissionStatisticsRecord(submission_id=sub_1.submission_id, record_count=5, number_record_rejections=2, number_warnings=3),
             SubmissionStatisticsRecord(submission_id=sub_4.submission_id, record_count=20, number_record_rejections=0, number_warnings=1)
         ])
-        
-        while not aud.queue.empty():
-            time.sleep(0.05)
-        
-        sub_stats_1 = aud.get_submission_status(sub_1.submission_id)
-        assert sub_stats_1.submission_result == "validation_failed"
-        assert sub_stats_1.validation_failed
-        assert not sub_stats_1.processing_failed
-        assert sub_stats_1.number_of_records == 5
-        sub_stats_2 = aud.get_submission_status(sub_2.submission_id)
-        assert sub_stats_2.submission_result == "processing_failed"
-        assert not sub_stats_2.validation_failed
-        assert sub_stats_2.processing_failed
-        sub_stats_3 = aud.get_submission_status(sub_3.submission_id)
-        assert not sub_stats_3.validation_failed
-        assert not sub_stats_3.processing_failed
-        sub_stats_4 = aud.get_submission_status(sub_4.submission_id)
-        assert sub_stats_4.submission_result == "success"
-        assert not sub_stats_4.validation_failed
-        assert not sub_stats_4.processing_failed
-        assert sub_stats_4.number_of_records == 20
-        assert not aud.get_submission_status("5")
+
+    sub_stats_1 = ddb_audit_manager_threaded.get_submission_status(sub_1.submission_id)
+    assert sub_stats_1.submission_result == "validation_failed"
+    assert sub_stats_1.validation_failed
+    assert not sub_stats_1.processing_failed
+    assert sub_stats_1.number_of_records == 5
+    sub_stats_2 = ddb_audit_manager_threaded.get_submission_status(sub_2.submission_id)
+    assert sub_stats_2.submission_result == "processing_failed"
+    assert not sub_stats_2.validation_failed
+    assert sub_stats_2.processing_failed
+    sub_stats_3 = ddb_audit_manager_threaded.get_submission_status(sub_3.submission_id)
+    assert not sub_stats_3.validation_failed
+    assert not sub_stats_3.processing_failed
+    sub_stats_4 = ddb_audit_manager_threaded.get_submission_status(sub_4.submission_id)
+    assert sub_stats_4.submission_result == "success"
+    assert not sub_stats_4.validation_failed
+    assert not sub_stats_4.processing_failed
+    assert sub_stats_4.number_of_records == 20
+    assert not ddb_audit_manager_threaded.get_submission_status("5")