wip

Author: Andyg79

pages/subject/subject_lynch_page.py

@@ -6,9 +6,14 @@
 class SubjectPage(BasePage):
     """Page object for interacting with subject-related actions."""
 
-    def __init__(self, page: Page):
-        super().__init__(page)
-        self.page = page
+    class StatusCodes:
+        LYNCH_SELF_REFERRAL = "4005"
+        SEEKING_FURTHER_DATA = "4007"
+
+    class ReasonCodes:
+        SELF_REFERRAL = "11316"
+        UNCERTIFIED_DEATH = "11314"
+        RESET_TO_SELF_REFERRAL = "11529"
 
     class TestData:
         hub_manager_role = "Hub Manager"
@@ -18,10 +23,26 @@ class TestData:
         last_colonoscopy_date = "2 years ago"
         screening_status_lynch_self_referral = "Lynch Self-referral"
 
+    def __init__(self, page: Page):
+        super().__init__(page)
+        self.page = page
+
     def self_refer_subject(self) -> None:
-        """Implement UI steps to self-refer the subject."""
-        logging.warning("[TODO] self_refer_subject not yet implemented.")
-        # TODO: Implement UI steps to self-refer the subject
+        """Perform UI steps to self-refer the subject."""
+        logging.info("[UI ACTION] Self-referring the subject")
+
+        # Select 'Lynch Self-referral' from the dropdown
+        self.page.get_by_label("Change Screening Status").select_option(
+            self.StatusCodes.LYNCH_SELF_REFERRAL
+        )
+
+        # Select reason: 'Self-referral' (value: 11316)
+        self.page.get_by_label("Reason").select_option(self.ReasonCodes.SELF_REFERRAL)
+
+        # Click the update button
+        self.safe_accept_dialog(
+            self.page.get_by_role("button", name="Update Subject Data")
+        )
 
     def set_seeking_further_data(self) -> None:
         """Set the subject to Seeking Further Data."""
@@ -32,13 +53,13 @@ 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.StatusCodes.SEEKING_FURTHER_DATA
+        )
 
         # Select 'Uncertified Death' as the reason
         self.page.get_by_label("Reason", exact=True).select_option(
-            "11314"
-        )  # Uncertified Death
+            self.ReasonCodes.UNCERTIFIED_DEATH
+        )
 
         # Click the update button
         self.safe_accept_dialog(
@@ -49,11 +70,15 @@ 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'")
 
-        # Select 'Lynch Self-referral' (value: 4005)
-        self.page.get_by_label("Change Screening Status").select_option("4005")
+        # Select 'Lynch Self-referral'
+        self.page.get_by_label("Change Screening Status").select_option(
+            self.StatusCodes.LYNCH_SELF_REFERRAL
+        )
 
-        # Select reason: 'Reset seeking further data to Lynch Self-referral' (value: 11529)
-        self.page.get_by_label("Reason").select_option("11529")
+        # Select reason: 'Reset seeking further data to Lynch Self-referral'
+        self.page.get_by_label("Reason").select_option(
+            self.ReasonCodes.RESET_TO_SELF_REFERRAL
+        )
 
         # Click the update button
         self.page.get_by_role("button", name="Update Subject Data").click()

tests/test_lynch_self_referral_seeking_further_data_flow.py

@@ -4,7 +4,7 @@
 from classes.subject.subject import Subject
 from classes.user.user import User
 from pages.logout.log_out_page import LogoutPage
-from utils.oracle.oracle import OracleDB, OracleSubjectTools
+from utils.oracle.oracle import OracleDB
 from utils.oracle.subject_selection_query_builder import SubjectSelectionQueryBuilder
 from utils.oracle.subject_selector import SubjectSelector
 from utils.user_tools import UserTools
@@ -37,16 +37,8 @@ def test_lynch_self_referral_seeking_further_data_flow(page: Page) -> None:
     login_role = "Hub Manager at BCS01"
     UserTools.user_login(page, login_role)
 
-    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)
 
     # # 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
@@ -62,13 +54,12 @@ def test_lynch_self_referral_seeking_further_data_flow(page: Page) -> None:
     # Then Comment: NHS number
     logging.info(f"[SUBJECT CREATION] Created subject's NHS number: {nhs_no}")
 
-    # TODO: When I self refer the subject
-    # And I press OK on my confirmation prompt
+    # When I self refer the subject
     subject_page.self_refer_subject()
     logging.info("[UI ACTION] Self-referred the subject")
 
     # Then my subject has been updated as follows:
-    criteria = {
+    self_referral_criteria = {
         "calculated fobt due date": "Null",
         "calculated lynch due date": "today",
         "calculated surveillance due date": "Null",
@@ -90,19 +81,19 @@ def test_lynch_self_referral_seeking_further_data_flow(page: Page) -> None:
         "surveillance due date reason": "Null",
     }
 
-    subject_assertion(nhs_no, criteria)
+    subject_assertion(nhs_no, self_referral_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
+    # And I set the subject to Seeking Further Data
     subject_page.set_seeking_further_data()
 
     # Then my subject has been updated as follows:
-    criteria = {
+    seeking_further_data_criteria = {
         "calculated fobt due date": "Null",
         "calculated lynch due date": "today",
         "calculated surveillance due date": "Null",
@@ -124,13 +115,13 @@ def test_lynch_self_referral_seeking_further_data_flow(page: Page) -> None:
         "surveillance due date reason": "Null",
     }
 
-    subject_assertion(nhs_no, criteria)
+    subject_assertion(nhs_no, seeking_further_data_criteria)
 
     # When I set the subject from Seeking Further Data back to "Lynch Self-referral"
     subject_page.set_self_referral_screening_status()
 
     # Then my subject has been updated as follows:
-    criteria = {
+    reverted_criteria = {
         "calculated fobt due date": "Null",
         "calculated lynch due date": "today",
         "calculated surveillance due date": "Null",
@@ -152,13 +143,13 @@ def test_lynch_self_referral_seeking_further_data_flow(page: Page) -> None:
         "surveillance due date reason": "Null",
     }
 
-    subject_assertion(nhs_no, criteria)
+    subject_assertion(nhs_no, reverted_criteria)
 
     LogoutPage(page).log_out()
     logging.info("[TEST END] test_lynch_self_referral_seeking_further_data_flow")
 
 
-# Helper Functions
+# Helper Functions - TODO: move to a utils file later
 def prepare_subject_with_lynch_diagnosis(
     page: Page,
     user: User,