share queryables mapping

Author: jonhealy1

stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/database_logic.py

@@ -26,6 +26,7 @@
     apply_intersects_filter_shared,
     create_index_templates_shared,
     delete_item_index_shared,
+    get_queryables_mapping_shared,
     populate_sort_shared,
 )
 from stac_fastapi.sfeos_helpers.mappings import (
@@ -219,23 +220,12 @@ async def get_queryables_mapping(self, collection_id: str = "*") -> dict:
         Returns:
             dict: A dictionary containing the Queryables mappings.
         """
-        queryables_mapping = {}
-
         mappings = await self.client.indices.get_mapping(
             index=f"{ITEMS_INDEX_PREFIX}{collection_id}",
         )
-
-        for mapping in mappings.values():
-            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:
-                queryables_mapping[property_key] = f"properties.{property_key}"
-
-        return queryables_mapping
+        return await get_queryables_mapping_shared(
+            collection_id=collection_id, mappings=mappings
+        )
 
     @staticmethod
     def make_search():

stac_fastapi/opensearch/stac_fastapi/opensearch/database_logic.py

@@ -26,6 +26,7 @@
     apply_intersects_filter_shared,
     create_index_templates_shared,
     delete_item_index_shared,
+    get_queryables_mapping_shared,
     populate_sort_shared,
 )
 from stac_fastapi.sfeos_helpers.mappings import (
@@ -238,23 +239,12 @@ async def get_queryables_mapping(self, collection_id: str = "*") -> dict:
         Returns:
             dict: A dictionary containing the Queryables mappings.
         """
-        queryables_mapping = {}
-
         mappings = await self.client.indices.get_mapping(
             index=f"{ITEMS_INDEX_PREFIX}{collection_id}",
         )
-
-        for mapping in mappings.values():
-            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:
-                queryables_mapping[property_key] = f"properties.{property_key}"
-
-        return queryables_mapping
+        return await get_queryables_mapping_shared(
+            collection_id=collection_id, mappings=mappings
+        )
 
     @staticmethod
     def make_search():

stac_fastapi/sfeos_helpers/stac_fastapi/sfeos_helpers/database_logic_helpers.py

@@ -152,3 +152,35 @@ async def delete_item_index_shared(settings: Any, collection_id: str) -> None:
     else:
         await client.indices.delete(index=name)
     await client.close()
+
+
+async def get_queryables_mapping_shared(
+    mappings: Dict[str, Dict[str, Any]], collection_id: str = "*"
+) -> Dict[str, str]:
+    """Retrieve mapping of Queryables for search.
+
+    Args:
+        mappings (Dict[str, Dict[str, Any]]): The mapping information returned from
+            Elasticsearch/OpenSearch client's indices.get_mapping() method.
+            Expected structure is {index_name: {"mappings": {...}}}.
+        collection_id (str, optional): The id of the Collection the Queryables
+            belongs to. Defaults to "*".
+
+    Returns:
+        Dict[str, str]: A dictionary containing the Queryables mappings, where keys are
+            field names and values are the corresponding paths in the Elasticsearch/OpenSearch
+            document structure.
+    """
+    queryables_mapping = {}
+
+    for mapping in mappings.values():
+        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:
+            queryables_mapping[property_key] = f"properties.{property_key}"
+
+    return queryables_mapping