progressing the compartment 3 task 1,2,3,4

Author: Megha Prasannan

tests/Smokescreen/test_compartment_2.py

@@ -6,7 +6,7 @@
 from utils.screening_subject_page_searcher import verify_subject_event_status_by_nhs_no
 from utils.fit_kit_generation import create_fit_id_df
 
-@pytest.mark.wip2
+
 @pytest.mark.smokescreen
 def test_compartment_2(page: Page) -> None:
     page.goto("/")

tests/Smokescreen/test_compartment_3.py

@@ -4,39 +4,69 @@
 from my_pages import *
 from utils import oracle, fit_kit_logged
 from utils.fit_kit_generation import create_fit_id_df
+from utils.fit_kit_logged import process_kit_data, update_kit_service_management_entity
 from utils.oracle import OracleDB
 from utils.screening_subject_page_searcher import verify_subject_event_status_by_nhs_no
 
-
+@pytest.mark.wip2
 def test_compartment_3(page: Page) -> None:
     UserTools.user_login(page, "Hub Manager State Registered")
 
     # Add results to the test records in the KIT_QUEUE table (i.e. mimic receiving results from the middleware)
-    fit_kit_logged.process_kit_data()
-
+    # and get device IDs and their flags
+    device_ids = process_kit_data()
     # (STEP - 4) Run two stored procedures to process any kit queue records at status BCSS_READY
-    fit_kit_logged.execute_stored_procedures()
-
-    # (STEP - 5) Check the results of the processed FIT kits have correctly updated the status of the associated subjects
-    # Navigate to log devices page
-    MainMenu(page).go_to_fit_test_kits_page()
-    FITTestKits(page).go_to_log_devices_page()
-
-    # Get a fit device id
-    subjectdf = create_fit_id_df()
-
-    # Log fit device
-    for subject in range(4):
-        fit_device_id = subjectdf["fit_device_id"].iloc[subject]
-        LogDevices(page).fill_fit_device_id_field(fit_device_id)
-        sample_date = datetime.now().strftime("%#d %b %Y")
-        LogDevices(page).fill_sample_date_field(sample_date)
-        LogDevices(page).verify_successfully_logged_device_text()
-
-    # Check statuses of 'normal' FIT kit subjects has moved to S2
-    nhs_no = subjectdf["subject_nhs_number"].iloc[0]
-    verify_subject_event_status_by_nhs_no(page, nhs_no, "S2 - Normal")
-
-    # Check status of 'abnormal' FIT kit subjects has moved to A8
-    nhs_no = subjectdf["subject_nhs_number"].iloc[0]
-    verify_subject_event_status_by_nhs_no(page, nhs_no, "A8 - Abnormal")
+    try:
+        fit_kit_logged.execute_stored_procedures()
+        logging.info("Stored procedures executed successfully.")
+    except Exception as e:
+        logging.error(f"Error executing stored procedures: {str(e)}")
+        raise
+
+    # Retrieve NHS numbers for each device_id and determine normal/abnormal status
+    nhs_numbers = []
+    normal_flags = []
+
+    for device_id, is_normal in device_ids:
+        nhs_number = update_kit_service_management_entity(device_id, is_normal)
+        nhs_numbers.append(nhs_number)
+        normal_flags.append(is_normal)  # Store the flag (True for normal, False for abnormal)
+
+    # Verify subject event status based on normal or abnormal classification
+    for nhs_number, is_normal in zip(nhs_numbers, normal_flags):
+        expected_status = "S2 - Normal" if is_normal else "A8 - Abnormal"  # S2 for normal, A8 for abnormal
+        logging.info(f"Verifying NHS number: {nhs_number} with expected status: {expected_status}")
+
+        try:
+            verify_subject_event_status_by_nhs_no(page, nhs_number, expected_status)
+            logging.info(f"Successfully verified NHS number {nhs_number} with status {expected_status}")
+        except Exception as e:
+            logging.error(f"Verification failed for NHS number {nhs_number} with status {expected_status}: {str(e)}")
+            raise
+
+
+
+    #
+    # # (STEP - 5) Check the results of the processed FIT kits have correctly updated the status of the associated subjects
+    # # Navigate to log devices page
+    # MainMenu(page).go_to_fit_test_kits_page()
+    # FITTestKits(page).go_to_log_devices_page()
+    #
+    # # Get a fit device id
+    # subjectdf = create_fit_id_df()
+    #
+    # # Log fit device
+    # for subject in range(4):
+    #     fit_device_id = subjectdf["fit_device_id"].iloc[subject]
+    #     LogDevices(page).fill_fit_device_id_field(fit_device_id)
+    #     sample_date = datetime.now().strftime("%#d %b %Y")
+    #     LogDevices(page).fill_sample_date_field(sample_date)
+    #     LogDevices(page).verify_successfully_logged_device_text()
+    #
+    # # Check statuses of 'normal' FIT kit subjects has moved to S2
+    # nhs_no = subjectdf["subject_nhs_number"].iloc[0]
+    # verify_subject_event_status_by_nhs_no(page, nhs_no, "S2 - Normal")
+    #
+    # # Check status of 'abnormal' FIT kit subjects has moved to A8
+    # nhs_no = subjectdf["subject_nhs_number"].iloc[0]
+    # verify_subject_event_status_by_nhs_no(page, nhs_no, "A8 - Abnormal")

utils/fit_kit_generation.py

@@ -27,7 +27,7 @@ def get_kit_id_from_db():
     and device_id is null
     and tk.invalidated_date is null
     and se.latest_event_status_id in (11198, 11213)
-    fetch first 5 rows only""")
+    fetch first 10 rows only""")
 
     return kit_id_df
 

utils/fit_kit_logged.py

@@ -4,30 +4,36 @@
 import logging
 
 
+
 def process_kit_data():
     # Get test data for compartment 3
     kit_id_df = get_kit_id_logged_from_db()
 
     # Split dataframe into two different dataframes, normal and abnormal
     normal_fit_kit_df, abnormal_fit_kit_df = split_fit_kits(kit_id_df)
 
+    # Prepare a list to store device IDs and their respective flags
+    device_ids = []
+
     # Process normal kits (only 1)
     if not normal_fit_kit_df.empty:
         device_id = normal_fit_kit_df["device_id"].iloc[0]
         logging.info(f"Processing normal kit with Device ID: {device_id}")  # Logging normal device_id
-        update_kit_service_management_entity(device_id, True)
+        device_ids.append((device_id, True))  # Add to the list with normal flag
     else:
         logging.warning("No normal kits found for processing.")  # Log warning
 
-    # Process abnormal kits (multiple, loop through)
+        # Process abnormal kits (multiple, loop through)
     if not abnormal_fit_kit_df.empty:
         for index, row in abnormal_fit_kit_df.iterrows():
             device_id = row["device_id"]
             logging.info(f"Processing abnormal kit with Device ID: {device_id}")  # Logging abnormal device_id
-            update_kit_service_management_entity(device_id, False)
+            device_ids.append((device_id, False))  # Add to the list with abnormal flag
     else:
         logging.warning("No abnormal kits found for processing.")  # Log warning
 
+    return device_ids
+
 
 def get_kit_id_logged_from_db():
     kit_id_df = OracleDB().execute_query("""SELECT tk.kitid,tk.device_id,tk.screening_subject_id
@@ -101,6 +107,9 @@ def execute_stored_procedures():
 
 def update_kit_service_management_entity(device_id, normal):
     get_service_management_df = get_service_management_by_device_id(device_id)
+
+    # Extract the NHS number from the DataFrame
+    subject_nhs_number = get_service_management_df["subject_nhs_number"].iloc[0]
     test_kit_name = get_service_management_df["test_kit_name"].iloc[0]
     test_kit_type = get_service_management_df["test_kit_type"].iloc[0]
     logged_by_hub = get_service_management_df["logged_by_hub"].iloc[0]
@@ -127,7 +136,7 @@ def update_kit_service_management_entity(device_id, normal):
     kq.test_result = :test_result,
     kq.calculated_result = :calculated_result,
     kq.error_code = NULL,
-    kq.analyser_code = 'HMJackalt1',
+    kq.analyser_code = '3Wjvy',
     kq.date_time_authorised = TO_TIMESTAMP(:date_time_authorised, 'DD-Mon-YY HH24.MI.SS.FF9'),
     kq.authoriser_user_code = 'AUTO1',
     kq.post_response = :post_response,
@@ -147,8 +156,8 @@ def update_kit_service_management_entity(device_id, normal):
     "test_result": int(test_result),
     "calculated_result": calculated_result,
     "date_time_authorised": str(date_time_authorised),
-    "post_response": int(post_response),
-    "post_attempts": int(post_attempts),
+    "post_response":int(post_response)if post_response is not None else 0,
+    "post_attempts":int(post_attempts)if post_attempts is not None else 0,
     "put_response": put_response,
     "put_attempts": put_attempts,
     "device_id": device_id
@@ -158,10 +167,8 @@ def update_kit_service_management_entity(device_id, normal):
     print("Parameters before execution:", params)
     rows_affected = OracleDB().update_or_insert_data_to_table(update_query, params)
     print(f"Rows affected: {rows_affected}")
+ # Return the subject NHS number
+    return subject_nhs_number
+
 
 
-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