Merge branch 'feature/BCSS-21309-fobt-regression-scenario-6' of github.com:NHSDigital/bcss-playwright into feature/BCSS-21310-selenium-to-playwright-fobtregressiontests-scenario-7

# Conflicts:
#	pages/screening_subject_search/advance_fobt_screening_episode_page.py
#	pages/screening_subject_search/reopen_fobt_screening_episode_page.py

Author: adrianoaru-nhs

pages/datasets/colonoscopy_dataset_page.py

@@ -3,6 +3,12 @@
 from enum import Enum
 
 
+class FitForColonoscopySspOptions(Enum):
+    YES = "17058"
+    NO = "17059"
+    UNABLE_TO_ASSESS = "17954"
+
+
 class ColonoscopyDatasetsPage(BasePage):
     """Colonoscopy Datasets Page locators, and methods for interacting with the page"""
 
@@ -44,16 +50,19 @@ def select_asa_grade_option(self, option: str) -> None:
         """
         self.select_asa_grade_dropdown.select_option(option)
 
-    def select_fit_for_colonoscopy_option(self, option: str) -> None:
+    def select_fit_for_colonoscopy_option(
+        self, option: FitForColonoscopySspOptions
+    ) -> None:
         """
-        This method is designed to select a specific option from the colonoscopy dataset page, Fit for Colonoscopy (SSP) dropdown menu.
+        Selects a specific option from the 'Fit for Colonoscopy (SSP)' dropdown.
+
         Args:
-            option (str): The option to be selected. This should be a string that matches one of the available options in the dropdown menu.
-                Valid options are: "YES", "NO", or "UNABLE_TO_ASSESS".
+            option (FitForColonoscopySspOptions): Enum member representing the desired option.
+
         Returns:
             None
         """
-        self.select_fit_for_colonoscopy_dropdown.select_option(option)
+        self.select_fit_for_colonoscopy_dropdown.select_option(option.value)
 
     def click_dataset_complete_radio_button_yes(self) -> None:
         """Clicks the 'Yes' radio button for the dataset complete option."""
@@ -72,9 +81,3 @@ class AsaGradeOptions(Enum):
     MORIBUND = "17013"
     NOT_APPLICABLE = "17014"
     NOT_KNOWN = "17015"
-
-
-class FitForColonoscopySspOptions(Enum):
-    YES = "17058"
-    NO = "17059"
-    UNABLE_TO_ASSESS = "17954"

pages/screening_subject_search/advance_fobt_screening_episode_page.py

@@ -54,6 +54,19 @@ def __init__(self, page: Page):
         self.subsequent_assessment_appointment_required_button = self.page.get_by_role(
             "button", name="Subsequent Assessment Appointment Required"
         )
+        self.suitable_for_radiological_test_button = self.page.get_by_role(
+            "button", name="Suitable for Radiological Test"
+        )
+        self.decision_not_to_continue_with_diagnostic_test_button = (
+            self.page.get_by_role(
+                "button", name="Decision not to Continue with Diagnostic Test"
+            )
+        )
+        self.waiting_decision_to_proceed_with_diagnostic_test_button = (
+            self.page.get_by_role(
+                "button", name="Waiting Decision to Proceed with Diagnostic Test"
+            )
+        )
 
     def click_suitable_for_endoscopic_test_button(self) -> None:
         """Click the 'Suitable for Endoscopic Test' button."""
@@ -150,3 +163,21 @@ def click_and_select_subsequent_assessment_appointment_required(
             label=option
         )
         self.safe_accept_dialog(self.subsequent_assessment_appointment_required_button)
+
+    def click_suitable_for_radiological_test_button(self) -> None:
+        """Click the 'Suitable for Radiological Test' button."""
+        AdvanceFOBTScreeningEpisodePage(self.page).safe_accept_dialog(
+            self.suitable_for_radiological_test_button
+        )
+
+    def click_decision_not_to_continue_with_diagnostic_test(self) -> None:
+        """Click the 'Decision not to Continue with Diagnostic Test' button."""
+        AdvanceFOBTScreeningEpisodePage(self.page).safe_accept_dialog(
+            self.decision_not_to_continue_with_diagnostic_test_button
+        )
+
+    def click_waiting_decision_to_proceed_with_diagnostic_test(self) -> None:
+        """Click the 'Waiting Decision to Proceed with Diagnostic Test' button."""
+        AdvanceFOBTScreeningEpisodePage(self.page).safe_accept_dialog(
+            self.waiting_decision_to_proceed_with_diagnostic_test_button
+        )

pages/screening_subject_search/reopen_fobt_screening_episode_page.py

@@ -18,6 +18,9 @@ def __init__(self, page: Page):
         self.reopen_due_to_subject_or_patient_decision = self.page.get_by_role(
             "button", name="Reopen due to subject or patient decision"
         )
+        self.reopen_following_non_response_button = self.page.get_by_role(
+            "button", name="Reopen following Non-Response"
+        )
 
     def click_reopen_to_book_an_assessment_button(self) -> None:
         """Click the 'Reopen to book an assessment' button."""
@@ -29,4 +32,6 @@ def click_reopen_episode_for_correction_button(self) -> None:
 
     def click_reopen_due_to_subject_or_patient_decision(self) -> None:
         """Click the 'Reopen due to subject or patient decision' button."""
-        self.safe_accept_dialog(self.reopen_due_to_subject_or_patient_decision)
+
+    def click_reopen_following_non_response_button(self) -> None:
+        """Click the 'Reopen following Non-Response' button."""

tests/regression/regression_tests/fobt_regression_tests/test_scenario_3.py

@@ -8,7 +8,6 @@
 from utils.batch_processing import batch_processing
 from utils.fit_kit import FitKitGeneration, FitKitLogged
 from utils import screening_subject_page_searcher
-from utils.calendar_picker import CalendarPicker
 from utils.sspi_change_steps import SSPIChangeSteps
 from utils.appointments import book_appointments
 from pages.base_page import BasePage
@@ -22,9 +21,6 @@
 from pages.screening_subject_search.advance_fobt_screening_episode_page import (
     AdvanceFOBTScreeningEpisodePage,
 )
-from pages.screening_practitioner_appointments.book_appointment_page import (
-    BookAppointmentPage,
-)
 from pages.screening_subject_search.record_diagnosis_date_page import (
     RecordDiagnosisDatePage,
 )

tests/regression/regression_tests/fobt_regression_tests/test_scenario_5.py

@@ -21,7 +21,7 @@
 from pages.screening_subject_search.record_diagnosis_date_page import (
     RecordDiagnosisDatePage,
 )
-from utils.appointments import mark_appointment_as_dna
+from utils.appointments import AppointmentAttendance
 
 
 @pytest.mark.usefixtures("setup_org_and_appointments")
@@ -61,6 +61,7 @@ def test_scenario_5(page: Page) -> None:
     """
 
     summary_page = SubjectScreeningSummaryPage(page)
+    attendance = AppointmentAttendance(page)
     logging.info(
         "[TEST START] Regression - Scenario: 5: DNA colonoscopy assessment twice"
     )
@@ -227,7 +228,7 @@ def test_scenario_5(page: Page) -> None:
     # And I view the event history for the subject's latest episode
     # And I view the latest practitioner appointment in the subject's episode
     # And The subject DNAs the practitioner appointment
-    mark_appointment_as_dna(page, "Patient did not attend")
+    attendance.mark_as_dna("Patient did not attend")
 
     # And there is a "J11" letter batch for my subject with the exact title "Practitioner Clinic 1st Appointment Non Attendance (Patient)"
     # When I process the open "J11" letter batch for my subject
@@ -278,7 +279,7 @@ def test_scenario_5(page: Page) -> None:
     # And I view the event history for the subject's latest episode
     # And I view the latest practitioner appointment in the subject's episode
     # And The subject DNAs the practitioner appointment
-    mark_appointment_as_dna(page, "Patient did not attend")
+    attendance.mark_as_dna("Patient did not attend")
 
     # Then my subject has been updated as follows:
     subject_assertion(

tests/regression/subject/episodes/datasets/investigation/endoscopy/polypcategories/test_setup.py

@@ -338,7 +338,7 @@ def setup_a99_status(page: Page, df: pd.DataFrame) -> pd.DataFrame:
         SubjectDatasetsPage(page).click_colonoscopy_show_datasets()
 
         ColonoscopyDatasetsPage(page).select_fit_for_colonoscopy_option(
-            FitForColonoscopySspOptions.YES.value
+            FitForColonoscopySspOptions.YES
         )
         ColonoscopyDatasetsPage(page).click_dataset_complete_radio_button_yes()
         ColonoscopyDatasetsPage(page).save_dataset()

tests/smokescreen/test_compartment_5.py

@@ -143,7 +143,7 @@ def test_compartment_5(page: Page, smokescreen_properties: dict) -> None:
 
         ColonoscopyDatasetsPage(page).select_asa_grade_option(AsaGradeOptions.FIT.value)
         ColonoscopyDatasetsPage(page).select_fit_for_colonoscopy_option(
-            FitForColonoscopySspOptions.YES.value
+            FitForColonoscopySspOptions.YES
         )
         ColonoscopyDatasetsPage(page).click_dataset_complete_radio_button_yes()
         ColonoscopyDatasetsPage(page).save_dataset()

utils/appointments.py

@@ -14,7 +14,6 @@
 from pages.screening_practitioner_appointments.book_appointment_page import (
     BookAppointmentPage,
 )
-from pages.screening_subject_search import subject_screening_summary_page
 from utils.calendar_picker import CalendarPicker
 from utils.user_tools import UserTools
 from datetime import datetime
@@ -133,36 +132,81 @@ def book_appointments(page: Page, screening_centre: str, site: str) -> None:
         )
 
 
-def mark_appointment_as_dna(page: Page, non_attendance_reason: str) -> None:
-    """
-    Marks an appointment as DNA (Did Not Attend)
-    This process starts from the subject screening summary page.
+class AppointmentAttendance:
+    def __init__(self, page: Page):
+        self.page = page
+        self.appointment_detail_page = AppointmentDetailPage(page)
+        self.subject_screening_summary_page = SubjectScreeningSummaryPage(page)
+        self.episode_events_and_notes_page = EpisodeEventsAndNotesPage(page)
+
+    def mark_as_dna(self, non_attendance_reason: str) -> None:
+        """
+        Marks an appointment as DNA (Did Not Attend)
+        This process starts from the subject screening summary page.
+
+        This method navigates through the subject's episode and appointment pages,
+        selects the 'Attendance' radio option, and sets the given DNA reason.
+
+        Args:
+            page (Page): Playwright page object.
+            non_attendance_reason (str): Reason for non-attendance. Must match one of the following:
+                - "Patient did not attend"
+                - "Screening Centre did not attend"
+                - "Patient and Screening Centre did not attend"
+
+        Raises:
+            AssertionError: If expected elements are not found or interaction fails.
+        """
+        logging.info(
+            f"[APPOINTMENT DNA] Starting DNA flow with reason: {non_attendance_reason}"
+        )
+        self.subject_screening_summary_page.click_list_episodes()
+        self.subject_screening_summary_page.click_view_events_link()
+        self.episode_events_and_notes_page.click_most_recent_view_appointment_link()
+        self.appointment_detail_page.check_attendance_radio()
+        self.page.locator("#UI_NON_ATTENDANCE_REASON").select_option(
+            label=non_attendance_reason
+        )
+        self.appointment_detail_page.click_save_button(accept_dialog=True)
 
-    This method navigates through the subject's episode and appointment pages,
-    selects the 'Attendance' radio option, and sets the given DNA reason.
+        logging.info("[APPOINTMENT DNA] DNA flow completed successfully")
 
-    Args:
-        page (Page): Playwright page object.
-        non_attendance_reason (str): Reason for non-attendance. Must match one of the following:
-            - "Patient did not attend"
-            - "Screening Centre did not attend"
-            - "Patient and Screening Centre did not attend"
+    def mark_as_attended(self) -> None:
+        """
+        Marks an appointment as attended and logs the auto-filled attendance details.
+        This process starts from the subject screening summary page.
 
-    Raises:
-        AssertionError: If expected elements are not found or interaction fails.
-    """
-    appointment_detail_page = AppointmentDetailPage(page)
-    subject_screening_summary_page = SubjectScreeningSummaryPage(page)
-    episode_events_and_notes_page = EpisodeEventsAndNotesPage(page)
+        This method navigates through the subject's episode and appointment pages,
+        selects the 'Attendance' radio option, checks the 'Attended' checkbox,
+        and logs the resulting date and time values.
 
-    logging.info(
-        f"[APPOINTMENT DNA] Starting DNA flow with reason: {non_attendance_reason}"
-    )
-    subject_screening_summary_page.click_list_episodes()
-    subject_screening_summary_page.click_view_events_link()
-    episode_events_and_notes_page.click_most_recent_view_appointment_link()
-    appointment_detail_page.check_attendance_radio()
-    page.locator("#UI_NON_ATTENDANCE_REASON").select_option(label=non_attendance_reason)
-    appointment_detail_page.click_save_button(accept_dialog=True)
-
-    logging.info("[APPOINTMENT DNA] DNA flow completed successfully")
+        Args:
+            page (Page): Playwright page object.
+
+        Raises:
+            AssertionError: If expected elements are not found or interaction fails.
+        """
+        logging.info("[APPOINTMENT ATTENDED] Starting attended flow")
+
+        self.subject_screening_summary_page.click_list_episodes()
+        self.subject_screening_summary_page.click_view_events_link()
+        self.episode_events_and_notes_page.click_most_recent_view_appointment_link()
+        self.appointment_detail_page.check_attendance_radio()
+
+        # Check the 'Attended' checkbox
+        attended_checkbox = self.page.locator("#UI_ATTENDED")
+        attended_checkbox.check()
+
+        # Log the auto-filled attendance details
+        attended_date = self.page.locator("#UI_ATTENDED_DATE").input_value()
+        time_from = self.page.locator("#UI_ATTENDED_TIME_FROM").input_value()
+        time_to = self.page.locator("#UI_ATTENDED_TIME_TO").input_value()
+        meeting_mode = self.page.locator("#UI_NEW_MEETING_MODE").input_value()
+
+        logging.info(
+            f"[APPOINTMENT ATTENDED] How Attended: {meeting_mode}, Date: {attended_date}, Time From: {time_from}, Time To: {time_to}"
+        )
+
+        self.appointment_detail_page.click_save_button(accept_dialog=True)
+
+        logging.info("[APPOINTMENT ATTENDED] Attended flow completed successfully")

utils/oracle/oracle.py

@@ -44,25 +44,38 @@ def disconnect_from_db(self, conn: oracledb.Connection) -> None:
         logging.debug("Connection Closed")
 
     def exec_bcss_timed_events(
-        self, nhs_number_df: pd.DataFrame
-    ) -> None:  # Executes bcss_timed_events when given NHS numbers
+        self,
+        nhs_number_df: Optional[pd.DataFrame] = None,
+        nhs_number: Optional[str] = None,
+    ) -> None:
         """
-        This function is used to execute bcss_timed_events against NHS Numbers.
-        It expects the nhs_numbers to be in a dataframe, and runs a for loop to get the subject_screening_id for each nhs number
-        Once a subject_screening_id is retrieved, it will then run the command: exec bcss_timed_events [<subject_id>,'Y']
+        Executes bcss_timed_events for either a DataFrame of NHS numbers or a single NHS number.
 
         Args:
-            nhs_number_df (pd.DataFrame): A dataframe containing all of the NHS numbers as separate rows
+            nhs_number_df (Optional[pd.DataFrame]): DataFrame with NHS numbers under 'subject_nhs_number'.
+            nhs_number (Optional[str]): A single NHS number.
+
+        Raises:
+            ValueError: If neither nhs_number_df nor nhs_number is provided.
         """
         conn = self.connect_to_db()
         try:
-            for index, row in nhs_number_df.iterrows():
-                subject_id = self.get_subject_id_from_nhs_number(
-                    row["subject_nhs_number"]
-                )
+            subject_ids = []
+
+            if nhs_number_df is not None:
+                subject_ids = [
+                    self.get_subject_id_from_nhs_number(row["subject_nhs_number"])
+                    for _, row in nhs_number_df.iterrows()
+                ]
+            elif nhs_number is not None:
+                subject_ids = [self.get_subject_id_from_nhs_number(nhs_number)]
+            else:
+                raise ValueError("Must provide either nhs_number_df or nhs_number")
+
+            for subject_id in subject_ids:
                 try:
                     logging.info(
-                        f"[ORACLE] Attempting to execute stored procedure: {f"'bcss_timed_events', [{subject_id},'Y']"}"
+                        f"[ORACLE] Attempting to execute stored procedure: 'bcss_timed_events', [{subject_id}, 'Y']"
                     )
                     cursor = conn.cursor()
                     cursor.callproc("bcss_timed_events", [subject_id, "Y"])
@@ -71,9 +84,10 @@ def exec_bcss_timed_events(
                     logging.error(
                         f"[ORACLE] Failed to execute stored procedure with execution error: {spExecutionError}"
                     )
+
         except Exception as queryExecutionError:
             logging.error(
-                f"[ORACLE] Failed to to extract subject ID with error: {queryExecutionError}"
+                f"[ORACLE] Failed to extract subject ID with error: {queryExecutionError}"
             )
         finally:
             if conn is not None: