Adding/Fixing utils

Author: adrianoaru-nhs

classes/kit_service_management_record.py

@@ -43,17 +43,17 @@ class KitServiceManagementRecord:
 
     def __str__(self) -> str:
         return (
-            f"KitServiceManagementRecord [device_id={self.device_id}, test_kit_type={self.test_kit_type}, "
-            f"test_kit_name={self.test_kit_name}, test_kit_status={self.test_kit_status}, "
-            f"logged_by_hub={self.logged_by_hub}, date_time_logged={self.date_time_logged}, "
-            f"test_result={self.test_result}, calculated_result={self.calculated_result}, "
-            f"error_code={self.error_code}, analyser_code={self.analyser_code}, "
-            f"date_time_authorised={self.date_time_authorised}, authoriser_user_code={self.authoriser_user_code}, "
-            f"datestamp={self.datestamp}, bcss_error_id={self.bcss_error_id}, post_response={self.post_response}, "
-            f"post_attempts={self.post_attempts}, put_response={self.put_response}, put_attempts={self.put_attempts}, "
-            f"date_time_error_archived={self.date_time_error_archived}, error_archived_user_code={self.error_archived_user_code}, "
-            f"date_time_issued={self.date_time_issued}, issued_by_hub={self.issued_by_hub}, nhs_number={self.nhs_number}, "
-            f"analyser_error_description={self.analyser_error_description}, error_type={self.error_type}, "
+            f"KitServiceManagementRecord [device_id={self.device_id}, test_kit_type={self.test_kit_type}, \n"
+            f"test_kit_name={self.test_kit_name}, test_kit_status={self.test_kit_status}, \n"
+            f"logged_by_hub={self.logged_by_hub}, date_time_logged={self.date_time_logged}, \n"
+            f"test_result={self.test_result}, calculated_result={self.calculated_result}, \n"
+            f"error_code={self.error_code}, analyser_code={self.analyser_code}, \n"
+            f"date_time_authorised={self.date_time_authorised}, authoriser_user_code={self.authoriser_user_code}, \n"
+            f"datestamp={self.datestamp}, bcss_error_id={self.bcss_error_id}, post_response={self.post_response}, \n"
+            f"post_attempts={self.post_attempts}, put_response={self.put_response}, put_attempts={self.put_attempts}, \n"
+            f"date_time_error_archived={self.date_time_error_archived}, error_archived_user_code={self.error_archived_user_code}, \n"
+            f"date_time_issued={self.date_time_issued}, issued_by_hub={self.issued_by_hub}, nhs_number={self.nhs_number}, \n"
+            f"analyser_error_description={self.analyser_error_description}, error_type={self.error_type}, \n"
             f"screening_test_result={self.screening_test_result}]"
         )
 
@@ -69,14 +69,6 @@ def from_dataframe_row(row) -> "KitServiceManagementRecord":
             KitServiceManagementRecord: The constructed object.
         """
 
-        def parse_enum(enum_cls, value):
-            if value is None:
-                return None
-            try:
-                return enum_cls(value)
-            except ValueError:
-                return None
-
         def parse_decimal(value):
             if value is None or value == "":
                 return None

classes/repositories/analyser_repository.py

@@ -89,4 +89,4 @@ def get_result_code(
             raise ValueError(
                 f"No result code found for analyser type id: {analyser_type_id} and code type id {result_code_type}"
             )
-        return int(result_code_df["tk_analyser_type_id"].iloc[0])
+        return int(result_code_df["error_code"].iloc[0])

classes/repositories/kit_service_management_repository.py

@@ -1,5 +1,5 @@
 import logging
-from typing import List, Optional, Any
+from typing import Optional
 from utils.oracle.oracle import OracleDB
 from classes.kit_service_management_record import KitServiceManagementRecord
 from classes.entities.kit_service_management_entity import KitServiceManagementEntity
@@ -216,14 +216,3 @@ def update_kit_service_management_entity(
             self.oracle_db.update_or_insert_data_to_table(sql_query, params)
         except Exception as ex:
             raise RuntimeError(f"Error updating KIT_QUEUE record: {ex}")
-
-    def process_kit_queue(self) -> None:
-        """
-        Processes the kit queue by executing the following stored procedures:
-            - PKG_TEST_KIT_QUEUE.p_validate_kit_queue
-            - PKG_TEST_KIT_QUEUE.p_calculate_result
-        """
-        self.oracle_db.execute_stored_procedure(
-            "PKG_TEST_KIT_QUEUE.p_validate_kit_queue"
-        )
-        self.oracle_db.execute_stored_procedure("PKG_TEST_KIT_QUEUE.p_calculate_result")

tests/regression/regression_tests/test_fobt_regression_tests.py

@@ -183,16 +183,21 @@ def test_scenario_1(page: Page) -> None:
         subject_assertion(nhs_no, criteria) is True
     ), "Subject does not meet the expected criteria"
 
-    batch_processing(page, "S3", "Test Spoilt", "S11 - Retest Kit Sent (Spoilt)", True)
+    batch_processing(
+        page, "S3", "Retest (Spoilt) (FIT)", "S11 - Retest Kit Sent (Spoilt)", True
+    )
     batch_processing(
         page,
         "S11",
-        "Retest Kit Sent (Spoilt)",
+        "Reminder of Retest (Spoilt)",
         "S20 - Reminder of Retest Kit Sent (Spoilt)",
         True,
     )
     batch_processing(
-        page, "S20", "Reminder of Retest Kit Sent (Spoilt)", "S13 - Test Spoilt Logged"
+        page,
+        "S20",
+        "GP Discharge Non Response (Spoilt)",
+        "S47 - GP Discharge for Non-response Sent (Spoilt Retest Kit)",
     )
 
     criteria = {

utils/fit_kit.py

@@ -18,6 +18,7 @@
 )
 from classes.kit_service_management_record import KitServiceManagementRecord
 from classes.kit_status import KitStatus
+from oracle.oracle_specific_functions import execute_fit_kit_stored_procedures
 
 
 class FitKitGeneration:
@@ -286,10 +287,11 @@ def read_latest_logged_kit(
             kit_queue_record.authoriser_user_code = "AUTOTEST"
             kit_queue_record.test_result = result_reading
             kit_queue_record.error_code = result_code
+            logging.debug(f"kit queue record: {kit_queue_record.__str__()}")
             kit_queue_repo.update_kit_service_management_record(kit_queue_record)
 
             # Immediately process the kit queue (don't wait for the scheduled DB job to kick in)
-            kit_queue_repo.process_kit_queue()
+            execute_fit_kit_stored_procedures()
 
         except Exception as e:
             raise RuntimeError(f"Error occurred while reading latest logged kit: {e}")