Add Postbox message authoring and concurrency
This commit is contained in:
@@ -17,6 +17,7 @@ from sqlalchemy import (
|
||||
)
|
||||
from sqlalchemy.orm import Mapped, mapped_column, relationship
|
||||
|
||||
from govoplan_core.core.concurrency import strong_resource_etag
|
||||
from govoplan_core.db.base import Base, TimestampMixin
|
||||
|
||||
|
||||
@@ -47,6 +48,11 @@ class PostboxTemplate(Base, TimestampMixin):
|
||||
index=True,
|
||||
)
|
||||
current_revision: Mapped[int] = mapped_column(Integer, default=1, nullable=False)
|
||||
resource_revision: Mapped[int] = mapped_column(
|
||||
Integer,
|
||||
default=1,
|
||||
nullable=False,
|
||||
)
|
||||
published_revision_id: Mapped[str | None] = mapped_column(
|
||||
String(36),
|
||||
nullable=True,
|
||||
@@ -65,6 +71,14 @@ class PostboxTemplate(Base, TimestampMixin):
|
||||
order_by="PostboxTemplateRevision.revision",
|
||||
)
|
||||
|
||||
@property
|
||||
def strong_etag(self) -> str:
|
||||
return strong_resource_etag(
|
||||
"postbox_template",
|
||||
self.id,
|
||||
self.resource_revision,
|
||||
)
|
||||
|
||||
|
||||
class PostboxTemplateRevision(Base, TimestampMixin):
|
||||
__tablename__ = "postbox_template_revisions"
|
||||
@@ -264,6 +278,11 @@ class Postbox(Base, TimestampMixin):
|
||||
nullable=False,
|
||||
)
|
||||
key_epoch: Mapped[int] = mapped_column(Integer, default=1, nullable=False)
|
||||
resource_revision: Mapped[int] = mapped_column(
|
||||
Integer,
|
||||
default=1,
|
||||
nullable=False,
|
||||
)
|
||||
settings: Mapped[dict[str, Any]] = mapped_column(
|
||||
JSON,
|
||||
default=dict,
|
||||
@@ -286,6 +305,14 @@ class Postbox(Base, TimestampMixin):
|
||||
cascade="all, delete-orphan",
|
||||
)
|
||||
|
||||
@property
|
||||
def strong_etag(self) -> str:
|
||||
return strong_resource_etag(
|
||||
"postbox",
|
||||
self.id,
|
||||
self.resource_revision,
|
||||
)
|
||||
|
||||
|
||||
class PostboxBinding(Base, TimestampMixin):
|
||||
__tablename__ = "postbox_bindings"
|
||||
@@ -376,6 +403,12 @@ class PostboxMessage(Base, TimestampMixin):
|
||||
"producer_resource_type",
|
||||
"producer_resource_id",
|
||||
),
|
||||
UniqueConstraint(
|
||||
"tenant_id",
|
||||
"postbox_id",
|
||||
"authoring_key",
|
||||
name="uq_postbox_messages_authoring_key",
|
||||
),
|
||||
)
|
||||
|
||||
id: Mapped[str] = mapped_column(String(36), primary_key=True, default=new_uuid)
|
||||
@@ -415,6 +448,11 @@ class PostboxMessage(Base, TimestampMixin):
|
||||
nullable=True,
|
||||
index=True,
|
||||
)
|
||||
authoring_key: Mapped[str | None] = mapped_column(
|
||||
String(255),
|
||||
nullable=True,
|
||||
index=True,
|
||||
)
|
||||
in_reply_to_message_id: Mapped[str | None] = mapped_column(
|
||||
ForeignKey("postbox_messages.id", ondelete="SET NULL"),
|
||||
nullable=True,
|
||||
@@ -774,6 +812,11 @@ class PostboxGrouping(Base, TimestampMixin):
|
||||
account_id: Mapped[str] = mapped_column(String(255), nullable=False, index=True)
|
||||
name: Mapped[str] = mapped_column(String(250), nullable=False)
|
||||
is_default: Mapped[bool] = mapped_column(Boolean, default=False, nullable=False)
|
||||
resource_revision: Mapped[int] = mapped_column(
|
||||
Integer,
|
||||
default=1,
|
||||
nullable=False,
|
||||
)
|
||||
settings: Mapped[dict[str, Any]] = mapped_column(
|
||||
JSON,
|
||||
default=dict,
|
||||
@@ -786,6 +829,14 @@ class PostboxGrouping(Base, TimestampMixin):
|
||||
order_by="PostboxGroupingSource.position",
|
||||
)
|
||||
|
||||
@property
|
||||
def strong_etag(self) -> str:
|
||||
return strong_resource_etag(
|
||||
"postbox_grouping",
|
||||
self.id,
|
||||
self.resource_revision,
|
||||
)
|
||||
|
||||
|
||||
class PostboxGroupingSource(Base, TimestampMixin):
|
||||
__tablename__ = "postbox_grouping_sources"
|
||||
|
||||
Reference in New Issue
Block a user