Update data_fetcher.py

data_fetcher.py

@@ -1,16 +1,19 @@
 # 🔍 data_fetcher.py
 from firestore_client import get_firestore_client
+from schema_utils import has_field, resolve_field
 
 db = get_firestore_client()
 
 # Utility function to convert Gemini-style filters into Firestore queries
-def apply_filters(query_ref, filters):
+def apply_filters(query_ref, collection_name, filters):
     for f in filters:
-        field = f.get("field")
+        raw_field = f.get("field")
+        field = resolve_field(collection_name, raw_field) if raw_field else None
         op = f.get("op", "==")
         value = f.get("value")
-        if field and value is not None:
+        if field and value is not None and has_field(collection_name, field):
             query_ref = query_ref.where(field, op, value)
+        # else: silently ignore invalid field for this collection
     return query_ref
 
 def fetch_data_from_firestore(instruction):
@@ -47,7 +50,7 @@ def fetch_data_from_firestore(instruction):
                     results[name] = []
             else:
                 col_ref = db.collection(name)
-                col_ref = apply_filters(col_ref, filters)
+                col_ref = apply_filters(col_ref, name, filters)
                 docs = col_ref.limit(limit).stream()
                 results[name] = [doc.to_dict() for doc in docs]
         except Exception as e: