Worked on review comments

Author: mepr1

classes/repositories/subject_repository.py

@@ -1,4 +1,3 @@
-from ast import Str
 import logging
 from typing import Optional
 from classes.subject.pi_subject import PISubject

pages/base_page.py

@@ -57,7 +57,6 @@ def __init__(self, page: Page):
             "#ntshPageTitle"
         )
         self.main_menu_header = self.page.locator("#ntshPageTitle")
-        self.surveillance = self.page.get_by_text("Surveillance", exact=True)
 
     def click_main_menu_link(self) -> None:
         """Click the Base Page 'Main Menu' link if it is visible."""
@@ -125,10 +124,6 @@ def click_help_link(self) -> None:
         """Click the Base Page 'Help' link."""
         self.click(self.help_link)
 
-    def click_surveillance_link(self) -> None:
-        """Click the Surveillance Page link."""
-        self.click(self.surveillance)
-
     def bowel_cancer_screening_system_header_is_displayed(self) -> None:
         """Asserts that the Bowel Cancer Screening System header is displayed."""
         expect(self.bowel_cancer_screening_system_header).to_contain_text(

tests/regression/regression_tests/surveillance_regression_tests/test_surveillance_scenario_1.py

@@ -2,6 +2,7 @@
 from playwright.sync_api import Page
 from sqlalchemy import false
 from classes.repositories.subject_repository import SubjectRepository
+from classes.subject import subject
 from conftest import general_properties
 from pages.base_page import BasePage
 from pages.screening_practitioner_appointments.appointment_detail_page import (
@@ -274,6 +275,7 @@ def test_scenario_1(page: Page, general_properties: dict) -> None:
             "latest event status": "X615 Surveillance Appointment Invitation Letter Printed",
         },
     )
+
     # When I view the subject
     screening_subject_page_searcher.navigate_to_subject_summary_page(page, nhs_no)
 
@@ -391,7 +393,6 @@ def test_scenario_1(page: Page, general_properties: dict) -> None:
         "surveillance due date reason": "Reopened episode",
     }
     subject_assertion(nhs_no, criteria)
-
     # When I view the subject
     screening_subject_page_searcher.navigate_to_subject_summary_page(page, nhs_no)
 
@@ -442,7 +443,8 @@ def test_scenario_1(page: Page, general_properties: dict) -> None:
     # And I view the latest practitioner appointment in the subject's episode
     EpisodeEventsAndNotesPage(page).click_most_recent_view_appointment_link()
 
-    # And the Screening Centre reschedules the surveillance practitioner appointment to "today"-recheck this
+    # And the Screening Centre reschedules the surveillance practitioner appointment to "today"
+
     AppointmentDetailPage(page).click_reschedule_radio()
     AppointmentDetailPage(page).click_calendar_button()
     CalendarPicker(page).v2_calendar_picker(datetime.today())
@@ -457,6 +459,7 @@ def test_scenario_1(page: Page, general_properties: dict) -> None:
         },
     )
     # And there is a "X610" letter batch for my subject with the exact title "Surveillance Appointment Invitation Letter"
+
     SubjectRepository().there_is_letter_batch_for_subject(
         nhs_no, "X610", "Surveillance Appointment Invitation Letter"
     )

utils/appointments.py

@@ -1,5 +1,4 @@
 import logging
-from typing import Optional
 from playwright.sync_api import Page
 from pages.base_page import BasePage
 from pages.logout.log_out_page import LogoutPage
@@ -134,7 +133,7 @@ def book_appointments(page: Page, screening_centre: str, site: str) -> None:
 
 
 def book_post_investigation_appointment(
-    page: Page, site: str, appointment_date: Optional[datetime] = None
+    page: Page, site: str, appointment_date= datetime.today()
 ) -> None:
     """
     Book a post-investigation appointment for a subject.
@@ -147,8 +146,6 @@ def book_post_investigation_appointment(
         site (str): The name of the site.
         appointment_date (datetime, optional): The appointment date. Defaults to today.
     """
-    if appointment_date is None:
-        appointment_date = datetime.today()
     book_appointments_page = BookAppointmentPage(page)
     book_appointments_page.select_site_dropdown_option(
         [