Addressing PR comments

Author: adrianoaru-nhs

classes/deduction/deduction_reason_types.py

@@ -69,6 +69,10 @@ def description(self) -> str:
     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:
@@ -81,6 +85,10 @@ def by_description_case_insensitive(
     ) -> 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:
@@ -92,6 +100,10 @@ def by_description_case_insensitive(
     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:
@@ -103,6 +115,10 @@ def by_deduction_code(cls, code: str) -> Optional["DeductionReasonType"]:
     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:

pages/screening_subject_search/advance_fobt_screening_episode_page.py

@@ -140,7 +140,7 @@ def check_advance_checkbox(self) -> None:
         self.advance_checkbox.check()
 
     def click_amend_diagnosis_date_button(self) -> None:
-        """Click the 'Amend Diagnosis Date' button."""
+        """Checks the 'Advance FOBT' checkbox and clicks the 'Amend Diagnosis Date' button."""
         self.advance_checkbox_v2.check()
         self.click(self.amend_diagnosis_date_button)
 

utils/sspi_change_steps.py

@@ -10,6 +10,9 @@
 
 
 class SSPIChangeSteps:
+    def __init__(self) -> None:
+        self.subject_repo = SubjectRepository()
+
     def sspi_update_to_change_dob_received(
         self, nhs_no: str, age_to_change_to: int
     ) -> None:
@@ -45,7 +48,6 @@ def process_sspi_deduction_by_code(self, nhs_no: str, deduction_code: str) -> No
         if DeductionReasonType.by_deduction_code(deduction_code) is None:
             raise ValueError(f"Unknown Deduction Code: {deduction_code}")
 
-        subject_repo = SubjectRepository()
         pi_subject = PISubject().from_subject(subject)
 
         if subject is not None:
@@ -67,7 +69,7 @@ def process_sspi_deduction_by_code(self, nhs_no: str, deduction_code: str) -> No
             elif deduction_code in ["LDN", "R/C"]:
                 # Logical deletion requires a "superseded by" NHS number
                 subject_criteria: Dict[str, str] = {"Screening Status": "Call"}
-                superseded_subject = subject_repo.get_matching_subject(
+                superseded_subject = self.subject_repo.get_matching_subject(
                     subject_criteria, Subject(), User()
                 )
                 if not superseded_subject:
@@ -100,12 +102,11 @@ def reregister_subject_with_latest_gp_practice(self, nhs_no) -> None:
         method_name = "reregister_subject_with_latest_gp_practice"
         logging.debug(f"start: {method_name}()")
 
-        subject_repo = SubjectRepository()
         subject = Subject().populate_subject_object_from_nhs_no(nhs_no)
         pi_subject = PISubject().from_subject(subject)
 
         if subject is not None:
-            gp_code = subject_repo.get_latest_gp_practice_for_subject(nhs_no)
+            gp_code = self.subject_repo.get_latest_gp_practice_for_subject(nhs_no)
             logging.debug(f"Set GP code to {gp_code} and remove all deduction details")
 
             pi_subject.gp_practice_code = gp_code
@@ -132,13 +133,12 @@ def handle_update(
         """
         logging.debug("start: handle_update(Subject, date)")
 
-        subject_repo = SubjectRepository()
         pi_subject.pi_reference = "AUTOMATED TEST"
         # Check if a date of birth change needs to be made first
         if birth_date is not None:
             pi_subject.birth_date = birth_date
 
         # Run the update into the DB (SSPI updates are always run as automated process user 2)
-        subject_repo.update_pi_subject(2, pi_subject)
+        self.subject_repo.update_pi_subject(2, pi_subject)
 
         logging.debug("exit: handle_update()")