Feature/bcss 20443 compartment 6 pom record diagnosis date (#63)

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

<!-- Describe your changes in detail. -->
New POM for the record diagnosis date page

## Context

<!-- Why is this change required? What problem does it solve? -->
Allowing for the locators in this page to be reused

## 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)
- [ ] 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
- [ ] 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

pages/screening_subject_search/record_diagnosis_date_page.py

@@ -0,0 +1,29 @@
+from playwright.sync_api import Page
+from pages.base_page import BasePage
+from datetime import datetime
+from utils.calendar_picker import CalendarPicker
+
+
+class RecordDiagnosisDatePage(BasePage):
+    """Record Diagnosis Date Page locators, and methods for interacting with the page."""
+
+    def __init__(self, page: Page):
+        super().__init__(page)
+        self.page = page
+        # Record Diagnosis Date - page locators
+        self.diagnosis_date_field = self.page.locator("#diagnosisDate")
+        self.save_button = self.page.get_by_role("button", name="Save")
+
+    def enter_date_in_diagnosis_date_field(self, date: datetime) -> None:
+        """
+        Enters a date in the diagnosis date field.
+        Args:
+            date (datetime): The date to enter in the field.
+        """
+        self.click(self.diagnosis_date_field)
+        CalendarPicker(self.page).v2_calendar_picker(date)
+        self.diagnosis_date_field.press("Enter")
+
+    def click_save_button(self) -> None:
+        """Clicks the save button."""
+        self.click(self.save_button)

pages/screening_subject_search/subject_screening_summary_page.py

@@ -56,6 +56,10 @@ def __init__(self, page: Page):
             "button", name="Advance FOBT Screening Episode"
         )
 
+    def wait_for_page_title(self) -> None:
+        """Waits for the page to be the Subject Screening Summary"""
+        self.subject_screening_summary.wait_for()
+
     def verify_result_contains_text(self, text) -> None:
         """Verify that the result contains the given text."""
         expect(self.display_rs).to_contain_text(text)
@@ -86,6 +90,7 @@ def verify_latest_event_status_header(self) -> None:
 
     def verify_latest_event_status_value(self, latest_event_status: str | list) -> None:
         """Verify that the latest event status value is visible."""
+        self.wait_for_page_title()
         latest_event_status_locator = self.get_visible_status_from_list(
             latest_event_status
         )

tests/smokescreen/test_compartment_6.py

@@ -11,6 +11,9 @@
 from pages.datasets.subject_datasets_page import SubjectDatasetsPage
 from utils.calendar_picker import CalendarPicker
 from datetime import datetime
+from pages.screening_subject_search.record_diagnosis_date_page import (
+    RecordDiagnosisDatePage,
+)
 from pages.datasets.investigation_dataset_page import (
     InvestigationDatasetsPage,
     SiteLookupOptions,
@@ -230,6 +233,36 @@ def after_lnpcp_result(page: Page) -> None:
     page.get_by_role("button", name="Save").click()
 
 
+def handover_subject_to_symptomatic_care(page: Page) -> None:
+    SubjectScreeningSummaryPage(page).verify_latest_event_status_value(
+        "A394 - Handover into Symptomatic Care for Surveillance - Patient Age"
+    )
+    SubjectScreeningSummaryPage(page).click_advance_fobt_screening_episode_button()
+
+    # The following code is on the advance fobt screening episode page
+    page.get_by_role("button", name="Handover into Symptomatic Care").click()
+
+    # The following code is on the handover into symptomatic care page
+    page.get_by_label("Referral").select_option("20445")
+    page.get_by_role("button", name="Calendar").click()
+    CalendarPicker(page).v1_calender_picker(datetime.today())
+    page.locator("#UI_NS_CONSULTANT_PIO_SELECT_LINK").click()
+    option_locator = page.locator(
+        '[value="201"]:visible'
+    )  # Here value '201' is referring to Consultant B, Frame
+    option_locator.wait_for(state="visible")
+    option_locator.click()
+    page.get_by_role("textbox", name="Notes").click()
+    page.get_by_role("textbox", name="Notes").fill("Test Automation")
+    page.once("dialog", lambda dialog: dialog.accept())
+    page.get_by_role("button", name="Save").click()
+
+    SubjectScreeningSummaryPage(page).wait_for_page_title()
+    SubjectScreeningSummaryPage(page).verify_latest_event_status_value(
+        "A385 - Handover into Symptomatic Care"
+    )
+
+
 @pytest.mark.vpn_required
 @pytest.mark.smokescreen
 @pytest.mark.compartment6
@@ -248,7 +281,7 @@ def test_compartment_6(page: Page, smokescreen_properties: dict) -> None:
 
     # This needs to be repeated for two subjects, one old and one not - High Risk Result
     # Older patient
-    nhs_no = "9056553305"
+    nhs_no = "9109877185"
     go_to_investigation_datasets_page(page, nhs_no)
 
     # The following code is on the investigation datasets page
@@ -260,35 +293,10 @@ def test_compartment_6(page: Page, smokescreen_properties: dict) -> None:
     save_investigation_dataset(page)
     after_high_risk_result(page)
 
-    SubjectScreeningSummaryPage(page).verify_latest_event_status_value(
-        "A394 - Handover into Symptomatic Care for Surveillance - Patient Age"
-    )
-    SubjectScreeningSummaryPage(page).click_advance_fobt_screening_episode_button()
-
-    # The following code is on the advance fobt screening episode page
-    page.get_by_role("button", name="Handover into Symptomatic Care").click()
-
-    # The following code is on the handover into symptomatic care page
-    page.get_by_label("Referral").select_option("20445")
-    page.get_by_role("button", name="Calendar").click()
-    CalendarPicker(page).v1_calender_picker(datetime.today())
-    page.locator("#UI_NS_CONSULTANT_PIO_SELECT_LINK").click()
-    option_locator = page.locator(
-        '[value="201"]:visible'
-    )  # Here value '201' is refering to Consultant B, Frame
-    option_locator.wait_for(state="visible")
-    option_locator.click()
-    page.get_by_role("textbox", name="Notes").click()
-    page.get_by_role("textbox", name="Notes").fill("Test Automation")
-    page.once("dialog", lambda dialog: dialog.accept())
-    page.get_by_role("button", name="Save").click()
-
-    SubjectScreeningSummaryPage(page).verify_latest_event_status_value(
-        "A385 - Handover into Symptomatic Care"
-    )
+    handover_subject_to_symptomatic_care(page)
 
     # Younger patient
-    nhs_no = "9867208471"
+    nhs_no = "9624131880"
     go_to_investigation_datasets_page(page, nhs_no)
 
     # The following code is on the investigation datasets page
@@ -309,17 +317,16 @@ def test_compartment_6(page: Page, smokescreen_properties: dict) -> None:
     page.get_by_role("button", name="Record Diagnosis Date").click()
 
     # The following code is on the record diagnosis date page
-    page.locator("#diagnosisDate").click()
-    CalendarPicker(page).v2_calendar_picker(datetime.today())
-    page.get_by_role("button", name="Save").click()
+    RecordDiagnosisDatePage(page).enter_date_in_diagnosis_date_field(datetime.today())
+    RecordDiagnosisDatePage(page).click_save_button()
 
     SubjectScreeningSummaryPage(page).verify_latest_event_status_value(
         "A318 - Post-investigation Appointment NOT Required - Result Letter Created"
     )
 
     # This needs to be repeated for two subjects, one old and one not - LNPCP Result
     # Older patient
-    nhs_no = "9840013254"
+    nhs_no = "9648064792"
     go_to_investigation_datasets_page(page, nhs_no)
 
     # The following code is on the investigation datasets page
@@ -331,35 +338,10 @@ def test_compartment_6(page: Page, smokescreen_properties: dict) -> None:
     save_investigation_dataset(page)
     after_lnpcp_result(page)
 
-    SubjectScreeningSummaryPage(page).verify_latest_event_status_value(
-        "A394 - Handover into Symptomatic Care for Surveillance - Patient Age"
-    )
-    SubjectScreeningSummaryPage(page).click_advance_fobt_screening_episode_button()
-
-    # The following code is on the advance fobt screening episode page
-    page.get_by_role("button", name="Handover into Symptomatic Care").click()
-
-    # The following code is on the handover into symptomatic care page
-    page.get_by_label("Referral").select_option("20445")
-    page.get_by_role("button", name="Calendar").click()
-    CalendarPicker(page).v1_calender_picker(datetime.today())
-    page.locator("#UI_NS_CONSULTANT_PIO_SELECT_LINK").click()
-    option_locator = page.locator(
-        '[value="201"]:visible'
-    )  # Here value '201' is refering to Consultant B, Frame
-    option_locator.wait_for(state="visible")
-    option_locator.click()
-    page.get_by_role("textbox", name="Notes").click()
-    page.get_by_role("textbox", name="Notes").fill("Test Automation")
-    page.once("dialog", lambda dialog: dialog.accept())
-    page.get_by_role("button", name="Save").click()
-
-    SubjectScreeningSummaryPage(page).verify_latest_event_status_value(
-        "A385 - Handover into Symptomatic Care"
-    )
+    handover_subject_to_symptomatic_care(page)
 
     # Younger patient
-    nhs_no = "9477527106"
+    nhs_no = "9627060208"
     go_to_investigation_datasets_page(page, nhs_no)
 
     # The following code is on the investigation datasets page
@@ -379,18 +361,16 @@ def test_compartment_6(page: Page, smokescreen_properties: dict) -> None:
     page.get_by_role("button", name="Record Diagnosis Date").click()
 
     # The following code is on the record diagnosis date page
-    page.locator("#diagnosisDate").click()
-    CalendarPicker(page).v2_calendar_picker(datetime.today())
-    page.locator("#diagnosisDate").press("Enter")
-    page.get_by_role("button", name="Save").click()
+    RecordDiagnosisDatePage(page).enter_date_in_diagnosis_date_field(datetime.today())
+    RecordDiagnosisDatePage(page).click_save_button()
 
     SubjectScreeningSummaryPage(page).verify_latest_event_status_value(
         "A318 - Post-investigation Appointment NOT Required - Result Letter Created"
     )
 
     # This needs to be repeated for 1 subject, age does not matter - Normal Result
-    nhs_no = "9936724968"
-    go_to_investigation_datasets_page(page, nhs_no)
+    nhs_no_normal = "9965184321"
+    go_to_investigation_datasets_page(page, nhs_no_normal)
 
     # The following code is on the investigation datasets page
     default_investigation_dataset_forms(page)
@@ -431,18 +411,8 @@ def test_compartment_6(page: Page, smokescreen_properties: dict) -> None:
     page.get_by_role("button", name="Record Diagnosis Date").click()
 
     # The following code is on the record diagnosis date page
-    page.locator("#diagnosisDate").click()
-    CalendarPicker(page).v2_calendar_picker(datetime.today())
-    page.get_by_role("button", name="Save").click()
-
-    # Modification needs to be done to accept this list. it should check if any of the values in this list are present. Something like the following:
-    # def get_first_visible_cell(page, values):
-    # if isinstance(values, str):
-    #     values = [values]
-    # for name in values:
-    #     locator = page.get_by_role("cell", name=name)
-    #     if locator.is_visible():
-    #         return locator
+    RecordDiagnosisDatePage(page).enter_date_in_diagnosis_date_field(datetime.today())
+    RecordDiagnosisDatePage(page).click_save_button()
 
     batch_processing(
         page,
@@ -455,6 +425,11 @@ def test_compartment_6(page: Page, smokescreen_properties: dict) -> None:
         ],
     )
 
+    # This is to check for the status of a normal subject as this NHS Number cannot be retrieved from the DB
+    verify_subject_event_status_by_nhs_no(
+        page, nhs_no_normal, "S61 - Normal (No Abnormalities Found)"
+    )
+
     batch_processing(
         page,
         "A385",

utils/batch_processing.py

@@ -92,7 +92,7 @@ def prepare_and_print_batch(
     page: Page, link_text: str, get_subjects_from_pdf: bool = False
 ) -> pd.DataFrame | None:
     """
-    This prepares the batch, retreives the files and confirms them as printed
+    This prepares the batch, retrieves the files and confirms them as printed
     Once those buttons have been pressed it waits for the message 'Batch Successfully Archived'
 
     Args: