Added surveillance review case type filter using review_case_type_id mapping

Author: Andyg79

classes/surveillance_review_case_type.py

@@ -0,0 +1,18 @@
+class SurveillanceReviewCaseType:
+    """
+    Maps surveillance review case type labels to valid value IDs.
+    """
+
+    _label_to_id = {
+        "routine": 9401,
+        "escalation": 9402,
+        "clinical discussion": 9403,
+        # Extend with additional mappings 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 review case type: '{description}'")
+        return cls._label_to_id[key]

utils/oracle/mock_selection_builder.py

@@ -9,23 +9,24 @@
 
 
 # Add helper class stubs below
-class DoesSubjectHaveSurveillanceReviewCase:
-    YES = "yes"
-    NO = "no"
+class SurveillanceReviewCaseType:
+    """
+    Maps surveillance review case type labels to valid value IDs.
+    """
 
-    _mapping = {
-        "yes": YES,
-        "no": NO,
+    _label_to_id = {
+        "routine": 9401,
+        "escalation": 9402,
+        "clinical discussion": 9403,
+        # Extend as needed
     }
 
     @classmethod
-    def from_description(cls, description: str) -> str:
+    def get_id(cls, description: str) -> int:
         key = description.strip().lower()
-        if key not in cls._mapping:
-            raise ValueError(
-                f"Unknown surveillance review case presence: '{description}'"
-            )
-        return cls._mapping[key]
+        if key not in cls._label_to_id:
+            raise ValueError(f"Unknown surveillance review case type: '{description}'")
+        return cls._label_to_id[key]
 
 
 class MockSelectionBuilder:
@@ -94,18 +95,16 @@ 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_does_subject_have_surveillance_review_case(self) -> None:
+    def _add_criteria_surveillance_review_type(self) -> None:
         """
-        Filters subjects based on presence or absence of a surveillance review case.
+        Filters subjects based on review_case_type_id in the surveillance review dataset.
         """
         try:
-            value = DoesSubjectHaveSurveillanceReviewCase.from_description(self.criteria_value)
-
-            clause = "AND EXISTS" if value == "yes" else "AND NOT EXISTS"
+            self._add_join_to_surveillance_review()
+            type_id = SurveillanceReviewCaseType.get_id(self.criteria_value)
 
             self.sql_where.append(
-                f"{clause} (SELECT 'sr' FROM surveillance_review sr "
-                "WHERE sr.subject_id = ss.screening_subject_id)"
+                f"AND sr.review_case_type_id {self.criteria_comparator} {type_id}"
             )
 
         except Exception:

utils/oracle/subject_selection_query_builder.py

@@ -43,6 +43,7 @@
 from classes.does_subject_have_surveillance_review_case import (
     DoesSubjectHaveSurveillanceReviewCase,
 )
+from classes.surveillance_review_case_type import SurveillanceReviewCaseType
 
 
 class SubjectSelectionQueryBuilder:
@@ -2028,6 +2029,21 @@ def _add_criteria_does_subject_have_surveillance_review_case(self) -> None:
         except Exception:
             raise SelectionBuilderException(self.criteria_key_name, self.criteria_value)
 
+    def _add_criteria_surveillance_review_type(self) -> None:
+        """
+        Filters subjects based on review_case_type_id in the surveillance review dataset.
+        """
+        try:
+            self._add_join_to_surveillance_review()
+            type_id = SurveillanceReviewCaseType.get_id(self.criteria_value)
+
+            self.sql_where.append(
+                f"AND sr.review_case_type_id {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,12 @@ def make_builder(key, value, index=0, comparator="="):
     return b
 
 
-# === Test: HAS_EXISTING_SURVEILLANCE_REVIEW_CASE (yes) ===
+# === Test: SURVEILLANCE_REVIEW_CASE_TYPE (escalation) ===
 b = make_builder(
-    SubjectSelectionCriteriaKey.HAS_EXISTING_SURVEILLANCE_REVIEW_CASE, "yes"
+    SubjectSelectionCriteriaKey.SURVEILLANCE_REVIEW_CASE_TYPE,
+    "escalation",
+    comparator="=",
 )
-b._add_criteria_does_subject_have_surveillance_review_case()
-print("=== HAS_EXISTING_SURVEILLANCE_REVIEW_CASE (yes) ===")
-print(b.dump_sql(), end="\n\n")
-
-# === Test: HAS_EXISTING_SURVEILLANCE_REVIEW_CASE (no) ===
-b = make_builder(
-    SubjectSelectionCriteriaKey.HAS_EXISTING_SURVEILLANCE_REVIEW_CASE, "no", index=1
-)
-b._add_criteria_does_subject_have_surveillance_review_case()
-print("=== HAS_EXISTING_SURVEILLANCE_REVIEW_CASE (no) ===")
+b._add_criteria_surveillance_review_type()
+print("=== SURVEILLANCE_REVIEW_CASE_TYPE (escalation) ===")
 print(b.dump_sql(), end="\n\n")