wip

Author: Andyg79

tests/regression/regression_tests/fobt_regression_tests/test_scenario_2.py

@@ -1,6 +1,6 @@
 import pytest
 import logging
-import datetime
+from datetime import datetime
 from playwright.sync_api import Page
 from pages.communication_production.batch_list_page import ActiveBatchListPage
 from utils.oracle.subject_creation_util import CreateSubjectSteps
@@ -9,7 +9,7 @@
 from utils.call_and_recall_utils import CallAndRecallUtils
 from utils import screening_subject_page_searcher
 from utils.batch_processing import batch_processing
-from utils.fit_kit import FitKitLogged
+from utils.fit_kit import FitKitLogged, FitKitGeneration
 from pages.screening_subject_search.subject_screening_summary_page import (
     SubjectScreeningSummaryPage,
 )
@@ -85,7 +85,7 @@ def test_scenario_2(page: Page) -> None:
     logging.info(f"[FAILSAFE TRAWL RUN] FOBT failsafe trawl run for subject {nhs_no}")
 
     # Then my subject has been updated as follows:
-    today = datetime.datetime.now().strftime("%d/%m/%Y")
+    today = datetime.now().strftime("%d/%m/%Y")
 
     subject_assertion(
         nhs_no,
@@ -164,8 +164,10 @@ def test_scenario_2(page: Page) -> None:
     logging.info("[DB ASSERTIONS COMPLETE] Updated subject status checked in the DB")
 
     # When I log my subject's latest unlogged FIT kit
-    fit_kit = FitKitLogged().log_fit_kit(page, nhs_no)
-
+    fit_kit = FitKitGeneration().get_fit_kit_for_subject_sql(nhs_no, False, False)
+    sample_date = datetime.now()
+    FitKitLogged().log_fit_kits(page, fit_kit, sample_date)
+    
     # Then my subject has been updated as follows:
     subject_assertion(
         nhs_no,

utils/fit_kit.py

@@ -3,6 +3,8 @@
     get_kit_id_logged_from_db,
 )
 from pages.base_page import BasePage
+from pages.fit_test_kits.log_devices_page import LogDevicesPage
+from pages.fit_test_kits.fit_test_kits_page import FITTestKitsPage
 from datetime import datetime
 import logging
 import pandas as pd
@@ -17,9 +19,7 @@
     KitServiceManagementRepository,
 )
 from classes.kit_status import KitStatus
-from pages.fit_test_kits.fit_test_kits_page import FITTestKitsPage
-from pages.fit_test_kits.log_devices_page import LogDevicesPage
-from playwright.sync_api import Page
+from oracle.oracle_specific_functions import execute_fit_kit_stored_procedures
 
 
 class FitKitGeneration:
@@ -127,16 +127,16 @@ def get_fit_kit_for_subject_sql(self, nhs_no: str, logged: bool, read: bool) ->
         sql_query = []
         sql_query.append(
             """
-                         SELECT kitid
-        FROM tk_items_t
-        WHERE tk_type_id > 1
-        AND kitid = (
-            SELECT MAX(tkx.kitid)
-            FROM tk_items_t tkx
-            LEFT OUTER JOIN kit_queue kq ON kq.device_id = tkx.device_id
-            WHERE tkx.tk_type_id > 1
-            AND tkx.screening_subject_id = :subject_id 
-                         """
+            SELECT kitid
+            FROM tk_items_t
+            WHERE tk_type_id > 1
+            AND kitid = (
+                SELECT MAX(tkx.kitid)
+                FROM tk_items_t tkx
+                LEFT OUTER JOIN kit_queue kq ON kq.device_id = tkx.device_id
+                WHERE tkx.tk_type_id > 1
+                AND tkx.screening_subject_id = :subject_id
+            """
         )
         if logged:
             sql_query.append("    AND tkx.logged_in_flag = 'Y' ")
@@ -239,11 +239,6 @@ def read_latest_logged_kit(
     ) -> None:
         """
         Reads the subject's latest logged FIT kit and updates its status/result.
-        Args:
-            user (UserRoleType): The user performing the action.
-            kit_type (int): The type of the kit.
-            kit (str): The FIT kit ID to be read.
-            kit_result (str): The result of the kit reading. Valid values are "NORMAL", "ABNORMAL", "SPOILT", "TECHNICAL_FAILURE".
         """
         logging.info("start: read_latest_logged_kit")
 
@@ -293,37 +288,35 @@ 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}")
 
         logging.info("exit: read_latest_logged_kit")
 
-    def log_fit_kit(self, page: Page, nhs_no: str) -> str:
-        """Logs the FIT kit for a given subject.
+    def log_fit_kits(self, page, fit_kit: str, sample_date: datetime) -> None:
+        """
+        Navigates to the log devices page and logs FIT kits
         Args:
-            page (Page): The Playwright page object.
-            nhs_no (str): The NHS number of the subject.
-        Returns:
-            str: The FIT kit ID that was successfully logged.
+            fit_kit (str): The device id of the FIT kit
+            sample_date (datetime): The date you want to select for the sample date field
         """
         BasePage(page).click_main_menu_link()
-        fit_kit = FitKitGeneration().get_fit_kit_for_subject_sql(nhs_no, False, False)
         BasePage(page).go_to_fit_test_kits_page()
         FITTestKitsPage(page).go_to_log_devices_page()
-        logging.info(f"Logging FIT Device ID: {fit_kit}")
+        logging.info(f"[FIT KITS] Logging FIT Device ID: {fit_kit}")
         LogDevicesPage(page).fill_fit_device_id_field(fit_kit)
-        sample_date = datetime.now()
-        logging.info(f"Setting sample date to {sample_date}")
         LogDevicesPage(page).fill_sample_date_field(sample_date)
         LogDevicesPage(page).log_devices_title.get_by_text("Scan Device").wait_for()
         try:
             LogDevicesPage(page).verify_successfully_logged_device_text()
-            logging.info(f"{fit_kit} Successfully logged")
+            logging.info(f"[UI ASSERTIONS COMPLETE] {fit_kit} Successfully logged")
         except Exception as e:
-            pytest.fail(f"{fit_kit} unsuccessfully logged: {str(e)}")
-        return fit_kit
+            pytest.fail(
+                f"[UI ASSERTIONS FAILED] {fit_kit} unsuccessfully logged: {str(e)}"
+            )