use unified verify refesh

Author: jonhealy1

CHANGELOG.md

@@ -13,7 +13,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Changed
 
-- Refactored CRUD methods in `TransactionsClient` to use the `_resolve_refresh` helper method for consistent and reusable handling of the `refresh` parameter. [#370](https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/pull/370)
+- Refactored CRUD methods in `TransactionsClient` to use the `validate_refresh` helper method for consistent and reusable handling of the `refresh` parameter. [#370](https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/pull/370)
 
 ### Fixed
 

stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/database_logic.py

@@ -31,7 +31,7 @@
 )
 from stac_fastapi.core.extensions import filter
 from stac_fastapi.core.serializers import CollectionSerializer, ItemSerializer
-from stac_fastapi.core.utilities import MAX_LIMIT, bbox2polygon, resolve_refresh
+from stac_fastapi.core.utilities import MAX_LIMIT, bbox2polygon, validate_refresh
 from stac_fastapi.elasticsearch.config import AsyncElasticsearchSettings
 from stac_fastapi.elasticsearch.config import (
     ElasticsearchSettings as SyncElasticsearchSettings,
@@ -874,7 +874,7 @@ async def create_item(
 
         # Resolve the `refresh` parameter
         refresh = kwargs.get("refresh", self.async_settings.database_refresh)
-        refresh = resolve_refresh(str(refresh).lower())
+        refresh = validate_refresh(refresh)
 
         # Log the creation attempt
         logger.info(
@@ -915,7 +915,7 @@ async def delete_item(self, item_id: str, collection_id: str, **kwargs: Any):
 
         # Resolve the `refresh` parameter
         refresh = kwargs.get("refresh", self.async_settings.database_refresh)
-        refresh = resolve_refresh(str(refresh).lower())
+        refresh = validate_refresh(refresh)
 
         # Log the deletion attempt
         logger.info(
@@ -978,7 +978,7 @@ async def create_collection(self, collection: Collection, **kwargs: Any):
 
         # Resolve the `refresh` parameter
         refresh = kwargs.get("refresh", self.async_settings.database_refresh)
-        refresh = resolve_refresh(str(refresh).lower())
+        refresh = validate_refresh(refresh)
 
         # Log the creation attempt
         logger.info(f"Creating collection {collection_id} with refresh={refresh}")
@@ -1053,7 +1053,7 @@ async def update_collection(
 
         # Resolve the `refresh` parameter
         refresh = kwargs.get("refresh", self.async_settings.database_refresh)
-        refresh = resolve_refresh(str(refresh).lower())
+        refresh = validate_refresh(refresh)
 
         # Log the update attempt
         logger.info(f"Updating collection {collection_id} with refresh={refresh}")
@@ -1124,7 +1124,7 @@ async def delete_collection(self, collection_id: str, **kwargs: Any):
 
         # Resolve the `refresh` parameter
         refresh = kwargs.get("refresh", self.async_settings.database_refresh)
-        refresh = resolve_refresh(str(refresh).lower())
+        refresh = validate_refresh(refresh)
 
         # Log the deletion attempt
         logger.info(f"Deleting collection {collection_id} with refresh={refresh}")
@@ -1180,7 +1180,7 @@ async def bulk_async(
 
         # Resolve the `refresh` parameter
         refresh = kwargs.get("refresh", self.async_settings.database_refresh)
-        refresh = resolve_refresh(str(refresh).lower())
+        refresh = validate_refresh(refresh)
 
         # Log the bulk insert attempt
         logger.info(
@@ -1245,8 +1245,8 @@ def bulk_sync(
         kwargs = kwargs or {}
 
         # Resolve the `refresh` parameter
-        refresh = kwargs.get("refresh", self.sync_settings.database_refresh)
-        refresh = resolve_refresh(str(refresh).lower())
+        refresh = kwargs.get("refresh", self.async_settings.database_refresh)
+        refresh = validate_refresh(refresh)
 
         # Log the bulk insert attempt
         logger.info(

stac_fastapi/opensearch/stac_fastapi/opensearch/database_logic.py

@@ -31,7 +31,7 @@
 )
 from stac_fastapi.core.extensions import filter
 from stac_fastapi.core.serializers import CollectionSerializer, ItemSerializer
-from stac_fastapi.core.utilities import MAX_LIMIT, bbox2polygon, resolve_refresh
+from stac_fastapi.core.utilities import MAX_LIMIT, bbox2polygon, validate_refresh
 from stac_fastapi.opensearch.config import (
     AsyncOpensearchSettings as AsyncSearchSettings,
 )
@@ -891,7 +891,7 @@ async def create_item(
 
         # Resolve the `refresh` parameter
         refresh = kwargs.get("refresh", self.async_settings.database_refresh)
-        refresh = resolve_refresh(str(refresh).lower())
+        refresh = validate_refresh(refresh)
 
         # Log the creation attempt
         logger.info(
@@ -924,7 +924,7 @@ async def delete_item(self, item_id: str, collection_id: str, **kwargs: Any):
 
         # Resolve the `refresh` parameter
         refresh = kwargs.get("refresh", self.async_settings.database_refresh)
-        refresh = resolve_refresh(str(refresh).lower())
+        refresh = validate_refresh(refresh)
 
         # Log the deletion attempt
         logger.info(
@@ -980,7 +980,7 @@ async def create_collection(self, collection: Collection, **kwargs: Any):
 
         # Resolve the `refresh` parameter
         refresh = kwargs.get("refresh", self.async_settings.database_refresh)
-        refresh = resolve_refresh(str(refresh).lower())
+        refresh = validate_refresh(refresh)
 
         # Log the creation attempt
         logger.info(f"Creating collection {collection_id} with refresh={refresh}")
@@ -1047,7 +1047,7 @@ async def update_collection(
 
         # Resolve the `refresh` parameter
         refresh = kwargs.get("refresh", self.async_settings.database_refresh)
-        refresh = resolve_refresh(str(refresh).lower())
+        refresh = validate_refresh(refresh)
 
         # Log the update attempt
         logger.info(f"Updating collection {collection_id} with refresh={refresh}")
@@ -1107,7 +1107,7 @@ async def delete_collection(self, collection_id: str, **kwargs: Any):
 
         # Resolve the `refresh` parameter
         refresh = kwargs.get("refresh", self.async_settings.database_refresh)
-        refresh = resolve_refresh(str(refresh).lower())
+        refresh = validate_refresh(refresh)
 
         # Log the deletion attempt
         logger.info(f"Deleting collection {collection_id} with refresh={refresh}")
@@ -1155,7 +1155,7 @@ async def bulk_async(
 
         # Resolve the `refresh` parameter
         refresh = kwargs.get("refresh", self.async_settings.database_refresh)
-        refresh = resolve_refresh(str(refresh).lower())
+        refresh = validate_refresh(refresh)
 
         # Log the bulk insert attempt
         logger.info(
@@ -1217,8 +1217,8 @@ def bulk_sync(
         kwargs = kwargs or {}
 
         # Resolve the `refresh` parameter
-        refresh = kwargs.get("refresh", self.sync_settings.database_refresh)
-        refresh = resolve_refresh(str(refresh).lower())
+        refresh = kwargs.get("refresh", self.async_settings.database_refresh)
+        refresh = validate_refresh(refresh)
 
         # Log the bulk insert attempt
         logger.info(