Added symptomatic procedure result filter using surgery_result_id and null check

Author: Andyg79

classes/symptomatic_procedure_result_type.py

@@ -0,0 +1,18 @@
+class SymptomaticProcedureResultType:
+    """
+    Maps symptomatic surgery result labels to valid value IDs.
+    """
+
+    _label_to_id = {
+        "normal": 9601,
+        "inconclusive": 9602,
+        "cancer detected": 9603,
+        # Add more as needed
+    }
+
+    @classmethod
+    def get_id(cls, description: str) -> int:
+        key = description.strip().lower()
+        if key not in cls._label_to_id:
+            raise ValueError(f"Unknown symptomatic procedure result: '{description}'")
+        return cls._label_to_id[key]

utils/oracle/mock_selection_builder.py

@@ -8,31 +8,24 @@
 
 
 # Add helper class stubs below
-class EpisodeResultType:
+class SymptomaticProcedureResultType:
     """
-    Represents various episode result types including special symbolic values.
+    Maps symptom-driven surgery result descriptions to valid value IDs.
     """
 
-    NULL = "null"
-    NOT_NULL = "not_null"
-    ANY_SURVEILLANCE_NON_PARTICIPATION = "any_surveillance_non_participation"
-
     _label_to_id = {
-        # Add actual mappings here, for example:
-        "normal": 9501,
-        "abnormal": 9502,
-        "surveillance offered": 9503,
-        # etc.
+        "normal": 9601,
+        "inconclusive": 9602,
+        "cancer detected": 9603,
+        # Extend as needed
     }
 
     @classmethod
-    def from_description(cls, description: str):
+    def get_id(cls, description: str) -> int:
         key = description.strip().lower()
-        if key in {cls.NULL, cls.NOT_NULL, cls.ANY_SURVEILLANCE_NON_PARTICIPATION}:
-            return key
-        if key in cls._label_to_id:
-            return cls._label_to_id[key]
-        raise ValueError(f"Unknown episode result type: '{description}'")
+        if key not in cls._label_to_id:
+            raise ValueError(f"Unknown symptomatic procedure result: '{description}'")
+        return cls._label_to_id[key]
 
 
 class MockSelectionBuilder:
@@ -101,27 +94,21 @@ 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_latest_episode_accumulated_episode_result(self) -> None:
+    def _add_criteria_symptomatic_procedure_result(self) -> None:
         """
-        Filters subjects based on the result of their latest episode.
+        Filters based on symptomatic surgery result value or presence.
         """
         try:
-            self._add_join_to_latest_episode()
-            value = EpisodeResultType.from_description(self.criteria_value)
-
-            if value == EpisodeResultType.NULL:
-                self.sql_where.append("AND ep.episode_result_id IS NULL")
-            elif value == EpisodeResultType.NOT_NULL:
-                self.sql_where.append("AND ep.episode_result_id IS NOT NULL")
-            elif value == EpisodeResultType.ANY_SURVEILLANCE_NON_PARTICIPATION:
+            column = "xt.surgery_result_id"
+            value = self.criteria_value.strip().lower()
+
+            if value == "null":
+                self.sql_where.append(f"AND {column} IS NULL")
+            else:
+                result_id = SymptomaticProcedureResultType.get_id(self.criteria_value)
                 self.sql_where.append(
-                    "AND ep.episode_result_id IN ("
-                    "SELECT snp.valid_value_id FROM valid_values snp "
-                    "WHERE snp.domain = 'OTHER_EPISODE_RESULT' "
-                    "AND LOWER(snp.description) LIKE '%surveillance non-participation')"
+                    f"AND {column} {self.criteria_comparator} {result_id}"
                 )
-            else:
-                self.sql_where.append(f"AND ep.episode_result_id = {value}")
 
         except Exception:
             raise SelectionBuilderException(self.criteria_key_name, self.criteria_value)

utils/oracle/subject_selection_query_builder.py

@@ -47,6 +47,7 @@
 from classes.has_date_of_death_removal import HasDateOfDeathRemoval
 from classes.invited_since_age_extension import InvitedSinceAgeExtension
 from classes.episode_result_type import EpisodeResultType
+from classes.symptomatic_procedure_result_type import SymptomaticProcedureResultType
 
 
 class SubjectSelectionQueryBuilder:
@@ -496,7 +497,7 @@ def _add_variable_selection_criteria(
                         ):
                             self._add_criteria_latest_episode_accumulated_episode_result()
                         case SubjectSelectionCriteriaKey.SYMPTOMATIC_PROCEDURE_RESULT:
-                            self._add_criteria_symmetric_procedure_result()
+                            self._add_criteria_symptomatic_procedure_result()
                         case SubjectSelectionCriteriaKey.SYMPTOMATIC_PROCEDURE_DATE:
                             self._add_criteria_date_field(
                                 subject, "ALL_PATHWAYS", "SYMPTOMATIC_PROCEDURE_DATE"
@@ -2125,6 +2126,25 @@ def _add_criteria_latest_episode_accumulated_episode_result(self) -> None:
         except Exception:
             raise SelectionBuilderException(self.criteria_key_name, self.criteria_value)
 
+    def _add_criteria_symptomatic_procedure_result(self) -> None:
+        """
+        Filters based on symptomatic surgery result value or presence.
+        """
+        try:
+            column = "xt.surgery_result_id"
+            value = self.criteria_value.strip().lower()
+
+            if value == "null":
+                self.sql_where.append(f"AND {column} IS NULL")
+            else:
+                result_id = SymptomaticProcedureResultType.get_id(self.criteria_value)
+                self.sql_where.append(
+                    f"AND {column} {self.criteria_comparator} {result_id}"
+                )
+
+        except Exception:
+            raise SelectionBuilderException(self.criteria_key_name, self.criteria_value)
+
     # ------------------------------------------------------------------------
     # 🧬 CADS Clinical Dataset Filters
     # ------------------------------------------------------------------------

utils/oracle/test_subject_criteria_dev.py

@@ -41,11 +41,18 @@ def make_builder(key, value, index=0, comparator="="):
     return b
 
 
-# === Test: LATEST_EPISODE_ACCUMULATED_RESULT (any_surveillance_non_participation) ===
+# === Test: SYMPTOMATIC_PROCEDURE_RESULT (cancer detected) ===
 b = make_builder(
-    SubjectSelectionCriteriaKey.LATEST_EPISODE_ACCUMULATED_RESULT,
-    "any_surveillance_non_participation",
+    SubjectSelectionCriteriaKey.SYMPTOMATIC_PROCEDURE_RESULT,
+    "cancer detected",
+    comparator="=",
 )
-b._add_criteria_latest_episode_accumulated_episode_result()
-print("=== LATEST_EPISODE_ACCUMULATED_RESULT (any_surveillance_non_participation) ===")
+b._add_criteria_symptomatic_procedure_result()
+print("=== SYMPTOMATIC_PROCEDURE_RESULT (cancer detected) ===")
+print(b.dump_sql(), end="\n\n")
+
+# === Test: SYMPTOMATIC_PROCEDURE_RESULT (null) ===
+b = make_builder(SubjectSelectionCriteriaKey.SYMPTOMATIC_PROCEDURE_RESULT, "null")
+b._add_criteria_symptomatic_procedure_result()
+print("=== SYMPTOMATIC_PROCEDURE_RESULT (null) ===")
 print(b.dump_sql(), end="\n\n")