updates to compartment 3

Author: Megha Prasannan

tests/Smokescreen/test_compartment_3.py

@@ -14,17 +14,9 @@
 def test_compartment_3(page: Page) -> None:
     UserTools.user_login(page, "Hub Manager State Registered")
 
-    # (STEP 1 & 2) Add results to the test records in the KIT_QUEUE table (i.e. mimic receiving results from the middleware)
+    # (STEP 1 ,2 & 3) find data , seperate it into normal and abnormal, Add results to the test records in the KIT_QUEUE table (i.e. mimic receiving results from the middleware)
     # 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
-    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 = []
@@ -33,7 +25,14 @@ def test_compartment_3(page: Page) -> None:
         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)
-
+    # (STEP - 4) Run two stored procedures to process any kit queue records at status BCSS_READY
+    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
+    # (STEP - 5) Check the results of the processed FIT kits have correctly updated the status of the associated subjects
     # 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
@@ -46,7 +45,7 @@ def test_compartment_3(page: Page) -> None:
             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()

utils/fit_kit_logged.py

@@ -34,7 +34,7 @@ def process_kit_data():
 
     return device_ids
 
-
+# find test data from db for compartment 3
 def get_kit_id_logged_from_db():
     kit_id_df = OracleDB().execute_query("""SELECT tk.kitid,tk.device_id,tk.screening_subject_id
 FROM tk_items_t tk
@@ -48,11 +48,11 @@ def get_kit_id_logged_from_db():
 AND tk.logged_in_at = 23159
 AND tk.reading_flag = 'N'
 AND tk.test_results IS NULL
-fetch first 10 rows only""")
+fetch first 9 rows only""")
 
     return kit_id_df
 
-
+# Seperate kits into normal and abnormal
 def split_fit_kits(kit_id_df):
     number_of_normal = 1
     number_of_abnormal = 9
@@ -61,7 +61,7 @@ def split_fit_kits(kit_id_df):
     abnormal_fit_kit_df = kit_id_df.iloc[number_of_normal:number_of_normal + number_of_abnormal]
     return normal_fit_kit_df, abnormal_fit_kit_df
 
-
+# Get device_id from the kit_queue table
 def get_service_management_by_device_id(deviceid):
     get_service_management_df = OracleDB().execute_query(f"""SELECT kq.device_id, kq.test_kit_name, kq.test_kit_type, kq.test_kit_status,
     CASE WHEN tki.logged_in_flag = 'Y' THEN kq.logged_by_hub END AS logged_by_hub,
@@ -95,7 +95,7 @@ def get_service_management_by_device_id(deviceid):
     """)
     return get_service_management_df
 
-
+# Stored procedure to to process any kit queue records at status BCSS_READY
 def execute_stored_procedures():
     db_instance = OracleDB()  # Create an instance of the OracleDB class
     logging.info("start: oracle.OracleDB.execute_stored_procedure")
@@ -104,7 +104,7 @@ def execute_stored_procedures():
     logging.info("exit: oracle.OracleDB.execute_stored_procedure")
 
 
-
+# Add kits to the kit queue table
 def update_kit_service_management_entity(device_id, normal):
     get_service_management_df = get_service_management_by_device_id(device_id)