Added DiagnosticTestIsVoid mapping class and criteria method for filtering voided diagnostic tests

Author: Andyg79

classes/diagnostic_test_is_void.py

@@ -0,0 +1,16 @@
+class DiagnosticTestIsVoid:
+    """
+    Maps descriptive yes/no flags to test void state checks.
+    """
+
+    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 test void flag: '{description}'")
+        return key

utils/oracle/mock_selection_builder.py

@@ -7,22 +7,24 @@
 
 
 # Add helper class stubs below
-class DiagnosticTestType:
+class DiagnosticTestIsVoid:
     """
-    Mock mapping of diagnostic test type names to valid value IDs.
+    Maps yes/no descriptions to boolean flags for test void criteria.
     """
 
+    YES = "yes"
+    NO = "no"
+
     _mapping = {
-        "pcr": 3001,
-        "antigen": 3002,
-        "lateral flow": 3003,
+        "yes": YES,
+        "no": NO,
     }
 
     @classmethod
-    def get_valid_value_id(cls, description: str) -> int:
+    def from_description(cls, description: str) -> str:
         key = description.strip().lower()
         if key not in cls._mapping:
-            raise ValueError(f"Unknown diagnostic test type: {description}")
+            raise ValueError(f"Unknown void flag: {description}")
         return cls._mapping[key]
 
 
@@ -73,35 +75,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_type(self, proposed_or_confirmed: str) -> None:
+    def _add_criteria_diagnostic_test_is_void(self) -> None:
         """
-        Filters diagnostic tests by type—proposed or confirmed.
-        Requires prior join to external_tests_t (xt aliasing assumed).
+        Adds WHERE clause to check whether diagnostic test is voided ('Y' or 'N').
+        Requires prior join to external_tests_t using alias xtN.
         """
         try:
             idx = getattr(self, "criteria_index", 0)
             xt = f"xt{idx}"
+            value = DiagnosticTestIsVoid.from_description(self.criteria_value)
 
-            if proposed_or_confirmed == "proposed":
-                column = f"{xt}.proposed_type_id"
-            elif proposed_or_confirmed == "confirmed":
-                column = f"{xt}.confirmed_type_id"
-            else:
-                raise SelectionBuilderException(
-                    self.criteria_key_name, self.criteria_value
-                )
-
-            self.sql_where.append(f"AND {column} ")
-
-            value = self.criteria_value.strip().lower()
-            if value == "null":
-                self.sql_where.append("IS NULL")
-            elif value == "not null":
-                self.sql_where.append("IS NOT NULL")
+            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'")
             else:
-                comparator = self.criteria_comparator
-                type_id = DiagnosticTestType.get_valid_value_id(self.criteria_value)
-                self.sql_where.append(f"{comparator} {type_id}")
+                raise SelectionBuilderException(self.criteria_key_name, self.criteria_value)
 
         except Exception:
             raise SelectionBuilderException(self.criteria_key_name, self.criteria_value)

utils/oracle/subject_selection_query_builder.py

@@ -29,6 +29,7 @@
 from classes.appointment_status_type import AppointmentStatusType
 from classes.which_diagnostic_test import WhichDiagnosticTest
 from classes.diagnostic_test_type import DiagnosticTestType
+from classes.diagnostic_test_is_void import DiagnosticTestIsVoid
 
 
 class SubjectSelectionQueryBuilder:
@@ -1724,6 +1725,28 @@ def _add_criteria_diagnostic_test_type(self, proposed_or_confirmed: str) -> None
         except Exception:
             raise SelectionBuilderException(self.criteria_key_name, self.criteria_value)
 
+    def _add_criteria_diagnostic_test_is_void(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.
+        """
+        try:
+            idx = getattr(self, "criteria_index", 0)
+            xt = f"xt{idx}"
+            value = DiagnosticTestIsVoid.from_description(self.criteria_value)
+
+            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'")
+            else:
+                raise SelectionBuilderException(
+                    self.criteria_key_name, 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,20 +37,14 @@ def make_builder(key, value, index=0):
     return b
 
 
-# === Test: DIAGNOSTIC_TEST_CONFIRMED_TYPE (valid value) ===
-b = make_builder(SubjectSelectionCriteriaKey.DIAGNOSTIC_TEST_CONFIRMED_TYPE, "PCR")
-b._add_criteria_diagnostic_test_type("confirmed")
-print("=== DIAGNOSTIC_TEST_CONFIRMED_TYPE (valid value) ===")
+# === 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 ===")
 print(b.dump_sql(), end="\n\n")
 
-# === Test: DIAGNOSTIC_TEST_PROPOSED_TYPE (null) ===
-b = make_builder(SubjectSelectionCriteriaKey.DIAGNOSTIC_TEST_PROPOSED_TYPE, "null")
-b._add_criteria_diagnostic_test_type("proposed")
-print("=== DIAGNOSTIC_TEST_PROPOSED_TYPE (null) ===")
-print(b.dump_sql(), end="\n\n")
-
-# === Test: DIAGNOSTIC_TEST_PROPOSED_TYPE (not null) ===
-b = make_builder(SubjectSelectionCriteriaKey.DIAGNOSTIC_TEST_PROPOSED_TYPE, "not null")
-b._add_criteria_diagnostic_test_type("proposed")
-print("=== DIAGNOSTIC_TEST_PROPOSED_TYPE (not null) ===")
+# === 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) ===")
 print(b.dump_sql(), end="\n\n")