wip

Author: Andyg79

pages/subject/subject_lynch_page.py

@@ -23,11 +23,6 @@ def self_refer_subject(self) -> None:
         logging.warning("[TODO] self_refer_subject not yet implemented.")
         # TODO: Implement UI steps to self-refer the subject
 
-    def confirm_prompt(self) -> None:
-        """Implement UI steps to confirm the prompt (e.g., confirmation dialog)."""
-        logging.warning("[TODO] confirm_prompt not yet implemented.")
-        # TODO: Implement UI steps to confirm the prompt
-
     def set_seeking_further_data(self) -> None:
         """Set the subject to Seeking Further Data."""
 
@@ -36,18 +31,32 @@ def set_seeking_further_data(self) -> None:
         )
 
         # Select 'Seeking Further Data' from the screening status dropdown
-        self.page.get_by_label("Change Screening Status").select_option("4007") # Seeking Further Data
+        self.page.get_by_label("Change Screening Status").select_option(
+            "4007"
+        )  # Seeking Further Data
 
         # Select 'Uncertified Death' as the reason
-        self.page.get_by_label("Reason", exact=True).select_option("11314") # Uncertified Death
+        self.page.get_by_label("Reason", exact=True).select_option(
+            "11314"
+        )  # Uncertified Death
 
         # Click the update button
-        self.page.get_by_role("button", name="Update Subject Data").click()
+        self.safe_accept_dialog(
+            self.page.get_by_role("button", name="Update Subject Data")
+        )
+
+    def set_self_referral_screening_status(self) -> None:
+        """Set the screening status to 'Lynch Self-referral' with reason 'Reset seeking further data to Lynch Self-referral'."""
+        logging.info("[UI ACTION] Setting screening status to 'Lynch Self-referral'")
 
-    def set_screening_status(self, status) -> None:
-        """Set the screening status."""
-        logging.warning("[TODO] set_screening_status not yet implemented.")
-        # TODO: Implement UI steps to set the screening status
+        # Select 'Lynch Self-referral' (value: 4005)
+        self.page.get_by_label("Change Screening Status").select_option("4005")
+
+        # Select reason: 'Reset seeking further data to Lynch Self-referral' (value: 11529)
+        self.page.get_by_label("Reason").select_option("11529")
+
+        # Click the update button
+        self.page.get_by_role("button", name="Update Subject Data").click()
 
     def receive_lynch_diagnosis(
         self, diagnosis_type, age, diagnosis_date, last_colonoscopy_date=None

tests/test_lynch_self_referral_seeking_further_data_flow.py

@@ -6,9 +6,11 @@
 from pages.logout.log_out_page import LogoutPage
 from utils.oracle.oracle import OracleDB, OracleSubjectTools
 from utils.oracle.subject_selection_query_builder import SubjectSelectionQueryBuilder
+from utils.oracle.subject_selector import SubjectSelector
 from utils.user_tools import UserTools
 from pages.subject.subject_lynch_page import SubjectPage
 from utils.subject_assertion import subject_assertion
+from utils import screening_subject_page_searcher
 
 
 @pytest.mark.wip
@@ -27,46 +29,44 @@ def test_lynch_self_referral_seeking_further_data_flow(page: Page) -> None:
     Set to Seeking Further Data
     Revert to Lynch Self-referral
     """
+    subject_page = SubjectPage(page)
+
     logging.info("[TEST START] test_lynch_self_referral_seeking_further_data_flow")
 
     # Given I log in to BCSS "England" as user role "Hub Manager"
     login_role = "Hub Manager at BCS01"
-
-    # Log in using the string
     UserTools.user_login(page, login_role)
 
-    # Retrieve user details using the same string
+    criteria = {
+        "subject age": "75",
+        "subject has lynch diagnosis": "Yes",
+        "screening status": "Lynch Self-referral",
+        "subject hub code": "BCS01",
+    }
+
+    # Retrieve user details and user object
     user_details = UserTools.retrieve_user(login_role)
     user = UserTools.get_user_object(user_details)
 
-    # And I have created a new subject ready for self-referral using OracleSubjectTools
-    nhs_no = OracleSubjectTools().create_self_referral_ready_subject(
-        screening_centre=user_details["hub_code"], base_age=75
+    # # TODO: When I receive Lynch diagnosis "EPCAM" for a new subject in my hub aged "75" with diagnosis date "3 years ago" and last colonoscopy date "2 years ago"
+    # Get or create a subject suitable for Lynch self-referral
+    nhs_no = SubjectSelector.get_or_create_subject_for_lynch_self_referral(
+        screening_centre=user_details["hub_code"],
+        base_age=75,
     )
 
     logging.info(
         "[SUBJECT CREATED IN DB] created subject in the database with no screening history who is eligible to self refer"
     )
 
-    # TODO: When I receive Lynch diagnosis "EPCAM" for a new subject in my hub aged "75" with diagnosis date "3 years ago" and last colonoscopy date "2 years ago"
-    prepare_subject_with_lynch_diagnosis(
-        page,
-        user,
-        nhs_no,
-        SubjectPage.TestData.subject_age,
-        SubjectPage.TestData.diagnosis_date,
-        SubjectPage.TestData.last_colonoscopy_date,
-    )
-
     # Then Comment: NHS number
     logging.info(f"[SUBJECT CREATION] Created subject's NHS number: {nhs_no}")
 
-    # When I self refer the subject
-    subject_page = SubjectPage(page)
+    # TODO: When I self refer the subject
+    # And I press OK on my confirmation prompt
     subject_page.self_refer_subject()
-    subject_page.confirm_prompt()
+    logging.info("[UI ACTION] Self-referred the subject")
 
-    # TODO: And I press OK on my confirmation prompt
     # Then my subject has been updated as follows:
     criteria = {
         "calculated fobt due date": "Null",
@@ -91,6 +91,12 @@ def test_lynch_self_referral_seeking_further_data_flow(page: Page) -> None:
     }
 
     subject_assertion(nhs_no, criteria)
+    logging.info(
+        "[ASSERTION PASSED] Subject details after self-referral are as expected"
+    )
+
+    # When I view the subject
+    screening_subject_page_searcher.navigate_to_subject_summary_page(page, nhs_no)
 
     # When I set the subject to Seeking Further Data
     subject_page.set_seeking_further_data()
@@ -121,9 +127,7 @@ def test_lynch_self_referral_seeking_further_data_flow(page: Page) -> None:
     subject_assertion(nhs_no, criteria)
 
     # When I set the subject from Seeking Further Data back to "Lynch Self-referral"
-    subject_page.set_screening_status(
-        SubjectPage.TestData.screening_status_lynch_self_referral
-    )
+    subject_page.set_self_referral_screening_status()
 
     # Then my subject has been updated as follows:
     criteria = {
@@ -149,6 +153,7 @@ def test_lynch_self_referral_seeking_further_data_flow(page: Page) -> None:
     }
 
     subject_assertion(nhs_no, criteria)
+
     LogoutPage(page).log_out()
     logging.info("[TEST END] test_lynch_self_referral_seeking_further_data_flow")
 
@@ -174,9 +179,6 @@ def prepare_subject_with_lynch_diagnosis(
 
     criteria = {"nhs number": nhs_no}
 
-    # if last_colonoscopy_date:
-    #     criteria["lynch last colonoscopy date"] = last_colonoscopy_date
-
     query, bind_vars = SubjectSelectionQueryBuilder().build_subject_selection_query(
         criteria=criteria,
         user=user,

utils/oracle/subject_selector.py

@@ -1,3 +1,4 @@
+import pandas as pd
 from oracle.oracle import OracleDB
 import logging
 from utils.oracle.subject_selection_query_builder import SubjectSelectionQueryBuilder
@@ -96,3 +97,63 @@ def get_subject_for_pre_invitation(criteria: dict) -> str:
         nhs_number = result_df["subject_nhs_number"].iloc[0]
         logging.info(f"[SUBJECT SELECTOR] Found subject NHS number: {nhs_number}")
         return nhs_number
+
+    @staticmethod
+    def get_or_create_subject_for_lynch_self_referral(
+        screening_centre: str = "BCS01", base_age: int = 75
+    ) -> str:
+        """
+        Retrieves a subject NHS number suitable for Lynch self-referral scenarios.
+        If no subject is found, creates one and returns its NHS number.
+
+        Args:
+            screening_centre (str): Screening centre code for subject association.
+            base_age (int): Minimum age to filter subject candidates.
+
+        Returns:
+            str: The NHS number of the selected or created subject.
+        """
+        from utils.oracle.oracle import OracleSubjectTools  # avoid circular import
+
+        criteria = {
+            "subject age": str(base_age),
+            "subject has lynch diagnosis": "Yes",
+            "screening status": "Lynch Self-referral",
+            "subject hub code": screening_centre,
+        }
+
+        logging.info(
+            "[SUBJECT SELECTOR] Attempting to find or create Lynch self-referral subject"
+        )
+        user_details = UserTools.retrieve_user(f"Hub Manager at {screening_centre}")
+        user = UserTools.get_user_object(user_details)
+        subject = Subject()
+        query_builder = SubjectSelectionQueryBuilder()
+
+        query, bind_vars = query_builder.build_subject_selection_query(
+            criteria=criteria,
+            user=user,
+            subject=subject,
+        )
+        result_df = OracleDB().execute_query(query, bind_vars)
+
+        if not result_df.empty:
+            nhs_number = result_df["subject_nhs_number"].iloc[0]
+            logging.info(
+                f"[SUBJECT SELECTOR] Found existing subject NHS number: {nhs_number}"
+            )
+            return nhs_number
+
+        logging.warning("[SUBJECT SELECTOR] No existing subject found — creating one")
+        nhs_number = OracleSubjectTools().create_self_referral_ready_subject(
+            screening_centre=screening_centre,
+            base_age=base_age,
+        )
+        logging.info(
+            f"[SUBJECT CREATED - LYNCH SELF-REFERRAL] NHS number: {nhs_number}"
+        )
+
+        nhs_df = pd.DataFrame({"subject_nhs_number": [nhs_number]})
+        OracleDB().exec_bcss_timed_events(nhs_df)
+
+        return nhs_number