resolving format issues

Author: mepr1

pages/screening_subject_search/subject_events_notes.py

@@ -12,19 +12,17 @@ class SubjectEventsNotes(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
         self.page = page
-        self.table_utils = TableUtils (page, "#displayRS")  # Initialize TableUtils for the table with id="displayRS"
+        self.table_utils = TableUtils(
+            page, "#displayRS"
+        )  # Initialize TableUtils for the table with id="displayRS"
         # Subject Events Notes - page filters
-        self.additional_care_note_checkbox = self.page.get_by_label("Additional Care Needs Note")
-        self.subject_note_checkbox = self.page.get_by_label(
-            "Subject Note"
-        )
-        self.kit_note_checkbox = self.page.get_by_label(
-            "Kit Note"
-        )
-        self.additional_care_note_type=self.page.locator("#UI_ADDITIONAL_CARE_NEED")
-        self.notes_upto_500_char = self.page.get_by_label(
-            "Notes (up to 500 char)"
+        self.additional_care_note_checkbox = self.page.get_by_label(
+            "Additional Care Needs Note"
         )
+        self.subject_note_checkbox = self.page.get_by_label("Subject Note")
+        self.kit_note_checkbox = self.page.get_by_label("Kit Note")
+        self.additional_care_note_type = self.page.locator("#UI_ADDITIONAL_CARE_NEED")
+        self.notes_upto_500_char = self.page.get_by_label("Notes (up to 500 char)")
         self.update_notes_button = self.page.get_by_role("button", name="Update Notes")
 
     def select_additional_care_note(self) -> None:
@@ -48,26 +46,27 @@ def select_additional_care_note_type(self, option: str) -> None:
                                                 - AdditionalCareNoteTypeOptions.LANGUAGE
                                                 - AdditionalCareNoteTypeOptions.OTHER
         """
-        self.additional_care_note_type.select_option(option) 
+        self.additional_care_note_type.select_option(option)
 
     def fill_notes(self, notes: str) -> None:
         """Fills the notes field with the provided text."""
-        self.notes_upto_500_char.fill(notes) 
+        self.notes_upto_500_char.fill(notes)
 
     def dismiss_dialog_and_update_notes(self) -> None:
         """Clicks the 'Update Notes' button and handles the dialog by clicking 'OK'."""
         self.page.once("dialog", lambda dialog: dialog.accept())
         self.update_notes_button.click()
 
+
 class AdditionalCareNoteTypeOptions(StrEnum):
     """Enum for AdditionalCareNoteTypeOptions."""
 
     LEARNING_DISABILITY = "4120"
     SIGHT_DISABILITY = "4121"
     HEARING_DISABILITY = "4122"
     MOBILITY_DISABILITY = "4123"
-    MANUAL_DEXTERITY= "4124"
+    MANUAL_DEXTERITY = "4124"
     SPEECH_DISABILITY = "4125"
     CONTINENCE_DISABILITY = "4126"
-    LANGUAGE= "4128"
-    OTHER= "4127"
+    LANGUAGE = "4128"
+    OTHER = "4127"

tests/regression/notes/test_additional_care_notes_regression.py

@@ -1,16 +1,26 @@
 import logging
 import pytest
-from playwright.sync_api import Page,expect
+from playwright.sync_api import Page, expect
 from pages import screening_subject_search
 from pages.logout.log_out_page import LogoutPage
 from pages.base_page import BasePage
 from pages.screening_subject_search import subject_screening_search_page
 from pages.screening_subject_search import subject_screening_summary_page
-from pages.screening_subject_search.subject_screening_search_page import (SubjectScreeningPage)
-from pages.screening_subject_search.subject_screening_summary_page import (SubjectScreeningSummaryPage)
-from pages.screening_subject_search.subject_events_notes import SubjectEventsNotes, AdditionalCareNoteTypeOptions
+from pages.screening_subject_search.subject_screening_search_page import (
+    SubjectScreeningPage,
+)
+from pages.screening_subject_search.subject_screening_summary_page import (
+    SubjectScreeningSummaryPage,
+)
+from pages.screening_subject_search.subject_events_notes import (
+    SubjectEventsNotes,
+    AdditionalCareNoteTypeOptions,
+)
 from utils.user_tools import UserTools
-from utils.oracle.oracle_specific_functions import get_subjects_by_note_count,get_supporting_notes
+from utils.oracle.oracle_specific_functions import (
+    get_subjects_by_note_count,
+    get_supporting_notes,
+)
 
 
 def note_types_order():
@@ -21,6 +31,7 @@ def note_types_order():
         ("Kit Note", 308015),
     ]
 
+
 @pytest.mark.wip
 @pytest.mark.parametrize("note_type_name, note_type_value", note_types_order())
 def test_subject_does_not_have_a_note(
@@ -56,12 +67,16 @@ def test_subject_does_not_have_a_note(
     SubjectScreeningSummaryPage(page).verify_note_link_not_present(note_type_name)
 
 
-def test_add_a_additional_care_note_for_a_subject_without_a_note(page: Page, smokescreen_properties: dict) -> None:
+def test_add_a_additional_care_note_for_a_subject_without_a_note(
+    page: Page, smokescreen_properties: dict
+) -> None:
     """
     Test to add an additional care note for a subject without an existing note.
     """
     # User login
-    logging.info("Starting test: Add an additional care note for a subject without a note.")
+    logging.info(
+        "Starting test: Add an additional care note for a subject without a note."
+    )
     logging.info("Logging in as 'Team Leader at BCS01'.")
     UserTools.user_login(page, "Team Leader at BCS01")
 
@@ -88,7 +103,9 @@ def test_add_a_additional_care_note_for_a_subject_without_a_note(page: Page, smo
     # Select Additional Care Note Type
     note_type = "Additional Care Need - Learning disability"
     logging.info(f"Selecting Additional Care Note Type: '{note_type}'.")
-    SubjectEventsNotes(page).select_additional_care_note_type(AdditionalCareNoteTypeOptions.LEARNING_DISABILITY)
+    SubjectEventsNotes(page).select_additional_care_note_type(
+        AdditionalCareNoteTypeOptions.LEARNING_DISABILITY
+    )
 
     # Fill Notes
     note_text = "adding additional care need notes"
@@ -104,7 +121,9 @@ def test_add_a_additional_care_note_for_a_subject_without_a_note(page: Page, smo
     BasePage(page).click_back_button()
 
     # Get supporting notes for the subject
-    logging.info("Retrieving supporting notes for the subject with NHS Number: {nhs_no}.")
+    logging.info(
+        "Retrieving supporting notes for the subject with NHS Number: {nhs_no}."
+    )
     screening_subject_id = int(subjects_df["screening_subject_id"].iloc[0])
     logging.info(f"Screening Subject ID retrieved: {screening_subject_id}")
     type_id = int(subjects_df["type_id"].iloc[0])
@@ -114,17 +133,24 @@ def test_add_a_additional_care_note_for_a_subject_without_a_note(page: Page, smo
 
     # Verify title and note match the provided values
     logging.info(
-        f"Verifying that the title and note match the provided values for type_id: {type_id}.")
-    assert (filtered_notes_df["title"].iloc[0].strip() == note_type), f"Title does not match. Expected: '{note_type}', Found: '{filtered_notes_df['title'].iloc[0].strip()}'."
-    assert (filtered_notes_df["note"].iloc[0].strip() == note_text), f"Note does not match. Expected: '{note_text}', Found: '{filtered_notes_df['note'].iloc[0].strip()}'."
+        f"Verifying that the title and note match the provided values for type_id: {type_id}."
+    )
+    assert (
+        filtered_notes_df["title"].iloc[0].strip() == note_type
+    ), f"Title does not match. Expected: '{note_type}', Found: '{filtered_notes_df['title'].iloc[0].strip()}'."
+    assert (
+        filtered_notes_df["note"].iloc[0].strip() == note_text
+    ), f"Note does not match. Expected: '{note_text}', Found: '{filtered_notes_df['note'].iloc[0].strip()}'."
 
     logging.info(
         f"Verification successful: Additional care note added for the subject with NHS Number: {nhs_no}. "
         f"Title and note matched the provided values. Title: '{note_type}', Note: '{note_text}'."
     )
 
 
-def test_add_additional_care_note_for_subject_with_existing_note(page: Page, smokescreen_properties: dict) -> None:
+def test_add_additional_care_note_for_subject_with_existing_note(
+    page: Page, smokescreen_properties: dict
+) -> None:
     """
     Test to add an additional care note for a subject who already has an existing note.
     """
@@ -140,7 +166,7 @@ def test_add_additional_care_note_for_subject_with_existing_note(page: Page, smo
     BasePage(page).go_to_screening_subject_search_page()
 
     # Get a subject with existing additional care notes
-    subjects_df = get_subjects_by_note_count(4112,1)
+    subjects_df = get_subjects_by_note_count(4112, 1)
     nhs_no = subjects_df["subject_nhs_number"].iloc[0]
     logging.info(f"Searching for subject with NHS Number: {nhs_no}")
     SubjectScreeningPage(page).fill_nhs_number(nhs_no)
@@ -197,10 +223,12 @@ def test_add_additional_care_note_for_subject_with_existing_note(page: Page, smo
     )
 
 
-def test_identify_subject_with_additional_care_note(page: Page, smokescreen_properties: dict) -> None:
+def test_identify_subject_with_additional_care_note(
+    page: Page, smokescreen_properties: dict
+) -> None:
+    """
+    Test to identify if a subject has an Additional Care note.
     """
-        Test to identify if a subject has an Additional Care note.   
-    """  
     logging.info("Starting test: Verify subject has an additional care note.")
     logging.info("Logging in as 'ScreeningAssistant at BCS02'.")
     # user login
@@ -212,7 +240,7 @@ def test_identify_subject_with_additional_care_note(page: Page, smokescreen_prop
     BasePage(page).go_to_screening_subject_search_page()
 
     # Search for the subject by NHS Number.")
-    subjects_df= get_subjects_by_note_count(4112,1)
+    subjects_df = get_subjects_by_note_count(4112, 1)
     nhs_no = subjects_df["subject_nhs_number"].iloc[0]
     SubjectScreeningPage(page).fill_nhs_number(nhs_no)
     SubjectScreeningPage(page).select_search_area_option("07")
@@ -223,7 +251,9 @@ def test_identify_subject_with_additional_care_note(page: Page, smokescreen_prop
     SubjectScreeningSummaryPage(page).verify_additional_care_note_visible()
 
 
-def test_view_active_additional_care_note(page: Page, smokescreen_properties: dict) -> None: 
+def test_view_active_additional_care_note(
+    page: Page, smokescreen_properties: dict
+) -> None:
     """
     Test to verify if an active Additional Care note is visible for a subject.
     """
@@ -238,7 +268,7 @@ def test_view_active_additional_care_note(page: Page, smokescreen_properties: di
     BasePage(page).go_to_screening_subject_search_page()
 
     # Search for the subject by NHS Number.")
-    subjects_df= get_subjects_by_note_count(4112,1)
+    subjects_df = get_subjects_by_note_count(4112, 1)
     nhs_no = subjects_df["subject_nhs_number"].iloc[0]
     SubjectScreeningPage(page).fill_nhs_number(nhs_no)
     SubjectScreeningPage(page).select_search_area_option("07")
@@ -265,5 +295,4 @@ def test_view_active_additional_care_note(page: Page, smokescreen_properties: di
     notes_df = get_supporting_notes(screening_subject_id, type_id)
     # Filter the DataFrame to only include rows where type_id == 4112
     filtered_notes_df = notes_df[notes_df["type_id"] == type_id]
-      # Verify title and note match the UI values
-      
+    # Verify title and note match the UI values