Addressed some of the pr comments

Andyg79 · Andyg79 · commit 67d51be75a38 · 2025-03-28T15:35:04.000Z
diff --git a/pages/active_batch_list_page.py b/pages/active_batch_list_page.py
@@ -1,6 +1,7 @@
 from playwright.sync_api import Page
 from utils.click_helper import click
 
+
 class ActiveBatchList:
     def __init__(self, page: Page):
         self.page = page
diff --git a/pages/archived_batch_list_page.py b/pages/archived_batch_list_page.py
@@ -1,6 +1,7 @@
-from playwright.sync_api import Page,expect
+from playwright.sync_api import Page, expect
 from utils.click_helper import click
 
+
 class ArchivedBatchList:
     def __init__(self, page: Page):
         self.page = page
@@ -15,7 +16,7 @@ def __init__(self, page: Page):
         self.count_filter = self.page.locator("#countFilter")
         self.table_data = self.page.locator("td")
 
-    def verify_table_data(self,value):
+    def verify_table_data(self, value):
         expect(self.table_data.filter(has_text=value)).to_be_visible()
 
     def text_id_filter(self, search_text: str):
@@ -62,5 +63,3 @@ 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")
-
-
diff --git a/pages/call_and_recall_page.py b/pages/call_and_recall_page.py
@@ -12,7 +12,6 @@ def __init__(self, page: Page):
         self.non_invitation_days_page = self.page.get_by_role("link", name="Non Invitation Days")
         self.age_extension_rollout_plans_page = self.page.get_by_role("link", name="Age Extension Rollout Plans")
 
-
     def go_to_planning_and_monitoring_page(self):
         click(self.page, self.planning_and_monitoring_page)
 
diff --git a/pages/cognito_login_page.py b/pages/cognito_login_page.py
@@ -1,5 +1,3 @@
-import os
-
 from playwright.sync_api import Page
 
 
diff --git a/pages/communications_production_page.py b/pages/communications_production_page.py
@@ -1,6 +1,7 @@
 from playwright.sync_api import Page
 from utils.click_helper import click
 
+
 class CommunicationsProduction:
     def __init__(self, page: Page):
         self.page = page
@@ -9,8 +10,8 @@ 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)
diff --git a/pages/contacts_list_page.py b/pages/contacts_list_page.py
@@ -11,7 +11,6 @@ def __init__(self, page: Page):
         self.maintain_contacts_page = self.page.get_by_role("link", name="Maintain Contacts")
         self.my_preference_settings_page = self.page.get_by_role("link", name="My Preference Settings")
 
-
     def go_to_view_contacts_page(self):
         click(self.page, self.view_contacts_page)
 
@@ -23,5 +22,3 @@ def go_to_maintain_contacts_details_page(self):
 
     def go_to_my_preference_settings_page(self):
         click(self.page, self.my_preference_settings_page)
-
-
diff --git a/pages/create_a_plan_page.py b/pages/create_a_plan_page.py
@@ -18,10 +18,10 @@ def __init__(self, page: Page):
     def click_set_all_button(self):
         click(self.page, self.set_all_button)
 
-    def fill_daily_invitation_rate_field(self,value: str):
+    def fill_daily_invitation_rate_field(self, value: str):
         self.daily_invitation_rate_field.fill(value)
 
-    def fill_weekly_invitation_rate_field(self,value):
+    def fill_weekly_invitation_rate_field(self, value):
         self.weekly_invitation_rate_field.fill(value)
 
     def click_update_button(self):
@@ -33,11 +33,8 @@ def click_confirm_button(self):
     def click_save_button(self):
         click(self.page, self.save_button)
 
-    def fill_note_field(self,value):
+    def fill_note_field(self, value):
         self.note_field.fill(value)
 
     def click_save_note_button(self):
         click(self.page, self.save_note_button)
-
-
-
diff --git a/pages/downloads_page.py b/pages/downloads_page.py
@@ -11,7 +11,6 @@ def __init__(self, page: Page):
         self.batch_download_request_and_page = self.page.get_by_role("link", name="Batch Download Request and")
         self.list_of_batch_downloads_page = self.page.get_by_role("cell", name="List of Batch Downloads", exact=True)
 
-
     def go_to_individual_download_request_page(self):
         click(self.page, self.individual_download_request_page)
 
@@ -23,8 +22,3 @@ def go_to_batch_download_request_and_page(self):
 
     def go_to_list_of_batch_downloads_page(self):
         click(self.page, self.list_of_batch_downloads_page)
-
-
-
-
-
diff --git a/pages/fit_test_kits_page.py b/pages/fit_test_kits_page.py
@@ -16,7 +16,7 @@ def __init__(self, page: Page):
         self.screening_incidents_list_page = self.page.get_by_role("link", name="Screening Incidents List")
         self.manage_qc_products_page = self.page.get_by_role("link", name="Manage QC Products")
         self.maintain_analysers_page = self.page.get_by_role("link", name="Maintain Analysers")
-        self.fit_device_id=self.page.get_by_role("textbox", name="FIT Device ID")
+        self.fit_device_id = self.page.get_by_role("textbox", name="FIT Device ID")
 
     def go_to_fit_rollout_summary_page(self):
         click(self.page, self.fit_rollout_summary_page)
@@ -49,4 +49,4 @@ def go_to_maintain_analysers(self):
         click(self.page, self.maintain_analysers_page)
 
     def go_to_fit_device_id(self):
-            self.fit_device_id.enter()
+        self.fit_device_id.enter()
diff --git a/pages/generate_invitations_page.py b/pages/generate_invitations_page.py
@@ -3,6 +3,7 @@
 from utils.click_helper import click
 import logging
 
+
 class GenerateInvitations:
     def __init__(self, page: Page):
         self.page = page
@@ -40,7 +41,7 @@ def wait_for_invitation_generation_complete(self) -> bool:
 
         # Loop until the table no longer contains "Queued"
         logging.info(f"Waiting for successful generation")
-        while elapsed < timeout: # there may be a stored procedure to speed this process up
+        while elapsed < timeout:  # there may be a stored procedure to speed this process up
             table_text = self.displayRS.text_content()
             if "Failed" in table_text:
                 pytest.fail("Invitation has failed to generate")
@@ -56,7 +57,7 @@ def wait_for_invitation_generation_complete(self) -> bool:
         try:
             expect(self.displayRS).to_contain_text("Completed")
             logging.info("Invitations successfully generated")
-            logging.info(f"Invitations took {elapsed/1000} seconds to generate")
+            logging.info(f"Invitations took {elapsed / 1000} seconds to generate")
         except Exception as e:
             pytest.fail("Invitations not generated successfully")
 
diff --git a/pages/invitations_monitoring_page.py b/pages/invitations_monitoring_page.py
@@ -1,5 +1,4 @@
 from playwright.sync_api import Page
-from utils.click_helper import click
 
 
 class InvitationsMonitoring:
diff --git a/pages/invitations_plans_page.py b/pages/invitations_plans_page.py
@@ -1,6 +1,7 @@
 from playwright.sync_api import Page
 from utils.click_helper import click
 
+
 class InvitationsPlans:
     def __init__(self, page: Page):
         self.page = page
@@ -10,8 +11,3 @@ def __init__(self, page: Page):
 
     def go_to_create_a_plan_page(self):
         click(self.page, self.create_a_plan)
-
-
-
-
-
diff --git a/pages/log_devices_page.py b/pages/log_devices_page.py
@@ -1,7 +1,10 @@
 from playwright.sync_api import Page, expect
 from utils.click_helper import click
 
+
 class LogDevices:
+    SPOILT_DEVICE_OPTION = "205156"
+
     def __init__(self, page: Page):
         self.page = page
         # Log Devices - page links
@@ -33,7 +36,7 @@ def verify_successfully_logged_device_text(self):
         expect(self.successfully_logged_device_text).to_be_visible()
 
     def select_spoilt_device_dropdown_option(self):
-        self.spoilt_device_dropdown.select_option("205156")
+        self.spoilt_device_dropdown.select_option(self.SPOILT_DEVICE_OPTION)
 
     def click_log_as_spoilt_button(self):
         click(self.page, self.log_as_spoilt_button)
diff --git a/pages/log_out_page.py b/pages/log_out_page.py
@@ -1,6 +1,8 @@
-from playwright.sync_api import Page,expect
+from playwright.sync_api import Page, expect
 from pages.navigation_bar_links import NavigationBar
 import logging
+
+
 class Logout:
     def __init__(self, page: Page):
         self.page = page
diff --git a/pages/login_failure_screen.py b/pages/login_failure_screen.py
@@ -1,4 +1,5 @@
-from playwright.sync_api import Page,expect
+from playwright.sync_api import Page, expect
+
 
 class LoginFailureScreen:
     def __init__(self, page: Page):
diff --git a/pages/login_page.py b/pages/login_page.py
@@ -1,5 +1,4 @@
 import os
-
 from playwright.sync_api import Page
 from utils.user_tools import UserTools
 from utils.click_helper import click
@@ -29,4 +28,3 @@ def login_as_user(self, username: str) -> None:
         self.password.fill(password)
         # Click Submit
         click(self.page, self.submit_button)
-
diff --git a/pages/manage_active_batch_page.py b/pages/manage_active_batch_page.py
@@ -1,6 +1,7 @@
 from playwright.sync_api import Page
 from utils.click_helper import click
 
+
 class ManageActiveBatch:
     def __init__(self, page: Page):
         self.page = page
diff --git a/pages/reports_page.py b/pages/reports_page.py
@@ -48,7 +48,6 @@ def go_to_failsafe_reports_page(page: Page) -> None:
     click(page, page.get_by_role("link", name="Failsafe Reports"))
 
 
-
 def go_to_operational_reports_page(page: Page) -> None:
     click(page, page.get_by_role("link", name="Operational Reports"))
 
diff --git a/pages/screening_practitioner_appointments.py b/pages/screening_practitioner_appointments.py
@@ -10,7 +10,6 @@ def __init__(self, page: Page):
         self.view_appointments_page = self.page.get_by_role("link", name="View appointments")
         self.patients_that_require_page = self.page.get_by_role("link", name="Patients that Require")
 
-
     def go_to_log_in_page(self):
         click(self.page, self.log_in_page)
 
@@ -19,10 +18,3 @@ def go_to_view_appointments_page(self):
 
     def go_to_patients_that_require_page(self):
         click(self.page, self.view_appointments_page)
-
-
-
-
-
-
-
diff --git a/pages/subject_screening_page.py b/pages/subject_screening_page.py
@@ -1,6 +1,7 @@
 from playwright.sync_api import Page
 from utils.click_helper import click
 
+
 class SubjectScreeningPage:
     def __init__(self, page: Page):
         self.page = page
@@ -15,7 +16,7 @@ def __init__(self, page: Page):
         self.date_of_birth_filter = self.page.locator("#A_C_DOB_From")
         self.data_of_birth_range_filter = self.page.get_by_role("textbox", name="(for a date range, enter a to")
         self.postcode_filter = self.page.get_by_role("textbox", name="Postcode")
-        self.episode_closed_date_filter = self. page.get_by_role("textbox", name="Episode Closed Date")
+        self.episode_closed_date_filter = self.page.get_by_role("textbox", name="Episode Closed Date")
         self.kit_batch_number_filter = self.page.get_by_role("textbox", name="Kit Batch Number")
         self.kit_number_filter = self.page.get_by_role("textbox", name="Kit Number")
         self.fit_device_id_filter = self.page.get_by_role("textbox", name="FIT Device ID")
diff --git a/tests/test_bcss_19181_users_permit_list.py b/tests/test_bcss_19181_users_permit_list.py
@@ -1,8 +1,10 @@
 import pytest
 from playwright.sync_api import Page
-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 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
 
+
 @pytest.fixture(scope="function", autouse=True)
 def before_test(page: Page):
     """
@@ -22,6 +24,7 @@ def before_test(page: Page):
     yield
     OracleDB().delete_all_users_from_approved_users_table()
 
+
 # @pytest.mark.smoke
 def test_only_users_on_approved_can_login_to_bcss(page: Page) -> None:
     # Add bcss401 user to approved users list table
diff --git a/tests/test_login_to_bcss.py b/tests/test_login_to_bcss.py
@@ -4,6 +4,7 @@
 from playwright.sync_api import Page, expect
 from pages.login_page import BcssLoginPage
 
+
 @pytest.mark.smoke
 def test_successful_login_to_bcss(page: Page) -> None:
     """
diff --git a/tests_utils/test_date_time_utils.py b/tests_utils/test_date_time_utils.py
@@ -2,9 +2,9 @@
 import utils.date_time_utils
 from datetime import datetime, timedelta
 
-
 pytestmark = [pytest.mark.utils]
 
+
 def test_current_datetime():
     dtu = utils.date_time_utils.DateTimeUtils()
     current_date = datetime.now()
diff --git a/tests_utils/test_nhs_number_tools.py b/tests_utils/test_nhs_number_tools.py
@@ -1,9 +1,9 @@
 import pytest
 from utils.nhs_number_tools import NHSNumberTools, NHSNumberToolsException
 
-
 pytestmark = [pytest.mark.utils]
 
+
 def test_nhs_number_checks() -> None:
     assert NHSNumberTools._nhs_number_checks("1234567890") == None
 
@@ -13,6 +13,7 @@ def test_nhs_number_checks() -> None:
     with pytest.raises(NHSNumberToolsException, match=r'The NHS number provided \(123\) is not 10 digits'):
         NHSNumberTools._nhs_number_checks("123")
 
+
 def test_spaced_nhs_number() -> None:
     assert NHSNumberTools.spaced_nhs_number("1234567890") == "123 456 7890"
     assert NHSNumberTools.spaced_nhs_number(3216549870) == "321 654 9870"
diff --git a/tests_utils/test_user_tools.py b/tests_utils/test_user_tools.py
@@ -3,9 +3,9 @@
 from utils.user_tools import UserTools, UserToolsException
 from pathlib import Path
 
-
 pytestmark = [pytest.mark.utils]
 
+
 def test_retrieve_user(monkeypatch: object) -> None:
     monkeypatch.setattr(utils.user_tools, "USERS_FILE", Path(__file__).parent / "resources" / "test_users.json")
 
diff --git a/utils/batch_processing.py b/utils/batch_processing.py
diff --git a/utils/click_helper.py b/utils/click_helper.py
diff --git a/utils/fit_kit_generation.py b/utils/fit_kit_generation.py
diff --git a/utils/get_nhs_no_from_batch_id.py b/utils/get_nhs_no_from_batch_id.py
diff --git a/utils/nhs_number_tools.py b/utils/nhs_number_tools.py
diff --git a/utils/oracle.py b/utils/oracle.py
diff --git a/utils/screening_subject_page_searcher.py b/utils/screening_subject_page_searcher.py

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-import os`
`2`		`-`
`3`	`1`	`from playwright.sync_api import Page`
`4`	`2`
`5`	`3`