Merge branch 'main' into feature/BCSS-20476-c6-pom-advance-fobt-screening-episode

# Conflicts:
#	tests/smokescreen/test_compartment_6.py

Author: mepr1

docs/utility-guides/BatchProcessing.md

@@ -43,8 +43,8 @@ This will call the other two functions in order to successfully process a batch.
   - Type: `str`
   - This is the description of the batch. For example: **Pre-invitation (FIT)** or **Post-investigation Appointment NOT Required**
 - `latest_event_status`:
-  - Type: `str`
-  - This is the status the subject will get updated to after the batch has been processed. It is used to check that the subject has been updated to the correct status after a batch has been printed
+  - Type: `str | None`
+  - This is the status the subject will get updated to after the batch has been processed. It is used to check that the subject has been updated to the correct status after a batch has been printed. If there are multiple different status in the same batch, provide them all in a list.
 
 #### Optional Arguments
 

pages/datasets/investigation_dataset_page.py

@@ -84,17 +84,36 @@ def verify_latest_event_status_header(self) -> None:
         """Verify that the latest event status header is visible."""
         expect(self.latest_event_status).to_be_visible()
 
-    def verify_latest_event_status_value(self, latest_event_status: str) -> None:
+    def verify_latest_event_status_value(self, latest_event_status: str | list) -> None:
         """Verify that the latest event status value is visible."""
-        logging.info(f"Verifying subject has the status: {latest_event_status}")
-        latest_event_status_cell = self.get_latest_event_status_cell(
+        latest_event_status_locator = self.get_visible_status_from_list(
             latest_event_status
         )
+        status = latest_event_status_locator.inner_text()
+        logging.info(f"Verifying subject has the status: {status}")
         try:
-            expect(latest_event_status_cell).to_be_visible()
-            logging.info(f"Subject has the status: {latest_event_status}")
+            expect(latest_event_status_locator).to_be_visible()
+            logging.info(f"Subject has the status: {status}")
         except Exception:
-            pytest.fail(f"Subject does not have the status: {latest_event_status}")
+            pytest.fail(f"Subject does not have the status: {status}")
+
+    def get_visible_status_from_list(self, latest_event_status) -> Locator:
+        """
+        Get the first visible status from the latest event status string or list.
+
+        Args:
+            latest_event_status (str | list): The latest event status to check.
+
+        Returns:
+            Locator: The locator for the first visible status.
+        """
+        if isinstance(latest_event_status, str):
+            latest_event_status = [latest_event_status]
+        for status in latest_event_status:
+            locator = self.page.get_by_role("cell", name=status, exact=True)
+            if locator.is_visible():
+                return locator
+        logging.error("Unable to find any of the listed statuses")
 
     def click_subjects_events_notes(self) -> None:
         """Click on the 'Subject Events & Notes' link."""

pages/screening_subject_search/subject_screening_summary_page.py

@@ -7,7 +7,7 @@
 from pages.logout.log_out_page import LogoutPage
 from pages.fit_test_kits.log_devices_page import LogDevicesPage
 from utils.batch_processing import batch_processing
-from utils.fit_kit_generation import create_fit_id_df
+from utils.fit_kit import FitKitGeneration
 from utils.screening_subject_page_searcher import verify_subject_event_status_by_nhs_no
 from utils.user_tools import UserTools
 
@@ -33,8 +33,7 @@ def test_compartment_2(page: Page, smokescreen_properties: dict) -> None:
     tk_type_id = smokescreen_properties["c2_fit_kit_tk_type_id"]
     hub_id = smokescreen_properties["c2_fit_kit_logging_test_org_id"]
     no_of_kits_to_retrieve = smokescreen_properties["c2_total_fit_kits_to_retieve"]
-    subjectdf = create_fit_id_df(tk_type_id, hub_id, no_of_kits_to_retrieve)
-
+    subjectdf = FitKitGeneration().create_fit_id_df(tk_type_id, hub_id, no_of_kits_to_retrieve)
     for subject in range(int(smokescreen_properties["c2_normal_kits_to_log"])):
         fit_device_id = subjectdf["fit_device_id"].iloc[subject]
         logging.info(f"Logging FIT Device ID: {fit_device_id}")

tests/smokescreen/test_compartment_2.py

@@ -3,7 +3,7 @@
 from playwright.sync_api import Page
 from pages.logout.log_out_page import LogoutPage
 from utils.batch_processing import batch_processing
-from utils.fit_kit_logged import process_kit_data
+from utils.fit_kit import FitKitLogged
 from utils.screening_subject_page_searcher import verify_subject_event_status_by_nhs_no
 from utils.oracle.oracle_specific_functions import (
     update_kit_service_management_entity,
@@ -26,9 +26,10 @@ def test_compartment_3(page: Page, smokescreen_properties: dict) -> None:
     """
     UserTools.user_login(page, "Hub Manager State Registered at BCS01")
 
+
     # Find data , separate it into normal and abnormal, Add results to the test records in the KIT_QUEUE table (i.e. mimic receiving results from the middleware)
     # and get device IDs and their flags
-    device_ids = process_kit_data(smokescreen_properties)
+    device_ids =FitKitLogged().process_kit_data(smokescreen_properties)
     # Retrieve NHS numbers for each device_id and determine normal/abnormal status
     nhs_numbers = []
     normal_flags = []