Merge pull request #1046 from RS-PYTHON/fix/rspy439-add-item-in-non-existing-collection

fix-rspy439-add-item-in-non-existing-collection

Author: alinbutu

services/catalog/rs_server_catalog/user_catalog.py

@@ -753,6 +753,13 @@ async def manage_put_post_request(  # pylint: disable=too-many-statements,too-ma
 
             # The following section handles the request to create/update an item
             elif "items" in request.scope["path"]:
+                # first check if the collection exists
+                if not await self.collection_exists(request, f"{self.request_ids['owner_id']}_{collection}"):
+                    raise HTTPException(
+                        status_code=HTTP_404_NOT_FOUND,
+                        detail=f"Collection {collection} does not exist.",
+                    )
+
                 # try to get the item if it is already part from the collection
                 item = await self.get_item_from_collection(request)
 

services/catalog/tests/test_endpoints.py

@@ -1612,7 +1612,6 @@ def test_update_timestamp_feature_fails_with_unfound_item(
         """
         ENDPOINT: PUT: /catalog/collections/{user:collection}/items/{featureID}
         """
-
         # Change correct feature collection id to match with minimal collection and post it
         a_correct_feature["collection"] = "fixture_collection"
         # Post the correct feature to catalog
@@ -1628,13 +1627,57 @@ def test_update_timestamp_feature_fails_with_unfound_item(
         updated_feature_sent["bbox"] = [77]
         del updated_feature_sent["collection"]
 
-        path = "/catalog/collections/fixture_owner:fixture_collections/items/NOT_FOUND_ITEM"
+        path = "/catalog/collections/fixture_owner:fixture_collection/items/NOT_FOUND_ITEM"
         feature_put_response = client.put(
             path,
             json=updated_feature_sent,
         )
         assert feature_put_response.status_code == fastapi.status.HTTP_400_BAD_REQUEST
 
+    def test_update_feature_in_non_existing_collection_fails(
+        self,
+        client,
+        a_minimal_collection,
+        a_correct_feature,
+    ):
+        """
+        ENDPOINT: PUT: /catalog/collections/{user:collection}/items/{featureID}
+        with collection as non existing collection
+        """
+        # Change correct feature collection id to match with minimal collection
+        a_correct_feature["collection"] = "fixture_collection"
+        # Put feature in non existing collection
+        non_existing_collection = "NON_EXISTING_FIXTURE_COLLECTION"
+        feature_put_response = client.put(
+            f"/catalog/collections/fixture_owner:{non_existing_collection}/items/{a_correct_feature['id']}",
+            json=a_correct_feature,
+        )
+
+        assert feature_put_response.status_code == fastapi.status.HTTP_404_NOT_FOUND
+        assert feature_put_response.json() == f"Collection {non_existing_collection} does not exist."
+
+    def test_add_feature_in_non_existing_collection_fails(
+        self,
+        client,
+        a_minimal_collection,
+        a_correct_feature,
+    ):
+        """
+        ENDPOINT: POST: /catalog/collections/{user:collection}/items/
+        with collection as non existing collection
+        """
+        # Change correct feature collection id to match with minimal collection and post it
+        a_correct_feature["collection"] = "fixture_collection"
+        # Post the correct feature to catalog
+        non_existing_collection = "NON_EXISTING_FIXTURE_COLLECTION"
+        feature_post_response = client.post(
+            f"/catalog/collections/fixture_owner:{non_existing_collection}/items",
+            json=a_correct_feature,
+        )
+
+        assert feature_post_response.status_code == fastapi.status.HTTP_404_NOT_FOUND
+        assert feature_post_response.json() == f"Collection {non_existing_collection} does not exist."
+
     def test_update_with_an_incorrect_feature(self, client, a_minimal_collection, a_correct_feature):
         """Testing POST feature endpoint with a wrong-formatted field (BBOX)."""
         # Change correct feature collection id to match with minimal collection and post it