Added DiagnosticTestHasResult mapping class and result filter criteria for diagnostic test selection

Author: Andyg79

classes/diagnostic_test_has_result.py

@@ -0,0 +1,33 @@
+class DiagnosticTestHasResult:
+    """
+    Maps descriptive flags and result labels to internal identifiers.
+    Used for interpreting criteria values for diagnostic test result presence or type.
+    """
+
+    YES = "yes"
+    NO = "no"
+
+    _label_to_id = {
+        "positive": 9001,
+        "negative": 9002,
+        "indeterminate": 9003,
+        # Add additional mappings as needed
+    }
+
+    _valid_flags = {YES, NO}
+
+    @classmethod
+    def from_description(cls, description: str):
+        key = description.strip().lower()
+        if key in cls._valid_flags:
+            return key
+        if key in cls._label_to_id:
+            return cls._label_to_id[key]
+        raise ValueError(f"Unknown diagnostic test result description: '{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 result description: '{description}'")
+        return cls._label_to_id[key]

utils/oracle/mock_selection_builder.py

@@ -7,9 +7,9 @@
 
 
 # Add helper class stubs below
-class DiagnosticTestIsVoid:
+class DiagnosticTestHasResult:
     """
-    Maps yes/no descriptions to boolean flags for test void criteria.
+    Resolves whether a diagnostic test has a result, or maps to a specific result ID.
     """
 
     YES = "yes"
@@ -18,15 +18,25 @@ class DiagnosticTestIsVoid:
     _mapping = {
         "yes": YES,
         "no": NO,
+        "positive": 9001,
+        "negative": 9002,
+        "indeterminate": 9003,
     }
 
     @classmethod
-    def from_description(cls, description: str) -> str:
+    def from_description(cls, description: str):
         key = description.strip().lower()
         if key not in cls._mapping:
-            raise ValueError(f"Unknown void flag: {description}")
+            raise ValueError(f"Unknown test result description: '{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: '{description}'")
+
 
 class MockSelectionBuilder:
     """
@@ -75,22 +85,25 @@ 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_is_void(self) -> None:
+    def _add_criteria_diagnostic_test_has_result(self) -> None:
         """
-        Adds WHERE clause to check whether diagnostic test is voided ('Y' or 'N').
-        Requires prior join to external_tests_t using alias xtN.
+        Adds WHERE clause to check whether a diagnostic test has a result (IS NULL / NOT NULL / = result_id).
         """
         try:
             idx = getattr(self, "criteria_index", 0)
             xt = f"xt{idx}"
-            value = DiagnosticTestIsVoid.from_description(self.criteria_value)
+            value = self.criteria_value.strip().lower()
+            result = DiagnosticTestHasResult.from_description(value)
+
+            self.sql_where.append(f"AND {xt}.result_id ")
 
-            if value == DiagnosticTestIsVoid.YES:
-                self.sql_where.append(f"AND {xt}.void = 'Y'")
-            elif value == DiagnosticTestIsVoid.NO:
-                self.sql_where.append(f"AND {xt}.void = 'N'")
+            if result == DiagnosticTestHasResult.YES:
+                self.sql_where.append("IS NOT NULL")
+            elif result == DiagnosticTestHasResult.NO:
+                self.sql_where.append("IS NULL")
             else:
-                raise SelectionBuilderException(self.criteria_key_name, self.criteria_value)
+                result_id = DiagnosticTestHasResult.get_id(value)
+                self.sql_where.append(f"= {result_id}")
 
         except Exception:
             raise SelectionBuilderException(self.criteria_key_name, self.criteria_value)

utils/oracle/subject_selection_query_builder.py

@@ -30,6 +30,7 @@
 from classes.which_diagnostic_test import WhichDiagnosticTest
 from classes.diagnostic_test_type import DiagnosticTestType
 from classes.diagnostic_test_is_void import DiagnosticTestIsVoid
+from classes.diagnostic_test_has_result import DiagnosticTestHasResult
 
 
 class SubjectSelectionQueryBuilder:
@@ -1747,6 +1748,29 @@ def _add_criteria_diagnostic_test_is_void(self) -> None:
         except Exception:
             raise SelectionBuilderException(self.criteria_key_name, self.criteria_value)
 
+    def _add_criteria_diagnostic_test_has_result(self) -> None:
+        """
+        Adds WHERE clause to check whether a diagnostic test has a result (IS NULL / NOT NULL / = result_id).
+        """
+        try:
+            idx = getattr(self, "criteria_index", 0)
+            xt = f"xt{idx}"
+            value = self.criteria_value.strip().lower()
+            result = DiagnosticTestHasResult.from_description(value)
+
+            self.sql_where.append(f"AND {xt}.result_id ")
+
+            if result == DiagnosticTestHasResult.YES:
+                self.sql_where.append("IS NOT NULL")
+            elif result == DiagnosticTestHasResult.NO:
+                self.sql_where.append("IS NULL")
+            else:
+                result_id = DiagnosticTestHasResult.get_id(value)
+                self.sql_where.append(f"= {result_id}")
+
+        except Exception:
+            raise SelectionBuilderException(self.criteria_key_name, self.criteria_value)
+
     # ------------------------------------------------------------------------
     # 🧬 CADS Clinical Dataset Filters
     # ------------------------------------------------------------------------

utils/oracle/test_subject_criteria_dev.py

@@ -37,14 +37,20 @@ def make_builder(key, value, index=0):
     return b
 
 
-# === Test: DIAGNOSTIC_TEST_IS_VOID ===
-b = make_builder(SubjectSelectionCriteriaKey.DIAGNOSTIC_TEST_IS_VOID, "yes")
-b._add_criteria_diagnostic_test_is_void()
-print("=== DIAGNOSTIC_TEST_IS_VOID ===")
+# === Test: DIAGNOSTIC_TEST_HAS_RESULT (yes) ===
+b = make_builder(SubjectSelectionCriteriaKey.DIAGNOSTIC_TEST_HAS_RESULT, "yes")
+b._add_criteria_diagnostic_test_has_result()
+print("=== DIAGNOSTIC_TEST_HAS_RESULT (yes) ===")
 print(b.dump_sql(), end="\n\n")
 
-# === Test: DIAGNOSTIC_TEST_IS_VOID (not void) ===
-b = make_builder(SubjectSelectionCriteriaKey.DIAGNOSTIC_TEST_IS_VOID, "no", index=1)
-b._add_criteria_diagnostic_test_is_void()
-print("=== DIAGNOSTIC_TEST_IS_VOID (not void) ===")
+# === Test: DIAGNOSTIC_TEST_HAS_RESULT (no) ===
+b = make_builder(SubjectSelectionCriteriaKey.DIAGNOSTIC_TEST_HAS_RESULT, "no")
+b._add_criteria_diagnostic_test_has_result()
+print("=== DIAGNOSTIC_TEST_HAS_RESULT (no) ===")
+print(b.dump_sql(), end="\n\n")
+
+# === Test: DIAGNOSTIC_TEST_HAS_RESULT (positive) ===
+b = make_builder(SubjectSelectionCriteriaKey.DIAGNOSTIC_TEST_HAS_RESULT, "positive")
+b._add_criteria_diagnostic_test_has_result()
+print("=== DIAGNOSTIC_TEST_HAS_RESULT (positive) ===")
 print(b.dump_sql(), end="\n\n")