Adding missing async-ness.

Author: rhysrevans3

stac_fastapi/core/stac_fastapi/core/core.py

@@ -607,7 +607,7 @@ async def post_search(
         if hasattr(search_request, "filter_expr"):
             cql2_filter = getattr(search_request, "filter_expr", None)
             try:
-                search = self.database.apply_cql2_filter(search, cql2_filter)
+                search = await self.database.apply_cql2_filter(search, cql2_filter)
             except Exception as e:
                 raise HTTPException(
                     status_code=400, detail=f"Error with cql2_json filter: {e}"

stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/database_logic.py

@@ -307,13 +307,13 @@ async def get_queryables_mapping(self, collection_id: str = "*") -> dict:
         )
 
         for mapping in mappings.values():
-            fields = mapping["mappings"]["properties"]
-            properties = fields.pop("properties")
+            fields = mapping["mappings"].get("properties", {})
+            properties = fields.pop("properties", {}).get("properties", {}).keys()
 
             for field_key in fields:
                 queryables_mapping[field_key] = field_key
 
-            for property_key in properties["properties"]:
+            for property_key in properties:
                 queryables_mapping[property_key] = f"properties.{property_key}"
 
         return queryables_mapping
@@ -546,7 +546,9 @@ def apply_free_text_filter(search: Search, free_text_queries: Optional[List[str]
 
         return search
 
-    def apply_cql2_filter(self, search: Search, _filter: Optional[Dict[str, Any]]):
+    async def apply_cql2_filter(
+        self, search: Search, _filter: Optional[Dict[str, Any]]
+    ):
         """
         Apply a CQL2 filter to an Elasticsearch Search object.
 
@@ -566,7 +568,7 @@ def apply_cql2_filter(self, search: Search, _filter: Optional[Dict[str, Any]]):
                     otherwise the original Search object.
         """
         if _filter is not None:
-            es_query = filter.to_es(self.get_queryables_mapping(), _filter)
+            es_query = filter.to_es(await self.get_queryables_mapping(), _filter)
             search = search.query(es_query)
 
         return search