Enhance test coverage to meet the defined acceptance criteria (#1324)

* updated test coverage

* added NO_GP_NHS test patient detail

* fix broken tests and reduce wait time for no msn event

Author: FimranNHS

tests/e2e_automation/features/APITests/create.feature

@@ -74,7 +74,7 @@ Feature: Create the immunization event for a patient
         And The terms are mapped to the respective text fields in imms delta table
         And MNS event will be triggered with correct data for created event
 
-    @Delete_cleanUp @vaccine_type_BCG @patient_id_Random @supplier_name_EMIS
+    @Delete_cleanUp @vaccine_type_BCG @patient_id_InvalidInPDS @supplier_name_EMIS
     Scenario: Verify that VACCINATION_PROCEDURE_TERM, VACCINE_PRODUCT_TERM fields are mapped to first instance of coding.display fields in imms delta table
         Given Valid json payload is created where vaccination terms has multiple instances of coding
         When Trigger the post create request
@@ -83,14 +83,14 @@ Feature: Create the immunization event for a patient
         And The terms are mapped to first instance of coding.display fields in imms delta table
         And MNS event will be triggered with correct data for created event
 
-    @Delete_cleanUp @vaccine_type_HEPB @patient_id_Random @supplier_name_MEDICUS
+    @Delete_cleanUp @vaccine_type_HEPB @patient_id_NullNHS @supplier_name_MEDICUS
     Scenario: Verify that VACCINATION_PROCEDURE_TERM, VACCINE_PRODUCT_TERM, SITE_OF_VACCINATION_TERM, ROUTE_OF_VACCINATION_TERM fields are mapped to correct instance of coding.display fields in imms delta table
         Given Valid json payload is created where vaccination terms has multiple instance of coding with different coding system
         When Trigger the post create request
         Then The request will be successful with the status code '201'
         And The location key and Etag in header will contain the Immunization Id and version
         And The terms are mapped to correct instance of coding.display fields in imms delta table
-        And MNS event will be triggered with correct data for created event
+        And MNS event will not be triggered for the event
 
     @smoke
     @Delete_cleanUp @vaccine_type_PERTUSSIS @patient_id_Random @supplier_name_EMIS
@@ -103,7 +103,7 @@ Feature: Create the immunization event for a patient
         And MNS event will be triggered with correct data for created event
 
     @smoke
-    @Delete_cleanUp @vaccine_type_HIB @patient_id_Random @supplier_name_TPP
+    @Delete_cleanUp @vaccine_type_HIB @patient_id_NO_GP_NHS @supplier_name_TPP
     Scenario: Verify that VACCINATION_PROCEDURE_TERM, VACCINE_PRODUCT_TERM, SITE_OF_VACCINATION_TERM, ROUTE_OF_VACCINATION_TERM fields are blank in imms delta table if no text or value string or display field is present
         Given Valid json payload is created where vaccination terms has no text or value string or display field
         When Trigger the post create request
@@ -305,3 +305,16 @@ Feature: Create the immunization event for a patient
         And The imms event table will be populated with the correct data for 'created' event
         And The delta table will be populated with the correct data for created event
         And MNS event will be triggered with correct data for created event
+
+
+    @smoke
+    @Delete_cleanUp @supplier_name_TPP @vaccine_type_BCG @patient_id_Random
+    Scenario:  Verify that the POST Create API will create MNS event when patient DOB is in future
+        Given Valid json payload is created where patient date is greater then vaccination occurrence date
+        When Trigger the post create request
+        Then The request will be successful with the status code '201'
+        And The location key and Etag in header will contain the Immunization Id and version
+        And The X-Request-ID and X-Correlation-ID keys in header will populate correctly
+        And The imms event table will be populated with the correct data for 'created' event
+        And The delta table will be populated with the correct data for created event
+        And MNS event will be triggered with correct data for created event

tests/e2e_automation/features/APITests/search.feature

@@ -235,6 +235,7 @@ Feature: Search the immunization of a patient
         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
+        And MNS event will not be triggered for the update event
 
     @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

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

@@ -63,6 +63,16 @@ def valid_json_payload_is_created_patient_age_is_less_then_a_year(context):
     context.immunization_object.contained[1].birthDate = dob.strftime("%Y-%m-%d")
 
 
+@given("Valid json payload is created where patient date is greater then vaccination occurrence date")
+def valid_json_payload_is_created_patient_age_is_in_future(context):
+    valid_json_payload_is_created(context)
+    today = datetime.now(UTC)
+    dob = today - timedelta(days=7)
+    context.immunization_object.contained[1].birthDate = dob.strftime("%Y-%m-%d")
+    occurrence_date = today - timedelta(days=14)
+    context.immunization_object.occurrenceDateTime = occurrence_date.isoformat()
+
+
 @given(parsers.parse("Valid json payload is created with Patient '{Patient}' and vaccine_type '{vaccine_type}'"))
 def The_Immunization_object_is_created_with_patient_for_vaccine_type(context, Patient, vaccine_type):
     context.vaccine_type = vaccine_type
@@ -123,7 +133,10 @@ def validVaccinationRecordIsCreated(context):
     Trigger_the_post_create_request(context)
     The_request_will_have_status_code(context, 201)
     validateCreateLocation(context)
-    mns_event_will_be_triggered_with_correct_data(context=context, action="CREATE")
+    if context.patient.identifier[0].value is not None:
+        mns_event_will_be_triggered_with_correct_data(context=context, action="CREATE")
+    else:
+        mns_event_will_not_be_triggered_for_the_event(context)
 
 
 @given(parsers.parse("valid vaccination record is created by '{Supplier}' supplier"))
@@ -271,7 +284,7 @@ def validate_imms_event_table_by_operation(context, operation: Operation):
         ),
         (
             "PatientPK",
-            f"Patient#{context.patient.identifier[0].value}",
+            f"Patient#{context.patient.identifier[0].value if context.patient.identifier[0].value is not None else 'TBC'}",
             item.get("PatientPK"),
         ),
         (
@@ -332,7 +345,6 @@ def send_update_for_immunization_event(context):
     context.update_object.contained[1].address[0].city = "Updated City"
     context.update_object.contained[1].address[0].state = "Updated State"
     trigger_the_updated_request(context)
-    mns_event_will_be_triggered_with_correct_data(context=context, action="UPDATE")
 
 
 @given("created event is being updated twice")
@@ -364,8 +376,27 @@ def mns_event_will_be_triggered_with_correct_data_for_created_event(context):
 
 @then("MNS event will not be triggered for the event")
 def mns_event_will_not_be_triggered_for_the_event(context):
-    message_body = read_message(context, queue_type="notification", wait_for_message=False)
-    print(f"Read message from SQS: {message_body}")
+    message_body = read_message(
+        context,
+        queue_type="notification",
+        action="CREATE",
+        wait_time_seconds=5,
+        max_empty_polls=1,
+    )
+    print("No MNS create event is created")
+    assert message_body is None, "Not expected a message but queue returned a message"
+
+
+@then("MNS event will not be triggered for the update event")
+def validate_mns_event_not_triggered_for_updated_event(context):
+    message_body = read_message(
+        context,
+        queue_type="notification",
+        action="UPDATE",
+        wait_time_seconds=5,
+        max_empty_polls=3,
+    )
+    print("no MNS update event is created")
     assert message_body is None, "Not expected a message but queue returned a message"
 
 
@@ -391,10 +422,6 @@ def calculate_age(birth_date_str: str, occurrence_datetime_str: str) -> int:
     age = occurrence.year - birth.year
     if (occurrence.month, occurrence.day) < (birth.month, birth.day):
         age -= 1
-
-    if age < 0:
-        age = 0
-
     return age
 
 
@@ -467,10 +494,18 @@ def validate_sqs_message(context, message_body, action):
 
 
 def mns_event_will_be_triggered_with_correct_data_for_deleted_event(context):
-    if context.patient.identifier[0].value is None or context.gp_code is not None:
+    if context.patient.identifier[0].value is None:
+        message_body = read_message(
+            context,
+            queue_type="notification",
+            action="DELETE",
+            wait_time_seconds=5,
+            max_empty_polls=3,
+        )
         print(
-            f"Patient {context.patient_id} has no NHS number or gp code is not setup, MNS message will go to Dead letter queue"
+            "No MNS delete event is created as expected since NHS number is not present in the original immunization event"
         )
+        assert message_body is None, "Not expected a message but queue returned a message"
     else:
         message_body = read_message(context, queue_type="notification", action="DELETE")
         print(f"Read deleted message from SQS: {message_body}")
@@ -479,14 +514,9 @@ def mns_event_will_be_triggered_with_correct_data_for_deleted_event(context):
 
 
 def mns_event_will_be_triggered_with_correct_data(context, action):
-    if context.patient.identifier[0].value is None or context.gp_code is not None:
-        print(
-            f"Patient {context.patient_id} has no NHS number or gp code is not setup, MNS message will go to Dead letter queue"
-        )
-    else:
-        message_body = read_message(context, queue_type="notification", action=action)
-        print(f"Read {action}d message from SQS: {message_body}")
-        assert message_body is not None, f"Expected a {action} message but queue returned empty"
-        context.gp_code = get_gp_code_by_nhs_number(context.patient.identifier[0].value)
-        context.patient_age = calculate_age(context.patient.birthDate, context.immunization_object.occurrenceDateTime)
-        validate_sqs_message(context, message_body, action)
+    message_body = read_message(context, queue_type="notification", action=action)
+    print(f"Read {action}d message from SQS: {message_body}")
+    assert message_body is not None, f"Expected a {action} message but queue returned empty"
+    context.gp_code = get_gp_code_by_nhs_number(context.patient.identifier[0].value)
+    context.patient_age = calculate_age(context.patient.birthDate, context.immunization_object.occurrenceDateTime)
+    validate_sqs_message(context, message_body, action)

tests/e2e_automation/features/APITests/update.feature

@@ -11,6 +11,7 @@ Feature: Update the immunization of a patient
         And The X-Request-ID and X-Correlation-ID keys in header will populate correctly
         And The imms event table will be populated with the correct data for 'updated' event
         And The delta table will be populated with the correct data for updated event
+        And MNS event will be triggered with correct data for Updated event
 
 
     @vaccine_type_RSV @patient_id_Random
@@ -21,7 +22,7 @@ Feature: Update the immunization of a patient
         And The Response JSONs should contain correct error message for 'forbidden' access
 
 
-    @delete_cleanup @vaccine_type_RSV @patient_id_Random @supplier_name_RAVS
+    @delete_cleanup @vaccine_type_RSV @patient_id_NullNHS @supplier_name_RAVS
     Scenario: verify that vaccination record can be updated with valid vaccination detail
         Given I have created a valid vaccination record
         When I update the address of the original immunization event
@@ -30,7 +31,7 @@ Feature: Update the immunization of a patient
         And The X-Request-ID and X-Correlation-ID keys in header will populate correctly
         And The imms event table will be populated with the correct data for 'updated' event
         And The delta table will be populated with the correct data for updated event
-        And MNS event will be triggered with correct data for Updated event
+        And MNS event will not be triggered for the update event
 
 
     @smoke
@@ -51,7 +52,7 @@ Feature: Update the immunization of a patient
         And MNS event will be triggered with correct data for Updated event
 
     @smoke
-    @delete_cleanup @vaccine_type_ROTAVIRUS @patient_id_Random
+    @delete_cleanup @vaccine_type_ROTAVIRUS @patient_id_NO_GP_NHS
     Scenario: Verify that update will be successful when request is triggered by other supplier with authorize permission
         Given valid vaccination record is created by 'TPP' supplier
         When Send a update for Immunization event created with patient address being updated by 'EMIS'
@@ -62,7 +63,7 @@ Feature: Update the immunization of a patient
         And MNS event will be triggered with correct data for Updated event
 
 
-    @Delete_cleanUp @vaccine_type_RSV @patient_id_Mod11_NHS @supplier_name_Postman_Auth
+    @Delete_cleanUp @vaccine_type_RSV @patient_id_InvalidInPDS @supplier_name_Postman_Auth
     Scenario: Verify that the Update API will be successful with invalid but Mod11 compliant NHS Number
         Given I have created a valid vaccination record
         When I update the address of the original immunization event
@@ -71,6 +72,7 @@ Feature: Update the immunization of a patient
         And The X-Request-ID and X-Correlation-ID keys in header will populate correctly
         And The imms event table will be populated with the correct data for 'updated' event
         And The delta table will be populated with the correct data for updated event
+        And MNS event will be triggered with correct data for Updated event
 
     @Delete_cleanUp @vaccine_type_RSV @patient_id_Mod11_NHS @supplier_name_Postman_Auth
     Scenario Outline: Scenario Outline name: Verify that the Update API will be fails if occurrenceDateTime has future or invalid formatted date

tests/e2e_automation/input/testData.csv

@@ -1,17 +1,19 @@
 id,nhs_number,family_name,given_name,gender,birth_date,address_text,address_line,city,district,state,postal_code,country,start_date,end_date,gp_code,dss_record_start_date,dss_record_end_date
-ValidNHS,9449309981,test1,test2,unknown,1980-11-01,Validate Obf,"1, obf_2",obf_3,obf_4,obf_5,LS01 1AB,obf_7,2000-01-01,2025-01-01
-NullNHS,none,test1,test2,unknown,1980-09-01,Validate Obf,"1, obf_2",obf_3,obf_4,obf_5,LS01 1AB,obf_7,2000-01-01,2025-01-01
-NullNHS,none,test1,test2,unknown,1981-12-01,Validate Obf,"1, obf_2",obf_3,obf_4,obf_5,LS01 1AB,obf_7,2000-01-01,2025-01-01
-SFlag,9449310475,test1,test2,unknown,1980-11-01,Validate Obf,"1, obf_2",obf_3,obf_4,obf_5,LS01 1AB,obf_7,2000-01-01,2025-01-01
-InvalidInPDS,9449310599,test1,test2,unknown,1980-11-01,Validate Obf,"1, obf_2",obf_3,obf_4,obf_5,LS01 1AB,obf_7,2000-01-01,2025-01-01
-InvalidMOD11Check,1234567890,test1,test2,unknown,1980-11-01,Validate Obf,"1, obf_2",obf_3,obf_4,obf_5,LS01 1AB,obf_7,2000-01-01,2025-01-01
-OldNHSNo,9452372230,test1,test2,unknown,1980-11-01,Validate Obf,"1, obf_2",obf_3,obf_4,obf_5,LS01 1AB,obf_7,2000-01-01,2025-01-01
-SupersedeNhsNo,9467351307,test1,test2,unknown,1980-11-01,Validate Obf,"1, obf_2",obf_3,obf_4,obf_5,LS01 1AB,obf_7,2000-01-01,2025-01-01
-Invalid_NHS,9461267665,STERLING,SOKHI,unknown,2007-11-25,217A,ROUNDHAY ROAD,City,district,State,LS8 4HS,UK,2013-12-22,2033-01-01,B83013,
-Mod11_NHS,2788584652,STERLING,Sal,unknown,2007-11-25,217A,ROUNDHAY ROAD,City,district,State,LS8 4HS,UK,2013-12-22,2033-01-01
-Mod11_NHS,3510670485,STERLING,Sall,unknown,2007-11-25,217A,ROUNDHAY ROAD,City,district,State,LS8 4HS,UK,2013-12-22,2033-01-01
-Mod11_NHS,5309741852,STERLING,Sally,unknown,2007-11-25,217A,ROUNDHAY ROAD,City,district,State,LS8 4HS,UK,2013-12-22,2033-01-01
-Valid_NHS,9727799280,MOAH,HANNAH,female,1934-05-30,50 GORDON STREET,BOOTHTOWN,HALIFAX,District,State,HX3 6NU,UK,2010-01-01,2029-12-30,B84612,2026-01-30,null
+ValidNHS,9449309981,test1,test2,unknown,1980-11-01,Validate Obf,"1, obf_2",obf_3,obf_4,obf_5,LS01 1AB,obf_7,2000-01-01,2025-01-01,,,
+NullNHS,none,test1,test2,unknown,1980-09-01,Validate Obf,"1, obf_2",obf_3,obf_4,obf_5,LS01 1AB,obf_7,2000-01-01,2025-01-01,,,
+NullNHS,none,test1,test2,unknown,1981-12-01,Validate Obf,"1, obf_2",obf_3,obf_4,obf_5,LS01 1AB,obf_7,2000-01-01,2025-01-01,,,
+SFlag,9449310475,test1,test2,unknown,1980-11-01,Validate Obf,"1, obf_2",obf_3,obf_4,obf_5,LS01 1AB,obf_7,2000-01-01,2025-01-01,,,
+InvalidInPDS,7085531614,test1,test2,unknown,1980-11-01,Validate Obf,"1, obf_2",obf_3,obf_4,obf_5,LS01 1AB,obf_7,2000-01-01,2025-01-01,,,
+InvalidInPDS,1542293278,test1,test2,unknown,1980-11-01,Validate Obf,"1, obf_2",obf_3,obf_4,obf_5,LS01 1AB,obf_7,2000-01-01,2025-01-01,,,
+InvalidMOD11Check,1234567890,test1,test2,unknown,1980-11-01,Validate Obf,"1, obf_2",obf_3,obf_4,obf_5,LS01 1AB,obf_7,2000-01-01,2025-01-01,,,
+OldNHSNo,9452372230,test1,test2,unknown,1980-11-01,Validate Obf,"1, obf_2",obf_3,obf_4,obf_5,LS01 1AB,obf_7,2000-01-01,2025-01-01,,,
+SupersedeNhsNo,9467351307,test1,test2,unknown,1980-11-01,Validate Obf,"1, obf_2",obf_3,obf_4,obf_5,LS01 1AB,obf_7,2000-01-01,2025-01-01,,,
+Invalid_NHS,9461267665,STERLING,SOKHI,unknown,2007-11-25,217A,ROUNDHAY ROAD,City,district,State,LS8 4HS,UK,2013-12-22,2033-01-01,B83013,,
+Mod11_NHS,2788584652,STERLING,Sal,unknown,2007-11-25,217A,ROUNDHAY ROAD,City,district,State,LS8 4HS,UK,2013-12-22,2033-01-01,,,
+Mod11_NHS,3510670485,STERLING,Sall,unknown,2007-11-25,217A,ROUNDHAY ROAD,City,district,State,LS8 4HS,UK,2013-12-22,2033-01-01,,,
+Mod11_NHS,5309741852,STERLING,Sally,unknown,2007-11-25,217A,ROUNDHAY ROAD,City,district,State,LS8 4HS,UK,2013-12-22,2033-01-01,,,
+NO_GP_NHS,9737366689,ERNEST,MILMIN,female,2021-07-21,50 GORDON STREET,BOOTHTOWN,HALIFAX,District,State,LS12 2QS,UK,2010-01-01,2029-12-30,,,
+NO_GP_NHS,9446144078,KEIRAN,POSTLETHWAITE,female,2010-03-21,50 GORDON STREET,BOOTHTOWN,HALIFAX,District,State,LS10 4QE,UK,2010-01-01,2029-12-30,,,
 Valid_NHS,9727805493,BULLEN,OTIS,male,1961-08-23,3 MANOR ROAD EXTENSION,OADBY,LEICESTER,District,State,LE2 4FG,UK,2010-01-01,2029-12-30,C82066,2026-01-30,null
 Valid_NHS,9727835147,MOXON,ANITA,female,1993-03-22,10 BRANDER DRIVE,LEEDS,null,District,State,LS9 6NU,UK,2010-01-01,2029-12-30,B86092,2026-01-30,null
 Valid_NHS,9727847587,DUFFY,BEN,male,1959-01-24,35 HOPWOOD LANE,HALIFAX,null,District,State,HX1 5ER,UK,2010-01-01,2029-12-30,B84612,2026-01-30,null

tests/e2e_automation/src/dynamoDB/dynamo_db_helper.py

@@ -294,7 +294,11 @@ def validate_imms_delta_record_with_created_event(
             ),
             (
                 "NHS_NUMBER",
-                create_obj.contained[1].identifier[0].value,
+                (
+                    create_obj.contained[1].identifier[0].value
+                    if create_obj.contained[1].identifier[0].value is not None
+                    else ""
+                ),
                 imms_event.get("NHS_NUMBER"),
             ),
             (

tests/e2e_automation/utilities/api_fhir_immunization_helper.py

@@ -241,8 +241,8 @@ def validate_to_compare_request_and_response(context, create_obj, created_event,
         fields_to_compare.append(
             (
                 "patient.identifier.value",
-                request_patient.identifier[0].value,
-                response_patient.identifier.value,
+                (request_patient.identifier[0].value if context.patient.identifier[0].value is not None else ""),
+                (response_patient.identifier.value if response_patient.identifier.value is not None else ""),
             )
         )
         fields_to_compare.append(

tests/e2e_automation/utilities/sqs_message_halder.py

@@ -26,22 +26,22 @@ def read_message(
     action="CREATE",
     wait_for_message=True,
     max_empty_polls=3,
+    wait_time_seconds=20,
 ):
     sqs = boto3.client("sqs", region_name="eu-west-2")
     queue_url = build_queue_url(context.S3_env, context.aws_account_id, queue_type)
 
     expected_dataref = f"{context.url}/{context.ImmsID}"
 
-    WAIT_TIME_SECONDS = 10
     empty_polls = 0
 
     while True:
-        print(f"Polling {queue_type} queue for {action} messages (wait {WAIT_TIME_SECONDS}s)...")
+        print(f"Polling {queue_type} queue for {action} messages (wait {wait_time_seconds}s)...")
 
         response = sqs.receive_message(
             QueueUrl=queue_url,
             MaxNumberOfMessages=10,
-            WaitTimeSeconds=WAIT_TIME_SECONDS,
+            WaitTimeSeconds=wait_time_seconds,
             VisibilityTimeout=30,
         )