Merge pull request #129 from labd/fix/custom-object-test

Adds missing routes to the custom objects test

Author: qdegraaf

src/commercetools/testing/abstract.py

@@ -118,6 +118,11 @@ def delete_by_key(self, key):
             if obj["key"] == key:
                 return self.objects.pop(obj_id)
 
+    def delete_by_container_and_key(self, container, key):
+        for obj_id, obj in self.objects.items():
+            if obj["container"] == container and obj["key"] == key:
+                return self.objects.pop(obj_id)
+
     def save(self, obj):
         assert obj["id"]
         obj["version"] += 1
@@ -277,6 +282,18 @@ def delete_by_key(self, request, key):
             return create_commercetools_response(request, json=obj)
         return create_commercetools_response(request, status_code=404)
 
+    def delete_by_container_and_key(self, request, container, key):
+        obj = self.model.get_by_container_and_key(container, key)
+        if obj:
+            if self._verify_version:
+                response = self._validate_resource_version(request, obj)
+                if response is not None:
+                    return response
+
+            obj = self.model.delete_by_container_and_key(key)
+            return create_commercetools_response(request, json=obj)
+        return create_commercetools_response(request, status_code=404)
+
     def _expand(self, request: _RequestObjectProxy, raw_obj):
         params = utils.parse_request_params(self._schema_query_params, request)
         if "expand" not in params:

src/commercetools/testing/custom_objects.py

@@ -8,7 +8,6 @@
     CustomObjectPagedQueryResponseSchema,
     CustomObjectSchema,
 )
-from commercetools.platform.models._schemas.error import ErrorResponseSchema
 from commercetools.testing.abstract import BaseModel, ServiceBackend
 from commercetools.testing.utils import create_commercetools_response
 
@@ -27,7 +26,7 @@ def add(self, draft, id=None):
         version matches. otherwise create a new item
         """
         new_obj = self._create_from_draft(draft, id)
-        current_obj = self._get_by_container_key(new_obj.container, new_obj.key)
+        current_obj = self._get_by_container_and_key(new_obj.container, new_obj.key)
 
         if current_obj:
             if current_obj["version"] != new_obj.version:
@@ -55,7 +54,7 @@ def _create_from_draft(
             last_modified_at=datetime.datetime.now(datetime.timezone.utc),
         )
 
-    def _get_by_container_key(
+    def _get_by_container_and_key(
         self, container: str, key: str
     ) -> typing.Optional[typing.Dict]:
         return next(
@@ -78,7 +77,21 @@ def urls(self):
         return [
             ("^$", "GET", self.query),
             ("^$", "POST", self.create),
-            ("^(?P<container>[^/]+)/(?P<key>[^/]+)$", "GET", self.get_by_container_key),
+            (
+                "^(?P<container>[^/]+)/(?P<key>[^/]+)$",
+                "GET",
+                self.get_by_container_and_key,
+            ),
+            (
+                "^(?P<container>[^/]+)/(?P<key>[^/]+)$",
+                "POST",
+                self.update_by_container_and_key,
+            ),
+            (
+                "^(?P<container>[^/]+)/(?P<key>[^/]+)$",
+                "DELETE",
+                self.delete_by_container_and_key,
+            ),
             ("^(?P<container>[^/]+)$", "GET", self.query_by_container),
         ]
 
@@ -91,9 +104,21 @@ def query_by_container(self, request, container: str):
 
         return self.query(request)
 
-    def get_by_container_key(self, request, container: str, key: str):
-        item = self.model._get_by_container_key(container, key)
+    def get_by_container_and_key(self, request, container: str, key: str):
+        item = self.model._get_by_container_and_key(container, key)
         if item:
             return create_commercetools_response(request, json=item)
-        else:
-            return create_commercetools_response(request, status_code=404)
+
+        return create_commercetools_response(request, status_code=404)
+
+    def update_by_container_and_key(self, request, container: str, key: str):
+        item = self.model._get_by_container_and_key(container, key)
+        return self._update(request, item)
+
+    def delete_by_container_and_key(self, request, container: str, key: str):
+        item = self.model._get_by_container_and_key(container, key)
+        if item:
+            obj = self.model.delete_by_container_and_key(container, key)
+            return create_commercetools_response(request, json=obj)
+
+        return create_commercetools_response(request, status_code=404)

tests/platform/test_service_custom_objects.py

@@ -87,3 +87,21 @@ def test_custom_object_query_by_container(old_client):
     result = old_client.custom_objects.query_by_container("unittest")
     assert len(result.results) == 2
     assert result.total == 2
+
+
+def test_delete_by_container_and_key(old_client):
+    custom_object = old_client.custom_objects.create_or_update(
+        models.CustomObjectDraft(container="unittest", key="test-object-1", value=1234)
+    )
+    assert custom_object.id
+    assert custom_object.key == "test-object-1"
+    deleted_object = old_client.custom_objects.delete_by_container_and_key(
+        container=custom_object.container, key=custom_object.key
+    )
+
+    assert deleted_object.key == "test-object-1"
+
+    with pytest.raises(HTTPError):
+        old_client.custom_objects.delete_by_container_and_key(
+            container=custom_object.container, key=custom_object.key
+        )