As per PR# 107 comments, code change is implemented.

Author: vidhya-chandra1

utils/oracle/subject_selection_query_builder.py

@@ -963,25 +963,17 @@ def _add_criteria_event_status(self, column_name: str) -> None:
         and injects its corresponding event_status_id into SQL.
         """
         try:
-            # Extract the code (e.g. "ES01") from the first word
-            code = self.criteria_value.strip().split()[0].upper()
-            comparator = self.criteria_comparator
-
-            # Simulated EventStatusType registry
-            event_status_code_map = {
-                "ES01": 600,
-                "ES02": 601,
-                "ES03": 602,
-                "ES99": 699,
-                # ...update with real mappings
-            }
-
-            if code not in event_status_code_map:
-                raise ValueError(f"Unknown event status code: {code}")
-
-            event_status_id = event_status_code_map[code]
-            self.sql_where.append(f"AND {column_name} {comparator} {event_status_id}")
+            self._add_join_to_latest_episode()
+            criteria_words = self.criteria_value.split(" ")
+            event_status = EventStatusType.get_by_code(criteria_words[0].upper())
+            if event_status is None:
+                raise SelectionBuilderException(
+                    self.criteria_key_name, self.criteria_value
+                )
 
+            self.sql_where.append(
+                f" AND {column_name} {self.criteria_comparator} {int(event_status.id) }"
+            )
         except Exception:
             raise SelectionBuilderException(self.criteria_key_name, self.criteria_value)