lean101/data-entry-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v1.3 - client and admin scaffolding

Browse Source
This commit is contained in:
ponzischeme89
2026-04-25 22:51:36 +12:00
parent bc211ffcc8
commit 8cf9bfb441
54 changed files with 8882 additions and 1248 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/app/models/__init__.py
+4 -1
View File
@@ -1,10 +1,14 @@
from app.models.assumption import FreightCostRule, PackagingCostRule, ProcessCostRule
from app.models.client_access import ClientAccount, ClientFeatureAccess, ClientUser
from app.models.mix import Mix, MixIngredient
from app.models.product import Product
from app.models.raw_material import RawMaterial, RawMaterialPriceVersion
from app.models.scenario import CostingResult, Scenario
__all__ = [
"ClientAccount",
"ClientFeatureAccess",
"ClientUser",
"CostingResult",
"FreightCostRule",
"Mix",
@@ -16,4 +20,3 @@ __all__ = [
"RawMaterialPriceVersion",
"Scenario",
]
backend/app/models/assumption.py
+3
View File
@@ -10,6 +10,7 @@ class ProcessCostRule(Base):
__tablename__ = "process_cost_rules"
id: Mapped[int] = mapped_column(primary_key=True)
tenant_id: Mapped[str] = mapped_column(String(64), default="default")
process_name: Mapped[str] = mapped_column(String(64), unique=True)
grading_cost: Mapped[float] = mapped_column(Float, default=0.0)
bagging_cost: Mapped[float] = mapped_column(Float, default=0.0)
@@ -21,6 +22,7 @@ class PackagingCostRule(Base):
__tablename__ = "packaging_cost_rules"
id: Mapped[int] = mapped_column(primary_key=True)
tenant_id: Mapped[str] = mapped_column(String(64), default="default")
sale_type: Mapped[str] = mapped_column(String(64))
unit_of_measure: Mapped[str] = mapped_column(String(64))
own_bag: Mapped[bool] = mapped_column(Boolean, default=False)
@@ -32,6 +34,7 @@ class FreightCostRule(Base):
__tablename__ = "freight_cost_rules"
id: Mapped[int] = mapped_column(primary_key=True)
tenant_id: Mapped[str] = mapped_column(String(64), default="default")
sale_type: Mapped[str] = mapped_column(String(64))
unit_of_measure: Mapped[str] = mapped_column(String(64))
cost_per_unit: Mapped[float] = mapped_column(Float, default=0.0)
backend/app/models/client_access.py
+68
View File
@@ -0,0 +1,68 @@
from __future__ import annotations
from datetime import datetime
from sqlalchemy import Boolean, DateTime, ForeignKey, String, Text, UniqueConstraint
from sqlalchemy.orm import Mapped, mapped_column, relationship
from app.db.session import Base
class ClientAccount(Base):
__tablename__ = "client_accounts"
id: Mapped[int] = mapped_column(primary_key=True)
tenant_id: Mapped[str] = mapped_column(String(64), default="default")
name: Mapped[str] = mapped_column(String(255), unique=True, index=True)
client_code: Mapped[str] = mapped_column(String(64), unique=True, index=True)
status: Mapped[str] = mapped_column(String(32), default="active")
powerbi_workspace: Mapped[str | None] = mapped_column(String(128), nullable=True)
notes: Mapped[str | None] = mapped_column(Text, nullable=True)
created_at: Mapped[datetime] = mapped_column(DateTime, default=datetime.utcnow)
users: Mapped[list["ClientUser"]] = relationship(
back_populates="client_account",
cascade="all, delete-orphan",
order_by="ClientUser.created_at.desc()",
)
features: Mapped[list["ClientFeatureAccess"]] = relationship(
back_populates="client_account",
cascade="all, delete-orphan",
order_by="ClientFeatureAccess.feature_group, ClientFeatureAccess.feature_name",
)
class ClientUser(Base):
__tablename__ = "client_users"
__table_args__ = (UniqueConstraint("client_account_id", "email", name="uq_client_user_email"),)
id: Mapped[int] = mapped_column(primary_key=True)
tenant_id: Mapped[str] = mapped_column(String(64), default="default")
client_account_id: Mapped[int] = mapped_column(ForeignKey("client_accounts.id"), index=True)
full_name: Mapped[str] = mapped_column(String(255))
email: Mapped[str] = mapped_column(String(255))
role: Mapped[str] = mapped_column(String(64), default="viewer")
status: Mapped[str] = mapped_column(String(32), default="invited")
is_new_user: Mapped[bool] = mapped_column(Boolean, default=True)
last_login_at: Mapped[datetime | None] = mapped_column(DateTime, nullable=True)
created_at: Mapped[datetime] = mapped_column(DateTime, default=datetime.utcnow)
client_account: Mapped[ClientAccount] = relationship(back_populates="users")
class ClientFeatureAccess(Base):
__tablename__ = "client_feature_access"
__table_args__ = (UniqueConstraint("client_account_id", "feature_key", name="uq_client_feature"),)
id: Mapped[int] = mapped_column(primary_key=True)
tenant_id: Mapped[str] = mapped_column(String(64), default="default")
client_account_id: Mapped[int] = mapped_column(ForeignKey("client_accounts.id"), index=True)
feature_key: Mapped[str] = mapped_column(String(64))
feature_name: Mapped[str] = mapped_column(String(255))
feature_group: Mapped[str] = mapped_column(String(64), default="operations")
description: Mapped[str | None] = mapped_column(Text, nullable=True)
enabled: Mapped[bool] = mapped_column(Boolean, default=False)
updated_at: Mapped[datetime] = mapped_column(DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
created_at: Mapped[datetime] = mapped_column(DateTime, default=datetime.utcnow)
client_account: Mapped[ClientAccount] = relationship(back_populates="features")
backend/app/models/mix.py
+1 -1
View File
@@ -32,6 +32,7 @@ class MixIngredient(Base):
__table_args__ = (UniqueConstraint("mix_id", "raw_material_id", name="uq_mix_ingredient"),)
id: Mapped[int] = mapped_column(primary_key=True)
tenant_id: Mapped[str] = mapped_column(String(64), default="default")
mix_id: Mapped[int] = mapped_column(ForeignKey("mixes.id"), index=True)
raw_material_id: Mapped[int] = mapped_column(ForeignKey("raw_materials.id"), index=True)
quantity_kg: Mapped[float] = mapped_column(Float)
@@ -43,4 +44,3 @@ class MixIngredient(Base):
from app.models.product import Product # noqa: E402
from app.models.raw_material import RawMaterial # noqa: E402
backend/app/models/raw_material.py
+1 -1
View File
@@ -32,6 +32,7 @@ class RawMaterialPriceVersion(Base):
__tablename__ = "raw_material_price_versions"
id: Mapped[int] = mapped_column(primary_key=True)
tenant_id: Mapped[str] = mapped_column(String(64), default="default")
raw_material_id: Mapped[int] = mapped_column(ForeignKey("raw_materials.id"), index=True)
market_value: Mapped[float] = mapped_column(Float)
waste_percentage: Mapped[float] = mapped_column(Float, default=0.0)
@@ -41,4 +42,3 @@ class RawMaterialPriceVersion(Base):
created_at: Mapped[datetime] = mapped_column(DateTime, default=datetime.utcnow)
raw_material: Mapped[RawMaterial] = relationship(back_populates="price_versions")
backend/app/models/scenario.py
+2 -1
View File
@@ -12,6 +12,7 @@ class Scenario(Base):
__tablename__ = "scenarios"
id: Mapped[int] = mapped_column(primary_key=True)
tenant_id: Mapped[str] = mapped_column(String(64), default="default")
name: Mapped[str] = mapped_column(String(255), unique=True)
status: Mapped[str] = mapped_column(String(32), default="draft")
description: Mapped[str | None] = mapped_column(String(500), nullable=True)
@@ -28,6 +29,7 @@ class CostingResult(Base):
__tablename__ = "costing_results"
id: Mapped[int] = mapped_column(primary_key=True)
tenant_id: Mapped[str] = mapped_column(String(64), default="default")
scenario_id: Mapped[int] = mapped_column(ForeignKey("scenarios.id"), index=True)
product_id: Mapped[int] = mapped_column(ForeignKey("products.id"), index=True)
finished_product_delivered: Mapped[float] = mapped_column(Float)
@@ -38,4 +40,3 @@ class CostingResult(Base):
created_at: Mapped[datetime] = mapped_column(DateTime, default=datetime.utcnow)
scenario: Mapped[Scenario] = relationship(back_populates="results")