Added filter for presence of date-of-death removal record using rad_type_id

Author: Andyg79

classes/has_date_of_death_removal.py

@@ -0,0 +1,18 @@
+class HasDateOfDeathRemoval:
+    """
+    Maps binary filter for presence of date-of-death removal record.
+    """
+
+    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"Invalid value for date-of-death removal filter: '{description}'"
+            )
+        return key

utils/oracle/mock_selection_builder.py

@@ -9,24 +9,23 @@
 
 
 # Add helper class stubs below
-class SurveillanceReviewCaseType:
-    """
-    Maps surveillance review case type labels to valid value IDs.
-    """
+class HasDateOfDeathRemoval:
+    YES = "yes"
+    NO = "no"
 
-    _label_to_id = {
-        "routine": 9401,
-        "escalation": 9402,
-        "clinical discussion": 9403,
-        # 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 surveillance review case type: '{description}'")
-        return cls._label_to_id[key]
+        if key not in cls._mapping:
+            raise ValueError(
+                f"Unknown input for HasDateOfDeathRemoval: '{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_type(self) -> None:
+    def _add_criteria_has_date_of_death_removal(self) -> None:
         """
-        Filters subjects based on review_case_type_id in the surveillance review dataset.
+        Filters subjects based on presence or absence of a date-of-death removal record.
         """
         try:
-            self._add_join_to_surveillance_review()
-            type_id = SurveillanceReviewCaseType.get_id(self.criteria_value)
+            value = HasDateOfDeathRemoval.from_description(self.criteria_value)
+            clause = "EXISTS" if value == "yes" else "NOT EXISTS"
 
             self.sql_where.append(
-                f"AND sr.review_case_type_id {self.criteria_comparator} {type_id}"
+                f"AND {clause} (SELECT 'dodr' FROM report_additional_data_t dodr "
+                "WHERE dodr.rad_type_id = 15901 "
+                "AND dodr.entity_id = c.contact_id)"
             )
 
         except Exception:

utils/oracle/subject_selection_query_builder.py

@@ -44,6 +44,7 @@
     DoesSubjectHaveSurveillanceReviewCase,
 )
 from classes.surveillance_review_case_type import SurveillanceReviewCaseType
+from classes.has_date_of_death_removal import HasDateOfDeathRemoval
 
 
 class SubjectSelectionQueryBuilder:
@@ -2044,6 +2045,23 @@ def _add_criteria_surveillance_review_type(self) -> None:
         except Exception:
             raise SelectionBuilderException(self.criteria_key_name, self.criteria_value)
 
+    def _add_criteria_has_date_of_death_removal(self) -> None:
+        """
+        Filters subjects based on presence or absence of a date-of-death removal record.
+        """
+        try:
+            value = HasDateOfDeathRemoval.from_description(self.criteria_value)
+            clause = "EXISTS" if value == "yes" else "NOT EXISTS"
+
+            self.sql_where.append(
+                f"AND {clause} (SELECT 'dodr' FROM report_additional_data_t dodr "
+                "WHERE dodr.rad_type_id = 15901 "
+                "AND dodr.entity_id = c.contact_id)"
+            )
+
+        except Exception:
+            raise SelectionBuilderException(self.criteria_key_name, self.criteria_value)
+
     # ------------------------------------------------------------------------
     # 🧬 CADS Clinical Dataset Filters
     # ------------------------------------------------------------------------

utils/oracle/test_subject_criteria_dev.py

@@ -41,12 +41,14 @@ def make_builder(key, value, index=0, comparator="="):
     return b
 
 
-# === Test: SURVEILLANCE_REVIEW_CASE_TYPE (escalation) ===
-b = make_builder(
-    SubjectSelectionCriteriaKey.SURVEILLANCE_REVIEW_CASE_TYPE,
-    "escalation",
-    comparator="=",
-)
-b._add_criteria_surveillance_review_type()
-print("=== SURVEILLANCE_REVIEW_CASE_TYPE (escalation) ===")
+# === Test: HAS_HAD_A_DATE_OF_DEATH_REMOVAL (yes) ===
+b = make_builder(SubjectSelectionCriteriaKey.HAS_HAD_A_DATE_OF_DEATH_REMOVAL, "yes")
+b._add_criteria_has_date_of_death_removal()
+print("=== HAS_HAD_A_DATE_OF_DEATH_REMOVAL (yes) ===")
+print(b.dump_sql(), end="\n\n")
+
+# === Test: HAS_HAD_A_DATE_OF_DEATH_REMOVAL (no) ===
+b = make_builder(SubjectSelectionCriteriaKey.HAS_HAD_A_DATE_OF_DEATH_REMOVAL, "no")
+b._add_criteria_has_date_of_death_removal()
+print("=== HAS_HAD_A_DATE_OF_DEATH_REMOVAL (no) ===")
 print(b.dump_sql(), end="\n\n")