Merge branch 'recovery-fix' into feature/BCSS-21304-selenium0to-playwright-fobtregressiontests-scenario-2

# Conflicts:
#	tests/regression/regression_tests/test_fobt_regression_tests.py
#	utils/fit_kit.py

Author: Andyg79

pages/communication_production/batch_list_page.py

@@ -1,6 +1,9 @@
 from playwright.sync_api import Page, expect, Locator
 from pages.base_page import BasePage
 from datetime import datetime
+from pages.communication_production.communications_production_page import (
+    CommunicationsProductionPage,
+)
 from utils.calendar_picker import CalendarPicker
 from utils.table_util import TableUtils
 import logging
@@ -204,6 +207,17 @@ def select_first_batch_row(self, table_selector: str, timeout_ms: int = 0) -> No
         ), f"No batch links found in table '{table_selector}'"
         first_link.click()
 
+    def navigate_to_active_batch_list_page(self) -> None:
+        """
+        Navigates to the active batch list page from anywhere in bcss (providing the main menu link is displayed).
+
+        Args:
+            page (Page): The Playwright page object.
+        """
+        BasePage(self.page).click_main_menu_link()
+        BasePage(self.page).go_to_communications_production_page()
+        CommunicationsProductionPage(self.page).go_to_active_batch_list_page()
+
 
 class ActiveBatchListPage(BatchListPage):
     """Active Batch List Page-specific methods."""
@@ -216,7 +230,10 @@ def select_first_active_batch(self) -> None:
         self.select_first_batch_row(self.table_selector, timeout_ms=10000)
 
     def is_batch_present(self, batch_type: str) -> bool:
-        """Checks if a batch of the given type exists in the active batch list."""
+        """Checks if a batch of the given type exists in the active batch list.
+        Args:
+            batch_type (str): The type of the batch to check for e.g. "S1 - Pre-invitation (FIT)"
+        """
         locator = self.page.locator(
             f"{self.table_selector} tbody tr td", has_text=batch_type
         )

pages/screening_subject_search/subject_screening_summary_page.py

@@ -331,7 +331,7 @@ def navigate_to_spine_search(self) -> None:
         Navigates to the Spine Search screen by clicking the appropriate link
         and loading the target URL.
         """
-        #self.retrieve_data_link.click()
+        # self.retrieve_data_link.click()
         self.click(self.retrieve_data_link)
         self.page.goto(self.spine_url)
 
@@ -377,15 +377,17 @@ def assert_latest_event_status(self, expected_status: str) -> None:
         Asserts that the latest event status displayed in the summary table matches the expected value.
 
         Args:
-            expected_status (str): The expected event status (e.g., 'S9 Pre-invitation Sent').
+            expected_status (str): The expected event status (e.g., 'S9 - Pre-invitation Sent').
 
         Raises:
             AssertionError: If the status in the UI does not match the expected value.
         """
-        actual_status = self.latest_event_status_cell.inner_text().strip()
-        assert actual_status == expected_status, (
-            f"[LATEST EVENT STATUS MISMATCH] Expected '{expected_status}', but found '{actual_status}' in UI."
-        )
+        cell = self.get_latest_event_status_cell(expected_status)
+        actual_status = cell.inner_text().strip()
+        assert (
+            actual_status == expected_status
+        ), f"[LATEST EVENT STATUS MISMATCH] Expected '{expected_status}', but found '{actual_status}' in UI."
+
 
 class ChangeScreeningStatusOptions(Enum):
     """Enum for Change Screening Status options."""

tests/regression/regression_tests/fobt_regression_tests/test_scenario_2.py

@@ -1,7 +1,6 @@
 import pytest
 import logging
 import datetime
-import pandas as pd
 from playwright.sync_api import Page
 from pages.communication_production.batch_list_page import ActiveBatchListPage
 from utils.oracle.subject_creation_util import CreateSubjectSteps
@@ -10,42 +9,11 @@
 from utils.call_and_recall_utils import CallAndRecallUtils
 from utils import screening_subject_page_searcher
 from utils.batch_processing import batch_processing
-from pages.base_page import BasePage
+from utils.fit_kit import FitKitLogged
 from pages.screening_subject_search.subject_screening_summary_page import (
     SubjectScreeningSummaryPage,
 )
-from pages.communication_production.communications_production_page import (
-    CommunicationsProductionPage,
-)
-from utils.oracle.oracle import OracleDB
-
-
-# Helper function to navigate to subject profile
-def navigate_to_subject_profile(page, nhs_no: str) -> None:
-    """
-    Navigates to the subject profile in the UI using the NHS number.
-
-    Args:
-        page (Page): The Playwright page object.
-        nhs_no (str): The NHS number of the subject to search.
-    """
-    BasePage(page).click_main_menu_link()
-    BasePage(page).go_to_screening_subject_search_page()
-    screening_subject_page_searcher.search_subject_by_nhs_number(page, nhs_no)
-    logging.info("[SUBJECT VIEW] Subject loaded in UI")
-
-
-# Helper function to navigate to active batch list
-def navigate_to_active_batch_list(page: Page) -> None:
-    """
-    Navigates to the active batch list page in the UI.
-
-    Args:
-        page (Page): The Playwright page object.
-    """
-    BasePage(page).click_main_menu_link()
-    BasePage(page).go_to_communications_production_page()
-    CommunicationsProductionPage(page).go_to_active_batch_list_page()
+from pages.communication_production.batch_list_page import BatchListPage
 
 
 @pytest.mark.wip
@@ -81,11 +49,6 @@ def test_scenario_2(page: Page) -> None:
     if user_role is None:
         raise ValueError("User cannot be assigned to a UserRoleType")
 
-    # Go to screening subject search page
-    base_page = BasePage(page)
-    base_page.click_main_menu_link()
-    base_page.go_to_screening_subject_search_page()
-
     # And I create a subject that meets the following criteria:
     requirements = {
         "age (y/d)": "66/130",
@@ -107,19 +70,19 @@ def test_scenario_2(page: Page) -> None:
             "screening status": "Inactive",
         },
     )
-    logging.info("[DB ASSERTIONS COMPLETE]Created subject's details checked in the DB")
+    logging.info("[DB ASSERTIONS COMPLETE] Created subject details checked in the DB")
 
-    # Navigate to subject profile in UI
-    navigate_to_subject_profile(page, nhs_no)
+    # Navigate to subject summary page in UI
+    screening_subject_page_searcher.navigate_to_subject_summary_page(page, nhs_no)
 
     # Assert subject details in the UI
     summary_page.assert_subject_age(66)
     summary_page.assert_screening_status("Inactive")
-    logging.info("[UI ASSERTIONS COMPLETE]Updated subject details checked in the UI")
+    logging.info("[UI ASSERTIONS COMPLETE] Updated subject details checked in the UI")
 
     # When I run the FOBT failsafe trawl for my subject
     CallAndRecallUtils().run_failsafe(nhs_no)
-    logging.info(f"[FAILSAFE TRAWL RUN]FOBT failsafe trawl run for subject {nhs_no}")
+    logging.info(f"[FAILSAFE TRAWL RUN] FOBT failsafe trawl run for subject {nhs_no}")
 
     # Then my subject has been updated as follows:
     today = datetime.datetime.now().strftime("%d/%m/%Y")
@@ -136,14 +99,14 @@ def test_scenario_2(page: Page) -> None:
             "Screening Status Reason": "Failsafe Trawl",
         },
     )
-    logging.info("[DB ASSERTIONS COMPLETE]Updated subject details checked in the DB")
+    logging.info("[DB ASSERTIONS COMPLETE] Updated subject details checked in the DB")
 
-    # Navigate to subject profile in UI
-    navigate_to_subject_profile(page, nhs_no)
+    # Navigate to subject summary page in UI
+    screening_subject_page_searcher.navigate_to_subject_summary_page(page, nhs_no)
 
     # Assert subject details in the UI
     summary_page.assert_screening_status("Call")
-    logging.info("[UI ASSERTIONS COMPLETE]Updated subject details checked in the UI")
+    logging.info("[UI ASSERTIONS COMPLETE] Updated subject details checked in the UI")
 
     # When I invite my subject for FOBT screening
     CallAndRecallUtils().invite_subject_for_fobt_screening(nhs_no, user_role)
@@ -157,40 +120,29 @@ def test_scenario_2(page: Page) -> None:
             "latest episode type": "FOBT",
         },
     )
-    logging.info("[DB ASSERTIONS COMPLETE]Updated subject details checked in the DB")
+    logging.info("[DB ASSERTIONS COMPLETE] Updated subject details checked in the DB")
 
     # Then there is a "S1" letter batch for my subject with the exact title "Pre-invitation (FIT)"
-    navigate_to_active_batch_list(page)
+    BatchListPage(page).navigate_to_active_batch_list_page()
     ActiveBatchListPage(page).is_batch_present("S1 - Pre-invitation (FIT)")
-    logging.info("[ASSERTIONS COMPLETE]S1 Letter batch exists")
+    logging.info("[UI ASSERTIONS COMPLETE] S1 Letter batch exists")
 
     # When I process the open "S1" letter batch for my subject
-    # Then my subject has been updated as follows:
+    # Then there is a "S9" letter batch for my subject with the exact title "Invitation & Test Kit (FIT)"
     batch_processing(
         page, "S1", "Pre-invitation (FIT)", "S9 - Pre-invitation Sent", True
     )
-    logging.info("[DB ASSERTIONS COMPLETE]Updated subject status checked in the DB")
-
-    # Navigate to subject profile in UI
-    navigate_to_subject_profile(page, nhs_no)
+    logging.info("[UI ASSERTIONS COMPLETE] Updated subject details checked in the UI")
+    logging.info("[UI ASSERTIONS COMPLETE] S9 Letter batch exists")
 
-    # Assert subject details in the UI
-    summary_page.assert_latest_event_status("S9 Pre-invitation Sent")
-    logging.info("[UI ASSERTIONS COMPLETE]Updated subject details checked in the UI")
-
-    # When I run Timed Events for my subject
-    nhs_df = pd.DataFrame(
-        {"subject_nhs_number": [nhs_no]}
-    )  # Create DataFrame with NHS number to pass to timed events procedure
-    OracleDB().exec_bcss_timed_events(
-        nhs_df
-    )  # Execute timed events procedure to process the subject
-    logging.info("[TIMED EVENTS] Executed for existing subject")
-
-    # Then there is a "S9" letter batch for my subject with the exact title "Invitation & Test Kit (FIT)"
-    navigate_to_active_batch_list(page)
-    ActiveBatchListPage(page).is_batch_present("S9 - Invitation & Test Kit (FIT)")
-    logging.info("[ASSERTIONS COMPLETE]S9 Letter batch exists")
+    # Then my subject has been updated as follows:
+    subject_assertion(
+        nhs_no,
+        {
+            "latest event status": "S9 - Pre-invitation Sent",
+        },
+    )
+    logging.info("[DB ASSERTIONS COMPLETE] Updated subject status checked in the DB")
 
     # When I process the open "S9" letter batch for my subject
     batch_processing(
@@ -200,19 +152,19 @@ def test_scenario_2(page: Page) -> None:
         "S10 - Invitation & Test Kit Sent",
         True,
     )
-    logging.info("[DB ASSERTIONS COMPLETE]Updated subject status checked in the DB")
+    logging.info("[UI ASSERTIONS COMPLETE] Updated subject status checked in the UI")
 
     # Then my subject has been updated as follows:
-    batch_processing(
-        page,
-        "S9",
-        "Invitation & Test Kit (FIT)",
-        "S10 - Invitation & Test Kit Sent",
-        True,
+    subject_assertion(
+        nhs_no,
+        {
+            "latest event status": "S10 - Invitation & Test Kit Sent",
+        },
     )
-    logging.info("[DB ASSERTIONS COMPLETE]Updated subject status checked in the DB")
+    logging.info("[DB ASSERTIONS COMPLETE] Updated subject status checked in the DB")
 
-    # TODO: When I log my subject's latest unlogged FIT kit
+    # When I log my subject's latest unlogged FIT kit
+    fit_kit = FitKitLogged().log_fit_kit(page, nhs_no)
 
     # Then my subject has been updated as follows:
     subject_assertion(
@@ -221,18 +173,19 @@ def test_scenario_2(page: Page) -> None:
             "latest event status": "S43 Kit Returned and Logged (Initial Test)",
         },
     )
-    logging.info("[DB ASSERTIONS COMPLETE]Updated subject status checked in the DB")
+    logging.info("[DB ASSERTIONS COMPLETE] Updated subject status checked in the DB")
 
-    # Navigate to subject profile in UI
-    navigate_to_subject_profile(page, nhs_no)
+    # Navigate to subject summary page in UI
+    screening_subject_page_searcher.navigate_to_subject_summary_page(page, nhs_no)
 
     # Assert subject details in the UI
     summary_page.assert_latest_event_status(
-        "S43 Kit Returned and Logged (Initial Test)"
+        "S43 - Kit Returned and Logged (Initial Test)"
     )
-    logging.info("[UI ASSERTIONS COMPLETE]Updated subject details checked in the UI")
+    logging.info("[UI ASSERTIONS COMPLETE] Updated subject details checked in the UI")
 
-    # TODO: When I read my subject's latest logged FIT kit as "NORMAL"
+    # When I read my subject's latest logged FIT kit as "NORMAL"
+    FitKitLogged().read_latest_logged_kit(user_role, 2, fit_kit, "NORMAL")
 
     # Then my subject has been updated as follows:
     subject_assertion(
@@ -241,53 +194,53 @@ def test_scenario_2(page: Page) -> None:
             "latest event status": "S2 Normal",
         },
     )
-    logging.info("[DB ASSERTIONS COMPLETE]Updated subject status checked in the DB")
+    logging.info("[DB ASSERTIONS COMPLETE] Updated subject status checked in the DB")
 
-    # Navigate to subject profile in UI
-    navigate_to_subject_profile(page, nhs_no)
+    # Navigate to subject summary page in UI
+    screening_subject_page_searcher.navigate_to_subject_summary_page(page, nhs_no)
 
     # Assert subject details in the UI
-    summary_page.assert_latest_event_status("S2 Normal")
-    logging.info("[UI ASSERTIONS COMPLETE]Updated subject details checked in the UI")
+    summary_page.assert_latest_event_status("S2 - Normal")
+    logging.info("[UI ASSERTIONS COMPLETE] Updated subject details checked in the UI")
 
     # And there is a "S2" letter batch for my subject with the exact title "Subject Result (Normal)"
-    navigate_to_active_batch_list(page)
+    BatchListPage(page).navigate_to_active_batch_list_page()
     ActiveBatchListPage(page).is_batch_present("S2 - Subject Result (Normal)")
-    logging.info("[ASSERTIONS COMPLETE]S2 Letter batch exists")
+    logging.info("[UI ASSERTIONS COMPLETE] S2 Letter batch exists")
 
     # When I process the open "S2" letter batch for my subject
-    batch_processing(page, "S2", "Normal", "S158 Subject Discharge Sent (Normal)", True)
-
-    # Then my subject has been updated as follows:
     batch_processing(
         page,
         "S2",
         "Subject Result (Normal)",
-        "S158 Subject Discharge Sent (Normal)",
+        "S158 - Subject Discharge Sent (Normal)",
         True,
     )
-    logging.info("[DB ASSERTIONS COMPLETE]Updated subject status checked in the DB")
-
-    # Navigate to subject profile in UI
-    navigate_to_subject_profile(page, nhs_no)
+    logging.info("[UI ASSERTIONS COMPLETE] Updated subject status checked in the UI")
 
-    # Assert subject details in the UI
-    summary_page.assert_latest_event_status("S158 Subject Discharge Sent (Normal)")
-    logging.info("[UI ASSERTIONS COMPLETE]Updated subject details checked in the UI")
+    # Then my subject has been updated as follows:
+    subject_assertion(
+        nhs_no,
+        {
+            "latest event status": "S158 Subject Discharge Sent (Normal)",
+        },
+    )
+    logging.info("[DB ASSERTIONS COMPLETE] Updated subject status checked in the DB")
 
     # And there is a "S158" letter batch for my subject with the exact title "GP Result (Normal)"
-    navigate_to_active_batch_list(page)
+    BatchListPage(page).navigate_to_active_batch_list_page()
     ActiveBatchListPage(page).is_batch_present("S158 - GP Result (Normal)")
-    logging.info("[ASSERTIONS COMPLETE]S158 Letter batch exists")
+    logging.info("[UI ASSERTIONS COMPLETE] S158 Letter batch exists")
 
     # When I process the open "S158" letter batch for my subject
     batch_processing(
         page,
         "S158",
         "GP Result (Normal)",
-        "S159 GP Discharge Sent (Normal)",
+        "S159 - GP Discharge Sent (Normal)",
         True,
     )
+    logging.info("[UI ASSERTIONS COMPLETE] Updated subject status checked in the UI")
 
     # Then my subject has been updated as follows:
     subject_assertion(
@@ -320,11 +273,6 @@ def test_scenario_2(page: Page) -> None:
             "surveillance due date reason": "Unchanged",
         },
     )
-    logging.info("[DB ASSERTIONS COMPLETE]Updated subject details checked in the DB")
+    logging.info("[DB ASSERTIONS COMPLETE] Updated subject details checked in the DB")
 
-    # Navigate to subject profile in UI
-    navigate_to_subject_profile(page, nhs_no)
-
-    # Assert subject details in the UI
-    summary_page.assert_latest_event_status("S159 GP Discharge Sent (Normal)")
-    logging.info("[UI ASSERTIONS COMPLETE]Updated subject details checked in the UI")
+    logging.info("[TEST COMPLETE] Scenario 2 passed all assertions")