derekc
60fed6d464
- models.py: add composite (user_id, date) indexes to flock_history, feed_purchases, and other_purchases for faster date-filtered queries (egg_collections already had one via its unique constraint) - main.py: add v2.2 migration to create the three composite indexes on existing installs at startup - stats.py: fix N+1 query in monthly_stats — flock history is now fetched once and looked up per month using bisect_right instead of one DB query per month row; also remove unnecessary Decimal(str(...)) round-trips since SQLAlchemy already returns Numeric columns as Decimal - eggs.py: add limit parameter (default 500, max 1000) to list_eggs to cap unbounded fetches on large datasets - dashboard.js: pass start= (30 days ago) when fetching eggs so the dashboard only loads the data it actually needs for the chart and recent collections list Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
66 lines
3.7 KiB
Python
66 lines
3.7 KiB
Python
from datetime import date, datetime
|
|
from sqlalchemy import Boolean, Integer, Date, DateTime, Text, Numeric, String, ForeignKey, UniqueConstraint, Index, func
|
|
from sqlalchemy.orm import Mapped, mapped_column
|
|
from database import Base
|
|
|
|
|
|
class User(Base):
|
|
__tablename__ = "users"
|
|
|
|
id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
|
|
username: Mapped[str] = mapped_column(String(64), unique=True, nullable=False, index=True)
|
|
hashed_password: Mapped[str] = mapped_column(String(255), nullable=False)
|
|
is_admin: Mapped[bool] = mapped_column(Boolean, default=False, nullable=False)
|
|
is_disabled: Mapped[bool] = mapped_column(Boolean, default=False, nullable=False)
|
|
timezone: Mapped[str] = mapped_column(String(64), nullable=False, default='UTC')
|
|
created_at: Mapped[datetime] = mapped_column(DateTime, server_default=func.now())
|
|
|
|
|
|
class EggCollection(Base):
|
|
__tablename__ = "egg_collections"
|
|
__table_args__ = (UniqueConstraint("user_id", "date", name="uq_user_date"),)
|
|
|
|
id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
|
|
user_id: Mapped[int] = mapped_column(Integer, ForeignKey("users.id", ondelete="CASCADE"), nullable=False, index=True)
|
|
date: Mapped[date] = mapped_column(Date, nullable=False, index=True)
|
|
eggs: Mapped[int] = mapped_column(Integer, nullable=False)
|
|
notes: Mapped[str] = mapped_column(Text, nullable=True)
|
|
created_at: Mapped[datetime] = mapped_column(DateTime, server_default=func.now())
|
|
|
|
|
|
class FlockHistory(Base):
|
|
__tablename__ = "flock_history"
|
|
__table_args__ = (Index("ix_flock_history_user_date", "user_id", "date"),)
|
|
|
|
id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
|
|
user_id: Mapped[int] = mapped_column(Integer, ForeignKey("users.id", ondelete="CASCADE"), nullable=False, index=True)
|
|
date: Mapped[date] = mapped_column(Date, nullable=False, index=True)
|
|
chicken_count: Mapped[int] = mapped_column(Integer, nullable=False)
|
|
notes: Mapped[str] = mapped_column(Text, nullable=True)
|
|
created_at: Mapped[datetime] = mapped_column(DateTime, server_default=func.now())
|
|
|
|
|
|
class FeedPurchase(Base):
|
|
__tablename__ = "feed_purchases"
|
|
__table_args__ = (Index("ix_feed_purchases_user_date", "user_id", "date"),)
|
|
|
|
id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
|
|
user_id: Mapped[int] = mapped_column(Integer, ForeignKey("users.id", ondelete="CASCADE"), nullable=False, index=True)
|
|
date: Mapped[date] = mapped_column(Date, nullable=False, index=True)
|
|
bags: Mapped[float] = mapped_column(Numeric(5, 2), nullable=False)
|
|
price_per_bag: Mapped[float] = mapped_column(Numeric(10, 2), nullable=False)
|
|
notes: Mapped[str] = mapped_column(Text, nullable=True)
|
|
created_at: Mapped[datetime] = mapped_column(DateTime, server_default=func.now())
|
|
|
|
|
|
class OtherPurchase(Base):
|
|
__tablename__ = "other_purchases"
|
|
__table_args__ = (Index("ix_other_purchases_user_date", "user_id", "date"),)
|
|
|
|
id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
|
|
user_id: Mapped[int] = mapped_column(Integer, ForeignKey("users.id", ondelete="CASCADE"), nullable=False, index=True)
|
|
date: Mapped[date] = mapped_column(Date, nullable=False, index=True)
|
|
total: Mapped[float] = mapped_column(Numeric(10, 2), nullable=False)
|
|
notes: Mapped[str] = mapped_column(Text, nullable=True)
|
|
created_at: Mapped[datetime] = mapped_column(DateTime, server_default=func.now())
|