hexkit 3.0.1__tar.gz → 3.0.2__tar.gz

{hexkit-3.0.1/src/hexkit.egg-info → hexkit-3.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hexkit
-Version: 3.0.1
+Version: 3.0.2
 Summary: A Toolkit for Building Microservices using the Hexagonal Architecture
 Author-email: "German Human Genome Phenome Archive (GHGA)" <contact@ghga.de>
 License: Apache 2.0

{hexkit-3.0.1 → hexkit-3.0.2}/pyproject.toml

@@ -23,7 +23,7 @@ classifiers = [
     "Intended Audience :: Developers",
 ]
 name = "hexkit"
-version = "3.0.1"
+version = "3.0.2"
 description = "A Toolkit for Building Microservices using the Hexagonal Architecture"
 dependencies = [
     "pydantic >=2, <3",

{hexkit-3.0.1 → hexkit-3.0.2}/src/hexkit/custom_types.py

@@ -22,7 +22,7 @@ from typing import Any, Literal, Union
 # This is intended to type objects that could be a potential output of `json.loads`.
 # (Scalar types as well as arrays are excluded from the above assumption.)
 JsonObject = Mapping[
-    str, Union[int, float, str, bool, Sequence[Any], Mapping[str, Any]]
+    str, Union[int, float, str, bool, Sequence[Any], Mapping[str, Any], None]
 ]
 
 

{hexkit-3.0.1 → hexkit-3.0.2}/src/hexkit/protocols/dao.py

@@ -132,7 +132,7 @@ class DaoCommons(typing.Protocol[Dto]):
         """
         ...
 
-    async def delete(self, *, id_: str) -> None:
+    async def delete(self, id_: str) -> None:
         """Delete a resource by providing its ID.
 
         Args:

{hexkit-3.0.1 → hexkit-3.0.2}/src/hexkit/providers/mongodb/provider.py

@@ -201,7 +201,7 @@ class MongoDbDaoBase(ABC, Generic[Dto]):
         # (trusting MongoDB that matching on the _id field can only yield one or
         # zero matches)
 
-    async def delete(self, *, id_: str) -> None:
+    async def delete(self, id_: str) -> None:
         """Delete a resource by providing its ID.
 
         Args:

{hexkit-3.0.1 → hexkit-3.0.2}/src/hexkit/providers/mongokafka/provider.py

@@ -135,7 +135,7 @@ def get_delete_publish_func(
         )
 
         document = {"_id": id_, "__metadata__": {"deleted": True, "published": True}}
-        await collection.replace_one({"_id": document["_id"]}, document, upsert=True)
+        await collection.replace_one({"_id": document["_id"]}, document)
 
     return publish_deletion
 
@@ -233,13 +233,17 @@ class MongoKafkaDaoPublisher(Generic[Dto]):
             ResourceNotFoundError:
                 when resource with the id specified in the dto was not found
         """
-        with assert_not_deleted():
-            await self._dao.update(dto)
+        document = self._dao._dto_to_document(dto)
+        result = await self._collection.replace_one(
+            {"_id": document["_id"], "__metadata__.deleted": False}, document
+        )
+        if result.matched_count == 0:
+            raise ResourceNotFoundError(id_=document["_id"])
 
         if self._autopublish:
             await self._publish_change(dto)
 
-    async def delete(self, *, id_: str) -> None:
+    async def delete(self, id_: str) -> None:
         """Delete a resource by providing its ID.
 
         Args:
@@ -248,10 +252,15 @@ class MongoKafkaDaoPublisher(Generic[Dto]):
         Raises:
             ResourceNotFoundError: when resource with the specified id_ was not found
         """
-        document = {"_id": id_, "__metadata__": {"deleted": True, "published": False}}
-        await self._collection.replace_one(
-            {"_id": document["_id"]}, document, upsert=True
+        document = {
+            "_id": id_,
+            "__metadata__": {"deleted": True, "published": False},
+        }
+        result = await self._collection.replace_one(
+            {"_id": document["_id"], "__metadata__.deleted": False}, document
         )
+        if result.matched_count == 0:
+            raise ResourceNotFoundError(id_=id_)
 
         if self._autopublish:
             await self._publish_delete(id_)

{hexkit-3.0.1 → hexkit-3.0.2/src/hexkit.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hexkit
-Version: 3.0.1
+Version: 3.0.2
 Summary: A Toolkit for Building Microservices using the Hexagonal Architecture
 Author-email: "German Human Genome Phenome Archive (GHGA)" <contact@ghga.de>
 License: Apache 2.0