Added screening referral type filter using screening_referral_type_id and null handling

Author: Andyg79

classes/screening_referral_type.py

@@ -0,0 +1,18 @@
+class ScreeningReferralType:
+    """
+    Maps screening referral descriptions to valid value IDs.
+    """
+
+    _label_to_id = {
+        "gp": 9701,
+        "self referral": 9702,
+        "hospital": 9703,
+        # Add more as needed
+    }
+
+    @classmethod
+    def get_id(cls, description: str) -> int:
+        key = description.strip().lower()
+        if key not in cls._label_to_id:
+            raise ValueError(f"Unknown screening referral type: '{description}'")
+        return cls._label_to_id[key]

utils/oracle/mock_selection_builder.py

@@ -8,23 +8,23 @@
 
 
 # Add helper class stubs below
-class SymptomaticProcedureResultType:
+class ScreeningReferralType:
     """
-    Maps symptom-driven surgery result descriptions to valid value IDs.
+    Maps screening referral descriptions to valid value IDs.
     """
 
     _label_to_id = {
-        "normal": 9601,
-        "inconclusive": 9602,
-        "cancer detected": 9603,
+        "gp": 9701,
+        "self referral": 9702,
+        "hospital": 9703,
         # Extend as needed
     }
 
     @classmethod
     def get_id(cls, description: str) -> int:
         key = description.strip().lower()
         if key not in cls._label_to_id:
-            raise ValueError(f"Unknown symptomatic procedure result: '{description}'")
+            raise ValueError(f"Unknown screening referral type: '{description}'")
         return cls._label_to_id[key]
 
 
@@ -94,21 +94,19 @@ def _add_join_to_surveillance_review(self):
     # 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_symptomatic_procedure_result(self) -> None:
+    def _add_criteria_screening_referral_type(self) -> None:
         """
-        Filters based on symptomatic surgery result value or presence.
+        Filters based on screening referral type ID or null presence.
         """
         try:
-            column = "xt.surgery_result_id"
+            column = "xt.screening_referral_type_id"
             value = self.criteria_value.strip().lower()
 
             if value == "null":
                 self.sql_where.append(f"AND {column} IS NULL")
             else:
-                result_id = SymptomaticProcedureResultType.get_id(self.criteria_value)
-                self.sql_where.append(
-                    f"AND {column} {self.criteria_comparator} {result_id}"
-                )
+                type_id = ScreeningReferralType.get_id(self.criteria_value)
+                self.sql_where.append(f"AND {column} {self.criteria_comparator} {type_id}")
 
         except Exception:
             raise SelectionBuilderException(self.criteria_key_name, self.criteria_value)

utils/oracle/subject_selection_query_builder.py

@@ -48,6 +48,7 @@
 from classes.invited_since_age_extension import InvitedSinceAgeExtension
 from classes.episode_result_type import EpisodeResultType
 from classes.symptomatic_procedure_result_type import SymptomaticProcedureResultType
+from classes.screening_referral_type import ScreeningReferralType
 
 
 class SubjectSelectionQueryBuilder:
@@ -2145,6 +2146,25 @@ def _add_criteria_symptomatic_procedure_result(self) -> None:
         except Exception:
             raise SelectionBuilderException(self.criteria_key_name, self.criteria_value)
 
+    def _add_criteria_screening_referral_type(self) -> None:
+        """
+        Filters based on screening referral type ID or null presence.
+        """
+        try:
+            column = "xt.screening_referral_type_id"
+            value = self.criteria_value.strip().lower()
+
+            if value == "null":
+                self.sql_where.append(f"AND {column} IS NULL")
+            else:
+                type_id = ScreeningReferralType.get_id(self.criteria_value)
+                self.sql_where.append(
+                    f"AND {column} {self.criteria_comparator} {type_id}"
+                )
+
+        except Exception:
+            raise SelectionBuilderException(self.criteria_key_name, self.criteria_value)
+
     # ------------------------------------------------------------------------
     # 🧬 CADS Clinical Dataset Filters
     # ------------------------------------------------------------------------

utils/oracle/test_subject_criteria_dev.py

@@ -41,18 +41,16 @@ def make_builder(key, value, index=0, comparator="="):
     return b
 
 
-# === Test: SYMPTOMATIC_PROCEDURE_RESULT (cancer detected) ===
+# === Test: SCREENING_REFERRAL_TYPE (self referral) ===
 b = make_builder(
-    SubjectSelectionCriteriaKey.SYMPTOMATIC_PROCEDURE_RESULT,
-    "cancer detected",
-    comparator="=",
+    SubjectSelectionCriteriaKey.SCREENING_REFERRAL_TYPE, "self referral", comparator="="
 )
-b._add_criteria_symptomatic_procedure_result()
-print("=== SYMPTOMATIC_PROCEDURE_RESULT (cancer detected) ===")
+b._add_criteria_screening_referral_type()
+print("=== SCREENING_REFERRAL_TYPE (self referral) ===")
 print(b.dump_sql(), end="\n\n")
 
-# === Test: SYMPTOMATIC_PROCEDURE_RESULT (null) ===
-b = make_builder(SubjectSelectionCriteriaKey.SYMPTOMATIC_PROCEDURE_RESULT, "null")
-b._add_criteria_symptomatic_procedure_result()
-print("=== SYMPTOMATIC_PROCEDURE_RESULT (null) ===")
+# === Test: SCREENING_REFERRAL_TYPE (null) ===
+b = make_builder(SubjectSelectionCriteriaKey.SCREENING_REFERRAL_TYPE, "null")
+b._add_criteria_screening_referral_type()
+print("=== SCREENING_REFERRAL_TYPE (null) ===")
 print(b.dump_sql(), end="\n\n")