Added appointment status type filter and AppointmentStatusType mapping class to selection query builder

Author: Andyg79

classes/appointment_status_type.py

@@ -0,0 +1,19 @@
+class AppointmentStatusType:
+    """
+    Maps descriptive appointment statuses to internal IDs.
+    Extend with real values as needed.
+    """
+
+    _mapping = {
+        "booked": 2001,
+        "attended": 2002,
+        "cancelled": 2003,
+        "dna": 2004,  # Did Not Attend
+    }
+
+    @classmethod
+    def get_id(cls, description: str) -> int:
+        key = description.strip().lower()
+        if key not in cls._mapping:
+            raise ValueError(f"Unknown appointment status: {description}")
+        return cls._mapping[key]

utils/oracle/mock_selection_builder.py

@@ -7,23 +7,24 @@
 
 
 # Add helper class stubs below
-class AppointmentSlotType:
+class AppointmentStatusType:
     """
-    Mocked appointment slot type mapping for test purposes.
-    Replace IDs with real values from production enum if needed.
+    Mocked appointment status mapping for test purposes.
+    Replace IDs with real values from production if needed.
     """
 
     _mapping = {
-        "clinic": 1001,
-        "phone": 1002,
-        "video": 1003,
+        "booked": 2001,
+        "attended": 2002,
+        "cancelled": 2003,
+        "dna": 2004,  # Did Not Attend
     }
 
     @classmethod
     def get_id(cls, description: str) -> int:
         key = description.strip().lower()
         if key not in cls._mapping:
-            raise ValueError(f"Unknown appointment slot type: {description}")
+            raise ValueError(f"Unknown appointment status: {description}")
         return cls._mapping[key]
 
 
@@ -73,20 +74,20 @@ 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_appointment_type(self) -> None:
+    def _add_criteria_appointment_status(self) -> None:
         """
-        Filters appointments by slot type (e.g. clinic, phone).
-        Requires prior join to appointment_t as alias 'ap' (via WHICH_APPOINTMENT).
+        Filters appointments by status (e.g. booked, attended).
+        Requires prior join to appointment_t as alias 'ap'.
 
-        Uses comparator and resolves slot type label to ID via AppointmentSlotType.
+        Uses comparator and resolves status label to ID via AppointmentStatusType.
         """
         try:
             comparator = self.criteria_comparator
             value = self.criteria_value.strip()
-            slot_type_id = AppointmentSlotType.get_id(value)
+            status_id = AppointmentStatusType.get_id(value)
 
             self.sql_where.append(
-                f"AND ap.appointment_slot_type_id {comparator} {slot_type_id}"
+                f"AND ap.appointment_status_id {comparator} {status_id}"
             )
 
         except Exception:

utils/oracle/subject_selection_query_builder.py

@@ -26,6 +26,7 @@
 from classes.user import User
 from classes.selection_builder_exception import SelectionBuilderException
 from classes.appointments_slot_type import AppointmentSlotType
+from classes.appointment_status_type import AppointmentStatusType
 
 
 class SubjectSelectionQueryBuilder:
@@ -1582,6 +1583,25 @@ def _add_criteria_appointment_type(self) -> None:
         except Exception:
             raise SelectionBuilderException(self.criteria_key_name, self.criteria_value)
 
+    def _add_criteria_appointment_status(self) -> None:
+        """
+        Filters appointments by status (e.g. booked, attended).
+        Requires prior join to appointment_t as alias 'ap'.
+
+        Uses comparator and resolves status label to ID via AppointmentStatusType.
+        """
+        try:
+            comparator = self.criteria_comparator
+            value = self.criteria_value.strip()
+            status_id = AppointmentStatusType.get_id(value)
+
+            self.sql_where.append(
+                f"AND ap.appointment_status_id {comparator} {status_id}"
+            )
+
+        except Exception:
+            raise SelectionBuilderException(self.criteria_key_name, self.criteria_value)
+
     # ------------------------------------------------------------------------
     # 🧬 CADS Clinical Dataset Filters
     # ------------------------------------------------------------------------

utils/oracle/test_subject_criteria_dev.py

@@ -29,16 +29,16 @@
 # === Example usage ===
 # Replace the examples below with your tests for the method you want to test
 
-# === Test: APPOINTMENT_TYPE — phone ===
-builder = MockSelectionBuilder(SubjectSelectionCriteriaKey.APPOINTMENT_TYPE, "phone")
+# === Test: APPOINTMENT_STATUS — booked ===
+builder = MockSelectionBuilder(SubjectSelectionCriteriaKey.APPOINTMENT_STATUS, "booked")
 builder.criteria_comparator = "="
-builder._add_criteria_appointment_type()
-print("=== APPOINTMENT_TYPE — phone ===")
+builder._add_criteria_appointment_status()
+print("=== APPOINTMENT_STATUS — booked ===")
 print(builder.dump_sql(), end="\n\n")
 
-# === Test: APPOINTMENT_TYPE — clinic !== ===
-builder = MockSelectionBuilder(SubjectSelectionCriteriaKey.APPOINTMENT_TYPE, "clinic")
+# === Test: APPOINTMENT_STATUS — dna !== ===
+builder = MockSelectionBuilder(SubjectSelectionCriteriaKey.APPOINTMENT_STATUS, "dna")
 builder.criteria_comparator = "!="
-builder._add_criteria_appointment_type()
-print("=== APPOINTMENT_TYPE — clinic !== ===")
+builder._add_criteria_appointment_status()
+print("=== APPOINTMENT_STATUS — dna !== ===")
 print(builder.dump_sql(), end="\n\n")