VED-496: Output PRIMARY_SOURCE as a string. (#685)

Author: mfjarvis

delta_backend/src/extractor.py

@@ -29,17 +29,17 @@ def _get_patient(self):
         return next((c for c in contained if isinstance(c, dict) and c.get("resourceType") == "Patient"), "")
 
     def _get_valid_names(self, names, occurrence_time):
-        
+
         official_names = [n for n in names if n.get("use") == "official" and self._is_current_period(n, occurrence_time)]
         if official_names:
             return official_names[0]
 
         valid_names = [n for n in names if self._is_current_period(n, occurrence_time) and n.get("use") != "old"]
         if valid_names:
             return valid_names[0]
-        
-        return names[0] 
-            
+
+        return names[0]
+
 
 
     def _get_person_names(self):
@@ -56,9 +56,9 @@ def _get_person_names(self):
 
         if person_forename and person_surname:
             return person_forename, person_surname
-        
+
         return "", ""
-    
+
     def _get_practitioner_names(self):
         contained = self.fhir_json_data.get("contained", [])
         occurrence_time = self._get_occurance_date_time()
@@ -282,8 +282,8 @@ def extract_valid_address(self):
         )
 
         return selected_address.get("postalCode") or self.DEFAULT_POSTCODE
-    
-    def extract_date_time(self) -> str: 
+
+    def extract_date_time(self) -> str:
         date = self.fhir_json_data.get("occurrenceDateTime","")
         if date:
             return self._convert_date_to_safe_format(ConversionFieldName.DATE_AND_TIME, date)
@@ -321,7 +321,7 @@ def extract_primary_source(self) -> bool | str:
         primary_source = self.fhir_json_data.get("primarySource")
 
         if isinstance(primary_source, bool):
-            return primary_source
+            return str(primary_source).upper()
         return ""
 
     def extract_vaccination_procedure_code(self) -> str:

delta_backend/tests/test_convert_primary_source.py

@@ -6,28 +6,27 @@
 from common.mappings import ConversionFieldName
 
 class TestPrimarySourceFlatJson(unittest.TestCase):
-    
+
     def setUp(self):
         self.request_json_data = copy.deepcopy(ValuesForTests.json_data)
-        
+
     def _run_primary_source_test(self, expected_result):
         """Helper function to run the test"""
         self.converter = Converter(json.dumps(self.request_json_data))
         flat_json = self.converter.run_conversion()
         self.assertEqual(flat_json.get(ConversionFieldName.PRIMARY_SOURCE), expected_result)
-    
+
     def test_primary_source_true(self):
         """Should return True when primarySource is true"""
         self.request_json_data["primarySource"] = True
-        self._run_primary_source_test(expected_result=True)
+        self._run_primary_source_test(expected_result="TRUE")
 
     def test_primary_source_false(self):
         """Should return False when primarySource is false"""
         self.request_json_data["primarySource"] = False
-        self._run_primary_source_test(expected_result=False)
-        
+        self._run_primary_source_test(expected_result="FALSE")
+
     def test_primary_source_missing(self):
         """Should return None when primarySource is missing"""
         self.request_json_data.pop("primarySource", None)
         self._run_primary_source_test(expected_result="")
-    

delta_backend/tests/utils_for_converter_tests.py

@@ -228,7 +228,7 @@ def get_expected_imms(expected_action_flag):
                 "PERFORMING_PROFESSIONAL_FORENAME": "Florence",
                 "PERFORMING_PROFESSIONAL_SURNAME": "Nightingale",
                 "RECORDED_DATE": "20210207",
-                "PRIMARY_SOURCE": True,
+                "PRIMARY_SOURCE": "TRUE",
                 "VACCINATION_PROCEDURE_CODE": "13246814444444",
                 "VACCINATION_PROCEDURE_TERM": "Test Value string 123456 COVID19 vaccination",
                 "DOSE_SEQUENCE": "1",
@@ -266,7 +266,7 @@ def get_expected_imms(expected_action_flag):
             "PERFORMING_PROFESSIONAL_FORENAME": "Florence",
             "PERFORMING_PROFESSIONAL_SURNAME": "Nightingale",
             "RECORDED_DATE": "20210207",
-            "PRIMARY_SOURCE": True,
+            "PRIMARY_SOURCE": "TRUE",
             "VACCINATION_PROCEDURE_CODE": "13246814444444",
             "VACCINATION_PROCEDURE_TERM": "Administration of first dose of severe acute respiratory syndrome coronavirus 2 vaccine (procedure)",
             "DOSE_SEQUENCE": 1,
@@ -304,7 +304,7 @@ def get_expected_imms(expected_action_flag):
             "PERFORMING_PROFESSIONAL_FORENAME": "Florence",
             "PERFORMING_PROFESSIONAL_SURNAME": "Nightingale",
             "RECORDED_DATE": "20210207",
-            "PRIMARY_SOURCE": True,
+            "PRIMARY_SOURCE": "TRUE",
             "VACCINATION_PROCEDURE_CODE": "13246814444444",
             "VACCINATION_PROCEDURE_TERM": "Test Value string 123456 COVID19 vaccination",
             "DOSE_SEQUENCE": "1",
@@ -457,7 +457,7 @@ def get_expected_imms_error_output(expected_action_flag):
                 "PERFORMING_PROFESSIONAL_FORENAME": "Florence",
                 "PERFORMING_PROFESSIONAL_SURNAME": "Nightingale",
                 "RECORDED_DATE": "20210207",
-                "PRIMARY_SOURCE": True,
+                "PRIMARY_SOURCE": "TRUE",
                 "VACCINATION_PROCEDURE_CODE": "13246814444444",
                 "VACCINATION_PROCEDURE_TERM": "Administration of first dose of severe acute respiratory syndrome coronavirus 2 vaccine (procedure)",
                 "DOSE_SEQUENCE": 1,