Initial commit - quick fix

Author: adrianoaru-nhs

classes/subject/gender_type.py

@@ -88,3 +88,18 @@ def by_redefined_value(cls, redefined_value: int) -> Optional["GenderType"]:
         return next(
             (item for item in cls if item.redefined_value == redefined_value), None
         )
+
+    @classmethod
+    def by_allowed_value(cls, allowed_value: str) -> Optional["GenderType"]:
+        """
+        Returns the GenderType enum member matching the given allowed value.
+
+        Args:
+            allowed_value (str): The allowed value to search for.
+
+        Returns:
+            Optional[GenderType]: The matching enum member, or None if not found.
+        """
+        return next(
+            (item for item in cls if item.allowed_value == allowed_value), None
+        )

classes/subject/subject.py

@@ -1302,6 +1302,16 @@ def from_dataframe_row(row: pd.Series) -> "Subject":
             ),
             "date_of_birth": DateTimeUtils.parse_date(row.get("date_of_birth")),
             "date_of_death": DateTimeUtils.parse_date(row.get("date_of_death")),
+            "title": row.get("person_title"),
+            "other_names": row.get("person_other_given_names"),
+            "address_line1": row.get("address_line_1"),
+            "address_line2": row.get("address_line_2"),
+            "address_line3": row.get("address_line_3"),
+            "address_line4": row.get("address_line_4"),
+            "address_line5": row.get("address_line_5"),
+            "postcode": row.get("postcode"),
+            "gp_practice_code": row.get("gp_practice_code"),
+            "gender": GenderType.by_allowed_value(str(row.get("person_gender"))),
         }
 
         return Subject(**field_map)
@@ -1318,13 +1328,17 @@ def populate_subject_object_from_nhs_no(self, nhs_no: str) -> "Subject":
             SubjectSelectionQueryBuilder,
         )
 
-        nhs_no_criteria = {"nhs number": nhs_no}
+        criteria = {
+            "nhs number": nhs_no,
+            "add column to select statement": " c.person_title, c.person_other_given_names, CASE c.person_gender WHEN 130 THEN 'M' WHEN 131 THEN 'F' WHEN 132 THEN 'I' WHEN 160 THEN 'U' END, adds.address_line_1, adds.address_line_2, adds.address_line_3, adds.address_line_4, adds.address_line_5, adds.postcode, (SELECT hub.org_code FROM org hub WHERE org_id = c.gp_practice_id) AS gp_practice_code ",
+            "add join to from statement": " INNER JOIN sd_address_t adds ON adds.contact_id = c.contact_id ",
+        }
         subject = Subject()
         user = User()
         builder = SubjectSelectionQueryBuilder()
 
         query, bind_vars = builder.build_subject_selection_query(
-            criteria=nhs_no_criteria,
+            criteria=criteria,
             user=user,
             subject=subject,
             subjects_to_retrieve=1,

classes/subject_selection_query_builder/subject_selection_criteria_key.py

@@ -24,6 +24,7 @@ class SubjectSelectionCriteriaKey(Enum):
     """
 
     ADD_COLUMN_TO_SELECT_STATEMENT = ("add column to select statement", False, False)
+    ADD_JOIN_TO_FROM_STATEMENT = ("add join to from statement", False, False)
     APPOINTMENT_DATE = ("appointment date", False, True)
     APPOINTMENT_STATUS = ("appointment status", True, True)
     APPOINTMENT_TYPE = ("appointment type", False, True)

tests/regression/regression_tests/fobt_regression_tests/test_scenario_6.py

@@ -538,3 +538,43 @@ def test_scenario_6(page: Page) -> None:
 
     logging.info("[TEST COMPLETE] Scenario 6 passed all assertions")
     LogoutPage(page).log_out()
+
+
+
+from classes.user.user import User
+from classes.subject.subject import Subject
+from utils.oracle.subject_selection_query_builder import SubjectSelectionQueryBuilder
+@pytest.mark.wip
+def test_test(page: Page) -> None:
+    # Given I log in to BCSS "England" as user role "Hub Manager"
+    user_role = UserTools.user_login(
+        page, "Hub Manager State Registered at BCS01", return_role_type=True
+    )
+    if user_role is None:
+        raise ValueError("This user cannot be assigned to a UserRoleType")
+
+    # And there is a subject who meets the following criteria:
+    criteria = {
+        "latest event status": "S9 Pre-Invitation Sent",
+        "latest episode kit class": "FIT",
+        "latest episode started": "Within the last 6 months",
+        "latest episode type": "FOBT",
+        "subject age": "Between 60 and 72",
+        "subject has unprocessed sspi updates": "No",
+        "subject has user dob updates": "No",
+    }
+
+    query, bind_vars = SubjectSelectionQueryBuilder().build_subject_selection_query(
+        criteria=criteria,
+        user=User(),
+        subject=Subject(),
+        subjects_to_retrieve=1,
+    )
+
+    nhs_no_df = OracleDB().execute_query(query=query, parameters=bind_vars)
+    nhs_no = nhs_no_df["subject_nhs_number"].iloc[0]
+
+    # Then Comment: NHS number
+    logging.info(f"[SUBJECT RETRIEVAL] Retrieved subject's NHS number: {nhs_no}")
+
+    SSPIChangeSteps().sspi_update_to_change_dob_received(nhs_no, 75)

utils/oracle/subject_selection_query_builder.py

@@ -716,6 +716,8 @@ def _dispatch_criteria_key(self, user: "User", subject: "Subject") -> None:
             # ------------------------------------------------------------------------
             case SubjectSelectionCriteriaKey.ADD_COLUMN_TO_SELECT_STATEMENT:
                 self._add_extra_column_to_select_statement()
+            case SubjectSelectionCriteriaKey.ADD_JOIN_TO_FROM_STATEMENT:
+                self._add_extra_join_to_from_statement()
             # ------------------------------------------------------------------------
             # 🛑 Fallback: Unmatched Criteria Key
             # ------------------------------------------------------------------------
@@ -792,6 +794,12 @@ def _add_extra_column_to_select_statement(self) -> None:
         """
         self.sql_select.append(f", {self.criteria_value}")
 
+    def _add_extra_join_to_from_statement(self) -> None:
+        """
+        Adds extra joins to the FROM statement.
+        """
+        self.sql_from.append(f" {self.criteria_value} ")
+
     def _add_criteria_nhs_number(self) -> None:
         """
         Adds a check for the subject's NHS number