Added _add_criteria_subject_lower_fobt_age method

Author: Andyg79

utils/oracle/mock_selection_builder.py

@@ -3,12 +3,7 @@
 import os
 
 sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), "../..")))
-print("PYTHONPATH set to:", sys.path[0])
-from classes.subject_selection_criteria_key import (
-    SubjectSelectionCriteriaKey,
-)
-from classes.episode_type import EpisodeType
-from classes.subject_has_episode import SubjectHasEpisode
+# print("PYTHONPATH set to:", sys.path[0]) # Uncomment for local debug
 from classes.selection_builder_exception import SelectionBuilderException
 
 
@@ -26,40 +21,38 @@ class MockSelectionBuilder:
         - Use dump_sql() to inspect the resulting SQL
     """
 
-    def __init__(self, criteria_key, criteria_value):
+    def __init__(self, criteria_key, criteria_value, criteria_comparator=">="):
         self.criteria_key = criteria_key
         self.criteria_key_name = criteria_key.description
         self.criteria_value = criteria_value
+        self.criteria_comparator = criteria_comparator
         self.sql_where = []
 
-    def _add_criteria_subject_has_episodes(self, episode_type=None):
+    # === Example testable method ===
+    # 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_subject_lower_fobt_age(self) -> None:
+        """
+        Adds a SQL constraint that compares a subject's lower FOBT age eligibility
+        using a comparator and a value (e.g. '>= 55' or '>= default').
+
+        If value is 'default', it's replaced with a national parameter lookup:
+        pkg_parameters.f_get_national_param_val(10)
+        """
         try:
-            value = SubjectHasEpisode.by_description(self.criteria_value.lower())
-            if value == SubjectHasEpisode.YES:
-                self.sql_where.append(" AND EXISTS ( SELECT 'ep' ")
-            elif value == SubjectHasEpisode.NO:
-                self.sql_where.append(" AND NOT EXISTS ( SELECT 'ep' ")
-            else:
-                raise SelectionBuilderException(
-                    self.criteria_key_name, self.criteria_value
-                )
-        except Exception:
-            raise SelectionBuilderException(self.criteria_key_name, self.criteria_value)
+            value = self.criteria_value
+            comparator = self.criteria_comparator
 
-        self.sql_where.append("   FROM ep_subject_episode_t ep ")
-        self.sql_where.append(
-            "   WHERE ep.screening_subject_id = ss.screening_subject_id "
-        )
+            if value.lower() == "default":
+                value = "pkg_parameters.f_get_national_param_val (10)"
 
-        if episode_type is not None:
             self.sql_where.append(
-                f"   AND ep.episode_type_id = {episode_type.valid_value_id} "
+                f"AND pkg_bcss_common.f_get_ss_lower_age_limit (ss.screening_subject_id) "
+                f"{comparator} {value}"
             )
-
-        if self.criteria_key == SubjectSelectionCriteriaKey.SUBJECT_HAS_AN_OPEN_EPISODE:
-            self.sql_where.append("   AND ep.episode_end_date IS NULL ")
-
-        self.sql_where.append(" )")
+        except Exception:
+            raise SelectionBuilderException(self.criteria_key_name, self.criteria_value)
 
     def dump_sql(self):
         return "\n".join(self.sql_where)

utils/oracle/subject_selection_query_builder.py

@@ -621,6 +621,28 @@ def _add_criteria_subject_age(self) -> None:
                 self.sql_where.append("= ")
             self.sql_where.append(self.criteria_value)
 
+    def _add_criteria_subject_lower_fobt_age(self) -> None:
+        """
+        Adds a SQL constraint that compares a subject's lower FOBT age eligibility
+        using a comparator and a value (e.g. '>= 55' or '>= default').
+
+        If value is 'default', it's replaced with a national parameter lookup:
+        pkg_parameters.f_get_national_param_val(10)
+        """
+        try:
+            value = self.criteria_value
+            comparator = self.criteria_comparator
+
+            if value.lower() == "default":
+                value = "pkg_parameters.f_get_national_param_val (10)"
+
+            self.sql_where.append(
+                f"AND pkg_bcss_common.f_get_ss_lower_age_limit (ss.screening_subject_id) "
+                f"{comparator} {value}"
+            )
+        except Exception:
+            raise SelectionBuilderException(self.criteria_key_name, self.criteria_value)
+
     def _add_criteria_subject_hub_code(self, user: "User") -> None:
         hub_code = None
         try: