Address review comments

Author: edhall-nhs

lambdas/shared/src/common/data_quality/checker.py

@@ -17,27 +17,26 @@ class DataQualityChecker:
 
     def __init__(
         self,
+        completeness_checker: DataQualityCompletenessChecker,
         is_batch_csv: bool,
     ):
+        self.completeness_checker = completeness_checker
         self.is_batch_csv = is_batch_csv
 
     def run_checks(self, immunisation: dict) -> DataQualityOutput:
-        fhir_converter = Converter(fhir_data=immunisation)
-        completeness_checker = DataQualityCompletenessChecker()
         data_quality_validator = DataQualityValidator()
 
         if not self.is_batch_csv:
-            immunisation = fhir_converter.run_conversion()
+            immunisation = Converter(fhir_data=immunisation).run_conversion()
 
         return DataQualityOutput(
-            missing_fields=self._check_completeness(immunisation, completeness_checker),
+            missing_fields=self._check_completeness(immunisation),
             invalid_fields=self._check_validity(immunisation, data_quality_validator),
             timeliness=self._check_timeliness(immunisation),
         )
 
-    @staticmethod
-    def _check_completeness(immunisation: dict, completeness_checker: DataQualityCompletenessChecker) -> MissingFields:
-        return completeness_checker.check_completeness(immunisation)
+    def _check_completeness(self, immunisation: dict) -> MissingFields:
+        return self.completeness_checker.run_checks(immunisation)
 
     @staticmethod
     def _check_validity(immunisation: dict, data_quality_validator: DataQualityValidator) -> list[str]:

lambdas/shared/src/common/data_quality/completeness.py

@@ -50,7 +50,7 @@ class MissingFields:
 
 
 class DataQualityCompletenessChecker:
-    def check_completeness(self, immunisation: dict) -> MissingFields:
+    def run_checks(self, immunisation: dict) -> MissingFields:
         return MissingFields(
             required_fields=self._get_missing_fields(immunisation, required_fields),
             mandatory_fields=self._get_missing_fields(immunisation, mandatory_fields),

lambdas/shared/tests/test_common/data_quality/sample_values.py

@@ -1,6 +1,6 @@
 from decimal import Decimal
 
-immunisation = {
+VALID_FHIR_IMMUNISATION = {
     "resourceType": "Immunization",
     "contained": [
         {
@@ -132,7 +132,7 @@
     ],
 }
 
-batch_immunisation = {
+VALID_BATCH_IMMUNISATION = {
     "NHS_NUMBER": "9000000009",
     "PERSON_FORENAME": "Sam",
     "PERSON_SURNAME": "Trailor",

lambdas/shared/tests/test_common/data_quality/test_completeness.py

@@ -2,7 +2,7 @@
 from copy import deepcopy
 
 from common.data_quality.completeness import DataQualityCompletenessChecker, MissingFields
-from test_common.data_quality.sample_values import batch_immunisation
+from test_common.data_quality.sample_values import VALID_BATCH_IMMUNISATION
 
 
 class TestDataQualityCompletenessChecker(unittest.TestCase):
@@ -11,16 +11,16 @@ def setUp(self):
         self.DataQualityCompletenessChecker = DataQualityCompletenessChecker()
 
     def test_check_completeness_no_missing_fields(self):
-        complete_immunisation = deepcopy(batch_immunisation)
+        complete_immunisation = deepcopy(VALID_BATCH_IMMUNISATION)
 
         expected_missing_fields = MissingFields(required_fields=[], mandatory_fields=[], optional_fields=[])
 
-        actual_missing_fields = self.DataQualityCompletenessChecker.check_completeness(complete_immunisation)
+        actual_missing_fields = self.DataQualityCompletenessChecker.run_checks(complete_immunisation)
 
         self.assertEqual(expected_missing_fields, actual_missing_fields)
 
     def test_check_completeness_empty_strings(self):
-        incomplete_immunisation = deepcopy(batch_immunisation)
+        incomplete_immunisation = deepcopy(VALID_BATCH_IMMUNISATION)
         incomplete_immunisation["NHS_NUMBER"] = ""  # required
         incomplete_immunisation["PERSON_FORENAME"] = ""  # mandatory
         incomplete_immunisation["PERFORMING_PROFESSIONAL_FORENAME"] = ""  # optional
@@ -31,12 +31,12 @@ def test_check_completeness_empty_strings(self):
             optional_fields=["PERFORMING_PROFESSIONAL_FORENAME"],
         )
 
-        actual_missing_fields = self.DataQualityCompletenessChecker.check_completeness(incomplete_immunisation)
+        actual_missing_fields = self.DataQualityCompletenessChecker.run_checks(incomplete_immunisation)
 
         self.assertEqual(expected_missing_fields, actual_missing_fields)
 
     def test_check_completeness_missing(self):
-        incomplete_immunisation = deepcopy(batch_immunisation)
+        incomplete_immunisation = deepcopy(VALID_BATCH_IMMUNISATION)
         incomplete_immunisation.pop("NHS_NUMBER")  # required
         incomplete_immunisation.pop("PERSON_FORENAME")  # mandatory
         incomplete_immunisation.pop("PERFORMING_PROFESSIONAL_FORENAME")  # optional
@@ -47,12 +47,12 @@ def test_check_completeness_missing(self):
             optional_fields=["PERFORMING_PROFESSIONAL_FORENAME"],
         )
 
-        actual_missing_fields = self.DataQualityCompletenessChecker.check_completeness(incomplete_immunisation)
+        actual_missing_fields = self.DataQualityCompletenessChecker.run_checks(incomplete_immunisation)
 
         self.assertEqual(expected_missing_fields, actual_missing_fields)
 
     def test_check_completeness_multiple_missing(self):
-        incomplete_immunisation = deepcopy(batch_immunisation)
+        incomplete_immunisation = deepcopy(VALID_BATCH_IMMUNISATION)
         incomplete_immunisation.pop("NHS_NUMBER")  # required
         incomplete_immunisation.pop("VACCINATION_PROCEDURE_TERM")  # required
         incomplete_immunisation.pop("PERSON_FORENAME")  # mandatory
@@ -66,6 +66,6 @@ def test_check_completeness_multiple_missing(self):
             optional_fields=["PERFORMING_PROFESSIONAL_FORENAME", "PERFORMING_PROFESSIONAL_SURNAME"],
         )
 
-        actual_missing_fields = self.DataQualityCompletenessChecker.check_completeness(incomplete_immunisation)
+        actual_missing_fields = self.DataQualityCompletenessChecker.run_checks(incomplete_immunisation)
 
         self.assertEqual(expected_missing_fields, actual_missing_fields)