Merge pull request #445 from minos-framework/0.7.0

0.7.0

Author: Sergio García Prado

packages/core/minos-microservice-aggregate/minos/aggregate/__init__.py

@@ -2,7 +2,7 @@
 
 __author__ = "Minos Framework Devs"
 __email__ = "[email protected]"
-__version__ = "0.7.0.dev2"
+__version__ = "0.7.0.dev4"
 
 from .actions import (
     Action,

packages/core/minos-microservice-aggregate/minos/aggregate/entities/collections.py

@@ -141,7 +141,7 @@ def decode_data(cls, decoder: DataDecoder, target: Any, type_: ModelType, **kwar
         :return: A decoded instance.
         """
         data_cls = get_args(type_.type_hints["data"])[1]
-        target = {decoder.build(v, data_cls, **kwargs) for v in target}
+        target = (decoder.build(v, data_cls, **kwargs) for v in target)
         target = {str(v["uuid"]): v for v in target}
         decoded = decoder.build(target, type_.type_hints["data"], **kwargs)
         return cls(decoded, additional_type_hints=type_.type_hints)

packages/core/minos-microservice-aggregate/poetry.lock

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "minos-microservice-aggregate"
-version = "0.7.0.dev2"
+version = "0.7.0.dev4"
 description = "The Aggregate pattern of the Minos Framework"
 readme = "README.md"
 repository = "https://github.com/minos-framework/minos-python"
@@ -21,12 +21,12 @@ keywords = [
     "saga",
 ]
 packages = [
-    { include = "minos" }
+    { include = "minos" },
 ]
 include = [
-    "AUTHORS.md",
-    "HISTORY.md",
-    "LICENSE",
+    { path = "AUTHORS.md", format = "sdist" },
+    { path = "HISTORY.md", format = "sdist" },
+    { path = "LICENSE", format = "sdist" },
 ]
 
 [tool.poetry.dependencies]
@@ -40,7 +40,7 @@ minos-microservice-common = { path = "../minos-microservice-common", develop = t
 minos-microservice-networks = { path = "../minos-microservice-networks", develop = true }
 black = "^22.3"
 isort = "^5.8.0"
-pytest = "^7.0.1"
+pytest = "^7.1.2"
 coverage = "^6.3"
 flake8 = "^4.0.1"
 

packages/core/minos-microservice-aggregate/pyproject.toml

@@ -8,6 +8,7 @@
 
 from minos.aggregate import (
     Action,
+    Entity,
     EntitySet,
     IncrementalSetDiff,
     IncrementalSetDiffEntry,
@@ -20,6 +21,10 @@
 )
 
 
+class _NotHashable(Entity):
+    foo: set[int]
+
+
 class TestEntitySet(unittest.TestCase):
     def test_data(self):
         raw = {OrderItem("John"), OrderItem("Michael")}
@@ -139,6 +144,10 @@ def test_avro_bytes(self):
         expected = EntitySet({OrderItem("John"), OrderItem("Michael")})
         self.assertEqual(expected, Model.from_avro_bytes(expected.avro_bytes))
 
+    def test_avro_bytes_not_hashable(self):
+        expected = EntitySet([_NotHashable({1}), _NotHashable({2})])
+        self.assertEqual(expected, Model.from_avro_bytes(expected.avro_bytes))
+
 
 class TestEntitySetDiff(unittest.TestCase):
     def setUp(self) -> None:

packages/core/minos-microservice-aggregate/tests/test_aggregate/test_entities/test_collections.py

@@ -1,7 +1,7 @@
 """The common core of the Minos Framework."""
 __author__ = "Minos Framework Devs"
 __email__ = "[email protected]"
-__version__ = "0.7.0.dev2"
+__version__ = "0.7.0.dev4"
 
 from .builders import (
     BuildableMixin,

packages/core/minos-microservice-common/minos/common/__init__.py

@@ -99,11 +99,14 @@ async def execute(self, operation: DatabaseOperation) -> None:
             await self._create_lock(operation.lock)
 
         if isinstance(operation, ComposedDatabaseOperation):
-            for op in operation.operations:
-                await wait_for(self._execute(op), operation.timeout)
+            await wait_for(self._execute_composed(operation), operation.timeout)
         else:
             await wait_for(self._execute(operation), operation.timeout)
 
+    async def _execute_composed(self, operation: ComposedDatabaseOperation) -> None:
+        for op in operation.operations:
+            await self.execute(op)
+
     @abstractmethod
     async def _execute(self, operation: DatabaseOperation) -> None:
         raise NotImplementedError

packages/core/minos-microservice-common/minos/common/database/clients/abc.py

@@ -5,8 +5,7 @@
 from collections.abc import (
     Hashable,
 )
-
-from pyparsing import (
+from typing import (
     Optional,
 )
 

packages/core/minos-microservice-common/minos/common/database/locks/impl.py

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "minos-microservice-common"
-version = "0.7.0.dev2"
+version = "0.7.0.dev4"
 description = "The common core of the Minos Framework"
 readme = "README.md"
 repository = "https://github.com/minos-framework/minos-python"
@@ -21,12 +21,12 @@ keywords = [
     "saga",
 ]
 packages = [
-    { include = "minos" }
+    { include = "minos" },
 ]
 include = [
-    "AUTHORS.md",
-    "HISTORY.md",
-    "LICENSE",
+    { path = "AUTHORS.md", format = "sdist" },
+    { path = "HISTORY.md", format = "sdist" },
+    { path = "LICENSE", format = "sdist" },
 ]
 
 [tool.poetry.dependencies]