eventsourcing 9.3.0a1__py3-none-any.whl → 9.3.0b1__py3-none-any.whl

eventsourcing/domain.py

@@ -941,6 +941,7 @@ class MetaAggregate(type, Generic[TAggregate]):
             setattr(cls, base_event_name, base_event_cls)
 
         # Make sure all events defined on aggregate subclass the base event class.
+        created_event_classes: Dict[str, Type[CanInitAggregate]] = {}
         for name, value in tuple(cls.__dict__.items()):
             if name == base_event_name:
                 # Don't subclass the base event class again.
@@ -955,31 +956,20 @@ class MetaAggregate(type, Generic[TAggregate]):
             ):
                 sub_class = cls._define_event_class(name, (value, base_event_cls), None)
                 setattr(cls, name, sub_class)
-
-        # Identify or define the aggregate's "created" event class.
-        created_event_class: Type[CanInitAggregate] | None = None
-
-        # Has the "created" event class been indicated with '_created_event_class'.
-        if "_created_event_class" in cls.__dict__:
-            created_event_class = cls.__dict__["_created_event_class"]
-            if isinstance(created_event_class, type) and issubclass(
-                created_event_class, CanInitAggregate
-            ):
-                # We just subclassed the event classes, so reassign this.
-                created_event_class = getattr(cls, created_event_class.__name__)
-                assert created_event_class
-                cls._created_event_class = created_event_class
-            else:
-                msg = (
-                    f"{created_event_class} not subclass of {CanInitAggregate.__name__}"
-                )
-                raise TypeError(msg)
+        for name, value in tuple(cls.__dict__.items()):
+            if isinstance(value, type) and issubclass(value, CanInitAggregate):
+                created_event_classes[name] = value
 
         # Disallow using both '_created_event_class' and 'created_event_name'.
+        created_event_class: Type[CanInitAggregate] | None = cls.__dict__.get(
+            "_created_event_class"
+        )
         if created_event_class and created_event_name:
             msg = "Can't use both '_created_event_class' and 'created_event_name'"
             raise TypeError(msg)
 
+        # Identify or define the aggregate's "created" event class.
+
         # Is the init method decorated with a CommandMethodDecorator?
         if isinstance(cls.__dict__.get("__init__"), CommandMethodDecorator):
             init_decorator: CommandMethodDecorator = cls.__dict__["__init__"]
@@ -987,31 +977,20 @@ class MetaAggregate(type, Generic[TAggregate]):
             # Set the original method on the class (un-decorate __init__).
             cls.__init__ = init_decorator.decorated_method  # type: ignore
 
-            # Disallow using both 'created_event_name' and '_created_event_class'.
+            # Disallow using both 'created_event_name' and decorator on __init__.
             if created_event_name:
                 msg = "Can't use both 'created_event_name' and decorator on __init__"
                 raise TypeError(msg)
+            # Disallow using both '_created_event_class' and decorator on __init__.
             if created_event_class:
                 msg = "Can't use both '_created_event_class' and decorator on __init__"
                 raise TypeError(msg)
 
-            # Does the decorator specify a "create" event class?
+            # Does the decorator specify a "created" event class?
             if init_decorator.given_event_cls:
-                created_event_class = getattr(
-                    cls, init_decorator.given_event_cls.__name__
+                created_event_class = cast(
+                    Type[CanInitAggregate], init_decorator.given_event_cls
                 )
-                if isinstance(created_event_class, type) and issubclass(
-                    created_event_class, CanInitAggregate
-                ):
-                    assert created_event_class
-                    cls._created_event_class = created_event_class
-                else:
-                    msg = (
-                        f"{created_event_class} not subclass of "
-                        f"{CanInitAggregate.__name__}"
-                    )
-                    raise TypeError(msg)
-
             # Does the decorator specify a "created" event name?
             elif init_decorator.event_cls_name:
                 created_event_name = init_decorator.event_cls_name
@@ -1028,65 +1007,85 @@ class MetaAggregate(type, Generic[TAggregate]):
                 _init_mentions_id.add(cls)
                 break
 
-        # If no "created" event class has been specified, find or create one.
-        if created_event_class is None:
-            # Discover all the "created" event classes already defined.
-            created_event_classes: Dict[str, Type[AggregateCreated]] = {}
-            for name, value in tuple(cls.__dict__.items()):
-                if isinstance(value, type) and issubclass(value, AggregateCreated):
-                    created_event_classes[name] = value
-
-            # Is a "created" event class already defined that matches the name?
-            if created_event_name in created_event_classes:
-                cls._created_event_class = created_event_classes[created_event_name]
-
-            # If there is only one class defined, and we have no name, use it.
-            elif len(created_event_classes) == 1 and not created_event_name:
-                cls._created_event_class = next(iter(created_event_classes.values()))
-
-            # If there are no "created" event classes already defined, or a name is
-            # specified that hasn't matched, then define a "created" event class.
-            elif len(created_event_classes) == 0 or created_event_name:
-                # If no "created" event name has been specified, use default name.
-                if not created_event_name:
-                    # This is safe because len(created_event_classes) == 0.
-                    created_event_name = "Created"
-
-                # Disallow init method from having variable params if
-                # we are using it to define a "created" event class.
+        if created_event_class:
+            # Check specified "created" event class can init aggregate.
+            if not issubclass(created_event_class, CanInitAggregate):
+                msg = (
+                    f"{created_event_class} not subclass of {CanInitAggregate.__name__}"
+                )
+                raise TypeError(msg)
+
+            for sub_class in created_event_classes.values():
+                if issubclass(sub_class, created_event_class):
+                    # We just subclassed the created event class, so reassign it.
+                    created_event_class = sub_class
+
+        # Is a "created" event class already defined that matches the name?
+        elif created_event_name and created_event_name in created_event_classes:
+            created_event_class = created_event_classes[created_event_name]
+
+        # If there is only one class defined, then use it.
+        elif len(created_event_classes) == 1 and not created_event_name:
+            created_event_class = next(iter(created_event_classes.values()))
+
+        # If there are no "created" event classes already defined, or a name is
+        # specified that hasn't matched, then define a "created" event class.
+        elif len(created_event_classes) == 0 or created_event_name:
+
+            # Decide the base classes for the new "created" event class.
+            if created_event_name and len(created_event_classes) == 1:
+                base_created_event_cls = next(iter(created_event_classes.values()))
+            else:
+                for base_cls in cls.__mro__:
+                    if base_cls is cls:
+                        continue
+                    base_created_event_cls = base_cls.__dict__.get(
+                        "_created_event_class",
+                        base_cls.__dict__.get("Created"),
+                    )
+                    if base_created_event_cls:
+                        break
+                else:  # pragma: no cover
+                    msg = "Can't decide base class for new 'created' event class"
+                    raise TypeError(msg)
+
+            if not created_event_name:
+                created_event_name = base_created_event_cls.__name__
+
+            # Disallow init method from having variable params if
+            # we are using it to define a "created" event class.
+            try:
+                init_method = cls.__dict__["__init__"]
+            except KeyError:
+                init_method = None
+            else:
                 try:
-                    init_method = cls.__dict__["__init__"]
-                except KeyError:
-                    init_method = None
-                else:
-                    try:
-                        _check_no_variable_params(init_method)
-                    except TypeError:
-                        raise
-
-                # Define a "created" event class for this aggregate.
-                if issubclass(cls.Created, base_event_cls):
-                    # Don't subclass from base event class twice.
-                    bases: Tuple[Type[CanMutateAggregate], ...] = (cls.Created,)
-                else:
-                    bases = (cls.Created, base_event_cls)
-                event_cls = cls._define_event_class(
+                    _check_no_variable_params(init_method)
+                except TypeError:
+                    raise
+
+            # Define a "created" event class for this aggregate.
+            if issubclass(base_created_event_cls, base_event_cls):
+                # Don't subclass from base event class twice.
+                bases: Tuple[Type[CanMutateAggregate], ...] = (base_created_event_cls,)
+            else:
+                bases = (base_created_event_cls, base_event_cls)
+            created_event_class = cast(
+                Type[CanInitAggregate],
+                cls._define_event_class(
                     created_event_name,
                     bases,
                     init_method,
-                )
-
-                # Set the event class as an attribute of the aggregate class.
-                setattr(cls, created_event_name, event_cls)
-
-                # Remember which is the "created" event class.
-                cls._created_event_class = cast(Type[AggregateCreated], event_cls)
+                ),
+            )
+            # Set the event class as an attribute of the aggregate class.
+            setattr(cls, created_event_name, created_event_class)
 
+        if created_event_class:
+            cls._created_event_class = created_event_class
+        else:
             # Prepare to disallow ambiguity of choice between created event classes.
-            else:
-                aggregate_has_many_created_event_classes[cls] = list(
-                    created_event_classes
-                )
+            aggregate_has_many_created_event_classes[cls] = list(created_event_classes)
 
         # Prepare the subsequent event classes.
         for attr_name, attr_value in tuple(cls.__dict__.items()):

eventsourcing/tests/domain_tests/test_aggregate.py

@@ -730,6 +730,7 @@ class TestAggregateCreation(TestCase):
         order = Order("name")
         pending = order.collect_events()
         self.assertEqual(type(pending[0]).__name__, "Started")
+        self.assertTrue(isinstance(pending[0], Order.Created))
 
     def test_raises_when_given_created_event_name_conflicts_with_created_event_class(
         self,
@@ -1098,6 +1099,19 @@ class TestAggregateEventsAreSubclassed(TestCase):
             MySubclass.Ended.__qualname__,
         )
 
+        self.assertTrue(
+            MySubclass._created_event_class.__qualname__.endswith("MySubclass.Opened")
+        )
+
+        class MySubSubClass(MySubclass):
+            pass
+
+        self.assertTrue(
+            MySubSubClass._created_event_class.__qualname__.endswith(
+                "MySubSubClass.Opened"
+            )
+        )
+
 
 class TestBankAccount(TestCase):
     def test_subclass_bank_account(self):

{eventsourcing-9.3.0a1.dist-info → eventsourcing-9.3.0b1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: eventsourcing
-Version: 9.3.0a1
+Version: 9.3.0b1
 Summary: Event sourcing in Python
 Home-page: https://github.com/pyeventsourcing/eventsourcing
 License: BSD 3-Clause
@@ -8,7 +8,7 @@ Keywords: event sourcing,event store,domain driven design,domain-driven design,d
 Author: John Bywater
 Author-email: john.bywater@appropriatesoftware.net
 Requires-Python: >=3.8,<4.0
-Classifier: Development Status :: 3 - Alpha
+Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Education
 Classifier: Intended Audience :: Science/Research

{eventsourcing-9.3.0a1.dist-info → eventsourcing-9.3.0b1.dist-info}/RECORD

@@ -3,7 +3,7 @@ eventsourcing/application.py,sha256=ZTsk-qTieT13Jesf44Xh6htF8Y_CP753bmdoDOKSVW4,
 eventsourcing/cipher.py,sha256=NJcVfZdSlCER6xryM4zVoY3cmKstF-iSSniB4jmpaKg,3200
 eventsourcing/compressor.py,sha256=IdvrJUB9B2td871oifInv4lGXmHwYL9d69MbHHCr7uI,421
 eventsourcing/dispatch.py,sha256=yYSpT-jqc6l_wTdqEnfPJJfvsZN2Ta8g2anrVPWIcqQ,1412
-eventsourcing/domain.py,sha256=YpPUSiJBRL3QRz_49X5KMaKa0bybDbdeMXen_mlntwE,57442
+eventsourcing/domain.py,sha256=rvm4Sv2MmLcha8_5wqJ13AjmqyWvuzkquYsexUaePIg,57264
 eventsourcing/examples/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 eventsourcing/examples/aggregate1/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 eventsourcing/examples/aggregate1/application.py,sha256=LPle9YoAu85EQFrp-lUk0I8DKuSdQOSUyJ__38JHSvE,766
@@ -114,7 +114,7 @@ eventsourcing/tests/docs_tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5
 eventsourcing/tests/docs_tests/test_docs.py,sha256=Yt--RMe_tcG9zERBJmaAVkZ0qgMWnlgbFzRPktRUVGk,10777
 eventsourcing/tests/domain.py,sha256=lHSlY6jIoSeqlcPSbrrozEPUJGvJ8bgPrznlmzTxn2w,3254
 eventsourcing/tests/domain_tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-eventsourcing/tests/domain_tests/test_aggregate.py,sha256=Ps1XCJo3nYr1vvOSQvhSNJwRPwbUC4CPz_Ripq8hJZ8,37851
+eventsourcing/tests/domain_tests/test_aggregate.py,sha256=tH61bA69MzNF9VVt5USayWoB8tZ2lnLIaqyE5MTEgUI,38255
 eventsourcing/tests/domain_tests/test_aggregate_decorators.py,sha256=zky6jmqblM0GKgdhCJjYdSxtEE9MwRcemYaZhqxL1AE,50256
 eventsourcing/tests/domain_tests/test_domainevent.py,sha256=3EGLKnla1aWfKPzMfLCNmh7UtVAztk_ne_Oi0cP7jPU,2782
 eventsourcing/tests/interface_tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -138,7 +138,7 @@ eventsourcing/tests/system_tests/test_system.py,sha256=xi-nCPTWeB5Rqasyn4-rP213F
 eventsourcing/tests/utils_tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 eventsourcing/tests/utils_tests/test_utils.py,sha256=8HcTk_0_lXyoT307fEmd2utwmOUS_joToUPGFeFnKW8,6486
 eventsourcing/utils.py,sha256=PIWDvoGiKCXsNbR5DirkoJ_svopg80SoH37bqxOcjkU,8247
-eventsourcing-9.3.0a1.dist-info/LICENSE,sha256=bSE_F-T6cQPmMY5LuJC27km_pGB1XCVuUFx1uY0Nueg,1512
-eventsourcing-9.3.0a1.dist-info/METADATA,sha256=pCAGpXV2lgzexep06p9k0Ca3IEQuDSFnopDhhNjb47A,9891
-eventsourcing-9.3.0a1.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
-eventsourcing-9.3.0a1.dist-info/RECORD,,
+eventsourcing-9.3.0b1.dist-info/LICENSE,sha256=bSE_F-T6cQPmMY5LuJC27km_pGB1XCVuUFx1uY0Nueg,1512
+eventsourcing-9.3.0b1.dist-info/METADATA,sha256=bNaX2a3mE4_9aGXlStw7M2EK_VijO5w8Z-GdTe4Rmmg,9890
+eventsourcing-9.3.0b1.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
+eventsourcing-9.3.0b1.dist-info/RECORD,,