Added latest episode type and sub-type logic to subject_selection_query_builder

Author: Andyg79

utils/oracle/mock_selection_builder.py

@@ -27,30 +27,43 @@ def __init__(self, criteria_key, criteria_value, criteria_comparator=">="):
         self.criteria_comparator = criteria_comparator
         self.sql_where = []
 
+    # Don't delete this method; it is used to inspect the SQL fragments
     def dump_sql(self):
         return "\n".join(self.sql_where)
 
     # === Example testable method below ===
     # Replace this with the one you want to test,
     # then use utils/oracle/test_subject_criteria_dev.py to run your scenarios
 
-    def _add_criteria_subject_lower_lynch_age(self) -> None:
+    def _add_criteria_latest_episode_sub_type(self) -> None:
         """
-        Adds a SQL constraint for Lynch syndrome lower-age eligibility.
+        Adds a SQL condition that filters based on the episode_subtype_id of a subject's latest episode.
 
-        If value is 'default', it's replaced with '35'.
-        Uses comparator to build the WHERE clause.
+        Translates a human-readable episode sub-type string into an internal numeric ID.
         """
         try:
-            value = self.criteria_value
+            value = self.criteria_value.lower()
             comparator = self.criteria_comparator
 
-            if value.lower() == "default":
-                value = "35"
+            # Simulated EpisodeSubType enum mapping
+            episode_subtype_map = {
+                "routine screening": 10,
+                "urgent referral": 11,
+                "pre-assessment": 12,
+                "follow-up": 13,
+                "surveillance": 14,
+                # Add more mappings as needed
+            }
 
+            if value not in episode_subtype_map:
+                raise ValueError(f"Unknown episode sub-type: {value}")
+
+            episode_subtype_id = episode_subtype_map[value]
+
+            # Add SQL condition using the mapped ID
             self.sql_where.append(
-                f"AND pkg_bcss_common.f_get_lynch_lower_age_limit (ss.screening_subject_id) "
-                f"{comparator} {value}"
+                f"AND ep.episode_subtype_id {comparator} {episode_subtype_id}"
             )
+
         except Exception:
             raise SelectionBuilderException(self.criteria_key_name, self.criteria_value)

utils/oracle/subject_selection_query_builder.py

@@ -664,6 +664,40 @@ def _add_criteria_subject_lower_lynch_age(self) -> None:
         except Exception:
             raise SelectionBuilderException(self.criteria_key_name, self.criteria_value)
 
+    def _add_criteria_latest_episode_type(self) -> None:
+        """
+        Adds a SQL condition that restricts subjects based on the episode_type_id of their latest episode.
+
+        Translates a human-readable episode type string into an internal numeric ID.
+        """
+        try:
+            value = self.criteria_value.lower()
+            comparator = self.criteria_comparator
+
+            # Simulate EpisodeType enum mapping
+            episode_type_map = {
+                "referral": 1,
+                "invitation": 2,
+                "test_kit_sent": 3,
+                "reminder": 4,
+                "episode_end": 5,
+                # Add more mappings as needed
+            }
+
+            if value not in episode_type_map:
+                raise ValueError(f"Unknown episode type: {value}")
+
+            episode_type_id = episode_type_map[value]
+
+            # Simulate the required join (docs only—no real SQL execution here)
+            # In real builder this would ensure join to 'latest_episode' alias (ep)
+            self.sql_where.append(
+                f"AND ep.episode_type_id {comparator} {episode_type_id}"
+            )
+
+        except Exception:
+            raise SelectionBuilderException(self.criteria_key_name, self.criteria_value)
+
     def _add_criteria_subject_hub_code(self, user: "User") -> None:
         hub_code = None
         try:

utils/oracle/test_subject_criteria_dev.py

@@ -30,30 +30,18 @@
 # === Example usage ===
 # Replace the examples below with the method you want to test
 
-# === Test: SUBJECT_HAS_AN_OPEN_EPISODE — yes ===
+# === Test: LATEST_EPISODE_SUB_TYPE — Routine Screening ===
 builder = MockSelectionBuilder(
-    SubjectSelectionCriteriaKey.SUBJECT_HAS_AN_OPEN_EPISODE, "yes"
+    SubjectSelectionCriteriaKey.LATEST_EPISODE_SUB_TYPE, "routine screening"
 )
-builder._add_criteria_subject_has_episodes()
-print("=== SUBJECT_HAS_AN_OPEN_EPISODE — yes ===")
+builder._add_criteria_latest_episode_sub_type()
+print("=== LATEST_EPISODE_SUB_TYPE — routine screening ===")
 print(builder.dump_sql(), end="\n\n")
 
-# === Test: SUBJECT_HAS_EPISODES — yes ===
-builder = MockSelectionBuilder(SubjectSelectionCriteriaKey.SUBJECT_HAS_EPISODES, "yes")
-builder._add_criteria_subject_has_episodes()
-print("=== SUBJECT_HAS_EPISODES — yes ===")
-print(builder.dump_sql(), end="\n\n")
-
-# === Test: SUBJECT_HAS_EPISODES — no ===
-builder = MockSelectionBuilder(SubjectSelectionCriteriaKey.SUBJECT_HAS_EPISODES, "no")
-builder._add_criteria_subject_has_episodes()
-print("=== SUBJECT_HAS_EPISODES — no ===")
-print(builder.dump_sql(), end="\n\n")
-
-# === Test: SUBJECT_HAS_FOBT_EPISODES — yes ===
+# === Test: LATEST_EPISODE_SUB_TYPE — Follow-up with custom comparator ===
 builder = MockSelectionBuilder(
-    SubjectSelectionCriteriaKey.SUBJECT_HAS_FOBT_EPISODES, "yes"
+    SubjectSelectionCriteriaKey.LATEST_EPISODE_SUB_TYPE, "follow-up", "!="
 )
-builder._add_criteria_subject_has_episodes(EpisodeType.FOBT)
-print("=== SUBJECT_HAS_FOBT_EPISODES — yes with episode_type ===")
+builder._add_criteria_latest_episode_sub_type()
+print("=== LATEST_EPISODE_SUB_TYPE — follow-up (!=) ===")
 print(builder.dump_sql(), end="\n\n")