tidy up

Author: motola

delta_backend/src/extractor.py

@@ -28,20 +28,17 @@ def _get_patient(self):
         contained = self.fhir_json_data.get("contained", [])
         return next((c for c in contained if isinstance(c, dict) and c.get("resourceType") == "Patient"), "")
 
-    def _get_valid_names(self, names, occurrence_time, resource_type="Patient"):
-        
-        def has_required_fields(name):
-            return "given" in name and "family" in name if resource_type == "Patient" else True
+    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:
-            filtered_official_names = [n for n in official_names if has_required_fields(n)]
-            return filtered_official_names[0]
+            return official_names[0]
 
         valid_names = [n for n in names if self._is_current_period(n, occurrence_time) and n.get("use") != "old"]
-        filtered_valid_names = [n for n in valid_names if has_required_fields(n)]
+        if valid_names:
+            return valid_names[0]
 
-        return filtered_valid_names[0] if filtered_valid_names else names[0]
+        return names[0] 
 
 
 
@@ -53,7 +50,7 @@ def _get_person_names(self):
         if not names:
             return "", ""
 
-        selected_name = self._get_valid_names(names, occurrence_time, resource_type="Patient")
+        selected_name = self._get_valid_names(names, occurrence_time)
         person_forename = " ".join(selected_name.get("given", []))
         person_surname = selected_name.get("family", "")
 
@@ -74,7 +71,7 @@ def _get_practitioner_names(self):
         if not valid_practitioner_names:
             return "", ""
 
-        selected_practitioner_name = self._get_valid_names(valid_practitioner_names, occurrence_time, resource_type="Practitioner")
+        selected_practitioner_name = self._get_valid_names(valid_practitioner_names, occurrence_time)
         performing_professional_forename = " ".join(selected_practitioner_name.get("given", []))
         performing_professional_surname = selected_practitioner_name.get("family", "")
 

delta_backend/tests/sample_data/fhir_sample.json

@@ -62,6 +62,18 @@
                     "end" : "2026-01-01"
                     }                
             },
+            {
+                "use": "official",
+                "text": "hello pat2",
+                "family": "test12",
+                "given": [
+                 "test13", "test14", "test15"
+                ],
+                "period":   {
+                    "start" : "2000-01-01",
+                    "end" : "2026-01-01"
+                    }                
+            },
             {
                 "use": "old",
                 "text": "hello pat3",

delta_backend/tests/test_convert_person_forename.py

@@ -6,6 +6,13 @@
 from common.mappings import ConversionFieldName
 
 class TestPersonForenmeToFlatJson(unittest.TestCase):
+    """"
+    Test cases for converting person forename to flat JSON format.
+    ## 1. If there is only one name use that one, else
+    ## 2. Select first name where Use=official with period covering vaccination date, else
+    ## 3. select instance where current name with use!=old at vaccination date
+    ## 4. Fallback to first available name instance
+    """
 
     def setUp(self):
         self.request_json_data = copy.deepcopy(ValuesForTests.json_data)

delta_backend/tests/test_convert_person_surname.py

@@ -6,6 +6,13 @@
 from common.mappings import ConversionFieldName
 
 class TestPersonSurnameToFlatJson(unittest.TestCase):
+    """"
+    Test cases for converting person surname to flat JSON format.
+    ## 1. If there is only one name use that one, else
+    ## 2. Select first name where Use=official with period covering vaccination date, else
+    ## 3. select instance where current name with use!=old at vaccination date
+    ## 4. Fallback to first available name instance
+    """
 
     def setUp(self):
         self.request_json_data = copy.deepcopy(ValuesForTests.json_data)