Moved attendence methods into new AppointmentAttendance class and updated tests accordingly

Author: Andyg79

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/regression_tests/fobt_regression_tests/test_scenario_6.py

@@ -21,7 +21,7 @@
 from pages.screening_subject_search.record_diagnosis_date_page import (
     RecordDiagnosisDatePage,
 )
-from utils.appointments import mark_appointment_as_dna, mark_appointment_as_attended
+from utils.appointments import AppointmentAttendance
 
 
 @pytest.mark.wip
@@ -69,6 +69,7 @@ def test_scenario_6(page: Page) -> None:
     """
 
     summary_page = SubjectScreeningSummaryPage(page)
+    attendance = AppointmentAttendance(page)
     logging.info(
         "[TEST START] Regression - Scenario: 6: Non-agreement to diagnostic tests"
     )
@@ -235,7 +236,7 @@ def test_scenario_6(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 Screening Centre DNAs the practitioner appointment
-    mark_appointment_as_dna(page, "Screening Centre did not attend")  # TODO: Line 1188
+    attendance.mark_as_dna("Screening Centre did not attend")
 
     # Then my subject has been updated as follows:
     subject_assertion(
@@ -269,7 +270,7 @@ def test_scenario_6(page: Page) -> None:
     )
 
     # And there is a "J30" letter batch for my subject with the exact title "Practitioner Clinic 1st Appointment Non Attendance (Screening Centre)"
-    # When I process the open "J30" letter batch for my subject TODO: Line 1203
+    # When I process the open "J30" letter batch for my subject
     # Then my subject has been updated as follows:
     batch_processing(
         page,
@@ -298,7 +299,7 @@ def test_scenario_6(page: Page) -> None:
     # And I save Diagnosis Date Information
     RecordDiagnosisDatePage(page).click_save_button()
 
-    # Then my subject has been updated as follows: TODO: line 1215
+    # Then my subject has been updated as follows: TODO: Selenium Feature File line 1215
     subject_assertion(
         nhs_no,
         {
@@ -320,7 +321,7 @@ def test_scenario_6(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 I attend the subject's practitioner appointment "today"
-    mark_appointment_as_attended(page)
+    attendance.mark_as_attended()
 
     # Then my subject has been updated as follows:
     subject_assertion(

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,81 +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.
-
-    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.
-    """
-    appointment_detail_page = AppointmentDetailPage(page)
-    subject_screening_summary_page = SubjectScreeningSummaryPage(page)
-    episode_events_and_notes_page = EpisodeEventsAndNotesPage(page)
-
-    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")
+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)
 
+        logging.info("[APPOINTMENT DNA] DNA flow completed successfully")
 
-def mark_appointment_as_attended(page: Page) -> None:
-    """
-    Marks an appointment as attended and logs the auto-filled attendance details.
-    This process starts from the subject screening summary page.
+    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.
 
-    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.
+        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.
 
-    Args:
-        page (Page): Playwright page object.
+        Args:
+            page (Page): Playwright page object.
 
-    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)
-
-    logging.info("[APPOINTMENT ATTENDED] Starting attended flow")
+        Raises:
+            AssertionError: If expected elements are not found or interaction fails.
+        """
+        logging.info("[APPOINTMENT ATTENDED] Starting attended flow")
 
-    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()
+        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 = page.locator("#UI_ATTENDED")
-    attended_checkbox.check()
+        # Check the 'Attended' checkbox
+        attended_checkbox = self.page.locator("#UI_ATTENDED")
+        attended_checkbox.check()
 
-    # Log the auto-filled attendance details
-    attended_date = page.locator("#UI_ATTENDED_DATE").input_value()
-    time_from = page.locator("#UI_ATTENDED_TIME_FROM").input_value()
-    time_to = page.locator("#UI_ATTENDED_TIME_TO").input_value()
-    meeting_mode = page.locator("#UI_NEW_MEETING_MODE").input_value()
+        # 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}"
-    )
+        logging.info(
+            f"[APPOINTMENT ATTENDED] How Attended: {meeting_mode}, Date: {attended_date}, Time From: {time_from}, Time To: {time_to}"
+        )
 
-    appointment_detail_page.click_save_button(accept_dialog=True)
+        self.appointment_detail_page.click_save_button(accept_dialog=True)
 
-    logging.info("[APPOINTMENT ATTENDED] Attended flow completed successfully")
+        logging.info("[APPOINTMENT ATTENDED] Attended flow completed successfully")