diff --git a/models/__init__.py b/models/__init__.py index 533cc57..71d926d 100644 --- a/models/__init__.py +++ b/models/__init__.py @@ -13,6 +13,7 @@ from .ghost_membership_entities import ( ) from .calendars import Calendar, CalendarEntry, Ticket +from .page_config import PageConfig diff --git a/models/cart_item.py b/models/cart_item.py deleted file mode 100644 index 728a747..0000000 --- a/models/cart_item.py +++ /dev/null @@ -1,70 +0,0 @@ -from __future__ import annotations - -from datetime import datetime - -from sqlalchemy import Integer, String, DateTime, ForeignKey, func, Index -from sqlalchemy.orm import Mapped, mapped_column, relationship - -from db.base import Base # you already import Base in app.py -# from .user import User # only if you normally import it here -# from .coop import Product # if not already in this module - -from .market import Product - -from .user import User - -class CartItem(Base): - __tablename__ = "cart_items" - - id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True) - - # Either a logged-in user OR an anonymous session - user_id: Mapped[int | None] = mapped_column( - ForeignKey("users.id", ondelete="CASCADE"), - nullable=True, - ) - session_id: Mapped[str | None] = mapped_column( - String(128), - nullable=True, - ) - - # IMPORTANT: link to product *id*, not slug - product_id: Mapped[int] = mapped_column( - ForeignKey("products.id", ondelete="CASCADE"), - nullable=False, - ) - - quantity: Mapped[int] = mapped_column( - Integer, - nullable=False, - default=1, - server_default="1", - ) - - created_at: Mapped[datetime] = mapped_column( - DateTime(timezone=True), - nullable=False, - server_default=func.now(), - ) - updated_at: Mapped[datetime] = mapped_column( - DateTime(timezone=True), - nullable=False, - server_default=func.now(), - ) - deleted_at: Mapped[datetime | None] = mapped_column( - DateTime(timezone=True), - nullable=True, - ) - - # Relationships - - product: Mapped["Product"] = relationship( - "Product", - back_populates="cart_items", - ) - user: Mapped["User | None"] = relationship("User", back_populates="cart_items") - - __table_args__ = ( - Index("ix_cart_items_user_product", "user_id", "product_id"), - Index("ix_cart_items_session_product", "session_id", "product_id"), - ) diff --git a/models/ghost_content.py b/models/ghost_content.py index be915a9..c278b4f 100644 --- a/models/ghost_content.py +++ b/models/ghost_content.py @@ -164,6 +164,14 @@ class Post(Base): order_by="MenuItem.sort_order", ) + page_config: Mapped[Optional["PageConfig"]] = relationship( + "PageConfig", + back_populates="post", + uselist=False, + cascade="all, delete-orphan", + passive_deletes=True, + ) + class Author(Base): __tablename__ = "authors" diff --git a/models/page_config.py b/models/page_config.py new file mode 100644 index 0000000..23fa591 --- /dev/null +++ b/models/page_config.py @@ -0,0 +1,45 @@ +from __future__ import annotations + +from datetime import datetime +from typing import Optional + +from sqlalchemy import Integer, String, Text, DateTime, ForeignKey, func, JSON +from sqlalchemy.orm import Mapped, mapped_column, relationship + +from db.base import Base + + +class PageConfig(Base): + __tablename__ = "page_configs" + + id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True) + + post_id: Mapped[int] = mapped_column( + Integer, + ForeignKey("posts.id", ondelete="CASCADE"), + unique=True, + nullable=False, + ) + + features: Mapped[dict] = mapped_column( + JSON, nullable=False, server_default="{}" + ) + + # Phase 3: per-page SumUp credentials (NULL until configured) + sumup_merchant_code: Mapped[Optional[str]] = mapped_column(String(64), nullable=True) + sumup_api_key: Mapped[Optional[str]] = mapped_column(Text(), nullable=True) + sumup_checkout_prefix: Mapped[Optional[str]] = mapped_column(String(64), nullable=True) + + created_at: Mapped[datetime] = mapped_column( + DateTime(timezone=True), nullable=False, server_default=func.now() + ) + updated_at: Mapped[datetime] = mapped_column( + DateTime(timezone=True), nullable=False, server_default=func.now() + ) + deleted_at: Mapped[Optional[datetime]] = mapped_column( + DateTime(timezone=True), nullable=True + ) + + post: Mapped["Post"] = relationship( + "Post", back_populates="page_config", foreign_keys=[post_id] + )