Adding scenario 9 (#139)

<!-- markdownlint-disable-next-line first-line-heading -->
## Description

<!-- Describe your changes in detail. -->
Adding scenario 9 from fobtregressiontests.feature

## Context

<!-- Why is this change required? What problem does it solve? -->
Adding scenario 9 from fobtregressiontests.feature

## Type of changes

<!-- What types of changes does your code introduce? Put an `x` in all
the boxes that apply. -->

- [x] Refactoring (non-breaking change)
- [x] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would change existing
functionality)
- [ ] Bug fix (non-breaking change which fixes an issue)

## Checklist

<!-- Go over all the following points, and put an `x` in all the boxes
that apply. -->

- [x] I am familiar with the [contributing
guidelines](https://github.com/nhs-england-tools/playwright-python-blueprint/blob/main/CONTRIBUTING.md)
- [x] I have followed the code style of the project
- [x] I have added tests to cover my changes (where appropriate)
- [x] I have updated the documentation accordingly
- [ ] This PR is a result of pair or mob programming

---

## Sensitive Information Declaration

To ensure the utmost confidentiality and protect your and others
privacy, we kindly ask you to NOT including [PII (Personal Identifiable
Information) / PID (Personal Identifiable
Data)](https://digital.nhs.uk/data-and-information/keeping-data-safe-and-benefitting-the-public)
or any other sensitive data in this PR (Pull Request) and the codebase
changes. We will remove any PR that do contain any sensitive
information. We really appreciate your cooperation in this matter.

- [x] I confirm that neither PII/PID nor sensitive data are included in
this PR and the codebase changes.

Author: adrianoaru-nhs

classes/date/has_user_dob_update.py

@@ -32,7 +32,7 @@ def by_description(cls, description: str) -> Optional["HasUserDobUpdate"]:
             Optional[HasUserDobUpdate]: The matching enum member, or None if not found.
         """
         for item in cls:
-            if item.value == description:
+            if item.value.lower() == description.lower():
                 return item
         return None
 

classes/repositories/subject_repository.py

@@ -153,7 +153,7 @@ def get_active_gp_practice_in_hub_and_sc(
         )
         if df.empty:
             return None
-        return df.iloc[0]["gp_code"]
+        return df["gp_code"].iloc[0]
 
     def get_inactive_gp_practice(self) -> Optional[str]:
         """
@@ -171,7 +171,7 @@ def get_inactive_gp_practice(self) -> Optional[str]:
         df = self.oracle_db.execute_query(query)
         if df.empty:
             return None
-        return df.iloc[0]["gp_code"]
+        return df["gp_code"].iloc[0]
 
     def get_latest_gp_practice_for_subject(self, nhs_number: str) -> Optional[str]:
         """
@@ -195,7 +195,7 @@ def get_latest_gp_practice_for_subject(self, nhs_number: str) -> Optional[str]:
         df = self.oracle_db.execute_query(query, {"nhs_number": nhs_number})
         if df.empty:
             return None
-        return df.iloc[0]["gp_code"]
+        return df["gp_code"].iloc[0]
 
     def get_matching_subject(
         self, criteria: dict, subject: Subject, user: User

classes/screening/has_unprocessed_sspi_updates.py

@@ -32,7 +32,7 @@ def by_description(cls, description: str) -> Optional["HasUnprocessedSSPIUpdates
             Optional[HasUnprocessedSSPIUpdates]: The matching enum member, or None if not found.
         """
         for item in cls:
-            if item.value == description:
+            if item.value.lower() == description.lower():
                 return item
         return None
 

pages/screening_subject_search/advance_fobt_screening_episode_page.py

@@ -70,6 +70,9 @@ def __init__(self, page: Page):
         self.not_suitable_for_diagnostic_tests_button = self.page.get_by_role(
             "button", name="Not Suitable for Diagnostic Tests"
         )
+        self.cancel_diagnostic_test_button = self.page.get_by_role(
+            "button", name="Cancel Diagnostic Test"
+        )
 
     def click_suitable_for_endoscopic_test_button(self) -> None:
         """Click the 'Suitable for Endoscopic Test' button."""
@@ -105,15 +108,21 @@ def get_latest_event_status_cell(self, latest_event_status: str) -> Locator:
 
     def verify_latest_event_status_value(self, latest_event_status: str) -> None:
         """Verify that the latest event status value is visible."""
-        logging.info(f"Verifying subject has the status: {latest_event_status}")
+        logging.info(
+            f"[UI ASSERTION] Verifying subject has the status: {latest_event_status}"
+        )
         latest_event_status_cell = self.get_latest_event_status_cell(
             latest_event_status
         )
         try:
             expect(latest_event_status_cell).to_be_visible()
-            logging.info(f"Subject has the status: {latest_event_status}")
+            logging.info(
+                f"[UI ASSERTION COMPLETE] Subject has the status: {latest_event_status}"
+            )
         except Exception:
-            pytest.fail(f"Subject does not have the status: {latest_event_status}")
+            raise AssertionError(
+                f"[UI ASSERTION FAILED] Subject does not have the status: {latest_event_status}"
+            )
 
     def click_record_other_post_investigation_contact_button(self) -> None:
         """Click the 'Record other post-investigation contact' button."""
@@ -180,3 +189,7 @@ def click_waiting_decision_to_proceed_with_diagnostic_test(self) -> None:
     def click_not_suitable_for_diagnostic_tests_button(self) -> None:
         """Click the 'Not Suitable for Diagnostic Tests' button."""
         self.safe_accept_dialog(self.not_suitable_for_diagnostic_tests_button)
+
+    def click_cancel_diagnostic_test_button(self) -> None:
+        """Click the 'Cancel Diagnostic Test' button."""
+        self.safe_accept_dialog(self.cancel_diagnostic_test_button)

pages/screening_subject_search/contact_with_patient_page.py

@@ -24,6 +24,7 @@ def __init__(self, page: Page):
         self.discussion_record_text_field = self.page.locator("#UI_COMMENT_ID")
         self.outcome_dropdown = self.page.locator("#UI_OUTCOME")
         self.save_button = self.page.get_by_role("button", name="Save")
+        self.patient_contacted_dropdown = self.page.locator("#UI_PATIENT_CONTACTED")
 
     def select_direction_dropdown_option(self, direction: str) -> None:
         """
@@ -79,7 +80,12 @@ def select_outcome_dropdown_option(self, outcome: str) -> None:
         Select an option from the 'Outcome' dropdown by its label.
 
         Args:
-        outcome (str): The label of the outcome option to select.
+            outcome (str): The label of the outcome option to select.
+            Can be one of the following:
+            - 'Suitable for Endoscopic Test'
+            - 'Suitable for Radiological Test'
+            - 'Close Episode - Patient Choice'
+            - 'SSP Appointment Required'
         """
         self.outcome_dropdown.select_option(label=outcome)
 
@@ -102,3 +108,37 @@ def record_post_investigation_appointment_not_required(self) -> None:
             "Post-investigation Appointment Not Required"
         )
         self.click_save_button()
+
+    def select_patient_contacted_dropdown_option(self, option: str) -> None:
+        """
+        Select an option from the 'Patient Contacted' dropdown by its label.
+
+        Args:
+            option (str): The label of the patient contacted option to select.
+            Options can be 'Yes' or 'No'.
+        """
+        self.patient_contacted_dropdown.select_option(label=option)
+
+    def record_contact(self, outcome: str, patient_contacted: str = "Yes") -> None:
+        """
+        Records contact with the patient.
+        Args:
+            outcome (str): The outcome of the contact. Options include:
+                - 'Suitable for Endoscopic Test'
+                - 'Suitable for Radiological Test'
+                - 'Close Episode - Patient Choice'
+                - 'SSP Appointment Required'
+            patient_contacted (str): Indicates if the patient was contacted. Default is 'Yes'. Options include:
+                - 'Yes'
+                - 'No'
+        """
+        self.select_direction_dropdown_option("To patient")
+        self.select_caller_id_dropdown_index_option(1)
+        self.click_calendar_button()
+        CalendarPicker(self.page).v1_calender_picker(datetime.today())
+        self.enter_start_time("11:00")
+        self.enter_end_time("12:00")
+        self.enter_discussion_record_text("TEST AUTOMATION")
+        self.select_patient_contacted_dropdown_option(patient_contacted)
+        self.select_outcome_dropdown_option(outcome)
+        self.click_save_button()

pages/screening_subject_search/patient_advised_of_diagnosis_page.py

@@ -26,3 +26,12 @@ def select_diagnosis_date_and_reason(self, date: datetime, reason: str) -> None:
         CalendarPicker(self.page).v2_calendar_picker(date)
         self.reason_dropdown.select_option(label=reason)
         self.click(self.save_button)
+
+    def select_diagnosis_reason(self, reason: str) -> None:
+        """
+        Selects the diagnosis reason, then saves the form.
+        Args:
+            reason (str): The reason for the diagnosis.
+        """
+        self.reason_dropdown.select_option(label=reason)
+        self.click(self.save_button)

subject_criteria_builder/criteria.json

@@ -3786,7 +3786,11 @@
   {
     "key": "LATEST_EPISODE_KIT_CLASS",
     "value_source": "",
-    "notes": "Specify the kit class for the latest episode (e.g., 'FIT', 'GFOBT')."
+    "notes": "Specify the kit class for the latest episode (e.g., 'FIT', 'GFOBT').",
+    "allowed_values": [
+      "FIT",
+      "GFOBT"
+    ]
   },
   {
     "key": "LATEST_EPISODE_HAS_SIGNIFICANT_KIT_RESULT",