bonamin
d07c7634e6
TableGroup gains prefix and color columns for display in the PWA zone filter. Table creation now assigns a global auto-increment number; batch creation uses group-local label numbering (avoids gaps/conflicts when adding to existing groups). DELETE table now blocks if an active order exists (soft or hard delete). Hard delete cascades past orders before removing the table row. list_tables enriches each TableOut with has_active_order computed server-side. TableOut no longer requires number in the input payload; TableCreate simplified. Migration runner refactored to give each ALTER TABLE its own connection so a no-op (column already exists) doesn't leave a dirty transaction blocking later migrations. New migrations added for all new columns. Order.print_logs relationship gains cascade="all, delete-orphan" so print logs are removed when an order is deleted. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
73 lines
3.4 KiB
Python
73 lines
3.4 KiB
Python
from sqlalchemy import Column, Integer, String, Boolean, Float, DateTime, ForeignKey, Text
|
|
from sqlalchemy.orm import relationship
|
|
from datetime import datetime
|
|
from database import Base
|
|
|
|
|
|
class Order(Base):
|
|
__tablename__ = "orders"
|
|
|
|
id = Column(Integer, primary_key=True, index=True)
|
|
table_id = Column(Integer, ForeignKey("tables.id"), nullable=False)
|
|
opened_by = Column(Integer, ForeignKey("users.id"), nullable=False)
|
|
opened_at = Column(DateTime, default=datetime.utcnow)
|
|
status = Column(String, default="open", nullable=False) # open|partially_paid|paid|closed|cancelled
|
|
closed_at = Column(DateTime, nullable=True)
|
|
closed_by = Column(Integer, ForeignKey("users.id"), nullable=True)
|
|
notes = Column(Text, nullable=True)
|
|
|
|
table = relationship("Table", back_populates="orders")
|
|
opener = relationship("User", foreign_keys=[opened_by], back_populates="orders_opened")
|
|
closer = relationship("User", foreign_keys=[closed_by], back_populates="orders_closed")
|
|
items = relationship("OrderItem", back_populates="order", cascade="all, delete-orphan")
|
|
waiters = relationship("OrderWaiter", back_populates="order", cascade="all, delete-orphan")
|
|
print_logs = relationship("PrintLog", back_populates="order", cascade="all, delete-orphan")
|
|
|
|
|
|
class OrderWaiter(Base):
|
|
__tablename__ = "order_waiters"
|
|
|
|
id = Column(Integer, primary_key=True, index=True)
|
|
order_id = Column(Integer, ForeignKey("orders.id"), nullable=False)
|
|
waiter_id = Column(Integer, ForeignKey("users.id"), nullable=False)
|
|
assigned_at = Column(DateTime, default=datetime.utcnow)
|
|
|
|
order = relationship("Order", back_populates="waiters")
|
|
waiter = relationship("User", back_populates="order_assignments")
|
|
|
|
|
|
class OrderItem(Base):
|
|
__tablename__ = "order_items"
|
|
|
|
id = Column(Integer, primary_key=True, index=True)
|
|
order_id = Column(Integer, ForeignKey("orders.id"), nullable=False)
|
|
product_id = Column(Integer, ForeignKey("products.id"), nullable=False)
|
|
added_by = Column(Integer, ForeignKey("users.id"), nullable=False)
|
|
quantity = Column(Integer, nullable=False)
|
|
unit_price = Column(Float, nullable=False) # price snapshot at time of order
|
|
selected_options = Column(Text, nullable=True) # JSON array of option ids
|
|
removed_ingredients = Column(Text, nullable=True) # JSON array of ingredient ids
|
|
notes = Column(Text, nullable=True)
|
|
status = Column(String, default="active", nullable=False) # active|paid|cancelled
|
|
added_at = Column(DateTime, default=datetime.utcnow)
|
|
printed = Column(Boolean, default=False, nullable=False)
|
|
|
|
order = relationship("Order", back_populates="items")
|
|
product = relationship("Product", back_populates="order_items")
|
|
added_by_user = relationship("User", back_populates="order_items")
|
|
|
|
|
|
class PrintLog(Base):
|
|
__tablename__ = "print_log"
|
|
|
|
id = Column(Integer, primary_key=True, index=True)
|
|
order_id = Column(Integer, ForeignKey("orders.id"), nullable=False)
|
|
printer_id = Column(Integer, ForeignKey("printers.id"), nullable=False)
|
|
printed_at = Column(DateTime, default=datetime.utcnow)
|
|
item_ids = Column(Text, nullable=False) # JSON array of order_item ids
|
|
success = Column(Boolean, nullable=False)
|
|
error_message = Column(Text, nullable=True)
|
|
|
|
order = relationship("Order", back_populates="print_logs")
|
|
printer = relationship("Printer", back_populates="print_logs")
|