Added subject filter for presence of existing surveillance review case

Author: Andyg79

classes/does_subject_have_surveillance_review_case.py

@@ -0,0 +1,18 @@
+class DoesSubjectHaveSurveillanceReviewCase:
+    """
+    Maps binary criteria for presence of a surveillance review case.
+    """
+
+    YES = "yes"
+    NO = "no"
+
+    _valid_values = {YES, NO}
+
+    @classmethod
+    def from_description(cls, description: str) -> str:
+        key = description.strip().lower()
+        if key not in cls._valid_values:
+            raise ValueError(
+                f"Unknown surveillance review case presence: '{description}'"
+            )
+        return key

utils/oracle/mock_selection_builder.py

@@ -9,24 +9,23 @@
 
 
 # Add helper class stubs below
-class SurveillanceReviewStatusType:
-    """
-    Maps descriptive surveillance review statuses to valid value IDs.
-    """
+class DoesSubjectHaveSurveillanceReviewCase:
+    YES = "yes"
+    NO = "no"
 
-    _label_to_id = {
-        "awaiting review": 9301,
-        "in progress": 9302,
-        "completed": 9303,
-        # Extend as needed
+    _mapping = {
+        "yes": YES,
+        "no": NO,
     }
 
     @classmethod
-    def get_id(cls, description: str) -> int:
+    def from_description(cls, description: str) -> str:
         key = description.strip().lower()
-        if key not in cls._label_to_id:
-            raise ValueError(f"Unknown review status: '{description}'")
-        return cls._label_to_id[key]
+        if key not in cls._mapping:
+            raise ValueError(
+                f"Unknown surveillance review case presence: '{description}'"
+            )
+        return cls._mapping[key]
 
 
 class MockSelectionBuilder:
@@ -95,16 +94,18 @@ 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_surveillance_review_status(self) -> None:
+    def _add_criteria_does_subject_have_surveillance_review_case(self) -> None:
         """
-        Filters subjects based on the review_status_id in their surveillance review dataset.
+        Filters subjects based on presence or absence of a surveillance review case.
         """
         try:
-            self._add_join_to_surveillance_review()
-            status_id = SurveillanceReviewStatusType.get_id(self.criteria_value)
+            value = DoesSubjectHaveSurveillanceReviewCase.from_description(self.criteria_value)
+
+            clause = "AND EXISTS" if value == "yes" else "AND NOT EXISTS"
 
             self.sql_where.append(
-                f"AND sr.review_status_id {self.criteria_comparator} {status_id}"
+                f"{clause} (SELECT 'sr' FROM surveillance_review sr "
+                "WHERE sr.subject_id = ss.screening_subject_id)"
             )
 
         except Exception:

utils/oracle/subject_selection_query_builder.py

@@ -39,7 +39,10 @@
 from classes.latest_episode_latest_investigation_dataset import (
     LatestEpisodeLatestInvestigationDataset,
 )
-from classes.surveillance_review_status_type import SurveillanceReviewStatusType 
+from classes.surveillance_review_status_type import SurveillanceReviewStatusType
+from classes.does_subject_have_surveillance_review_case import (
+    DoesSubjectHaveSurveillanceReviewCase,
+)
 
 
 class SubjectSelectionQueryBuilder:
@@ -1999,13 +2002,31 @@ def _add_criteria_surveillance_review_status(self) -> None:
 
         except Exception:
             raise SelectionBuilderException(self.criteria_key_name, self.criteria_value)
-    
+
     def _add_join_to_surveillance_review(self) -> None:
         """
         Internal helper. Adds the necessary join to the surveillance review dataset for filtering.
         """
         self.sql_from.append("-- JOIN to surveillance review placeholder")
 
+    def _add_criteria_does_subject_have_surveillance_review_case(self) -> None:
+        """
+        Filters subjects based on presence or absence of a surveillance review case.
+        """
+        try:
+            value = DoesSubjectHaveSurveillanceReviewCase.from_description(
+                self.criteria_value
+            )
+
+            clause = "AND EXISTS" if value == "yes" else "AND NOT EXISTS"
+
+            self.sql_where.append(
+                f"{clause} (SELECT 'sr' FROM surveillance_review sr "
+                "WHERE sr.subject_id = ss.screening_subject_id)"
+            )
+
+        except Exception:
+            raise SelectionBuilderException(self.criteria_key_name, self.criteria_value)
 
     # ------------------------------------------------------------------------
     # 🧬 CADS Clinical Dataset Filters

utils/oracle/test_subject_criteria_dev.py

@@ -41,10 +41,18 @@ def make_builder(key, value, index=0, comparator="="):
     return b
 
 
-# === Test: SURVEILLANCE_REVIEW_STATUS (completed) ===
+# === Test: HAS_EXISTING_SURVEILLANCE_REVIEW_CASE (yes) ===
 b = make_builder(
-    SubjectSelectionCriteriaKey.SURVEILLANCE_REVIEW_STATUS, "completed", comparator=">="
+    SubjectSelectionCriteriaKey.HAS_EXISTING_SURVEILLANCE_REVIEW_CASE, "yes"
 )
-b._add_criteria_surveillance_review_status()
-print("=== SURVEILLANCE_REVIEW_STATUS (completed) ===")
+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) ===")
 print(b.dump_sql(), end="\n\n")