Self review

Author: dlzhry2nhs

lambdas/backend/src/filter.py

@@ -1,5 +1,7 @@
 """Functions for filtering a FHIR Immunization Resource"""
 
+import copy
+
 from common.models.constants import Constants, Urls
 from common.models.utils.generic_utils import (
     get_contained_patient,
@@ -36,7 +38,7 @@ def create_reference_to_patient_resource(patient_full_url: str, patient: dict) -
 
     for identifier in patient.get("identifier", []):
         if identifier.get("system", "") == Urls.NHS_NUMBER:
-            patient_nhs_number_identifier = identifier
+            patient_nhs_number_identifier = copy.deepcopy(identifier)
             break
 
     if patient_nhs_number_identifier is None:

lambdas/backend/tests/test_filter.py

@@ -101,8 +101,8 @@ def test_create_reference_to_patient_resource_when_identifier_missing(self):
         )
 
     def test_create_reference_to_patient_resource_when_nhs_number_missing(self):
-        """Test that create_reference_to_patient_resource creates an appropriate reference with empty identifier info
-        where the saved patient record does not contain this information"""
+        """Test that create_reference_to_patient_resource creates an appropriate reference with empty
+        identifier[0].value info where the saved patient record does not contain this information"""
         test_data = deepcopy(self.bundle_patient_resource)
         del test_data["identifier"][0]["value"]
 

lambdas/shared/tests/test_common/testing_utils/immunization_utils.py

@@ -2,6 +2,7 @@
 
 from fhir.resources.R4B.immunization import Immunization
 
+from common.models.constants import Constants
 from test_common.testing_utils.generic_utils import load_json_data
 from test_common.testing_utils.values_for_tests import ValidValues
 
@@ -24,7 +25,7 @@ def create_covid_immunization_dict(
     immunization_json["id"] = imms_id
 
     for contained_resource in immunization_json.get("contained", []):
-        if contained_resource.get("resourceType") == "Patient":
+        if contained_resource.get("resourceType") == Constants.PATIENT_RESOURCE_TYPE:
             if omit_nhs_number:
                 del contained_resource["identifier"][0]["value"]
             else:

tests/e2e_automation/features/APITests/search.feature

@@ -201,22 +201,22 @@ Feature: Search the immunization of a patient
     @Delete_cleanUp @vaccine_type_FLU @patient_id_Random  @supplier_name_Postman_Auth
     Scenario: Flu event is created and search post request fetch the only one record matched with identifier
         Given I have created a valid vaccination record
-        When Send a search request with Post method using identifier parameter for Immunization event created
+        When I send a search request with Post method using identifier parameter for Immunization event created
         Then The request will be successful with the status code '200'
         And correct immunization event is returned in the response
 
     @smoke
     @Delete_cleanUp @vaccine_type_FLU @patient_id_NullNHS  @supplier_name_Postman_Auth
     Scenario: Search by Identifier (POST) is successful when patient does not have an NHS Number recorded
         Given I have created a valid vaccination record
-        When Send a search request with Post method using identifier parameter for Immunization event created
+        When I send a search request with Post method using identifier parameter for Immunization event created
         Then The request will be successful with the status code '200'
         And correct immunization event is returned in the response
 
     @Delete_cleanUp @vaccine_type_FLU @patient_id_Random  @supplier_name_Postman_Auth
     Scenario: Flu event is created and search post request fetch the only one record matched with identifier and _elements
         Given I have created a valid vaccination record
-        When Send a search request with Post method using identifier and _elements parameters for Immunization event created
+        When I send a search request with Post method using identifier and _elements parameters for Immunization event created
         Then The request will be successful with the status code '200'
         And correct immunization event is returned in the response with only specified elements
 
@@ -225,7 +225,7 @@ Feature: Search the immunization of a patient
     Scenario: Flu event is created and search post request fetch the only one record matched with identifier with correct version id
         Given I have created a valid vaccination record
         And created event is being updated twice
-        When Send a search request with Post method using identifier parameter for Immunization event created
+        When I send a search request with Post method using identifier parameter for Immunization event created
         Then The request will be successful with the status code '200'
         And correct immunization event is returned in the response
 
@@ -234,13 +234,13 @@ Feature: Search the immunization of a patient
     Scenario: Flu event is created and search post request fetch the only one record matched with identifier and _elements with correct version id
         Given I have created a valid vaccination record
         And created event is being updated twice
-        When Send a search request with Post method using identifier and _elements parameters for Immunization event created
+        When I send a search request with Post method using identifier and _elements parameters for Immunization event created
         Then The request will be successful with the status code '200'
         And correct immunization event is returned in the response with only specified elements
 
     @smoke
     @vaccine_type_4IN1 @patient_id_Random  @supplier_name_Postman_Auth
     Scenario: Empty search response will be received when no record is found for the given identifier in search request
-        When Send a search request with post method using invalid identifier header for Immunization event created
+        When I send a search request with Post method using an invalid identifier header for Immunization event created
         Then The request will be successful with the status code '200'
         And Empty immunization event is returned in the response

tests/e2e_automation/features/APITests/steps/test_search_steps.py

@@ -20,7 +20,7 @@
 scenarios("APITests/search.feature")
 
 
-@when("Send a search request with Post method using identifier parameter for Immunization event created")
+@when("I send a search request with Post method using identifier parameter for Immunization event created")
 def send_search_post_request_with_identifier_header(context):
     get_search_post_url_header(context)
     context.request = {
@@ -30,7 +30,9 @@ def send_search_post_request_with_identifier_header(context):
     context.response = http_requests_session.post(context.url, headers=context.headers, data=context.request)
 
 
-@when("Send a search request with Post method using identifier and _elements parameters for Immunization event created")
+@when(
+    "I send a search request with Post method using identifier and _elements parameters for Immunization event created"
+)
 def send_search_post_request_with_identifier_and_elements_header(context):
     get_search_post_url_header(context)
     context.request = {
@@ -41,7 +43,7 @@ def send_search_post_request_with_identifier_and_elements_header(context):
     context.response = http_requests_session.post(context.url, headers=context.headers, data=context.request)
 
 
-@when("Send a search request with post method using invalid identifier header for Immunization event created")
+@when("I send a search request with Post method using an invalid identifier header for Immunization event created")
 def send_search_post_request_with_invalid_identifier_header(context):
     get_search_post_url_header(context)
     context.request = {"identifier": f"https://www.ieds.england.nhs.uk/|{str(uuid.uuid4())}", "_elements": "meta,id"}