addressing sonarqube issues

Author: Andyg79

pages/call_and_recall/generate_invitations_page.py

@@ -8,6 +8,8 @@
 from classes.subject import Subject
 from utils.table_util import TableUtils
 
+DISPLAY_RS_SELECTOR = "#displayRS"
+
 
 class GenerateInvitationsPage(BasePage):
     """Generate Invitations page locators, and methods to interact with the page"""
@@ -19,7 +21,7 @@ def __init__(self, page: Page):
         self.generate_invitations_button = self.page.get_by_role(
             "button", name="Generate Invitations"
         )
-        self.display_rs = self.page.locator("#displayRS")
+        self.display_rs = self.page.locator(DISPLAY_RS_SELECTOR)
         self.refresh_button = self.page.get_by_role("button", name="Refresh")
         self.planned_invitations_total = self.page.locator("#col8_total")
         self.self_referrals_total = self.page.locator("#col5_total")
@@ -50,7 +52,7 @@ def wait_for_invitation_generation_complete(
         Every 5 seconds it refreshes the table and checks to see if the invitations have been generated.
         It also checks that enough invitations were generated and checks to see if self referrals are present
         """
-        self.page.wait_for_selector("#displayRS", timeout=5000)
+        self.page.wait_for_selector(DISPLAY_RS_SELECTOR, timeout=5000)
 
         if self.planned_invitations_total == "0":
             pytest.fail("There are no planned invitations to generate")
@@ -152,7 +154,7 @@ def wait_for_self_referral_invitation_generation_complete(
             pytest.fail(f"[ERROR] Invitations not generated successfully: {str(e)}")
 
         # Dynamically check 'Self Referrals Generated'
-        table_utils = TableUtils(self.page, "#displayRS")
+        table_utils = TableUtils(self.page, DISPLAY_RS_SELECTOR)
 
         try:
             value_text = table_utils.get_footer_value_by_header(
@@ -197,7 +199,9 @@ def check_self_referral_subjects_ready(
         self_referrals_text = self.self_referrals_total.text_content()
         if self_referrals_text is None:
             pytest.fail("Failed to read self-referrals total")
-        self_referrals_count = int(self_referrals_text.strip())
+
+        self_referrals_text = self_referrals_text.strip()
+        self_referrals_count = int(self_referrals_text)
 
         # Determine if condition is met
         condition_met = (

pages/communication_production/batch_list_page.py

@@ -5,11 +5,13 @@
 from utils.table_util import TableUtils
 import logging
 
+BATCH_LIST_SELECTOR = "table#batchList"
+
 
 class BatchListPage(BasePage):
     """Shared base class for both Active and Archived Batch List Pages."""
 
-    def __init__(self, page: Page, table_selector: str = "table#batchList"):
+    def __init__(self, page: Page, table_selector: str = BATCH_LIST_SELECTOR):
         super().__init__(page)
         self.page = page
         self.table_selector = table_selector
@@ -175,7 +177,7 @@ class ActiveBatchListPage(BatchListPage):
     """Active Batch List Page-specific methods."""
 
     def __init__(self, page: Page):
-        super().__init__(page, table_selector="table#batchList")
+        super().__init__(page, table_selector=BATCH_LIST_SELECTOR)
 
     def select_first_active_batch(self) -> None:
         """Clicks the first batch ID link in the active batch list."""
@@ -199,7 +201,7 @@ def get_open_original_batch_row(self) -> Locator | None:
         Returns:
             Locator of the matching <tr> element, or None if not found.
         """
-        table = TableUtils(self.page, "table#batchList")
+        table = TableUtils(self.page, BATCH_LIST_SELECTOR)
         row_count = table.get_row_count()
 
         for i in range(row_count):
@@ -211,7 +213,6 @@ def get_open_original_batch_row(self) -> Locator | None:
                 return table.pick_row(i)
         return None
 
-
     def assert_s83f_batch_present(self) -> None:
         self.enter_type_filter("Original")
         self.enter_event_code_filter("S83")
@@ -227,7 +228,7 @@ class ArchivedBatchListPage(BatchListPage):
     """Archived Batch List Page-specific setup."""
 
     def __init__(self, page: Page):
-        super().__init__(page, table_selector="table#batchList")
+        super().__init__(page, table_selector=BATCH_LIST_SELECTOR)
 
     def select_first_archived_batch(self) -> None:
         """Clicks the first batch ID link in the archived batch list."""

pages/communication_production/letter_library_index_page.py

@@ -2,17 +2,19 @@
 from pages.base_page import BasePage
 from utils.table_util import TableUtils
 
+DISPLAY_RS_SELECTOR = "#displayRS"
+
 
 class LetterLibraryIndexPage(BasePage):
     """Letter Library Index Page locators, and methods for interacting with the page"""
 
     def __init__(self, page: Page):
         super().__init__(page)
         self.page = page
-        self.table_utils = TableUtils(page, "#displayRS")
+        self.table_utils = TableUtils(page, DISPLAY_RS_SELECTOR)
         # Letter Library Index - page locators, methods
 
-        self.letter_library_index_table = page.locator("#displayRS")
+        self.letter_library_index_table = page.locator(DISPLAY_RS_SELECTOR)
         self.define_supplementary_letter_button = page.locator(
             "input.HeaderButtons[value='Define Supplementary Letter']"
         )
@@ -139,7 +141,7 @@ def assert_definition_setting(self, field_name: str, expected_value: str) -> Non
             field_name (str): The label text (e.g., "Description")
             expected_value (str): The expected value shown beside the label
         """
-        label_cell = self.page.locator(f"td.screenTableLabelCell", has_text=field_name)
+        label_cell = self.page.locator("td.screenTableLabelCell", has_text=field_name)
         assert (
             label_cell.count() > 0
         ), f"[ASSERTION FAILED] Field label '{field_name}' not found"
@@ -160,8 +162,10 @@ def has_current_version(self) -> bool:
             bool: True if a current version row is present, False otherwise
         """
         version_table = self.page.locator("table#displayRS")
-        current_row = version_table.locator("tr").filter(
-            has=self.page.locator("td", has_text="Current")
-        ).first
+        current_row = (
+            version_table.locator("tr")
+            .filter(has=self.page.locator("td", has_text="Current"))
+            .first
+        )
 
         return current_row.count() > 0

tests/regression/communications_production/test_basic_manage_archived_batch_functionality.py

@@ -29,7 +29,7 @@ def before_each(page: Page):
     # Go to communications production page
     BasePage(page).go_to_communications_production_page()
 
-
+@pytest.mark.wip
 @pytest.mark.letters_tests
 @pytest.mark.regression
 def test_reprint_and_archive_letter_batch(page: Page) -> None:
@@ -53,11 +53,6 @@ def test_reprint_and_archive_letter_batch(page: Page) -> None:
     page.wait_for_function(
         "document.querySelectorAll('table#batchList tbody tr').length > 1", timeout=8000
     )
-    rows = page.locator("table#batchList tbody tr")
-    row_count = rows.count()
-
-    for i in range(row_count):
-        row = rows.nth(i)
 
     # Find and open archived batch with Type "Original", Event Code "S1", and Description "Pre"
     # You might want to use filters like: