refactor(B1): migrate to domain-driven project structure
Move all models/schemas/services/routers into app/domains/. Keep backward-compat shims in old locations for imports. Preserves domains/rendering/tasks.py from Phase A. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -0,0 +1 @@
|
||||
# Domain: orders
|
||||
@@ -0,0 +1,150 @@
|
||||
import uuid
|
||||
import enum
|
||||
from datetime import datetime
|
||||
from decimal import Decimal
|
||||
from sqlalchemy import String, DateTime, Enum as SAEnum, ForeignKey, Text, Integer, Boolean, Numeric
|
||||
from sqlalchemy.orm import Mapped, mapped_column, relationship
|
||||
from sqlalchemy.dialects.postgresql import UUID, JSONB
|
||||
from app.database import Base
|
||||
|
||||
|
||||
class OrderStatus(str, enum.Enum):
|
||||
draft = "draft"
|
||||
submitted = "submitted"
|
||||
processing = "processing"
|
||||
completed = "completed"
|
||||
rejected = "rejected"
|
||||
|
||||
|
||||
class Order(Base):
|
||||
__tablename__ = "orders"
|
||||
|
||||
id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
|
||||
order_number: Mapped[str] = mapped_column(String(50), unique=True, nullable=False, index=True)
|
||||
template_id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), ForeignKey("templates.id"), nullable=True)
|
||||
status: Mapped[OrderStatus] = mapped_column(SAEnum(OrderStatus), default=OrderStatus.draft, nullable=False)
|
||||
created_by: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), ForeignKey("users.id"), nullable=False)
|
||||
source_excel: Mapped[str] = mapped_column(String(1000), nullable=True)
|
||||
notes: Mapped[str] = mapped_column(Text, nullable=True)
|
||||
created_at: Mapped[datetime] = mapped_column(DateTime, default=datetime.utcnow, nullable=False)
|
||||
updated_at: Mapped[datetime] = mapped_column(DateTime, default=datetime.utcnow, onupdate=datetime.utcnow, nullable=False)
|
||||
submitted_at: Mapped[datetime | None] = mapped_column(DateTime, nullable=True)
|
||||
processing_started_at: Mapped[datetime | None] = mapped_column(DateTime, nullable=True)
|
||||
completed_at: Mapped[datetime | None] = mapped_column(DateTime, nullable=True)
|
||||
rejected_at: Mapped[datetime | None] = mapped_column(DateTime, nullable=True)
|
||||
estimated_price: Mapped[Decimal | None] = mapped_column(Numeric(12, 2), nullable=True)
|
||||
|
||||
template: Mapped["Template"] = relationship("Template", back_populates="orders")
|
||||
created_by_user: Mapped["User"] = relationship("User", back_populates="orders", foreign_keys=[created_by])
|
||||
items: Mapped[list["OrderItem"]] = relationship("OrderItem", back_populates="order", cascade="all, delete-orphan")
|
||||
lines: Mapped[list["OrderLine"]] = relationship(
|
||||
"OrderLine", back_populates="order", cascade="all, delete-orphan"
|
||||
)
|
||||
|
||||
|
||||
class ItemStatus(str, enum.Enum):
|
||||
pending = "pending"
|
||||
approved = "approved"
|
||||
rejected = "rejected"
|
||||
|
||||
|
||||
class AIValidationStatus(str, enum.Enum):
|
||||
not_started = "not_started"
|
||||
pending = "pending"
|
||||
completed = "completed"
|
||||
failed = "failed"
|
||||
|
||||
|
||||
class OrderItem(Base):
|
||||
__tablename__ = "order_items"
|
||||
|
||||
id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
|
||||
order_id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), ForeignKey("orders.id"), nullable=False)
|
||||
row_index: Mapped[int] = mapped_column(Integer, nullable=False)
|
||||
|
||||
# 11 Standard fields (columns 0-10, skip col 5)
|
||||
ebene1: Mapped[str] = mapped_column(String(500), nullable=True)
|
||||
ebene2: Mapped[str] = mapped_column(String(500), nullable=True)
|
||||
baureihe: Mapped[str] = mapped_column(String(500), nullable=True)
|
||||
pim_id: Mapped[str] = mapped_column(String(500), nullable=True)
|
||||
produkt_baureihe: Mapped[str] = mapped_column(String(500), nullable=True)
|
||||
# col 5 is skipped (separator)
|
||||
gewaehltes_produkt: Mapped[str] = mapped_column(String(500), nullable=True)
|
||||
name_cad_modell: Mapped[str] = mapped_column(String(500), nullable=True)
|
||||
gewuenschte_bildnummer: Mapped[str] = mapped_column(String(500), nullable=True)
|
||||
lagertyp: Mapped[str] = mapped_column(String(500), nullable=True)
|
||||
medias_rendering: Mapped[bool] = mapped_column(Boolean, nullable=True)
|
||||
|
||||
# Component pairs (cols 11+): [{part_name, material, component_type, column_index}]
|
||||
components: Mapped[list] = mapped_column(JSONB, nullable=False, default=list)
|
||||
|
||||
# CAD linkage
|
||||
cad_file_id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), ForeignKey("cad_files.id"), nullable=True)
|
||||
thumbnail_path: Mapped[str] = mapped_column(String(1000), nullable=True)
|
||||
# Material assignments per CAD part: [{part_name, material}]
|
||||
cad_part_materials: Mapped[list] = mapped_column(JSONB, nullable=False, default=list)
|
||||
|
||||
# AI validation
|
||||
ai_validation_status: Mapped[AIValidationStatus] = mapped_column(
|
||||
SAEnum(AIValidationStatus), default=AIValidationStatus.not_started, nullable=False
|
||||
)
|
||||
ai_validation_result: Mapped[dict] = mapped_column(JSONB, nullable=True)
|
||||
|
||||
item_status: Mapped[ItemStatus] = mapped_column(SAEnum(ItemStatus), default=ItemStatus.pending, nullable=False)
|
||||
notes: Mapped[str] = mapped_column(Text, nullable=True)
|
||||
created_at: Mapped[datetime] = mapped_column(DateTime, default=datetime.utcnow, nullable=False)
|
||||
updated_at: Mapped[datetime] = mapped_column(DateTime, default=datetime.utcnow, onupdate=datetime.utcnow, nullable=False)
|
||||
|
||||
order: Mapped["Order"] = relationship("Order", back_populates="items")
|
||||
cad_file: Mapped["CadFile"] = relationship("CadFile", back_populates="order_items")
|
||||
|
||||
@property
|
||||
def cad_parsed_objects(self) -> list[str] | None:
|
||||
"""Part names extracted from the linked STEP file, for Pydantic serialization."""
|
||||
if self.cad_file and self.cad_file.parsed_objects:
|
||||
return self.cad_file.parsed_objects.get("objects") or []
|
||||
return None
|
||||
|
||||
|
||||
class OrderLine(Base):
|
||||
__tablename__ = "order_lines"
|
||||
|
||||
id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
|
||||
order_id: Mapped[uuid.UUID] = mapped_column(
|
||||
UUID(as_uuid=True), ForeignKey("orders.id", ondelete="CASCADE"), nullable=False, index=True
|
||||
)
|
||||
product_id: Mapped[uuid.UUID] = mapped_column(
|
||||
UUID(as_uuid=True), ForeignKey("products.id"), nullable=False, index=True
|
||||
)
|
||||
output_type_id: Mapped[uuid.UUID | None] = mapped_column(
|
||||
UUID(as_uuid=True), ForeignKey("output_types.id"), nullable=True
|
||||
)
|
||||
gewuenschte_bildnummer: Mapped[str | None] = mapped_column(String(500), nullable=True)
|
||||
item_status: Mapped[str] = mapped_column(String(20), nullable=False, default="pending")
|
||||
render_status: Mapped[str] = mapped_column(String(20), nullable=False, default="pending")
|
||||
result_path: Mapped[str | None] = mapped_column(String(1000), nullable=True)
|
||||
render_log: Mapped[dict | None] = mapped_column(JSONB, nullable=True)
|
||||
ai_validation_status: Mapped[str] = mapped_column(String(20), nullable=False, default="not_started")
|
||||
ai_validation_result: Mapped[dict | None] = mapped_column(JSONB, nullable=True)
|
||||
flamenco_job_id: Mapped[str | None] = mapped_column(String(100), nullable=True)
|
||||
render_backend_used: Mapped[str | None] = mapped_column(String(20), nullable=True)
|
||||
render_started_at: Mapped[datetime | None] = mapped_column(DateTime, nullable=True)
|
||||
render_completed_at: Mapped[datetime | None] = mapped_column(DateTime, nullable=True)
|
||||
unit_price: Mapped[Decimal | None] = mapped_column(Numeric(10, 2), nullable=True)
|
||||
render_position_id: Mapped[uuid.UUID | None] = mapped_column(
|
||||
UUID(as_uuid=True),
|
||||
ForeignKey("product_render_positions.id", ondelete="SET NULL"),
|
||||
nullable=True,
|
||||
)
|
||||
notes: Mapped[str | None] = mapped_column(Text, nullable=True)
|
||||
created_at: Mapped[datetime] = mapped_column(DateTime, default=datetime.utcnow, nullable=False)
|
||||
updated_at: Mapped[datetime] = mapped_column(
|
||||
DateTime, default=datetime.utcnow, onupdate=datetime.utcnow, nullable=False
|
||||
)
|
||||
|
||||
order: Mapped["Order"] = relationship("Order", back_populates="lines")
|
||||
product: Mapped["Product"] = relationship("Product", back_populates="order_lines")
|
||||
output_type: Mapped["OutputType | None"] = relationship("OutputType", back_populates="order_lines")
|
||||
render_position: Mapped["ProductRenderPosition | None"] = relationship(
|
||||
"ProductRenderPosition", back_populates="order_lines"
|
||||
)
|
||||
@@ -0,0 +1,5 @@
|
||||
# Re-export from original routers.
|
||||
from app.api.routers.orders import router as orders_router
|
||||
from app.api.routers.order_items import router as order_items_router
|
||||
|
||||
__all__ = ["orders_router", "order_items_router"]
|
||||
@@ -0,0 +1,124 @@
|
||||
import uuid
|
||||
from datetime import datetime
|
||||
from typing import Any
|
||||
from pydantic import BaseModel
|
||||
from app.domains.orders.models import OrderStatus, ItemStatus, AIValidationStatus
|
||||
|
||||
|
||||
class ComponentData(BaseModel):
|
||||
part_name: str | None = None
|
||||
material: str | None = None
|
||||
component_type: str | None = None
|
||||
column_index: int | None = None
|
||||
|
||||
|
||||
class OrderItemCreate(BaseModel):
|
||||
row_index: int
|
||||
ebene1: str | None = None
|
||||
ebene2: str | None = None
|
||||
baureihe: str | None = None
|
||||
pim_id: str | None = None
|
||||
produkt_baureihe: str | None = None
|
||||
gewaehltes_produkt: str | None = None
|
||||
name_cad_modell: str | None = None
|
||||
gewuenschte_bildnummer: str | None = None
|
||||
lagertyp: str | None = None
|
||||
medias_rendering: bool | None = None
|
||||
components: list[ComponentData] = []
|
||||
|
||||
|
||||
class OrderItemOut(BaseModel):
|
||||
id: uuid.UUID
|
||||
order_id: uuid.UUID
|
||||
row_index: int
|
||||
ebene1: str | None
|
||||
ebene2: str | None
|
||||
baureihe: str | None
|
||||
pim_id: str | None
|
||||
produkt_baureihe: str | None
|
||||
gewaehltes_produkt: str | None
|
||||
name_cad_modell: str | None
|
||||
gewuenschte_bildnummer: str | None
|
||||
lagertyp: str | None
|
||||
medias_rendering: bool | None
|
||||
components: list[dict]
|
||||
cad_file_id: uuid.UUID | None
|
||||
thumbnail_path: str | None
|
||||
cad_parsed_objects: list[str] | None = None
|
||||
cad_part_materials: list[dict] = []
|
||||
ai_validation_status: AIValidationStatus
|
||||
ai_validation_result: dict | None
|
||||
item_status: ItemStatus
|
||||
notes: str | None
|
||||
created_at: datetime
|
||||
|
||||
model_config = {"from_attributes": True}
|
||||
|
||||
|
||||
class OrderLineCreate(BaseModel):
|
||||
product_id: uuid.UUID
|
||||
output_type_id: uuid.UUID | None = None
|
||||
render_position_id: uuid.UUID | None = None
|
||||
gewuenschte_bildnummer: str | None = None
|
||||
notes: str | None = None
|
||||
|
||||
|
||||
class OrderLineOut(BaseModel):
|
||||
id: uuid.UUID
|
||||
order_id: uuid.UUID
|
||||
product_id: uuid.UUID
|
||||
product: Any # ProductOut — forward ref to avoid circular imports
|
||||
output_type_id: uuid.UUID | None
|
||||
output_type: Any | None # OutputTypeOut
|
||||
gewuenschte_bildnummer: str | None
|
||||
item_status: str
|
||||
render_status: str
|
||||
result_path: str | None
|
||||
thumbnail_url: str | None = None
|
||||
ai_validation_status: str
|
||||
ai_validation_result: dict | None
|
||||
render_backend_used: str | None = None
|
||||
flamenco_job_id: str | None = None
|
||||
unit_price: float | None = None
|
||||
render_position_id: uuid.UUID | None = None
|
||||
render_position_name: str | None = None
|
||||
notes: str | None
|
||||
created_at: datetime
|
||||
updated_at: datetime
|
||||
|
||||
model_config = {"from_attributes": True}
|
||||
|
||||
|
||||
class OrderCreate(BaseModel):
|
||||
template_id: uuid.UUID | None = None
|
||||
source_excel: str | None = None
|
||||
notes: str | None = None
|
||||
items: list[OrderItemCreate] = []
|
||||
lines: list[OrderLineCreate] = []
|
||||
|
||||
|
||||
class OrderOut(BaseModel):
|
||||
id: uuid.UUID
|
||||
order_number: str
|
||||
template_id: uuid.UUID | None
|
||||
status: OrderStatus
|
||||
created_by: uuid.UUID
|
||||
source_excel: str | None
|
||||
notes: str | None
|
||||
created_at: datetime
|
||||
updated_at: datetime
|
||||
submitted_at: datetime | None = None
|
||||
processing_started_at: datetime | None = None
|
||||
completed_at: datetime | None = None
|
||||
rejected_at: datetime | None = None
|
||||
estimated_price: float | None = None
|
||||
item_count: int = 0
|
||||
line_count: int = 0
|
||||
render_progress: dict | None = None
|
||||
|
||||
model_config = {"from_attributes": True}
|
||||
|
||||
|
||||
class OrderDetailOut(OrderOut):
|
||||
items: list[OrderItemOut] = []
|
||||
lines: list[OrderLineOut] = []
|
||||
@@ -0,0 +1,101 @@
|
||||
"""Order service — order number generation and business logic."""
|
||||
from datetime import datetime
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
from sqlalchemy import select, func, create_engine, update as sql_update
|
||||
from sqlalchemy.orm import Session
|
||||
from app.domains.orders.models import Order, OrderLine, OrderStatus
|
||||
import logging
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
async def generate_order_number(db: AsyncSession) -> str:
|
||||
"""Generate next sequential order number: SA-2026-XXXXX."""
|
||||
year = datetime.utcnow().year
|
||||
prefix = f"SA-{year}-"
|
||||
|
||||
# Use MAX to find the highest existing sequence number this year.
|
||||
# COUNT-based approach breaks when orders are deleted (produces duplicates).
|
||||
result = await db.execute(
|
||||
select(func.max(Order.order_number)).where(Order.order_number.like(f"{prefix}%"))
|
||||
)
|
||||
max_num = result.scalar()
|
||||
if max_num:
|
||||
last_seq = int(max_num.split("-")[-1])
|
||||
return f"{prefix}{last_seq + 1:05d}"
|
||||
return f"{prefix}00001"
|
||||
|
||||
|
||||
def check_order_completion(order_id: str) -> bool:
|
||||
"""If all renderable lines are done, auto-advance order to completed.
|
||||
|
||||
Called from Celery tasks (sync context).
|
||||
Returns True if the order was advanced to completed.
|
||||
"""
|
||||
from app.config import settings as app_settings
|
||||
|
||||
sync_url = app_settings.database_url.replace("+asyncpg", "")
|
||||
engine = create_engine(sync_url)
|
||||
|
||||
try:
|
||||
with Session(engine) as session:
|
||||
# Get all lines that have an output type (i.e. renderable)
|
||||
lines = session.execute(
|
||||
select(OrderLine).where(
|
||||
OrderLine.order_id == order_id,
|
||||
OrderLine.output_type_id.isnot(None),
|
||||
)
|
||||
).scalars().all()
|
||||
|
||||
if not lines:
|
||||
return False
|
||||
|
||||
# Check if all renderable lines are in a terminal state
|
||||
all_terminal = all(
|
||||
line.render_status in ("completed", "failed", "cancelled")
|
||||
for line in lines
|
||||
)
|
||||
|
||||
if not all_terminal:
|
||||
return False
|
||||
|
||||
# Check order is still in processing state
|
||||
order = session.execute(
|
||||
select(Order).where(Order.id == order_id)
|
||||
).scalar_one_or_none()
|
||||
|
||||
if order is None or order.status != OrderStatus.processing:
|
||||
return False
|
||||
|
||||
# Auto-advance to completed
|
||||
now = datetime.utcnow()
|
||||
session.execute(
|
||||
sql_update(Order)
|
||||
.where(Order.id == order_id)
|
||||
.values(
|
||||
status=OrderStatus.completed,
|
||||
completed_at=now,
|
||||
updated_at=now,
|
||||
)
|
||||
)
|
||||
session.commit()
|
||||
logger.info(f"Order {order_id} auto-advanced to completed (all {len(lines)} lines done)")
|
||||
|
||||
# Notify order creator
|
||||
try:
|
||||
from app.domains.notifications.service import emit_notification_sync
|
||||
emit_notification_sync(
|
||||
actor_user_id=None,
|
||||
target_user_id=str(order.created_by),
|
||||
action="order.completed",
|
||||
entity_type="order",
|
||||
entity_id=str(order_id),
|
||||
details={"order_number": order.order_number},
|
||||
)
|
||||
except Exception:
|
||||
logger.exception("Failed to emit order.completed notification")
|
||||
|
||||
return True
|
||||
|
||||
finally:
|
||||
engine.dispose()
|
||||
Reference in New Issue
Block a user