Addressing issues mentioned by Dave in PR #6 Feature/smokescreen compartment 1

Author: adrianoaru-nhs

pages/generate_invitations_page.py

@@ -11,6 +11,7 @@ def __init__(self, page: Page):
         self.displayRS = self.page.locator("#displayRS")
         self.refresh_button = self.page.get_by_role("button", name="Refresh")
         self.planned_invitations_total = self.page.locator("#col8_total")
+        self.self_referrals_total = self.page.locator("#col9_total")
 
     def click_generate_invitations_button(self):
         click(self.page, self.generate_invitations_button)
@@ -54,6 +55,11 @@ def wait_for_invitation_generation_complete(self):
         except Exception as e:
             pytest.fail("Invitations not generated successfully")
 
+        self_referrals_total = int(self.self_referrals_total.text_content().strip())
+        if self_referrals_total >= 1:
+            logging.warning("No S1 Digital Leaflet batch will be generated")
+            return True
+
         value = self.planned_invitations_total.text_content().strip()  # Get text and remove extra spaces
         if int(value) < 5:
-            pytest.fail("There are less than 5 invitations generated")
+            pytest.fail("There are less than 5 invitations generated")

requirements.txt

@@ -1,7 +1,6 @@
 pytest-playwright>=0.5.1
 pytest-html>=4.1.1
 pytest-json-report>=1.5.0
-pypdf>=5.3.0
 oracledb>=2.5.1
 pandas>=2.2.3
 python-dotenv~=1.0.1

tests/Smokescreen/test_compartment_1.py

@@ -37,11 +37,14 @@ def test_compartment_1(page: Page) -> None:
     CallAndRecall(page).go_to_generate_invitations_page()
     logging.info("Generating invitations based on the invitations plan")
     GenerateInvitations(page).click_generate_invitations_button()
-    GenerateInvitations(page).wait_for_invitation_generation_complete()
+    self_referrals_available = GenerateInvitations(page).wait_for_invitation_generation_complete()
 
     # Print the batch of Pre-Invitation Letters - England
     logging.info("Compartment 1 - Process S1 Batch")
-    batch_processing(page, "S1", "Pre-invitation (FIT) (digital leaflet)", "S9 - Pre-invitation Sent")
+    if self_referrals_available:
+        batch_processing(page, "S1", "Pre-invitation (FIT) (digital leaflet)", "S9 - Pre-invitation Sent")
+    else:
+        logging.warning("Skipping S1 Pre-invitation (FIT) (digital leaflet) as no self referral invitations were generated")
     nhs_number_df = batch_processing(page, "S1", "Pre-invitation (FIT)", "S9 - Pre-invitation Sent")
     OracleDB().exec_bcss_timed_events(nhs_number_df)
 
@@ -55,4 +58,4 @@ def test_compartment_1(page: Page) -> None:
     batch_processing(page, "S10", "Test Kit Reminder", "S19 - Reminder of Initial Test Sent")
 
     # Log out
-    Logout(page).log_out()
+    Logout(page).log_out()

utils/batch_processing.py

@@ -20,10 +20,7 @@ def batch_processing(page: Page, batch_type: str, batch_description: str, latest
 
     batch_description_cells = page.locator(f"//td[text()='{batch_description}']")
 
-    if batch_description_cells.count() == 0 and batch_description == "Pre-invitation (FIT) (digital leaflet)":
-        logging.warning("No S1 Pre-invitation (FIT) (digital leaflet) batch found. Skipping to next step")
-        return
-    elif batch_description_cells.count() == 0 and page.locator("td", has_text="No matching records found"):
+    if batch_description_cells.count() == 0 and page.locator("td", has_text="No matching records found"):
         pytest.fail(f"No {batch_type} {batch_description} batch found")
 
     for i in range(batch_description_cells.count()):
@@ -58,8 +55,8 @@ def batch_processing(page: Page, batch_type: str, batch_description: str, latest
             logging.info(f"Clicking retrieve button {retrieve_button_count}")
             # Start waiting for the pdf download
             with page.expect_download() as download_info:
-                # Perform the action that initiates download
-                ManageActiveBatch(page).retrieve_button.nth(retrieve_button-1).click()
+                # Perform the action that initiates download. The line below is running in a FOR loop to click every retrieve button as in some cases more than 1 is present
+                ManageActiveBatch(page).retrieve_button.nth(retrieve_button).click()
             download_file = download_info.value
             file = download_file.suggested_filename
             # Wait for the download process to complete and save the downloaded file in a temp folder
@@ -99,4 +96,4 @@ def batch_processing(page: Page, batch_type: str, batch_description: str, latest
         logging.info(f"Successfully verified NHS number {first_nhs_no} with status {latest_event_status}")
     except Exception as e:
         pytest.fail(f"Verification failed for NHS number {first_nhs_no}: {str(e)}")
-    return nhs_no_df
+    return nhs_no_df