Added IntendedExtentType mapping class and builder logic for diagnostic test intended extent filtering

Author: Andyg79

classes/intended_extent_type.py

@@ -0,0 +1,40 @@
+class IntendedExtentType:
+    """
+    Maps intended extent values to nullability flags or valid value IDs.
+    """
+
+    NULL = "null"
+    NOT_NULL = "not null"
+
+    _label_to_id = {
+        "full": 9201,
+        "partial": 9202,
+        "none": 9203,
+        # Add others as needed
+    }
+
+    _null_flags = {NULL, NOT_NULL}
+
+    @classmethod
+    def from_description(cls, description: str):
+        key = description.strip().lower()
+        if key in cls._null_flags:
+            return key
+        if key in cls._label_to_id:
+            return cls._label_to_id[key]
+        raise ValueError(f"Unknown intended extent: '{description}'")
+
+    @classmethod
+    def get_id(cls, description: str) -> int:
+        key = description.strip().lower()
+        if key not in cls._label_to_id:
+            raise ValueError(f"No ID available for intended extent: '{description}'")
+        return cls._label_to_id[key]
+
+    @classmethod
+    def get_description(cls, sentinel: str) -> str:
+        if sentinel == cls.NULL:
+            return "NULL"
+        if sentinel == cls.NOT_NULL:
+            return "NOT NULL"
+        raise ValueError(f"Invalid sentinel: '{sentinel}'")

utils/oracle/mock_selection_builder.py

@@ -7,35 +7,43 @@
 
 
 # Add helper class stubs below
-class DiagnosticTestHasOutcomeOfResult:
+class IntendedExtentType:
     """
-    Maps outcome-of-result criteria values to either flags or valid value IDs.
+    Resolves intended extent descriptions to valid value IDs or null-check constants.
     """
 
-    YES = "yes"
-    NO = "no"
+    NULL = "null"
+    NOT_NULL = "not null"
 
     _mapping = {
-        "yes": YES,
-        "no": NO,
-        "referred": 9101,
-        "treated": 9102,
-        "not required": 9103,
+        "null": NULL,
+        "not null": NOT_NULL,
+        "full": 9201,
+        "partial": 9202,
+        "none": 9203,
     }
 
     @classmethod
     def from_description(cls, description: str):
         key = description.strip().lower()
         if key not in cls._mapping:
-            raise ValueError(f"Unknown outcome description: '{description}'")
+            raise ValueError(f"Unknown intended extent: '{description}'")
         return cls._mapping[key]
 
     @classmethod
     def get_id(cls, description: str) -> int:
         val = cls.from_description(description)
         if isinstance(val, int):
             return val
-        raise ValueError(f"No ID associated with outcome: '{description}'")
+        raise ValueError(f"No ID associated with extent: '{description}'")
+
+    @classmethod
+    def get_description(cls, sentinel: str) -> str:
+        if sentinel == cls.NULL:
+            return "NULL"
+        if sentinel == cls.NOT_NULL:
+            return "NOT NULL"
+        raise ValueError(f"Unknown null sentinel: {sentinel}")
 
 
 class MockSelectionBuilder:
@@ -85,25 +93,22 @@ def _add_join_to_latest_episode(self) -> None:
     # 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_diagnostic_test_has_outcome_of_result(self) -> None:
+    def _add_criteria_diagnostic_test_intended_extent(self) -> None:
         """
-        Adds WHERE clause filtering on whether the diagnostic test has an outcome-of-result.
+        Adds WHERE clause filtering diagnostic tests by intended_extent_id.
+        Supports null checks and value comparisons.
         """
         try:
             idx = getattr(self, "criteria_index", 0)
             xt = f"xt{idx}"
-            value = self.criteria_value.strip().lower()
-            outcome = DiagnosticTestHasOutcomeOfResult.from_description(value)
+            extent = IntendedExtentType.from_description(self.criteria_value)
 
-            self.sql_where.append(f"AND {xt}.outcome_of_result_id ")
+            self.sql_where.append(f"AND {xt}.intended_extent_id ")
 
-            if outcome == DiagnosticTestHasOutcomeOfResult.YES:
-                self.sql_where.append("IS NOT NULL")
-            elif outcome == DiagnosticTestHasOutcomeOfResult.NO:
-                self.sql_where.append("IS NULL")
+            if extent in (IntendedExtentType.NULL, IntendedExtentType.NOT_NULL):
+                self.sql_where.append(f"IS {IntendedExtentType.get_description(extent)}")
             else:
-                outcome_id = DiagnosticTestHasOutcomeOfResult.get_id(value)
-                self.sql_where.append(f"= {outcome_id}")
+                self.sql_where.append(f"{self.criteria_comparator} {IntendedExtentType.get_id(self.criteria_value)}")
 
         except Exception:
             raise SelectionBuilderException(self.criteria_key_name, self.criteria_value)

utils/oracle/subject_selection_query_builder.py

@@ -34,6 +34,7 @@
 from classes.diagnostic_test_has_outcome_of_result import (
     DiagnosticTestHasOutcomeOfResult,
 )
+from classes.intended_extent_type import IntendedExtentType
 
 
 class SubjectSelectionQueryBuilder:
@@ -1797,6 +1798,30 @@ def _add_criteria_diagnostic_test_has_outcome_of_result(self) -> None:
         except Exception:
             raise SelectionBuilderException(self.criteria_key_name, self.criteria_value)
 
+    def _add_criteria_diagnostic_test_intended_extent(self) -> None:
+        """
+        Adds WHERE clause filtering diagnostic tests by intended_extent_id.
+        Supports null checks and value comparisons.
+        """
+        try:
+            idx = getattr(self, "criteria_index", 0)
+            xt = f"xt{idx}"
+            extent = IntendedExtentType.from_description(self.criteria_value)
+
+            self.sql_where.append(f"AND {xt}.intended_extent_id ")
+
+            if extent in (IntendedExtentType.NULL, IntendedExtentType.NOT_NULL):
+                self.sql_where.append(
+                    f"IS {IntendedExtentType.get_description(extent)}"
+                )
+            else:
+                self.sql_where.append(
+                    f"{self.criteria_comparator} {IntendedExtentType.get_id(self.criteria_value)}"
+                )
+
+        except Exception:
+            raise SelectionBuilderException(self.criteria_key_name, self.criteria_value)
+
     # ------------------------------------------------------------------------
     # 🧬 CADS Clinical Dataset Filters
     # ------------------------------------------------------------------------

utils/oracle/test_subject_criteria_dev.py

@@ -37,22 +37,24 @@ def make_builder(key, value, index=0):
     return b
 
 
-# === Test: DIAGNOSTIC_TEST_HAS_OUTCOME (yes) ===
-b = make_builder(SubjectSelectionCriteriaKey.DIAGNOSTIC_TEST_HAS_OUTCOME, "yes")
-b._add_criteria_diagnostic_test_has_outcome_of_result()
-print("=== DIAGNOSTIC_TEST_HAS_OUTCOME (yes) ===")
+# === Test: DIAGNOSTIC_TEST_INTENDED_EXTENT (null) ===
+b = make_builder(SubjectSelectionCriteriaKey.DIAGNOSTIC_TEST_INTENDED_EXTENT, "null")
+b._add_criteria_diagnostic_test_intended_extent()
+print("=== DIAGNOSTIC_TEST_INTENDED_EXTENT (null) ===")
 print(b.dump_sql(), end="\n\n")
 
-# === Test: DIAGNOSTIC_TEST_HAS_OUTCOME (no) ===
-b = make_builder(SubjectSelectionCriteriaKey.DIAGNOSTIC_TEST_HAS_OUTCOME, "no", index=1)
-b._add_criteria_diagnostic_test_has_outcome_of_result()
-print("=== DIAGNOSTIC_TEST_HAS_OUTCOME (no) ===")
+# === Test: DIAGNOSTIC_TEST_INTENDED_EXTENT (not null) ===
+b = make_builder(
+    SubjectSelectionCriteriaKey.DIAGNOSTIC_TEST_INTENDED_EXTENT, "not null", index=1
+)
+b._add_criteria_diagnostic_test_intended_extent()
+print("=== DIAGNOSTIC_TEST_INTENDED_EXTENT (not null) ===")
 print(b.dump_sql(), end="\n\n")
 
-# === Test: DIAGNOSTIC_TEST_HAS_OUTCOME (treated) ===
+# === Test: DIAGNOSTIC_TEST_INTENDED_EXTENT (partial) ===
 b = make_builder(
-    SubjectSelectionCriteriaKey.DIAGNOSTIC_TEST_HAS_OUTCOME, "treated", index=2
+    SubjectSelectionCriteriaKey.DIAGNOSTIC_TEST_INTENDED_EXTENT, "partial", index=2
 )
-b._add_criteria_diagnostic_test_has_outcome_of_result()
-print("=== DIAGNOSTIC_TEST_HAS_OUTCOME (treated) ===")
+b._add_criteria_diagnostic_test_intended_extent()
+print("=== DIAGNOSTIC_TEST_INTENDED_EXTENT (partial) ===")
 print(b.dump_sql(), end="\n\n")