Adding functionality onto batch processing to pass a list for the latest_event_status

Author: adrianoaru-nhs

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 idfferent status in the same batch, provide them all in a list.
 
 #### Optional Arguments
 

pages/screening_subject_search/subject_screening_summary_page.py

@@ -84,17 +84,34 @@ 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
-        )
+        latest_event_status_locator = self.get_first_visible_status(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_first_visible_status(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."""

utils/batch_processing.py

@@ -24,7 +24,7 @@ def batch_processing(
     page: Page,
     batch_type: str,
     batch_description: str,
-    latest_event_status: str,
+    latest_event_status: str | list,
     run_timed_events: bool = False,
     get_subjects_from_pdf: bool = False,
 ) -> None:
@@ -35,7 +35,7 @@ def batch_processing(
         page (Page): This is the playwright page object
         batch_type (str): The event code of the batch. E.g. S1 or S9
         batch_description (str): The description of the batch. E.g. Pre-invitation (FIT)
-        latest_event_status (str): The status the subject will get updated to after the batch has been processed.
+        latest_event_status (str | list): The status the subject will get updated to after the batch has been processed.
         run_timed_events (bool): An optional input that executes bcss_timed_events if set to True
         get_subjects_from_pdf (bool): An optional input to change the method of retrieving subjects from the batch from the DB to the PDF file.
     """

utils/screening_subject_page_searcher.py

@@ -10,7 +10,7 @@
 
 
 def verify_subject_event_status_by_nhs_no(
-    page: Page, nhs_no: str, latest_event_status: str
+    page: Page, nhs_no: str, latest_event_status: str | list
 ) -> None:
     """
     This is used to check that the latest event status of a subject has been updated to what is expected