bvandeusenandClaude Fable 5
b0eda32575
CI & Build / Python lint (push) Successful in 4s
CI & Build / Plugin hooks (push) Successful in 7s
CI & Build / integration (push) Successful in 25s
CI & Build / TypeScript typecheck (push) Successful in 33s
CI & Build / Python tests (push) Successful in 57s
CI & Build / Build & push image (push) Successful in 26s
Reading all 28 models against each other: 54 `x.isoformat() if x else None` / `x.isoformat()` expressions in 23 to_dict methods, in two guarded/unguarded wordings, become iso() from models/base.py — uniform, and a row read before flush serialises as null instead of raising. Rulebook / RulebookTopic / Rule carried byte-identical copies of TimestampMixin's two columns; InvitationToken / PasswordResetToken / NoteUsageEvent carried CreatedAtMixin's — all six now use the mixin. AppLog and RetrievalLog keep their explicit created_at, commented: their composite index orders on `created_at.desc()`, which needs the column object in the class body. Schema-neutral (same column definitions) — no migration. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
58 lines
1.9 KiB
Python
58 lines
1.9 KiB
Python
from datetime import datetime, timezone
|
|
|
|
from sqlalchemy import ForeignKey, Integer, Text, UniqueConstraint
|
|
from sqlalchemy.orm import Mapped, mapped_column, relationship
|
|
|
|
from scribe.models import Base
|
|
from scribe.models.base import CreatedAtMixin, TimestampMixin, iso
|
|
|
|
|
|
class Group(Base, TimestampMixin):
|
|
__tablename__ = "groups"
|
|
|
|
id: Mapped[int] = mapped_column(Integer, primary_key=True)
|
|
name: Mapped[str] = mapped_column(Text, nullable=False, unique=True)
|
|
description: Mapped[str | None] = mapped_column(Text)
|
|
created_by: Mapped[int | None] = mapped_column(
|
|
Integer, ForeignKey("users.id", ondelete="SET NULL")
|
|
)
|
|
|
|
memberships: Mapped[list["GroupMembership"]] = relationship(
|
|
"GroupMembership", back_populates="group", cascade="all, delete-orphan"
|
|
)
|
|
|
|
def to_dict(self) -> dict:
|
|
return {
|
|
"id": self.id,
|
|
"name": self.name,
|
|
"description": self.description,
|
|
"created_by": self.created_by,
|
|
"created_at": iso(self.created_at),
|
|
"updated_at": iso(self.updated_at),
|
|
}
|
|
|
|
|
|
class GroupMembership(Base, CreatedAtMixin):
|
|
__tablename__ = "group_memberships"
|
|
__table_args__ = (UniqueConstraint("group_id", "user_id", name="uq_gm_group_user"),)
|
|
|
|
id: Mapped[int] = mapped_column(Integer, primary_key=True)
|
|
group_id: Mapped[int] = mapped_column(
|
|
Integer, ForeignKey("groups.id", ondelete="CASCADE"), nullable=False
|
|
)
|
|
user_id: Mapped[int] = mapped_column(
|
|
Integer, ForeignKey("users.id", ondelete="CASCADE"), nullable=False
|
|
)
|
|
role: Mapped[str] = mapped_column(Text, nullable=False, default="member")
|
|
|
|
group: Mapped["Group"] = relationship("Group", back_populates="memberships")
|
|
|
|
def to_dict(self) -> dict:
|
|
return {
|
|
"id": self.id,
|
|
"group_id": self.group_id,
|
|
"user_id": self.user_id,
|
|
"role": self.role,
|
|
"created_at": iso(self.created_at),
|
|
}
|