move add bbox shape, check if extension enabled

Author: jonhealy1

stac_fastapi/core/stac_fastapi/core/serializers.py

@@ -139,16 +139,11 @@ def stac_to_db(
         Returns:
             stac_types.Collection: The database-ready STAC Collection object.
         """
-        from stac_fastapi.sfeos_helpers.database import add_bbox_shape_to_collection
-
         collection = deepcopy(collection)
         collection["links"] = resolve_links(
             collection.get("links", []), str(request.base_url)
         )
 
-        # Convert bbox to bbox_shape for geospatial queries (ES/OS specific)
-        add_bbox_shape_to_collection(collection)
-
         if get_bool_env("STAC_INDEX_ASSETS"):
             collection["assets"] = [
                 {"es_key": k, **v} for k, v in collection.get("assets", {}).items()

stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/database_logic.py

@@ -29,6 +29,7 @@
 )
 from stac_fastapi.sfeos_helpers import filter as filter_module
 from stac_fastapi.sfeos_helpers.database import (
+    add_bbox_shape_to_collection,
     apply_collections_bbox_filter_shared,
     apply_collections_datetime_filter_shared,
     apply_free_text_filter_shared,
@@ -1349,6 +1350,12 @@ async def create_collection(self, collection: Collection, **kwargs: Any):
         if await self.client.exists(index=COLLECTIONS_INDEX, id=collection_id):
             raise ConflictError(f"Collection {collection_id} already exists")
 
+        if get_bool_env("ENABLE_COLLECTIONS_SEARCH") or get_bool_env(
+            "ENABLE_COLLECTIONS_SEARCH_ROUTE"
+        ):
+            # Convert bbox to bbox_shape for geospatial queries (ES/OS specific)
+            add_bbox_shape_to_collection(collection)
+
         # Index the collection in the database
         await self.client.index(
             index=COLLECTIONS_INDEX,
@@ -1452,6 +1459,12 @@ async def update_collection(
             await self.delete_collection(collection_id)
 
         else:
+            if get_bool_env("ENABLE_COLLECTIONS_SEARCH") or get_bool_env(
+                "ENABLE_COLLECTIONS_SEARCH_ROUTE"
+            ):
+                # Convert bbox to bbox_shape for geospatial queries (ES/OS specific)
+                add_bbox_shape_to_collection(collection)
+
             # Update the existing collection
             await self.client.index(
                 index=COLLECTIONS_INDEX,

stac_fastapi/opensearch/stac_fastapi/opensearch/database_logic.py

@@ -29,6 +29,7 @@
 from stac_fastapi.opensearch.config import OpensearchSettings as SyncSearchSettings
 from stac_fastapi.sfeos_helpers import filter as filter_module
 from stac_fastapi.sfeos_helpers.database import (
+    add_bbox_shape_to_collection,
     apply_collections_bbox_filter_shared,
     apply_collections_datetime_filter_shared,
     apply_free_text_filter_shared,
@@ -1339,6 +1340,12 @@ async def create_collection(self, collection: Collection, **kwargs: Any):
         if await self.client.exists(index=COLLECTIONS_INDEX, id=collection_id):
             raise ConflictError(f"Collection {collection_id} already exists")
 
+        if get_bool_env("ENABLE_COLLECTIONS_SEARCH") or get_bool_env(
+            "ENABLE_COLLECTIONS_SEARCH_ROUTE"
+        ):
+            # Convert bbox to bbox_shape for geospatial queries (ES/OS specific)
+            add_bbox_shape_to_collection(collection)
+
         await self.client.index(
             index=COLLECTIONS_INDEX,
             id=collection_id,
@@ -1430,6 +1437,12 @@ async def update_collection(
             await self.delete_collection(collection_id=collection_id, **kwargs)
 
         else:
+            if get_bool_env("ENABLE_COLLECTIONS_SEARCH") or get_bool_env(
+                "ENABLE_COLLECTIONS_SEARCH_ROUTE"
+            ):
+                # Convert bbox to bbox_shape for geospatial queries (ES/OS specific)
+                add_bbox_shape_to_collection(collection)
+
             await self.client.index(
                 index=COLLECTIONS_INDEX,
                 id=collection_id,