Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ maintainers = [{name = "Vadim Kozyrevskiy", email = "vadikko2@mail.ru"}]
name = "python-cqrs"
readme = "README.md"
requires-python = ">=3.10"
version = "4.6.3"
version = "4.6.4"

[project.optional-dependencies]
aiobreaker = ["aiobreaker>=0.3.0"]
Expand Down
3 changes: 2 additions & 1 deletion src/cqrs/message_brokers/protocol.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import dataclasses
import typing
import uuid
from dataclass_wizard import asdict


@dataclasses.dataclass
Expand All @@ -28,7 +29,7 @@ def to_dict(self) -> dict[str, typing.Any]:
Returns:
A dictionary containing all fields of the message instance.
"""
return dataclasses.asdict(self)
return asdict(self)


class MessageBroker(abc.ABC):
Expand Down
19 changes: 16 additions & 3 deletions src/cqrs/saga/storage/sqlalchemy.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import datetime
import logging
import os
import typing
import uuid

import dotenv
import sqlalchemy
from sqlalchemy import func
from sqlalchemy.exc import SQLAlchemyError
Expand All @@ -17,12 +19,23 @@
Base = registry().generate_base()
logger = logging.getLogger(__name__)

dotenv.load_dotenv()

DEFAULT_SAGA_EXECUTION_TABLE_NAME = "saga_executions"
DEFAULT_SAGA_LOG_TABLE_NAME = "saga_logs"

SAGA_EXECUTION_TABLE_NAME = os.getenv(
"CQRS_SAGA_EXECUTION_TABLE_NAME",
DEFAULT_SAGA_EXECUTION_TABLE_NAME,
)
SAGA_LOG_TABLE_NAME = os.getenv(
"CQRS_SAGA_LOG_TABLE_NAME",
DEFAULT_SAGA_LOG_TABLE_NAME,
)


class SagaExecutionModel(Base):
__tablename__ = DEFAULT_SAGA_EXECUTION_TABLE_NAME
__tablename__ = SAGA_EXECUTION_TABLE_NAME

id = sqlalchemy.Column(
sqlalchemy.Uuid,
Expand Down Expand Up @@ -68,7 +81,7 @@ class SagaExecutionModel(Base):


class SagaLogModel(Base):
__tablename__ = DEFAULT_SAGA_LOG_TABLE_NAME
__tablename__ = SAGA_LOG_TABLE_NAME

id = sqlalchemy.Column(
sqlalchemy.BigInteger(),
Expand All @@ -80,7 +93,7 @@ class SagaLogModel(Base):
)
saga_id = sqlalchemy.Column(
sqlalchemy.Uuid,
sqlalchemy.ForeignKey(f"{DEFAULT_SAGA_EXECUTION_TABLE_NAME}.id"),
sqlalchemy.ForeignKey(f"{SAGA_EXECUTION_TABLE_NAME}.id"),
nullable=False,
comment="Saga ID",
)
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/test_dcevent_from_dict_recursive.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

import pytest

from cqrs.events.event import DCEvent, DCDomainEvent, DCNotificationEvent
from cqrs.events.event import DCDomainEvent, DCNotificationEvent


# ============================================================================
Expand All @@ -22,7 +22,7 @@


@dataclasses.dataclass(frozen=True)
class NestedData(DCEvent):
class NestedData:
"""Nested dataclass for testing recursive conversion."""

nested_id: uuid.UUID
Expand Down