remove uneeded code

Author: jonhealy1

stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/core.py

@@ -72,7 +72,9 @@ def all_collections(self, **kwargs) -> Collections:
     def get_collection(self, collection_id: str, **kwargs) -> Collection:
         """Get collection by id."""
         base_url = str(kwargs["request"].base_url)
-        collection = self.database.get_one_collection(collection_id)
+        collection = self.database.find_collection(collection_id=collection_id)[
+            "_source"
+        ]
         return self.collection_serializer.db_to_stac(collection, base_url)
 
     @overrides

stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/database_logic.py

@@ -9,7 +9,6 @@
 
 from stac_fastapi.elasticsearch import serializers
 from stac_fastapi.elasticsearch.config import ElasticsearchSettings
-from stac_fastapi.types import stac as stac_types
 from stac_fastapi.types.errors import ConflictError, ForeignKeyError, NotFoundError
 from stac_fastapi.types.stac import Collection, Collections, Item, ItemCollection
 
@@ -65,11 +64,6 @@ def get_all_collections(self, base_url: str) -> Collections:
 
         return serialized_collections
 
-    def get_one_collection(self, collection_id: str) -> Collection:
-        """Database logic to retrieve a single collection."""
-        collection = self.find_collection(collection_id=collection_id)
-        return collection["_source"]
-
     def get_item_collection(
         self, collection_id: str, limit: int, base_url: str
     ) -> ItemCollection:
@@ -235,7 +229,7 @@ def check_collection_exists(self, collection_id: str):
         if not self.client.exists(index=COLLECTIONS_INDEX, id=collection_id):
             raise ForeignKeyError(f"Collection {collection_id} does not exist")
 
-    def prep_create_item(self, item: stac_types.Item, base_url: str) -> stac_types.Item:
+    def prep_create_item(self, item: Item, base_url: str) -> Item:
         """Database logic for prepping an item for insertion."""
         self.check_collection_exists(collection_id=item["collection"])
 
@@ -248,7 +242,7 @@ def prep_create_item(self, item: stac_types.Item, base_url: str) -> stac_types.I
 
         return self.item_serializer.stac_to_db(item, base_url)
 
-    def create_item(self, item: stac_types.Item, base_url: str):
+    def create_item(self, item: Item, base_url: str):
         """Database logic for creating one item."""
         # todo: check if collection exists, but cache
         es_resp = self.client.index(
@@ -262,10 +256,6 @@ def create_item(self, item: stac_types.Item, base_url: str):
                 f"Item {item['id']} in collection {item['collection']} already exists"
             )
 
-    def prep_update_item(self, item: stac_types.Item):
-        """Database logic for prepping an item for updating."""
-        self.check_collection_exists(collection_id=item["collection"])
-
     def delete_item(self, item_id: str, collection_id: str):
         """Database logic for deleting one item."""
         try:
@@ -275,7 +265,7 @@ def delete_item(self, item_id: str, collection_id: str):
                 f"Item {item_id} in collection {collection_id} not found"
             )
 
-    def create_collection(self, collection: stac_types.Collection):
+    def create_collection(self, collection: Collection):
         """Database logic for creating one collection."""
         if self.client.exists(index=COLLECTIONS_INDEX, id=collection["id"]):
             raise ConflictError(f"Collection {collection['id']} already exists")
@@ -286,7 +276,7 @@ def create_collection(self, collection: stac_types.Collection):
             document=collection,
         )
 
-    def find_collection(self, collection_id: str) -> stac_types.Collection:
+    def find_collection(self, collection_id: str) -> Collection:
         """Database logic to find and return a collection."""
         try:
             collection = self.client.get(index=COLLECTIONS_INDEX, id=collection_id)
@@ -295,10 +285,6 @@ def find_collection(self, collection_id: str) -> stac_types.Collection:
 
         return collection
 
-    def prep_update_collection(self, collection_id: str):
-        """Database logic for prepping a collection for updating."""
-        _ = self.find_collection(collection_id=collection_id)
-
     def delete_collection(self, collection_id: str):
         """Database logic for deleting one collection."""
         _ = self.find_collection(collection_id=collection_id)

stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/transactions.py

@@ -56,7 +56,7 @@ def update_item(self, item: stac_types.Item, **kwargs) -> stac_types.Item:
         now = datetime.now(timezone.utc).isoformat().replace("+00:00", "Z")
         item["properties"]["updated"] = str(now)
 
-        self.database.prep_update_item(item=item)
+        self.database.check_collection_exists(collection_id=item["collection"])
         # todo: index instead of delete and create
         self.delete_item(item_id=item["id"], collection_id=item["collection"])
         self.create_item(item=item, **kwargs)
@@ -92,7 +92,7 @@ def update_collection(
         """Update collection."""
         base_url = str(kwargs["request"].base_url)
 
-        self.database.prep_update_collection(collection_id=collection["id"])
+        self.database.find_collection(collection_id=collection["id"])
         self.delete_collection(collection["id"])
         self.create_collection(collection, **kwargs)