Resolve e2e test failures

Author: dlzhry2nhs

lambdas/backend/src/controller/fhir_controller.py

@@ -214,7 +214,12 @@ def _get_search_params_from_request(
         """Simple helper function to retrieve the search params from the relevant part of the AWS event, depending on
         which search endpoint is being used"""
         if not is_post_endpoint_req:
-            return get_multi_value_query_params(aws_event)
+            return get_multi_value_query_params(aws_event) if not None else {}
 
-        decoded_body = base64.b64decode(aws_event.get("body", "")).decode("utf-8")
+        form_body = aws_event.get("body")
+
+        if not form_body:
+            return {}
+
+        decoded_body = base64.b64decode(form_body).decode("utf-8")
         return parse_qs(decoded_body)

lambdas/backend/tests/service/test_fhir_service.py

@@ -315,7 +315,7 @@ def test_get_immunization_by_identifier_when_elements_parameter_provided(self):
         )
         self.assertEqual(
             result.entry[0].resource,
-            Immunization.construct(**{"resourceType": "Immunization", "id": "1234-some-id", "meta": {"versionId": "1"}}),
+            Immunization.construct(**{"resourceType": "Immunization", "id": "1234-some-id", "meta": {"versionId": 1}}),
         )
 
 

lambdas/shared/src/common/models/utils/generic_utils.py

@@ -174,7 +174,7 @@ def make_search_bundle(
     if not resource:
         return make_empty_search_bundle(searched_url)
 
-    meta = {"versionId": str(version_id)}
+    meta = {"versionId": version_id}
 
     # Full Immunization payload to be returned if only the identifier parameter was provided and truncated when
     # _elements is used

tests/e2e/test_search_by_identifier_immunization.py

@@ -182,8 +182,8 @@ class SearchTestParams(NamedTuple):
                 "POST",
                 f"identifier={identifier_system}|{identifier_value}",
                 f"identifier={identifier_system}|{identifier_value}",
-                False,
-                400,
+                True,
+                200,
             ),
         ]
         for search in searches:

tests/e2e/test_search_immunization.py

@@ -379,7 +379,7 @@ def test_search_immunization_accepts_include_and_provides_patient(self):
         imms_obj_id = self.store_records(imms_obj)
 
         response = self.default_imms_api.search_immunizations_full(
-            "POST",
+            "GET",
             f"patient.identifier={valid_patient_identifier1}&-immunization.target={VaccineTypes.mmr}"
             + "&_include=Immunization:patient",
             body=None,