Added logging to compartment 2 and changed the way NHS numbers are obtained

Author: adrianoaru-nhs

tests/Smokescreen/test_compartment_2.py

@@ -5,8 +5,9 @@
 from datetime import datetime
 from utils.screening_subject_page_searcher import verify_subject_event_status_by_nhs_no
 from utils.fit_kit_generation import create_fit_id_df
+import logging
 
-
+@pytest.mark.smoke
 @pytest.mark.smokescreen
 @pytest.mark.compartment2
 def test_compartment_2(page: Page) -> None:
@@ -18,27 +19,44 @@ def test_compartment_2(page: Page) -> None:
 
     for subject in range(4):
         fit_device_id = subjectdf["fit_device_id"].iloc[subject]
+        logging.info(f"Logging FIT Device ID: {fit_device_id}")
         LogDevices(page).fill_fit_device_id_field(fit_device_id)
         sample_date = datetime.now().strftime("%#d %b %Y")
+        logging.info("Setting sample date to todays date")
         LogDevices(page).fill_sample_date_field(sample_date)
-        LogDevices(page).verify_successfully_logged_device_text()
+        try:
+            LogDevices(page).verify_successfully_logged_device_text()
+            logging.info(f"{fit_device_id} Successfully logged")
+        except:
+            pytest.fail(f"{fit_device_id} unsuccessfully logged")
 
     nhs_no = subjectdf["subject_nhs_number"].iloc[0]
-    verify_subject_event_status_by_nhs_no(page, nhs_no, "S43 - Kit Returned and Logged (Initial Test)")
+    try:
+        verify_subject_event_status_by_nhs_no(page, nhs_no, "S43 - Kit Returned and Logged (Initial Test)")
+        logging.info(f"Successfully verified NHS number {nhs_no} with status S43 - Kit Returned and Logged (Initial Test)")
+    except Exception as e:
+        pytest.fail(f"Verification failed for NHS number {nhs_no}: {str(e)}")
 
     NavigationBar(page).click_main_menu_link()
     MainMenu(page).go_to_fit_test_kits_page()
     FITTestKits(page).go_to_log_devices_page()
     spoilt_fit_device_id = subjectdf["fit_device_id"].iloc[-1]
+    logging.info(f"Logging Spoilt FIT Device ID: {spoilt_fit_device_id}")
     LogDevices(page).fill_fit_device_id_field(spoilt_fit_device_id)
     LogDevices(page).click_device_spoilt_button()
     LogDevices(page).select_spoilt_device_dropdown_option()
     LogDevices(page).click_log_as_spoilt_button()
-    LogDevices(page).verify_successfully_logged_device_text()
+    try:
+        LogDevices(page).verify_successfully_logged_device_text()
+        logging.info(f"{spoilt_fit_device_id} Successfully logged")
+    except:
+        pytest.fail(f"{spoilt_fit_device_id} unsuccessfully logged")
+
 
     batch_processing(page, "S3", "Retest (Spoilt) (FIT)", "S11 - Retest Kit Sent (Spoilt)")
 
     # Log out
+    logging.info("Logging Out")
     NavigationBar(page).click_log_out_link()
     Logout(page).verify_log_out_page()
     page.close()

tests/Smokescreen/test_compartment_3.py

@@ -56,6 +56,7 @@ def test_compartment_3(page: Page) -> None:
     OracleDB().exec_bcss_timed_events(nhs_number_df)
 
     # Log out
+    logging.info("Logging Out")
     NavigationBar(page).click_log_out_link()
     Logout(page).verify_log_out_page()
     page.close()

utils/batch_processing.py

@@ -39,7 +39,7 @@ def batch_processing(page: Page, batch_type: str, batch_description: str, latest
                 nhs_no_df = get_nhs_no_from_batch_id(link_text)
                 logging.info(f"Successfully retrieved NHS Numbers from batch: {link_text}")
             except Exception as e:
-                logging.error(f"Failed to retrieve NHS Numbers from batch: {link_text}")
+                pytest.fail(f"Failed to retrieve NHS Numbers from batch: {link_text}, {str(e)}")
             link.click()
             break
         else:
@@ -65,7 +65,7 @@ def batch_processing(page: Page, batch_type: str, batch_description: str, latest
             download_file.save_as(file)
             os.remove(file) # Deletes the file after extracting the necessary data
     except Exception as e:
-        logging.error(f"No retrieve button available to click: {str(e)}")
+        pytest.fail(f"No retrieve button available to click: {str(e)}")
 
     # This loops through each Confirm printed button and clicks each one
     try:
@@ -74,13 +74,13 @@ def batch_processing(page: Page, batch_type: str, batch_description: str, latest
             page.once("dialog", lambda dialog: dialog.accept())
             ManageActiveBatch(page).confirm_button.nth(0).click()
     except Exception as e:
-        logging.error(f"No confirm printed button available to click: {str(e)}")
+        pytest.fail(f"No confirm printed button available to click: {str(e)}")
 
     try:
         ActiveBatchList(page).batch_successfully_archived_msg.wait_for()
         logging.info(f"Batch {link_text} successfully archived")
     except Exception as e:
-        logging.error(f"Batch successfully archived message is not shown: {str(e)}")
+        pytest.fail(f"Batch successfully archived message is not shown: {str(e)}")
 
     NavigationBar(page).click_main_menu_link()
     MainMenu(page).go_to_communications_production_page()
@@ -89,13 +89,13 @@ def batch_processing(page: Page, batch_type: str, batch_description: str, latest
     try:
         ArchivedBatchList(page).verify_table_data(link_text)
         logging.info(f"Batch {link_text} visible in archived batch list")
-    except Exception:
-        logging.error(f"Batch {link_text} not visible in archived batch list")
+    except Exception as e:
+        logging.error(f"Batch {link_text} not visible in archived batch list: {str(e)}")
 
     first_nhs_no = nhs_no_df["subject_nhs_number"].iloc[0]
     try:
         verify_subject_event_status_by_nhs_no(page, first_nhs_no, latest_event_status)
         logging.info(f"Successfully verified NHS number {first_nhs_no} with status {latest_event_status}")
     except Exception as e:
-        logging.error(f"Verification failed for NHS number {first_nhs_no} with status {latest_event_status}: {str(e)}")
+        pytest.fail(f"Verification failed for NHS number {first_nhs_no}: {str(e)}")
     return nhs_no_df

utils/fit_kit_generation.py

@@ -1,22 +1,17 @@
 from oracle import OracleDB
 import pandas as pd
 from datetime import datetime
+import logging
 
 def create_fit_id_df():
     df = get_kit_id_from_db()
     df["fit_device_id"] = df["kitid"].apply(calculate_check_digit)
     df["fit_device_id"] = df["fit_device_id"].apply(convert_kit_id_to_fit_device_id)
-
-    temp_string = df["screening_subject_id"].apply(str).iloc[0]
-    for subject in range(df.shape[0]):
-        subject_id = df["screening_subject_id"].apply(str).iloc[subject]
-        temp_string += f" or SCREENING_SUBJECT_ID = {subject_id}"
-
-    df = get_nhs_number_from_subject_id(temp_string, df)
     return df
 
 def get_kit_id_from_db():
-    kit_id_df = OracleDB().execute_query("""select tk.kitid, tk.screening_subject_id
+    logging.info("Retrieving useable test kit ids")
+    kit_id_df = OracleDB().execute_query("""select tk.kitid, tk.screening_subject_id, sst.subject_nhs_number
     from tk_items_t tk
     inner join ep_subject_episode_t se on se.screening_subject_id = tk.screening_subject_id
     inner join screening_subject_t sst on (sst.screening_subject_id = tk.screening_subject_id)
@@ -32,6 +27,7 @@ def get_kit_id_from_db():
     return kit_id_df
 
 def calculate_check_digit(kitID: str):
+    logging.info(f"Calculating check digit for kit id: {kitID}")
     total = 0
     charString = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ-. $/+%"
     for i in range(len(kitID)):
@@ -40,11 +36,7 @@ def calculate_check_digit(kitID: str):
     return f"{kitID}-{check_digit}"
 
 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"
-
-def get_nhs_number_from_subject_id(subject_ids, df):
-    temp_df = OracleDB().execute_query(f"SELECT SCREENING_SUBJECT_ID, SUBJECT_NHS_NUMBER FROM SCREENING_SUBJECT_T WHERE SCREENING_SUBJECT_ID = {subject_ids}")
-    df = df.merge(temp_df[["screening_subject_id","subject_nhs_number"]], on="screening_subject_id", how="left")
-    return df