final review

Author: Akol125

backend/src/parameter_parser.py

@@ -48,16 +48,17 @@ def process_patient_identifier(identifier_params: ParamContainer) -> str:
         raise ParameterException(f"Search parameter {patient_identifier_key} must have one value.")
 
     patient_identifier_parts = patient_identifier.split("|")
-    if len(patient_identifier_parts) != 2 or not patient_identifier_parts[
-                                                     0] == patient_identifier_system:
+    identifier_system = patient_identifier_parts[0]
+    if len(patient_identifier_parts) != 2 or not identifier_system == patient_identifier_system:
         raise ParameterException("patient.identifier must be in the format of "
                       f"\"{patient_identifier_system}|{{NHS number}}\" "
                       f"e.g. \"{patient_identifier_system}|9000000009\"")
-    
-    if not nhs_number_mod11_check(patient_identifier_parts[1]):
+
+    nhs_number = patient_identifier_parts[1]
+    if not nhs_number_mod11_check(nhs_number):
         raise ParameterException("Search parameter patient.identifier must be a valid NHS number.")
-      
-    return patient_identifier.split("|")[1]
+
+    return nhs_number
 
 
 def process_immunization_target(imms_params: ParamContainer) -> list[str]:

backend/tests/test_parameter_parser.py

@@ -108,7 +108,7 @@ def test_process_search_params_checks_patient_identifier_format(self):
                 self.immunization_target_key: ["RSV"],
             }
         )
-        self.assertIsNotNone(params)
+        
 
     def test_process_search_params_whitelists_immunization_target(self):
         mock_redis_key = "RSV"
@@ -117,14 +117,18 @@ def test_process_search_params_whitelists_immunization_target(self):
             process_search_params(
                 {
                     self.patient_identifier_key: ["https://fhir.nhs.uk/Id/nhs-number|9000000009"],
-                    self.immunization_target_key: ["not-a-code"],
+                    self.immunization_target_key: ["FLU", "COVID-19", "NOT-A-REAL-VALUE"],
                 }
             )
         self.assertEqual(
             str(e.exception), f"immunization-target must be one or more of the following: {mock_redis_key}",
             f"Unexpected exception message: {str(e.exception)}"
         )
 
+
+    def test_process_search_params_immunization_target(self):
+        mock_redis_key = "RSV"
+        self.mock_redis_client.hkeys.return_value = [mock_redis_key]
         params = process_search_params(
             {
                 self.patient_identifier_key: ["https://fhir.nhs.uk/Id/nhs-number|9000000009"],
@@ -134,6 +138,7 @@ def test_process_search_params_whitelists_immunization_target(self):
 
         self.assertIsNotNone(params)
 
+
     def test_search_params_date_from_must_be_before_date_to(self):
         self.mock_redis_client.hkeys.return_value = ["RSV"]
         params = process_search_params(