Added filter for subjects invited since age extension using attribute and domain check

Author: Andyg79

classes/invited_since_age_extension.py

@@ -0,0 +1,18 @@
+class InvitedSinceAgeExtension:
+    """
+    Maps subject invitation criteria based on age extension presence.
+    """
+
+    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 invited-since-age-extension flag: '{description}'"
+            )
+        return key

utils/oracle/mock_selection_builder.py

@@ -9,23 +9,24 @@
 
 
 # Add helper class stubs below
-class HasDateOfDeathRemoval:
+class InvitedSinceAgeExtension:
+    """
+    Maps input describing whether subject was invited since age extension.
+    """
+
     YES = "yes"
     NO = "no"
 
-    _mapping = {
-        "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._mapping:
+        if key not in cls._valid_values:
             raise ValueError(
-                f"Unknown input for HasDateOfDeathRemoval: '{description}'"
+                f"Unknown invited-since-age-extension flag: '{description}'"
             )
-        return cls._mapping[key]
+        return key
 
 
 class MockSelectionBuilder:
@@ -94,19 +95,22 @@ 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_has_date_of_death_removal(self) -> None:
+    def _add_criteria_invited_since_age_extension(self) -> None:
         """
-        Filters subjects based on presence or absence of a date-of-death removal record.
+        Filters subjects based on whether they were invited since age extension began.
         """
         try:
-            value = HasDateOfDeathRemoval.from_description(self.criteria_value)
+            self._add_join_to_latest_episode()
+            value = InvitedSinceAgeExtension.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)"
+                f"AND {clause} (SELECT 'sagex' FROM screening_subject_attribute_t sagex "
+                "INNER JOIN valid_values vvagex ON vvagex.valid_value_id = sagex.attribute_id "
+                "AND vvagex.domain = 'FOBT_AGEX_LOWER_AGE' "
+                "WHERE sagex.screening_subject_id = ep.screening_subject_id "
+                "AND sagex.start_date < ep.episode_start_date)"
             )
-
         except Exception:
             raise SelectionBuilderException(self.criteria_key_name, self.criteria_value)
+

utils/oracle/subject_selection_query_builder.py

@@ -45,6 +45,7 @@
 )
 from classes.surveillance_review_case_type import SurveillanceReviewCaseType
 from classes.has_date_of_death_removal import HasDateOfDeathRemoval
+from classes.invited_since_age_extension import InvitedSinceAgeExtension
 
 
 class SubjectSelectionQueryBuilder:
@@ -2062,6 +2063,25 @@ def _add_criteria_has_date_of_death_removal(self) -> None:
         except Exception:
             raise SelectionBuilderException(self.criteria_key_name, self.criteria_value)
 
+    def _add_criteria_invited_since_age_extension(self) -> None:
+        """
+        Filters subjects based on whether they were invited since age extension began.
+        """
+        try:
+            self._add_join_to_latest_episode()
+            value = InvitedSinceAgeExtension.from_description(self.criteria_value)
+            clause = "EXISTS" if value == "yes" else "NOT EXISTS"
+
+            self.sql_where.append(
+                f"AND {clause} (SELECT 'sagex' FROM screening_subject_attribute_t sagex "
+                "INNER JOIN valid_values vvagex ON vvagex.valid_value_id = sagex.attribute_id "
+                "AND vvagex.domain = 'FOBT_AGEX_LOWER_AGE' "
+                "WHERE sagex.screening_subject_id = ep.screening_subject_id "
+                "AND sagex.start_date < ep.episode_start_date)"
+            )
+        except Exception:
+            raise SelectionBuilderException(self.criteria_key_name, self.criteria_value)
+
     # ------------------------------------------------------------------------
     # 🧬 CADS Clinical Dataset Filters
     # ------------------------------------------------------------------------

utils/oracle/test_subject_criteria_dev.py

@@ -41,14 +41,14 @@ def make_builder(key, value, index=0, comparator="="):
     return b
 
 
-# === 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) ===")
+# === Test: INVITED_SINCE_AGE_EXTENSION (yes) ===
+b = make_builder(SubjectSelectionCriteriaKey.INVITED_SINCE_AGE_EXTENSION, "yes")
+b._add_criteria_invited_since_age_extension()
+print("=== INVITED_SINCE_AGE_EXTENSION (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) ===")
+# === Test: INVITED_SINCE_AGE_EXTENSION (no) ===
+b = make_builder(SubjectSelectionCriteriaKey.INVITED_SINCE_AGE_EXTENSION, "no")
+b._add_criteria_invited_since_age_extension()
+print("=== INVITED_SINCE_AGE_EXTENSION (no) ===")
 print(b.dump_sql(), end="\n\n")