Merge pull request #1008 from NHSDigital/rework-clinic-sessions

Rework clinic sessions to be created dynamically

Author: thomasleese

mavis/test/pages/add_session_wizard_page.py

@@ -12,10 +12,7 @@
 
 
 class AddSessionWizardPage:
-    def __init__(
-        self,
-        page: Page,
-    ) -> None:
+    def __init__(self, page: Page) -> None:
         self.page = page
         self.header = HeaderComponent(page)
 
@@ -27,24 +24,13 @@ def __init__(
             "button",
             name="Add another date",
         )
-        self.school_session_radio = self.page.get_by_role(
-            "radio",
-            name="School session",
-        )
-        self.community_clinic_radio = self.page.get_by_role(
-            "radio",
-            name="Community clinic",
-        )
         self.select_a_school_combobox = self.page.get_by_role(
             "combobox",
             name="Search for a school",
         )
         self.keep_session_dates_button = self.page.get_by_role(
             "button", name="Keep session dates"
         )
-        self.session_type_heading = self.page.get_by_role(
-            "heading", name="What type of session is this?"
-        )
         self.standard_consent_style_radio = self.page.get_by_role(
             "radio",
             name="Standard request",
@@ -57,15 +43,6 @@ def __init__(
             "heading", name="Check and confirm"
         )
 
-    @step("Select School session")
-    def select_school_session(self) -> None:
-        expect(self.session_type_heading).to_be_visible()
-
-        self.school_session_radio.check()
-        self.page.wait_for_load_state()
-
-        self.click_continue()
-
     @step("Select Community clinic")
     def select_community_clinic(self) -> None:
         expect(self.session_type_heading).to_be_visible()
@@ -142,8 +119,7 @@ def schedule_school_session(
         date_offset: int | None,
         consent_style: str = "Standard",
     ) -> None:
-        if school is not None:
-            self.select_school_session()
+        if school:
             self.select_school(school)
 
         self.choose_programmes(programmes)
@@ -183,19 +159,6 @@ def check_confirmation_page(
                 f"{consent_style} request",
             )
 
-    def schedule_clinic_session(
-        self,
-        programmes: list[Programme],
-        date_offset: int,
-    ) -> None:
-        self.select_community_clinic()
-        self.choose_programmes(programmes)
-
-        self.fill_date_fields(get_offset_date_compact_format(date_offset))
-        self.click_continue()
-
-        self.click_continue()
-
     @step("Keep session dates if necessary")
     def keep_session_dates_if_necessary(self) -> None:
         self.page.wait_for_load_state()

mavis/test/pages/children/child_programme_page.py

@@ -3,7 +3,7 @@
 from playwright.sync_api import Locator, Page, expect
 
 from mavis.test.annotations import step
-from mavis.test.data_models import Location
+from mavis.test.data_models import Location, Programme
 from mavis.test.pages.header_component import HeaderComponent
 from mavis.test.utils import get_todays_date, reload_until_element_is_visible
 
@@ -30,6 +30,11 @@ def __init__(self, page: Page) -> None:
             "Consent response manually matched with child record",
         )
 
+    def click_record_new_vaccination(self, programme: Programme) -> None:
+        self.page.get_by_role(
+            "button", name=f"Record a new {programme.name} vaccination"
+        ).click()
+
     def _link_for_vaccination_record(self, date: datetime.date) -> Locator:
         return self.vaccination_record_card.filter(
             has_text=str(date.strftime("%-d %B %Y"))

mavis/test/pages/utils.py

@@ -5,7 +5,7 @@
     ConsentMethod,
     Programme,
 )
-from mavis.test.data_models import Child, Clinic, School, VaccinationRecord
+from mavis.test.data_models import Child, School, VaccinationRecord
 from mavis.test.pages import (
     AddSessionWizardPage,
     DashboardPage,
@@ -38,20 +38,6 @@ def schedule_school_session_if_needed(  # noqa: PLR0913
         )
 
 
-def schedule_community_clinic_session_if_needed(
-    page: Page,
-    programmes: list[Programme],
-    date_offset: int = 0,
-) -> None:
-    DashboardPage(page).header.click_mavis()
-    DashboardPage(page).click_sessions()
-    if not SessionsSearchPage(page).click_session_if_exists(
-        Clinic("community clinic"), programmes, [], date_offset
-    ):
-        SessionsSearchPage(page).click_add_a_new_session()
-        AddSessionWizardPage(page).schedule_clinic_session(programmes, date_offset)
-
-
 def prepare_child_for_vaccination(
     page: Page,
     school: School,

tests/test_invite_to_clinic.py

@@ -13,7 +13,6 @@
     SchoolInviteToClinicPage,
     SchoolsSearchPage,
 )
-from mavis.test.pages.utils import schedule_community_clinic_session_if_needed
 
 pytestmark = pytest.mark.clinics
 
@@ -26,11 +25,10 @@ def test_single_from_child_record(
     Test: Invite a single child to the clinic from their child record.
 
     Steps:
-    1. Schedule a community clinic session for the future.
-    2. Import a child with parent details via child records.
-    3. Find the child's record.
-    4. Click on "Invite to community clinic"
-    5. Check the activity log for an invitation having been sent.
+    1. Import a child with parent details via child records.
+    2. Find the child's record.
+    3. Click on "Invite to community clinic"
+    4. Check the child has been invited.
     """
 
     programme = Programme.HPV
@@ -44,8 +42,6 @@ def test_single_from_child_record(
     child_programme_page = ChildProgrammePage(page)
     child_record_page = ChildRecordPage(page)
 
-    schedule_community_clinic_session_if_needed(page, [programme])
-
     # Import a child with parent details via child records.
     imports_page.header.click_imports()
     imports_page.click_upload_records()
@@ -60,11 +56,11 @@ def test_single_from_child_record(
     # Click on "Invite to community clinic"
     child_record_page.click_programme(programme)
     child_programme_page.click_invite_to_community_clinic()
+    child_programme_page.header.click_children()
 
-    # Check the activity log for an invitation having been sent.
-    child_programme_page.expect_activity_log_entry(
-        "Added to the session at Community Clinic"
-    )
+    # Check the child has been invited.
+    children_search_page.search.search_invited_to_clinic()
+    children_search_page.search.click_child(child)
 
     # TODO: We can't check for the entry from the notifications log as no
     #   emails actually get sent from the end to end test environments.
@@ -90,13 +86,12 @@ def test_bulk_home_educated_or_unknown_school(
     Test: Invite a single child to the clinic from their child record.
 
     Steps:
-    1. Schedule a community clinic session for the future.
-    2. Import a home-educated or unknown school child with parent details via child
+    1. Import a home-educated or unknown school child with parent details via child
        records.
-    3. Click on "Invite to community clinic" from the home-educated or unknown school.
-    4. Choose a programme and submit the request to send invitations
-    5. Find the child's record.
-    6. Check the activity log for an invitation having been sent.
+    2. Click on "Invite to community clinic" from the home-educated or unknown school.
+    3. Choose a programme and submit the request to send invitations
+    4. Find the child's record.
+    5. Check the activity log for an invitation having been sent.
     """
 
     programme = Programme.HPV

tests/test_sessions.py

@@ -4,7 +4,7 @@
 from mavis.test.annotations import issue
 from mavis.test.constants import ConsentMethod, Programme, Vaccine
 from mavis.test.data import ClassFileMapping
-from mavis.test.data_models import Clinic, VaccinationRecord
+from mavis.test.data_models import VaccinationRecord
 from mavis.test.helpers.accessibility_helper import AccessibilityHelper
 from mavis.test.pages import (
     ChildProgrammePage,
@@ -24,10 +24,7 @@
     SessionsSearchPage,
     SessionsVaccinationWizardPage,
 )
-from mavis.test.pages.utils import (
-    schedule_community_clinic_session_if_needed,
-    schedule_school_session_if_needed,
-)
+from mavis.test.pages.utils import schedule_school_session_if_needed
 from mavis.test.utils import expect_alert_text, expect_details
 
 pytestmark = pytest.mark.sessions
@@ -359,7 +356,7 @@ def test_consent_refused_and_activity_log(
 @pytest.mark.bug
 @pytest.mark.clinics
 @pytest.mark.rav
-def test_verify_excel_export_and_clinic_invitation(
+def test_add_child_to_community_clinic_session(
     setup_fixed_child,
     add_vaccine_batch,
     schools,
@@ -368,36 +365,31 @@ def test_verify_excel_export_and_clinic_invitation(
     children,
 ):
     """
-    Test: Export session data to Excel and send clinic invitations,
-       then verify vaccination record.
+    Test: Add a child to a community clinic session, record a vaccination, and
+      verify outcome and Excel export.
+
     Steps:
-    1. Schedule session, import class list, and send clinic invitations.
+    1. Import a child and click on "Record a new vaccination".
     2. Record verbal consent and register child as attending.
     3. Record vaccination for the child at the clinic.
     4. Verify vaccination outcome and Excel export.
+
     Verification:
     - Vaccination outcome is recorded and session Excel export is available.
     """
+
     child = children[Programme.HPV][0]
     school = schools[Programme.HPV][0]
     batch_name = add_vaccine_batch(Vaccine.GARDASIL_9)
-    generic_clinic = Clinic(name="Community clinic")
-
-    schedule_community_clinic_session_if_needed(page, [Programme.HPV])
 
     SessionsOverviewPage(page).header.click_mavis()
     DashboardPage(page).click_children()
     ChildrenSearchPage(page).search.search_for_a_child_name(str(child))
     ChildrenSearchPage(page).search.click_child(child)
 
     ChildRecordPage(page).click_programme(Programme.HPV)
-    # TODO: Replace this with importing an unknown school child without
-    #  needing to manually invite them to the clinic. Inviting to a clinic
-    #  is covered by other tests.
-    ChildProgrammePage(page).click_invite_to_community_clinic()
-    ChildRecordPage(page).click_programme(Programme.HPV)
+    ChildProgrammePage(page).click_record_new_vaccination(Programme.HPV)
 
-    ChildProgrammePage(page).click_session(generic_clinic)
     SessionsPatientPage(page).click_record_a_new_consent_response()
     NurseConsentWizardPage(page).select_parent(child.parents[0])
     NurseConsentWizardPage(page).select_consent_method(ConsentMethod.IN_PERSON)