Working on comments on PR: Feature/smokescreen compartment 1 #6 regarding Oracle connetion

Also removing duplicated lines from the active batch list

Author: adrianoaru-nhs

pages/archived_batch_list_page.py

@@ -1,11 +1,11 @@
-from playwright.sync_api import Page
+from playwright.sync_api import Page, expect
 from utils.click_helper import click
 
 
-class ActiveBatchList:
+class BatchList:
     def __init__(self, page: Page):
         self.page = page
-        # Active Batch List - page filters
+        #Batch List - page filters
         self.id_filter = self.page.locator("#batchIdFilter")
         self.type_filter = self.page.locator("#batchTypeFilter")
         self.original_filter = self.page.locator("#originalBatchIdFilter")
@@ -14,44 +14,48 @@ def __init__(self, page: Page):
         self.batch_split_by_filter = self.page.locator("#splitByFilter")
         self.screening_centre_filter = self.page.locator("#screeningCentreFilter")
         self.count_filter = self.page.locator("#countFilter")
+        self.table_data = self.page.locator("td")
         self.batch_successfully_archived_msg = self.page.locator('text="Batch Successfully Archived and Printed"')
 
+    def verify_table_data(self, value):
+        expect(self.table_data.filter(has_text=value)).to_be_visible()
+
     def enter_id_filter(self, search_text: str):
-        click(self.page, self.id_filter)
         self.id_filter.fill(search_text)
         self.id_filter.press("Enter")
 
     def enter_type_filter(self, search_text: str):
-        click(self.page, self.type_filter)
         self.type_filter.fill(search_text)
         self.type_filter.press("Enter")
 
     def enter_original_filter(self, search_text: str):
-        click(self.page, self.original_filter)
         self.original_filter.fill(search_text)
         self.original_filter.press("Enter")
 
     def enter_event_code_filter(self, search_text: str):
-        click(self.page, self.event_code_filter)
         self.event_code_filter.fill(search_text)
         self.event_code_filter.press("Enter")
 
     def enter_description_filter(self, search_text: str):
-        click(self.page, self.description_filter)
         self.description_filter.fill(search_text)
         self.description_filter.press("Enter")
 
     def enter_batch_split_by_filter(self, search_text: str):
-        click(self.page, self.batch_split_by_filter)
         self.batch_split_by_filter.fill(search_text)
         self.batch_split_by_filter.press("Enter")
 
     def enter_screening_centre_filter(self, search_text: str):
-        click(self.page, self.screening_centre_filter)
         self.screening_centre_filter.fill(search_text)
         self.screening_centre_filter.press("Enter")
 
     def enter_count_filter(self, search_text: str):
-        click(self.page, self.count_filter)
         self.count_filter.fill(search_text)
         self.count_filter.press("Enter")
+
+class ActiveBatchList(BatchList):
+    def __init__(self, page):
+        super().__init__(page)
+
+class ArchivedBatchList(BatchList):
+    def __init__(self, page):
+        super().__init__(page)

pages/active_batch_list_page.py pages/batch_list_page.pypages/active_batch_list_page.py renamed to pages/batch_list_page.py

@@ -10,8 +10,7 @@ def __init__(self, page: Page):
         self.archived_batch_list_page = self.page.get_by_role("link", name="Archived Batch List")
         self.letter_library_index_page = self.page.get_by_role("link", name="Letter Library Index")
         self.letter_signatory_page = self.page.get_by_role("link", name="Letter Signatory")
-        self.electronic_communication_management_page = self.page.get_by_role("link",
-                                                                              name="Electronic Communication Management")
+        self.electronic_communication_management_page = self.page.get_by_role("link", name="Electronic Communication Management")
 
     def go_to_active_batch_list_page(self):
         click(self.page, self.active_batch_list_page)

pages/communications_production_page.py

@@ -12,12 +12,11 @@ def __init__(self, page: Page):
         self.save_and_log_device_button = self.page.get_by_role("button", name="Save and Log Device")
         self.device_spoilt_button = self.page.get_by_role("button", name="Device Spoilt")
         self.sample_date_field = self.page.locator("#sampleDate")
-        self.successfully_logged_device_text = self.page.get_by_text("Successfully logged device")
+        self.successfully_logged_device_text = self.page.get_by_text("×Successfully logged device")
         self.spoilt_device_dropdown = self.page.get_by_label("Spoil reason drop down")
         self.log_as_spoilt_button = self.page.get_by_role("button", name="Log as Spoilt")
 
     def fill_fit_device_id_field(self, value):
-        click(self.page, self.fit_device_id_field)
         self.fit_device_id_field.fill(value)
         self.fit_device_id_field.press("Enter")
 
@@ -28,7 +27,6 @@ def click_device_spoilt_button(self):
         click(self.page, self.device_spoilt_button)
 
     def fill_sample_date_field(self, value):
-        click(self.page, self.sample_date_field)
         self.sample_date_field.fill(value)
         self.sample_date_field.press("Enter")
 

pages/log_devices_page.py

@@ -1,9 +1,8 @@
 import pytest
 from playwright.sync_api import Page
 from utils.user_tools import UserTools
-from pages import (login_page as login, bcss_home_page as bcss_home, navigation_bar_links as nav_bar_links,
-                   log_out_page as logout, login_failure_screen as login_failure)
-from utils.oracle import OracleDB
+from pages import (login_page as login, bcss_home_page as bcss_home, navigation_bar_links as nav_bar_links, log_out_page as logout, login_failure_screen as login_failure)
+from utils.oracle.oracle import OracleDB
 
 
 @pytest.fixture(scope="function", autouse=True)

tests/test_bcss_19181_users_permit_list.py

@@ -52,8 +52,7 @@ def test_home_page_links_navigation(page: Page) -> None:
     # Click the refresh alerts link
     homepage.click_refresh_alerts_link()
     # Verify that the 'last updated' timestamp matches the current date and time
-    (expect(page.locator("form[name=\"refreshCockpit\"]")).to_contain_text
-     ("Refresh alerts (last updated :" + DateTimeUtils.current_datetime()))
+    (expect(page.locator("form[name=\"refreshCockpit\"]")).to_contain_text("Refresh alerts (last updated :" + DateTimeUtils.current_datetime()))
 
     # Click the user guide link
     with page.expect_popup() as page1_info:

tests/test_home_page_links.py

@@ -1,20 +1,18 @@
 from pages.navigation_bar_links import NavigationBar
 from pages.bcss_home_page import MainMenu
 from pages.communications_production_page import CommunicationsProduction
-from pages.active_batch_list_page import ActiveBatchList
 from pages.manage_active_batch_page import ManageActiveBatch
-from pages.archived_batch_list_page import ArchivedBatchList
+from pages.batch_list_page import ActiveBatchList, ArchivedBatchList
 from utils.screening_subject_page_searcher import verify_subject_event_status_by_nhs_no
-from utils.get_nhs_no_from_batch_id import get_nhs_no_from_batch_id
-from utils.oracle import OracleDB
+from utils.oracle.oracle_specific_functions import get_nhs_no_from_batch_id
+from utils.oracle.oracle import OracleDB
 import os
 import pytest
 from playwright.sync_api import Page
 import logging
 
 
-def batch_processing(page: Page, batch_type: str, batch_description: str, latest_event_status: str,
-                     run_timed_events: bool = False) -> None:
+def batch_processing(page: Page, batch_type: str, batch_description: str, latest_event_status: str, run_timed_events: bool = False) -> None:
     """
     This util is used to process batches. It expects the following inputs:
     - page: This is playwright page variable
@@ -88,6 +86,7 @@ def batch_processing(page: Page, batch_type: str, batch_description: str, latest
 
     try:
         ActiveBatchList(page).batch_successfully_archived_msg.wait_for()
+
         logging.info(f"Batch {link_text} successfully archived")
     except Exception as e:
         pytest.fail(f"Batch successfully archived message is not shown: {str(e)}")

utils/batch_processing.py

@@ -1,4 +1,4 @@
-from oracle import OracleDB
+from utils.oracle.oracle_specific_functions import get_kit_id_from_db
 import pandas as pd
 from datetime import datetime
 import logging
@@ -10,25 +10,6 @@ def create_fit_id_df():
     df["fit_device_id"] = df["fit_device_id"].apply(convert_kit_id_to_fit_device_id)
     return df
 
-
-def get_kit_id_from_db():
-    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)
-    inner join sd_contact_t sdc on (sdc.nhs_number = sst.subject_nhs_number)
-    where tk.tk_type_id = 2
-    and tk.logged_in_flag = 'N'
-    and sdc.hub_id = 23159
-    and device_id is null
-    and tk.invalidated_date is null
-    and se.latest_event_status_id in (11198, 11213)
-    fetch first 10 rows only""")
-
-    return kit_id_df
-
-
 def calculate_check_digit(kitID: str):
     logging.info(f"Calculating check digit for kit id: {kitID}")
     total = 0
@@ -38,7 +19,6 @@ def calculate_check_digit(kitID: str):
     check_digit = charString[total % 43]
     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()