VED-367: refactor logic, rename variables from code review

Author: Akol125

backend/src/fhir_controller.py

@@ -482,8 +482,7 @@ def _validate_id(self, _id: str) -> Optional[dict]:
         else:
             return None
 
-    def _validate_identifier_system(self, _id: str, _element: str) -> Optional[dict]:
-
+    def _validate_identifier_system(self, _id: str, _elements: str) -> Optional[dict]:
         if not _id:
             return create_operation_outcome(
                 resource_id=str(uuid.uuid4()),
@@ -506,11 +505,13 @@ def _validate_identifier_system(self, _id: str, _element: str) -> Optional[dict]
                     'e.g. "http://xyz.org/vaccs|2345-gh3s-r53h7-12ny"'
                 ),
             )
+        
+        if not _elements:
+            return None
 
-        element_lower = _element.lower()
-        result = element_lower.split(",")
-        is_present = all(key in ["id", "meta"] for key in result)
-        if _element and not is_present:
+        requested_elements = {e.strip().lower() for e in _elements.split(",") if e.strip()}
+        requested_elements_valid = requested_elements.issubset({"id", "meta"})
+        if _elements and not requested_elements_valid:
             return create_operation_outcome(
                 resource_id=str(uuid.uuid4()),
                 severity=Severity.error,
@@ -561,12 +562,10 @@ def fetch_identifier_system_and_element(self, event: dict):
         body = event["body"]
         not_required_keys = ["-date.from", "-date.to", "-immunization.target", "_include", "patient.identifier"]
 
-        # Get Search Identifer Parameters
+        # Get Search Query Parameters
         if query_params and not body:
-            query_string_has_immunization_identifier = "identifier" in event.get(
-                "queryStringParameters", {}
-            )
-            query_string_has_element = "_elements" in event.get("queryStringParameters", {})
+            query_string_has_immunization_identifier = "identifier" in query_params
+            query_string_has_element = "_elements" in query_params
             identifier = query_params.get("identifier", "")
             element = query_params.get("_elements", "")
             query_check = check_keys_in_sources(event, not_required_keys)
@@ -613,21 +612,12 @@ def create_response_for_identifier(self, not_required, has_identifier, has_eleme
             )
             return self.create_response(400, error)
 
-        if "patient.identifier" not in not_required and not_required and has_identifier:
-            error = create_operation_outcome(
-                resource_id=str(uuid.uuid4()),
-                severity=Severity.error,
-                code=Code.server_error,
-                diagnostics="Search parameter identifier must have the following parameter: _elements",
-            )
-            return self.create_response(400, error)
-
         if not_required and has_element:
             error = create_operation_outcome(
                 resource_id=str(uuid.uuid4()),
                 severity=Severity.error,
                 code=Code.server_error,
-                diagnostics="Search parameter _elements must have  the following parameter: identifier",
+                diagnostics="Search parameter _elements must have the following parameter: identifier",
             )
             return self.create_response(400, error)
 

backend/src/search_imms_handler.py

@@ -42,7 +42,7 @@ def search_imms(event: events.APIGatewayProxyEventV1, controller: FhirController
                 # Parse the URL encoded body
                 parsed_body = urllib.parse.parse_qs(decoded_body)
 
-                # Check for 'immunization.identifier' in body
+                # Check for 'identifier' in body
                 body_has_immunization_identifier = "identifier" in parsed_body
                 body_has_immunization_element = "_elements" in parsed_body
             if (

backend/tests/test_fhir_controller.py

@@ -240,29 +240,6 @@ def test_get_imms_by_identifer_both_body_and_query_params_present(self, mock_get
         body = json.loads(response["body"])
         self.assertEqual(body["resourceType"], "OperationOutcome")
 
-    @patch("fhir_controller.get_supplier_permissions")
-    def test_get_imms_by_identifer_imms_identifier_and_element_not_present(self, mock_get_supplier_permissions):
-        """it should return Immunization Id if it exists"""
-        # Given
-        mock_get_supplier_permissions.return_value = ["COVID19.CRUDS"]
-        self.service.get_immunization_by_identifier.return_value = {"id": "test", "Version": 1}
-        lambda_event = {
-            "headers": {"SupplierSystem": "test"},
-            "queryStringParameters": {
-                "-immunization.target": "test",
-                "identifier": "https://supplierABC/identifiers/vacc|f10b59b3-fc73-4616-99c9-9e882ab31184",
-            },
-            "body": None,
-        }
-        # When
-        response = self.controller.get_immunization_by_identifier(lambda_event)
-        # Then
-        self.service.get_immunization_by_identifier.assert_not_called
-
-        self.assertEqual(response["statusCode"], 400)
-        body = json.loads(response["body"])
-        self.assertEqual(body["resourceType"], "OperationOutcome")
-
     @patch("fhir_controller.get_supplier_permissions")
     def test_get_imms_by_identifer_both_identifier_present(self, mock_get_supplier_permissions):
         """it should return Immunization Id if it exists"""
@@ -355,7 +332,7 @@ def test_validate_immunization_identifier_in_invalid_format(self,mock_get_suppli
                     "details": {
                         "coding": [{"system": "https://fhir.nhs.uk/Codesystem/http-error-codes", "code": "INVALID"}]
                     },
-                    "diagnostics": "immunization.identifier must be in the format of immunization.identifier.system|immunization.identifier.value e.g. http://pinnacle.org/vaccs|2345-gh3s-r53h7-12ny",
+                    "diagnostics": "identifier must be in the format of identifier.system|identifier.value e.g. http://pinnacle.org/vaccs|2345-gh3s-r53h7-12ny",
                 }
             ],
         }
@@ -677,7 +654,7 @@ def test_validate_immunization_identifier_is_empty(self, mock_get_supplier_permi
                     "details": {
                         "coding": [{"system": "https://fhir.nhs.uk/Codesystem/http-error-codes", "code": "INVALID"}]
                     },
-                    "diagnostics": "immunization.identifier must be in the format of immunization.identifier.system|immunization.identifier.value e.g. http://pinnacle.org/vaccs|2345-gh3s-r53h7-12ny",
+                    "diagnostics": "identifier must be in the format of identifier.system|identifier.value e.g. http://pinnacle.org/vaccs|2345-gh3s-r53h7-12ny",
                 }
             ],
         }