use concatenation of id and collection for elasticsearch _id value #58
Conversation
| @@ -25,7 +25,7 @@ docker-shell: | |||
|
|
|||
| .PHONY: test | |||
| test: | |||
| $(run_es) /bin/bash -c 'export && ./scripts/wait-for-it-es.sh elasticsearch:9200 && cd /app/stac_fastapi/elasticsearch/tests/ && pytest' | |||
| -$(run_es) /bin/bash -c 'export && ./scripts/wait-for-it-es.sh elasticsearch:9200 && cd /app/stac_fastapi/elasticsearch/tests/ && pytest' | |||
There was a problem hiding this comment.
the - at the beginning will allow the execution of docker-compose down even if there are failing tests.
| actions = [ | ||
| { | ||
| "_index": ITEMS_INDEX, | ||
| "_id": mk_item_id(item["id"], item["collection"]), |
There was a problem hiding this comment.
explicitly set the document id for bulk insert now
| @@ -33,6 +33,11 @@ | |||
| COLLECTIONS_INDEX = "stac_collections" | |||
|
|
|||
|
|
|||
| def mk_item_id(item_id: str, collection_id: str): | |||
| """Make the Elasticsearch document _id value from the Item id and collection.""" | |||
| return f"{item_id}|{collection_id}" | |||
|
|
||
| es_transactions.delete_collection( | ||
| collection_data["id"], request=MockStarletteRequest | ||
| ) | ||
| es_transactions.delete_item( | ||
| item_data["id"], coll["id"], request=MockStarletteRequest | ||
| item_data["id"], item_data["collection"], request=MockStarletteRequest |
There was a problem hiding this comment.
this test started failing because the wrong collection value was passed (notice it's passing the Item ID again), but the collection was previously ignored in delete, whereas now it's used.
| @@ -153,7 +153,10 @@ def app_client(api_client, load_test_data): | |||
| try: | |||
| client.create_collection(coll, request=MockStarletteRequest) | |||
| except ConflictError: | |||
| pass | |||
| try: | |||
There was a problem hiding this comment.
these tests do not clean up well, especially when any of them fail. This is a stop-gap until that's better handled.
| @@ -143,6 +143,8 @@ def test_update_item_missing_collection(app_client, load_test_data): | |||
| def test_update_item_geometry(app_client, load_test_data): | |||
| test_item = load_test_data("test_item.json") | |||
|
|
|||
| test_item["id"] = "update_test_item_1" | |||
There was a problem hiding this comment.
again, another stop-gap. The index should probably be cleared before each run, and each item should be given a random id.
Related Issue(s):
Description:
PR Checklist:
pre-commit run --all-files)make test)make docs)