Merge remote-tracking branch 'origin/0.8.0' into issue-51-implement-aiopg-saga-execution-repository

Author: Sergio García Prado

packages/core/minos-microservice-aggregate/minos/aggregate/deltas/models.py

@@ -63,7 +63,9 @@ def simplified_name(self) -> str:
         return self.name.rsplit(".", 1)[-1]
 
     def __lt__(self, other: Any) -> bool:
-        return isinstance(other, type(self)) and self.version < other.version
+        return isinstance(other, type(self)) and (
+            (self.name == other.name and self.version < other.version) or self.created_at < other.created_at
+        )
 
     def __getitem__(self, item: str) -> Any:
         try:

packages/core/minos-microservice-aggregate/tests/test_aggregate/test_deltas/test_models.py

@@ -55,20 +55,17 @@ def test_simplified_name(self):
         self.assertEqual("Car", self.diff.simplified_name)
 
     def test_total_ordering(self):
-        observed = [
+        values = [
             Delta.from_entity(Car(3, "blue", version=4)),
             Delta.from_entity(Car(3, "blue", version=1)),
             Delta.from_entity(Car(3, "blue", version=3)),
             Delta.from_entity(Car(3, "blue", version=2)),
+            Delta.from_entity(Owner("foo", "bar", version=4, updated_at=current_datetime())),
+            Delta.from_entity(Owner("foo", "bar", version=3, updated_at=current_datetime())),
         ]
-        observed.sort()
+        observed = sorted(values)
 
-        expected = [
-            Delta.from_entity(Car(3, "blue", version=1)),
-            Delta.from_entity(Car(3, "blue", version=2)),
-            Delta.from_entity(Car(3, "blue", version=3)),
-            Delta.from_entity(Car(3, "blue", version=4)),
-        ]
+        expected = [values[5], values[4], values[1], values[3], values[2], values[0]]
         self.assertEqual(expected, observed)
 
     def test_from_entity(self):

packages/core/minos-microservice-common/minos/common/model/serializers/avro/data/decoder.py

@@ -24,7 +24,6 @@
     TYPE_CHECKING,
     Any,
     Optional,
-    Type,
     TypeVar,
     Union,
     get_args,
@@ -251,7 +250,7 @@ def _build_uuid(data: Any, **kwargs) -> UUID:
                 pass
         raise DataDecoderTypeException(UUID, data)
 
-    def _build_model(self, type_: Type[Model], data: Any, **kwargs) -> Any:
+    def _build_model(self, type_: type[Model], data: Any, **kwargs) -> Any:
         if is_type_subclass(type_) and isinstance(data, type_):
             return data
         return self._build_model_type(ModelType.from_model(type_), data, **kwargs)
@@ -263,7 +262,7 @@ def _build_model_type(self, type_: ModelType, data: Any, **kwargs) -> Any:
         if (ans := type_.model_cls.decode_data(self, data, type_, **kwargs)) is not MissingSentinel:
             return ans
 
-        if isinstance(data, dict):
+        if isinstance(data, Mapping):
             with suppress(Exception):
                 decoded_data = {
                     field_name: self._build(field_type, data[field_name], **kwargs)

packages/core/minos-microservice-common/tests/test_common/test_model/test_serializers/test_avro/test_data/test_decoder.py

@@ -303,6 +303,15 @@ def test_model_with_inheritance(self):
         observed = decoder.build(value)
         self.assertEqual(value, observed)
 
+    # noinspection PyUnusedLocal,PyPep8Naming
+    def test_model_with_model(self):
+        Foo = ModelType.build("Foo", one=int)
+        Bar = ModelType.build("Bar", one=int, two=str)
+
+        self.assertEqual(Foo(1234), AvroDataDecoder(Foo).build(Bar(1234, "5678")))
+        self.assertEqual(Foo(1234), AvroDataDecoder(Union[Foo, Bar]).build(Bar(1234, "5678")))
+        self.assertEqual(Bar(1234, "5678"), AvroDataDecoder(Union[Bar, Foo]).build(Bar(1234, "5678")))
+
     def test_model_from_dict(self):
         decoder = AvroDataDecoder(User)
         value = User(1234)

packages/core/minos-microservice-saga/minos/saga/definitions/operations.py

@@ -1,3 +1,5 @@
+"""Operation module."""
+
 from __future__ import (
     annotations,
 )
@@ -31,7 +33,7 @@
 
 
 class SagaOperationDecorator(Generic[T]):
-    """ "TODO"""
+    """Saga Operation Decorator class."""
 
     def __init__(self, attr_name: str = None, step_meta: SagaStepDecoratorMeta = None, *args, **kwargs):
         if attr_name is None:

packages/core/minos-microservice-saga/minos/saga/definitions/saga.py

@@ -1,3 +1,5 @@
+"""Saga definitions module."""
+
 from __future__ import (
     annotations,
 )
@@ -50,13 +52,13 @@
 
 @runtime_checkable
 class SagaDecoratorWrapper(Protocol):
-    """TODO"""
+    """Saga Decorator Wrapper class."""
 
     meta: SagaDecoratorMeta
 
 
 class SagaDecoratorMeta:
-    """TODO"""
+    """Saga Decorator Meta class."""
 
     _inner: type
     _definition: Saga
@@ -67,7 +69,10 @@ def __init__(self, func: type, saga: Saga):
 
     @cached_property
     def definition(self) -> Saga:
-        """TODO"""
+        """Get the saga definition.
+
+        :return: A ``Saga`` instance.
+        """
         steps = getmembers(self._inner, predicate=lambda x: isinstance(x, SagaStepDecoratorWrapper))
         steps = list(map(lambda member: member[1].meta.definition, steps))
         for step in steps:
@@ -113,6 +118,11 @@ def __init__(
             self.committed = True
 
     def __call__(self, type_: TP) -> Union[TP, SagaDecoratorWrapper]:
+        """Decorate the given type.
+
+        :param type_: The type to be decorated.
+        :return: The decorated type.
+        """
         type_.meta = SagaDecoratorMeta(type_, self)
         return type_
 
@@ -182,11 +192,11 @@ def remote_step(
         return self.add_step(step, RemoteSagaStep)
 
     def add_step(self, step: Optional[Union[SagaOperation, T]], step_cls: type[T] = SagaStep) -> T:
-        """TODO
+        """Add a new step.
 
-        :param step: TODO
-        :param step_cls: TODO
-        :return: TODO
+        :param step: The step to be added.
+        :param step_cls: The step class (for validation purposes).
+        :return: The added step.
         """
         if self.committed:
             raise AlreadyCommittedException("It is not possible to add more steps to an already committed saga.")

packages/core/minos-microservice-saga/minos/saga/definitions/steps/abc.py

@@ -1,3 +1,5 @@
+"""Base Step Definitions module."""
+
 from __future__ import (
     annotations,
 )
@@ -45,13 +47,13 @@
 
 @runtime_checkable
 class SagaStepDecoratorWrapper(Protocol):
-    """TODO"""
+    """Saga Step Decorator Wrapper class."""
 
     meta: SagaStepDecoratorMeta
 
 
 class SagaStepDecoratorMeta:
-    """TODO"""
+    """Saga Step Decorator Meta class."""
 
     _inner: Any
     _definition: SagaStep
@@ -63,7 +65,10 @@ def __init__(self, inner: Any, definition: SagaStep):
     @property
     @abstractmethod
     def definition(self) -> SagaStep:
-        """TODO"""
+        """Get the step definition.
+
+        :return: A ``SagaStep`` instance.
+        """
 
 
 class SagaStep(ABC):
@@ -104,7 +109,11 @@ def _from_raw(cls, raw: dict[str, Any]) -> SagaStep:
 
     @abstractmethod
     def __call__(self, func: Callable) -> SagaStepDecoratorWrapper:
-        """TODO"""
+        """Decorate the given function.
+
+        :param func: The function to be decorated.
+        :return: The decorated function.
+        """
 
     def conditional_step(self, *args, **kwargs) -> ConditionalSagaStep:
         """Create a new conditional step in the ``Saga``.

packages/core/minos-microservice-saga/minos/saga/definitions/steps/conditional.py

@@ -1,3 +1,5 @@
+"""Conditional Step Definitions module."""
+
 from __future__ import (
     annotations,
 )
@@ -55,19 +57,22 @@
 
 @runtime_checkable
 class ConditionalSagaStepDecoratorWrapper(SagaStepDecoratorWrapper, Protocol):
-    """TODO"""
+    """Conditional Saga Step Decorator Wrapper class."""
 
     meta: ConditionalSagaStepDecoratorMeta
 
 
 class ConditionalSagaStepDecoratorMeta(SagaStepDecoratorMeta):
-    """TODO"""
+    """Conditional Saga Step Decorator Meta class."""
 
     _definition: ConditionalSagaStep
 
     @cached_property
     def definition(self):
-        """TODO"""
+        """Get the step definition.
+
+        :return: A ``SagaStep`` instance.
+        """
         if_then_alternatives = getmembers(
             self._inner,
             predicate=(
@@ -140,6 +145,11 @@ def _from_raw(cls, raw: dict[str, Any], **kwargs) -> ConditionalSagaStep:
         return cls(**current)
 
     def __call__(self, type_: TP) -> Union[TP, ConditionalSagaStepDecoratorWrapper]:
+        """Decorate the given type.
+
+        :param type_: The type to be decorated.
+        :return: The decorated type.
+        """
         meta = ConditionalSagaStepDecoratorMeta(type_, self)
         type_.meta = meta
         return type_
@@ -226,22 +236,25 @@ def __iter__(self) -> Iterable:
 
 @runtime_checkable
 class IfThenAlternativeDecoratorWrapper(Protocol):
-    """TODO"""
+    """If Then Alternative Decorator Wrapper class."""
 
     meta: IfThenAlternativeDecoratorMeta
     __call__: ConditionCallback
 
 
 class IfThenAlternativeDecoratorMeta:
-    """TODO"""
+    """If Then Alternative Decorator Meta class."""
 
     def __init__(self, inner: ConditionCallback, alternative: IfThenAlternative):
         self._inner = inner
         self._alternative = alternative
 
     @cached_property
     def alternative(self) -> IfThenAlternative:
-        """TODO"""
+        """Get the if-then alternative.
+
+        :return: A ``IfThenAlternative`` instance.
+        """
         self._alternative.condition = SagaOperation(self._inner)
         return self._alternative
 
@@ -305,6 +318,7 @@ def raw(self) -> dict[str, Any]:
         """
 
         return {
+            "order": self.order,
             "condition": self.condition.raw,
             "saga": self.saga.raw,
         }
@@ -324,22 +338,25 @@ def __iter__(self):
 
 @runtime_checkable
 class ElseThenAlternativeDecoratorWrapper(Protocol):
-    """TODO"""
+    """Else Then Alternative Decorator Wrapper class."""
 
     meta: ElseThenAlternativeDecoratorMeta
     __call__: Callable
 
 
 class ElseThenAlternativeDecoratorMeta:
-    """TODO"""
+    """Else Then Alternative Decorator Meta class."""
 
     def __init__(self, inner: Callable, alternative: ElseThenAlternative):
         self._inner = inner
         self._alternative = alternative
 
     @cached_property
     def alternative(self) -> ElseThenAlternative:
-        """TODO"""
+        """Get the else-then alternative.
+
+        :return: A ``ElseThenAlternative`` instance.
+        """
         return self._alternative
 
 

packages/core/minos-microservice-saga/minos/saga/definitions/steps/local.py

@@ -1,3 +1,5 @@
+"""Local Step Definitions module."""
+
 from __future__ import (
     annotations,
 )
@@ -49,15 +51,15 @@
 
 @runtime_checkable
 class LocalSagaStepDecoratorWrapper(SagaStepDecoratorWrapper, Protocol):
-    """TODO"""
+    """Local Saga Step Decorator Wrapper class."""
 
     meta: LocalSagaStepDecoratorMeta
     on_failure: type[SagaOperationDecorator[LocalCallback]]
     __call__: LocalCallback
 
 
 class LocalSagaStepDecoratorMeta(SagaStepDecoratorMeta):
-    """TODO"""
+    """Local Saga Step Decorator Meta class."""
 
     _definition: LocalSagaStep
     _on_failure: Optional[LocalCallback]
@@ -68,17 +70,23 @@ def __init__(self, *args, **kwargs):
 
     @cached_property
     def definition(self):
-        """TODO"""
+        """Get the step definition.
+
+        :return: A ``SagaStep`` instance.
+        """
         self._definition.on_execute(self._inner)
         if self._on_failure is not None:
             self._definition.on_failure(self._on_failure)
         return self._definition
 
     @cached_property
     def on_failure(self) -> SagaOperationDecorator:
-        """TODO"""
+        """Get the on failure decorator.
+
+        :return: A ``SagaOperationDecorator`` type.
+        """
         # noinspection PyTypeChecker
-        return partial(SagaOperationDecorator, step_meta=self, attr_name="_on_failure")
+        return partial(SagaOperationDecorator[LocalCallback], step_meta=self, attr_name="_on_failure")
 
 
 class LocalSagaStep(SagaStep):
@@ -109,6 +117,11 @@ def _from_raw(cls, raw: dict[str, Any]) -> LocalSagaStep:
         return cls(**raw)
 
     def __call__(self, func: LocalCallback) -> LocalSagaStepDecoratorWrapper:
+        """Decorate the given function.
+
+        :param func: The function to be decorated.
+        :return: The decorated function.
+        """
         meta = LocalSagaStepDecoratorMeta(func, self)
         func.meta = meta
         func.on_failure = meta.on_failure
@@ -121,7 +134,7 @@ def on_execute(
 
         :param operation: The callback function to be called.
         :param parameters: A mapping of named parameters to be passed to the callback.
-        :param kwargs: A set of named arguments to be passed to the callback. ``parameters`` has order if it is not
+        :param kwargs: A set of named arguments to be passed to the callback. ``parameters`` has priority if it is not
             ``None``.
         :return: A ``self`` reference.
         """
@@ -142,7 +155,7 @@ def on_failure(
 
         :param operation: The callback function to be called.
         :param parameters: A mapping of named parameters to be passed to the callback.
-        :param kwargs: A set of named arguments to be passed to the callback. ``parameters`` has order if it is not
+        :param kwargs: A set of named arguments to be passed to the callback. ``parameters`` has priority if it is not
             ``None``.
         :return: A ``self`` reference.
         """