Merge remote-tracking branch 'origin' into feature/BCSS-21311-fobt-regression-scenario-8

# Conflicts:
#	pages/screening_subject_search/advance_fobt_screening_episode_page.py

Author: Andyg79

classes/date/has_user_dob_update.py

@@ -32,7 +32,7 @@ def by_description(cls, description: str) -> Optional["HasUserDobUpdate"]:
             Optional[HasUserDobUpdate]: The matching enum member, or None if not found.
         """
         for item in cls:
-            if item.value == description:
+            if item.value.lower() == description.lower():
                 return item
         return None
 

classes/deduction/deduction_reason_types.py

@@ -0,0 +1,126 @@
+from enum import Enum
+from typing import Optional
+
+
+class DeductionReasonType(Enum):
+    """
+    Enum representing deduction reason types, mapped to valid value IDs, allowed values, and descriptions.
+    Provides utility methods for lookup by description, allowed value, and valid value ID.
+    """
+
+    AFL = (307006, "AFL", "AF Enlistment (local)")
+    AFN = (307007, "AFN", "AF Enlistment (AF)")
+    CGA = (307008, "CGA", "Gone away")
+    DEA = (307009, "DEA", "Death")
+    Death = (307009, "DEA", "Death")  # Alias for DEA
+    DDR = (1, "DDR", "Deducted at Doctor's request")
+    DIS = (307010, "DIS", "Practice dissolution")
+    DPR = (2, "DPR", "Deducted at Patient's request")
+    EMB = (307011, "EMB", "Embarkation")
+    Embarkation = (307011, "EMB", "Embarkation")  # Alias for EMB
+    FP69 = (17, "FP69", "Deducted as a result of a non-respond to an FP69/")
+    LDN = (307012, "LDN", "Logical Deletion")
+    MH = (7, "M/H", "Mental Hospital")
+    NIT = (307013, "NIT", "Transfer to Northern Ireland")
+    OR = (10, "O/R", "Other")
+    OPA = (307014, "OPA", "Address out of practice area")
+    ORR = (307015, "ORR", "Other Reason")
+    PAR = (13, "PAR", "Practice advise subject no longer resident")
+    PSR = (14, "PSR", "Practice advise removal via screening system")
+    PVR = (15, "PVR", "Practice advise removal via vaccination data")
+    R = (26, "R", "Deducted as a result of removal to other HA")
+    RA = (8, "R/A", "Registration/A")
+    RC = (9, "R/C", "Registration Cancelled")
+    RU = (27, "R/U", "Deducted as a result of return undelivered")
+    RDI = (307016, "RDI", "Practice Request - immediate")
+    RDR = (307017, "RDR", "Practice request")
+    RFI = (307018, "RFI", "Residential Institute")
+    RPR = (307019, "RPR", "Patient request")
+    SD = (6, "S/D", "Service Dependant")
+    SCT = (307020, "SCT", "Transferred to Scotland")
+    SDL = (307021, "SDL", "Services Dependant (local)")
+    SDN = (307022, "SDN", "Services Dependant (SMU)")
+    SER = (5, "SER", "Services")
+    TRA = (307023, "TRA", "Temporary resident not returned")
+
+    def __init__(
+        self, valid_value_id: int, allowed_value: str, description: str
+    ) -> None:
+        self._valid_value_id = valid_value_id
+        self._allowed_value = allowed_value
+        self._description = description
+
+    @property
+    def valid_value_id(self) -> int:
+        """Returns the valid value ID for the deduction reason type."""
+        return self._valid_value_id
+
+    @property
+    def allowed_value(self) -> str:
+        """Returns the allowed value for the deduction reason type."""
+        return self._allowed_value
+
+    @property
+    def description(self) -> str:
+        """Returns the description for the deduction reason type."""
+        return self._description
+
+    @classmethod
+    def by_description(cls, description: str) -> Optional["DeductionReasonType"]:
+        """
+        Returns the enum member matching the given description (case-sensitive).
+        Args:
+            description (str): The description to match.
+        Returns:
+            Optional[DeductionReasonType]: The matching enum member, or None if not found.
+        """
+        for member in cls:
+            if member.description == description:
+                return member
+        return None
+
+    @classmethod
+    def by_description_case_insensitive(
+        cls, description: str
+    ) -> Optional["DeductionReasonType"]:
+        """
+        Returns the enum member matching the given description (case-insensitive).
+        Args:
+            description (str): The description to match.
+        Returns:
+            Optional[DeductionReasonType]: The matching enum member, or None if not found.
+        """
+        desc_lower = description.lower()
+        for member in cls:
+            if member.description.lower() == desc_lower:
+                return member
+        return None
+
+    @classmethod
+    def by_deduction_code(cls, code: str) -> Optional["DeductionReasonType"]:
+        """
+        Returns the enum member matching the given allowed value (deduction code).
+        Args:
+            code (str): The code to match.
+        Returns:
+            Optional[DeductionReasonType]: The matching enum member, or None if not found.
+        """
+        code_upper = code.upper()
+        for member in cls:
+            if member.allowed_value.upper() == code_upper:
+                return member
+        return None
+
+    @classmethod
+    def by_valid_value_id(cls, valid_value_id: int) -> Optional["DeductionReasonType"]:
+        """
+        Returns the enum member matching the given valid value ID.
+        Args:
+            valid_value_id (str): The valid_value_id to match.
+        Returns:
+            Optional[DeductionReasonType]: The matching enum member, or None if not found.
+        """
+        for member in cls:
+            if member.valid_value_id == valid_value_id:
+                return member
+        return None

classes/episode/subject_has_episode.py

@@ -32,7 +32,7 @@ def by_description(cls, description: str) -> Optional["SubjectHasEpisode"]:
             Optional[SubjectHasEpisode]: The matching enum member, or None if not found.
         """
         for item in cls:
-            if item.value == description:
+            if item.value.lower() == description.lower():
                 return item
         return None
 

classes/repositories/subject_repository.py

@@ -1,7 +1,10 @@
 import logging
 from typing import Optional
 from classes.subject.pi_subject import PISubject
+from classes.subject.subject import Subject
+from classes.user.user import User
 from utils.oracle.oracle import OracleDB
+from utils.oracle.subject_selection_query_builder import SubjectSelectionQueryBuilder
 
 
 class SubjectRepository:
@@ -150,7 +153,7 @@ def get_active_gp_practice_in_hub_and_sc(
         )
         if df.empty:
             return None
-        return df.iloc[0]["gp_code"]
+        return df["gp_code"].iloc[0]
 
     def get_inactive_gp_practice(self) -> Optional[str]:
         """
@@ -168,7 +171,7 @@ def get_inactive_gp_practice(self) -> Optional[str]:
         df = self.oracle_db.execute_query(query)
         if df.empty:
             return None
-        return df.iloc[0]["gp_code"]
+        return df["gp_code"].iloc[0]
 
     def get_latest_gp_practice_for_subject(self, nhs_number: str) -> Optional[str]:
         """
@@ -192,4 +195,33 @@ def get_latest_gp_practice_for_subject(self, nhs_number: str) -> Optional[str]:
         df = self.oracle_db.execute_query(query, {"nhs_number": nhs_number})
         if df.empty:
             return None
-        return df.iloc[0]["gp_code"]
+        return df["gp_code"].iloc[0]
+
+    def get_matching_subject(
+        self, criteria: dict, subject: Subject, user: User
+    ) -> Subject:
+        """
+        Finds a subject in the DB matching the given criteria.
+        Args:
+            criteria (dict): The criteria you want the subject to match
+            subject (Subject): The subject class object. Can be populated or not, depends on the criteria
+            user (User): The user class object. Can be populated or not, depends on the criteria
+        Returns:
+            Subject: A populated Subject object with a subject that matches the provided criteria
+        Raises:
+            ValueError: If no subject matching the criteria was found.
+        """
+        builder = SubjectSelectionQueryBuilder()
+        query, bind_vars = builder.build_subject_selection_query(
+            criteria=criteria,
+            user=user,
+            subject=subject,
+            subjects_to_retrieve=1,
+        )
+        df = OracleDB().execute_query(query, bind_vars)
+        try:
+            df_row = df.iloc[0]
+            subject = Subject().from_dataframe_row(df_row)
+        except Exception:
+            raise ValueError("No subject found matching the given criteria")
+        return subject

classes/screening/has_unprocessed_sspi_updates.py

@@ -32,7 +32,7 @@ def by_description(cls, description: str) -> Optional["HasUnprocessedSSPIUpdates
             Optional[HasUnprocessedSSPIUpdates]: The matching enum member, or None if not found.
         """
         for item in cls:
-            if item.value == description:
+            if item.value.lower() == description.lower():
                 return item
         return None
 

pages/screening_practitioner_appointments/appointment_detail_page.py

@@ -1,6 +1,8 @@
 from playwright.sync_api import Page, expect
 from pages.base_page import BasePage
 from enum import StrEnum
+from datetime import datetime
+from utils.calendar_picker import CalendarPicker
 
 
 class AppointmentDetailPage(BasePage):
@@ -87,6 +89,23 @@ def select_reason_for_cancellation_option(self, option: str) -> None:
         self.reason_for_cancellation_dropdown.select_option(value=option)
 
 
+    def mark_appointment_as_attended(self, date: datetime) -> None:
+        """
+        Marks an appointment as attended.
+        Args:
+            date (datetime): The date the appointment was attended
+        """
+        self.wait_for_attendance_radio(
+            600000
+        )  # Max of 10 minute wait as appointments need to be set for future times and they are in 10 minute intervals
+        self.check_attendance_radio()
+        self.check_attended_check_box()
+        self.click_calendar_button()
+        CalendarPicker(self.page).v1_calender_picker(date)
+        self.click_save_button()
+        self.verify_text_visible("Record updated")
+
+
 class ReasonForCancellationOptions(StrEnum):
     """Enum for cancellation reason options"""
 

pages/screening_subject_search/advance_fobt_screening_episode_page.py

@@ -45,6 +45,16 @@ def __init__(self, page: Page):
         self.record_contact_with_patient_button = self.page.get_by_role(
             "button", name="Record Contact with Patient"
         )
+        self.amend_diagnosis_date_button = self.page.get_by_role(
+            "button", name="Amend Diagnosis Date"
+        )
+        self.advance_checkbox_v2 = self.page.get_by_role("checkbox")
+        self.subsequent_assessment_appointment_required_dropdown = (
+            self.page.get_by_role("combobox")
+        )
+        self.subsequent_assessment_appointment_required_button = self.page.get_by_role(
+            "button", name="Subsequent Assessment Appointment Required"
+        )
         self.suitable_for_radiological_test_button = self.page.get_by_role(
             "button", name="Suitable for Radiological Test"
         )
@@ -58,6 +68,12 @@ def __init__(self, page: Page):
                 "button", name="Waiting Decision to Proceed with Diagnostic Test"
             )
         )
+        self.not_suitable_for_diagnostic_tests_button = self.page.get_by_role(
+            "button", name="Not Suitable for Diagnostic Tests"
+        )
+        self.cancel_diagnostic_test_button = self.page.get_by_role(
+            "button", name="Cancel Diagnostic Test"
+        )
 
     def click_suitable_for_endoscopic_test_button(self) -> None:
         """Click the 'Suitable for Endoscopic Test' button."""
@@ -93,15 +109,21 @@ def get_latest_event_status_cell(self, latest_event_status: str) -> Locator:
 
     def verify_latest_event_status_value(self, latest_event_status: str) -> None:
         """Verify that the latest event status value is visible."""
-        logging.info(f"Verifying subject has the status: {latest_event_status}")
+        logging.info(
+            f"[UI ASSERTION] Verifying subject has the status: {latest_event_status}"
+        )
         latest_event_status_cell = self.get_latest_event_status_cell(
             latest_event_status
         )
         try:
             expect(latest_event_status_cell).to_be_visible()
-            logging.info(f"Subject has the status: {latest_event_status}")
+            logging.info(
+                f"[UI ASSERTION COMPLETE] Subject has the status: {latest_event_status}"
+            )
         except Exception:
-            pytest.fail(f"Subject does not have the status: {latest_event_status}")
+            raise AssertionError(
+                f"[UI ASSERTION FAILED] Subject does not have the status: {latest_event_status}"
+            )
 
     def click_record_other_post_investigation_contact_button(self) -> None:
         """Click the 'Record other post-investigation contact' button."""
@@ -127,6 +149,28 @@ def check_advance_checkbox(self) -> None:
         """Selects the 'Advance FOBT' checkbox"""
         self.advance_checkbox.check()
 
+    def click_amend_diagnosis_date_button(self) -> None:
+        """Checks the 'Advance FOBT' checkbox and clicks the 'Amend Diagnosis Date' button."""
+        self.advance_checkbox_v2.check()
+        self.click(self.amend_diagnosis_date_button)
+
+    def click_and_select_subsequent_assessment_appointment_required(
+        self, option: str
+    ) -> None:
+        """
+        Click the 'Subsequent Assessment Appointment Required' button and select an option from the dropdown.
+        Args:
+            option (str): The option to select from the dropdown.
+            Must be one of:
+                - 'Previous attendance, further assessment required'
+                - 'Interpreter requirement not identified'
+                - 'SC interpreter DNA'
+        """
+        self.subsequent_assessment_appointment_required_dropdown.select_option(
+            label=option
+        )
+        self.safe_accept_dialog(self.subsequent_assessment_appointment_required_button)
+
     def click_suitable_for_radiological_test_button(self) -> None:
         """Click the 'Suitable for Radiological Test' button."""
         self.safe_accept_dialog(self.suitable_for_radiological_test_button)
@@ -148,7 +192,9 @@ def select_ct_colonography_and_invite(self) -> None:
         Enters today's date, selects 'CT Colonography' as the diagnostic test type,
         and clicks the 'Invite for Diagnostic Test' button.
         """
-        logging.info("[ADVANCE EPISODE] Selecting CT Colonography and inviting for diagnostic test")
+        logging.info(
+            "[ADVANCE EPISODE] Selecting CT Colonography and inviting for diagnostic test"
+        )
 
         # Step 1: Enter today's date
         today = date.today().strftime("%d/%m/%Y")
@@ -160,7 +206,9 @@ def select_ct_colonography_and_invite(self) -> None:
         logging.info("[ADVANCE EPISODE] Selected test type: CT Colonography")
 
         # Step 3: Click 'Invite for Diagnostic Test'
-        invite_button = self.page.get_by_role("button", name="Invite for Diagnostic Test >>")
+        invite_button = self.page.get_by_role(
+            "button", name="Invite for Diagnostic Test >>"
+        )
         self.safe_accept_dialog(invite_button)
 
         logging.info("[ADVANCE EPISODE] Invite for diagnostic test completed")
@@ -177,7 +225,9 @@ def record_contact_close_episode_no_contact(self) -> None:
             - Selects the outcome 'Close Episode - No Contact'
             - Clicks the save button
         """
-        logging.info("[CONTACT RECORD] Starting contact recording flow with outcome: Close Episode - No Contact")
+        logging.info(
+            "[CONTACT RECORD] Starting contact recording flow with outcome: Close Episode - No Contact"
+        )
 
         # Step 1: Click 'Record Contact with Patient' button
         self.page.get_by_role("button", name="Record Contact with Patient").click()
@@ -191,16 +241,28 @@ def record_contact_close_episode_no_contact(self) -> None:
         self.page.locator("#UI_START_TIME").fill("09:00")
         self.page.locator("#UI_END_TIME").fill("09:10")
         self.page.locator("#UI_DURATION").fill("10")
-        logging.info("[CONTACT RECORD] Entered time details: 09:00–09:10, duration 10 mins")
+        logging.info(
+            "[CONTACT RECORD] Entered time details: 09:00–09:10, duration 10 mins"
+        )
 
         # Step 4: Enter note
         self.page.locator("#UI_COMMENT_ID").fill("automation test note")
         logging.info("[CONTACT RECORD] Entered note: automation test note")
 
         # Step 5: Select outcome
-        self.page.locator("#UI_OUTCOME").select_option(label="Close Episode - No Contact")
+        self.page.locator("#UI_OUTCOME").select_option(
+            label="Close Episode - No Contact"
+        )
         logging.info("[CONTACT RECORD] Selected outcome: Close Episode - No Contact")
 
         # Step 6: Click save
         self.page.locator("input[name='UI_BUTTON_SAVE']").click()
         logging.info("[CONTACT RECORD] Contact recording flow completed successfully")
+
+    def click_not_suitable_for_diagnostic_tests_button(self) -> None:
+        """Click the 'Not Suitable for Diagnostic Tests' button."""
+        self.safe_accept_dialog(self.not_suitable_for_diagnostic_tests_button)
+
+    def click_cancel_diagnostic_test_button(self) -> None:
+        """Click the 'Cancel Diagnostic Test' button."""
+        self.safe_accept_dialog(self.cancel_diagnostic_test_button)