3053cb321d
All checks were successful
Build and Deploy / build-and-deploy (push) Successful in 3m11s
PageConfig (db_blog) decoupling: - Blog: add page-config, page-config-by-id, page-configs-batch data endpoints - Blog: add update-page-config action endpoint for events payment admin - Cart: hydrate_page, resolve_page_config, get_cart_grouped_by_page all fetch PageConfig from blog via HTTP instead of direct DB query - Cart: check_sumup_status auto-fetches page_config from blog when needed - Events: payment routes read/write PageConfig via blog HTTP endpoints - Order model: remove cross-domain page_config ORM relationship (keep column) Cart + Market DB merge: - Cart tables (cart_items, orders, order_items) moved into db_market - Cart app DATABASE_URL now points to db_market (same bounded context) - CartItem.product / CartItem.market_place relationships work again (same database, no cross-domain join issues) - Updated split-databases.sh, init-databases.sql, docker-compose.yml Ghost sync fix: - Wrap PostAuthor/PostTag delete+re-add in no_autoflush block - Use synchronize_session="fetch" to keep identity map consistent - Prevents query-invoked autoflush IntegrityError on composite PK Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
114 lines
3.5 KiB
Python
114 lines
3.5 KiB
Python
from __future__ import annotations
|
|
|
|
from datetime import datetime
|
|
from typing import Optional, List
|
|
|
|
from sqlalchemy import Integer, String, DateTime, ForeignKey, Numeric, func, Text
|
|
from sqlalchemy.orm import Mapped, mapped_column, relationship
|
|
|
|
from shared.db.base import Base
|
|
|
|
|
|
class Order(Base):
|
|
__tablename__ = "orders"
|
|
|
|
id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
|
|
|
|
user_id: Mapped[Optional[int]] = mapped_column(Integer, nullable=True)
|
|
session_id: Mapped[Optional[str]] = mapped_column(String(64), index=True, nullable=True)
|
|
|
|
page_config_id: Mapped[Optional[int]] = mapped_column(
|
|
Integer,
|
|
nullable=True,
|
|
index=True,
|
|
)
|
|
|
|
status: Mapped[str] = mapped_column(
|
|
String(32),
|
|
nullable=False,
|
|
default="pending",
|
|
server_default="pending",
|
|
)
|
|
currency: Mapped[str] = mapped_column(String(16), nullable=False, default="GBP")
|
|
total_amount: Mapped[float] = mapped_column(Numeric(12, 2), nullable=False)
|
|
|
|
# free-form description for the order
|
|
description: Mapped[Optional[str]] = mapped_column(Text, nullable=True, index=True)
|
|
|
|
# SumUp reference string (what we send as checkout_reference)
|
|
sumup_reference: Mapped[Optional[str]] = mapped_column(
|
|
String(255),
|
|
nullable=True,
|
|
index=True,
|
|
)
|
|
|
|
# SumUp integration fields
|
|
sumup_checkout_id: Mapped[Optional[str]] = mapped_column(
|
|
String(128),
|
|
nullable=True,
|
|
index=True,
|
|
)
|
|
sumup_status: Mapped[Optional[str]] = mapped_column(String(32), nullable=True)
|
|
sumup_hosted_url: Mapped[Optional[str]] = mapped_column(Text, 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(),
|
|
onupdate=func.now(),
|
|
)
|
|
|
|
items: Mapped[List["OrderItem"]] = relationship(
|
|
"OrderItem",
|
|
back_populates="order",
|
|
cascade="all, delete-orphan",
|
|
lazy="selectin",
|
|
)
|
|
# page_config_id references PageConfig in db_blog (cross-domain).
|
|
# Fetch via HTTP: fetch_data("blog", "page-config-by-id", params={"id": ...})
|
|
|
|
|
|
class OrderItem(Base):
|
|
__tablename__ = "order_items"
|
|
|
|
id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
|
|
order_id: Mapped[int] = mapped_column(
|
|
ForeignKey("orders.id", ondelete="CASCADE"),
|
|
nullable=False,
|
|
)
|
|
|
|
product_id: Mapped[int] = mapped_column(
|
|
Integer,
|
|
nullable=False,
|
|
)
|
|
product_title: Mapped[Optional[str]] = mapped_column(String(512), nullable=True)
|
|
|
|
quantity: Mapped[int] = mapped_column(Integer, nullable=False, default=1)
|
|
unit_price: Mapped[float] = mapped_column(Numeric(12, 2), nullable=False)
|
|
currency: Mapped[str] = mapped_column(String(16), nullable=False, default="GBP")
|
|
|
|
created_at: Mapped[datetime] = mapped_column(
|
|
DateTime(timezone=True),
|
|
nullable=False,
|
|
server_default=func.now(),
|
|
)
|
|
|
|
order: Mapped["Order"] = relationship(
|
|
"Order",
|
|
back_populates="items",
|
|
)
|
|
|
|
# Cross-domain relationship — explicit join, viewonly (no FK constraint)
|
|
product: Mapped["Product"] = relationship(
|
|
"Product",
|
|
primaryjoin="OrderItem.product_id == Product.id",
|
|
foreign_keys="[OrderItem.product_id]",
|
|
viewonly=True,
|
|
lazy="selectin",
|
|
)
|