db logic helpers

Author: jonhealy1

stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/database_logic.py

@@ -21,12 +21,12 @@
     ElasticsearchSettings as SyncElasticsearchSettings,
 )
 from stac_fastapi.sfeos_helpers import filter
+from stac_fastapi.sfeos_helpers.database_logic_helpers import (
+    create_index_templates_shared,
+)
 from stac_fastapi.sfeos_helpers.mappings import (
     COLLECTIONS_INDEX,
     DEFAULT_SORT,
-    ES_COLLECTIONS_MAPPINGS,
-    ES_ITEMS_MAPPINGS,
-    ES_ITEMS_SETTINGS,
     ITEM_INDICES,
     ITEMS_INDEX_PREFIX,
     Geometry,
@@ -51,22 +51,7 @@ async def create_index_templates() -> None:
         None
 
     """
-    client = AsyncElasticsearchSettings().create_client
-    await client.indices.put_index_template(
-        name=f"template_{COLLECTIONS_INDEX}",
-        body={
-            "index_patterns": [f"{COLLECTIONS_INDEX}*"],
-            "template": {"mappings": ES_COLLECTIONS_MAPPINGS},
-        },
-    )
-    await client.indices.put_index_template(
-        name=f"template_{ITEMS_INDEX_PREFIX}",
-        body={
-            "index_patterns": [f"{ITEMS_INDEX_PREFIX}*"],
-            "template": {"settings": ES_ITEMS_SETTINGS, "mappings": ES_ITEMS_MAPPINGS},
-        },
-    )
-    await client.close()
+    await create_index_templates_shared(settings=AsyncElasticsearchSettings())
 
 
 async def create_collection_index() -> None:

stac_fastapi/opensearch/stac_fastapi/opensearch/database_logic.py

@@ -21,6 +21,9 @@
 )
 from stac_fastapi.opensearch.config import OpensearchSettings as SyncSearchSettings
 from stac_fastapi.sfeos_helpers import filter
+from stac_fastapi.sfeos_helpers.database_logic_helpers import (
+    create_index_templates_shared,
+)
 from stac_fastapi.sfeos_helpers.mappings import (
     COLLECTIONS_INDEX,
     DEFAULT_SORT,
@@ -51,23 +54,7 @@ async def create_index_templates() -> None:
         None
 
     """
-    client = AsyncSearchSettings().create_client
-    await client.indices.put_template(
-        name=f"template_{COLLECTIONS_INDEX}",
-        body={
-            "index_patterns": [f"{COLLECTIONS_INDEX}*"],
-            "mappings": ES_COLLECTIONS_MAPPINGS,
-        },
-    )
-    await client.indices.put_template(
-        name=f"template_{ITEMS_INDEX_PREFIX}",
-        body={
-            "index_patterns": [f"{ITEMS_INDEX_PREFIX}*"],
-            "settings": ES_ITEMS_SETTINGS,
-            "mappings": ES_ITEMS_MAPPINGS,
-        },
-    )
-    await client.close()
+    await create_index_templates_shared(settings=AsyncSearchSettings())
 
 
 async def create_collection_index() -> None:

stac_fastapi/sfeos_helpers/stac_fastapi/sfeos_helpers/database_logic_helpers.py

@@ -0,0 +1,37 @@
+"""Shared code for elasticsearch/ opensearch database logic."""
+
+from typing import Any
+
+from stac_fastapi.sfeos_helpers.mappings import (
+    COLLECTIONS_INDEX,
+    ES_COLLECTIONS_MAPPINGS,
+    ES_ITEMS_MAPPINGS,
+    ES_ITEMS_SETTINGS,
+    ITEMS_INDEX_PREFIX,
+)
+
+
+async def create_index_templates_shared(settings: Any) -> None:
+    """
+    Create index templates for the Collection and Item indices.
+
+    Returns:
+        None
+
+    """
+    client = settings.create_client
+    await client.indices.put_index_template(
+        name=f"template_{COLLECTIONS_INDEX}",
+        body={
+            "index_patterns": [f"{COLLECTIONS_INDEX}*"],
+            "template": {"mappings": ES_COLLECTIONS_MAPPINGS},
+        },
+    )
+    await client.indices.put_index_template(
+        name=f"template_{ITEMS_INDEX_PREFIX}",
+        body={
+            "index_patterns": [f"{ITEMS_INDEX_PREFIX}*"],
+            "template": {"settings": ES_ITEMS_SETTINGS, "mappings": ES_ITEMS_MAPPINGS},
+        },
+    )
+    await client.close()

stac_fastapi/tests/database/test_database.py

@@ -1,25 +1,16 @@
-import os
 import uuid
 
 import pytest
 from stac_pydantic import api
 
-from ..conftest import MockRequest, database
+from stac_fastapi.sfeos_helpers.mappings import (
+    COLLECTIONS_INDEX,
+    ES_COLLECTIONS_MAPPINGS,
+    ES_ITEMS_MAPPINGS,
+    index_alias_by_collection_id,
+)
 
-if os.getenv("BACKEND", "elasticsearch").lower() == "opensearch":
-    from stac_fastapi.opensearch.database_logic import (
-        COLLECTIONS_INDEX,
-        ES_COLLECTIONS_MAPPINGS,
-        ES_ITEMS_MAPPINGS,
-        index_alias_by_collection_id,
-    )
-else:
-    from stac_fastapi.elasticsearch.database_logic import (
-        COLLECTIONS_INDEX,
-        ES_COLLECTIONS_MAPPINGS,
-        ES_ITEMS_MAPPINGS,
-        index_alias_by_collection_id,
-    )
+from ..conftest import MockRequest, database
 
 
 @pytest.mark.asyncio