Merge remote-tracking branch 'origin/0.7.1' into 0.8.0

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

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)