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

Author: adrianoaru-nhs

pages/cognito_login_page.py

@@ -22,4 +22,4 @@ def login_as_user(self, username: str, password: str) -> None:
         # Retrieve and enter password from .env file
         self.password.fill(password)
         # Click Submit
-        self.submit_button.click()
+        self.submit_button.click()

pages/generate_invitations_page.py

@@ -57,8 +57,9 @@ def wait_for_invitation_generation_complete(self):
 
         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
+        else:
+            logging.warning("No S1 Digital Leaflet batch will be generated")
 
         value = self.planned_invitations_total.text_content().strip()  # Get text and remove extra spaces
         if int(value) < 5:

pytest.ini

@@ -30,4 +30,4 @@ markers =
     smokescreen: all compartments to be run as part of the smokescreen
     compartment1: only for compartment 1
     compartment2: only for compartment 2
-    compartment3: only for compartment 3
+    compartment3: only for compartment 3

tests/Smokescreen/test_compartment_1.py

@@ -2,11 +2,13 @@
 from playwright.sync_api import Page
 from my_pages import *
 from utils.batch_processing import batch_processing
-from utils.oracle import OracleDB
 
 @pytest.mark.smoke
 @pytest.mark.compartment1
 def test_create_invitations_plan(page: Page) -> None:
+    """
+    This is used to create the invitations plan. As it is not always needed it is separate to the main Compartment 1 function
+    """
     logging.info("Compartment 1 - Create Invitations Plan")
     UserTools.user_login(page, "Hub Manager State Registered")
     # Create plan - England
@@ -29,6 +31,13 @@ def test_create_invitations_plan(page: Page) -> None:
 @pytest.mark.smokescreen
 @pytest.mark.compartment1
 def test_compartment_1(page: Page) -> None:
+    """
+    This is the main compartment 1 function. It covers the following:
+    - Generating invitations based on the invitation plan
+    - Processes S1 (FIT) batches
+    - Processes S9 (FIT) batches
+    - Processes S10 (FIT) batches
+    """
     logging.info("Compartment 1 - Generate Invitations")
     UserTools.user_login(page, "Hub Manager State Registered")
 
@@ -42,20 +51,18 @@ def test_compartment_1(page: Page) -> None:
     # Print the batch of Pre-Invitation Letters - England
     logging.info("Compartment 1 - Process S1 Batch")
     if self_referrals_available:
-        batch_processing(page, "S1", "Pre-invitation (FIT) (digital leaflet)", "S9 - Pre-invitation Sent")
+        batch_processing(page, "S1", "Pre-invitation (FIT) (digital leaflet)", "S9 - Pre-invitation Sent", False)
     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)
+    batch_processing(page, "S1", "Pre-invitation (FIT)", "S9 - Pre-invitation Sent", True)
 
     # Print the batch of Invitation & Test Kit Letters - England
     logging.info("Compartment 1 - Process S9 Batch")
-    nhs_number_df = batch_processing(page, "S9", "Invitation & Test Kit (FIT)", "S10 - Invitation & Test Kit Sent")
-    OracleDB().exec_bcss_timed_events(nhs_number_df)
+    batch_processing(page, "S9", "Invitation & Test Kit (FIT)", "S10 - Invitation & Test Kit Sent", True)
 
     # Print a set of reminder letters
     logging.info("Compartment 1 - Process S10 Batch")
-    batch_processing(page, "S10", "Test Kit Reminder", "S19 - Reminder of Initial Test Sent")
+    batch_processing(page, "S10", "Test Kit Reminder", "S19 - Reminder of Initial Test Sent", False)
 
     # Log out
     Logout(page).log_out()

tests/Smokescreen/test_compartment_2.py

@@ -56,4 +56,4 @@ def test_compartment_2(page: Page) -> None:
     batch_processing(page, "S3", "Retest (Spoilt) (FIT)", "S11 - Retest Kit Sent (Spoilt)")
 
     # Log out
-    Logout(page).log_out()
+    Logout(page).log_out()

tests/test_bcss_19181_users_permit_list.py

@@ -1,7 +1,6 @@
 import pytest
 from playwright.sync_api import Page
-from pages import (login_page as login, bcss_home_page as bcss_home, navigation_bar_links as nav_bar_links, log_out_page as logout,
-                   login_failure_screen as login_failure)
+from pages import (login_page as login, bcss_home_page as bcss_home, navigation_bar_links as nav_bar_links, log_out_page as logout, login_failure_screen as login_failure)
 from utils.oracle import OracleDB
 
 @pytest.fixture(scope="function", autouse=True)

users.json

@@ -13,4 +13,4 @@
       "Screening Centre Manager for Wolverhampton, Midlands and North West"
     ]
   }
-}
+}

utils/batch_processing.py

@@ -6,12 +6,13 @@
 from pages.archived_batch_list_page import ArchivedBatchList
 from utils.screening_subject_page_searcher import verify_subject_event_status_by_nhs_no
 from utils.get_nhs_no_from_batch_id import get_nhs_no_from_batch_id
+from utils.oracle import OracleDB
 import os
 import pytest
 from playwright.sync_api import Page
 import logging
 
-def batch_processing(page: Page, batch_type: str, batch_description: str, latest_event_status: str):
+def batch_processing(page: Page, batch_type: str, batch_description: str, latest_event_status: str, run_timed_events: bool):
     logging.info(f"Processing {batch_type} - {batch_description} batch")
     NavigationBar(page).click_main_menu_link()
     MainMenu(page).go_to_communications_production_page()
@@ -96,4 +97,6 @@ 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
+
+    if run_timed_events:
+        OracleDB().exec_bcss_timed_events(nhs_no_df)

utils/fit_kit_generation.py

@@ -39,4 +39,4 @@ def convert_kit_id_to_fit_device_id(kit_id: str):
     logging.info(f"Generating FIT Device ID from: {kit_id}")
     today = datetime.now()
     year = today.strftime("%y") # Get the year from todays date in YY format
-    return f"{kit_id}12{int(year)+1}12345/KD00001"
+    return f"{kit_id}12{int(year)+1}12345/KD00001"

utils/oracle.py

@@ -139,4 +139,4 @@ def update_or_insert_data_to_table(self, statement,params):  # To update or inse
                     conn.close()
                     logging.info("Connection Closed")
         except Exception as connectionError:
-            logging.error(f"Failed to connect to the DB! with connection error {connectionError}")
+            logging.error(f"Failed to connect to the DB! with connection error {connectionError}")