Pr 521 (#524)

* Align CNC export endpoint with versioned exports API

* Fix CNC export auth tests and fallback nesting engine

* Fix duplicated orders router include

* Refine CNC export artifact helpers

* Reuse backend Order model and harden CNC fallback

Author: shayancoin

backend/api/exports.py

@@ -5,7 +5,6 @@
 import logging
 from datetime import datetime, timezone
 from typing import Dict
-
 from fastapi import APIRouter, Depends, HTTPException
 from sqlalchemy.orm import Session
 
@@ -23,7 +22,7 @@
 )
 from api.security import require_write_token
 from api.storage_dependencies import get_storage_client
-from backend.services.storage import StorageClient
+from backend.services.storage import StorageClient, StoredObject
 from services.cnc_service import CNCService
 
 logger = logging.getLogger(__name__)
@@ -32,8 +31,95 @@
     tags=["exports"],
     dependencies=[Depends(require_write_token)],
 )
+legacy_router = APIRouter(
+    prefix="/api/cnc",
+    tags=["cnc"],
+    dependencies=[Depends(require_write_token)],
+)
 _cnc_service = CNCService()
 
+__all__ = ["router", "legacy_router"]
+
+
+def _to_stored_artifact(obj: StoredObject) -> StoredArtifact:
+    return StoredArtifact(
+        bucket=obj.bucket,
+        key=obj.key,
+        url=obj.url,
+        content_type=obj.content_type,
+    )
+
+
+def _export_cnc(
+    payload: CNCExportRequest,
+    db: Session,
+    storage: StorageClient,
+    settings: Settings,
+) -> CNCExportResponse:
+    module_rows = db.query(models.Module).all()
+    material_rows = db.query(models.Material).all()
+
+    modules_by_id: Dict[str, ModuleDTO] = {
+        module.id: ModuleDTO.model_validate(module) for module in module_rows
+    }
+    materials_by_id: Dict[str, MaterialDTO] = {
+        material.id: MaterialDTO.model_validate(material)
+        for material in material_rows
+    }
+
+    artifacts = _cnc_service.export(
+        request=payload,
+        modules_by_id=modules_by_id,
+        materials_by_id=materials_by_id,
+    )
+
+    timestamp = datetime.now(timezone.utc).strftime("%Y%m%dT%H%M%S")
+    prefix = settings.cnc_exports_prefix.strip("/")
+    configuration_segment = payload.configuration_id.replace(" ", "-")
+    base_path_parts = [
+        segment for segment in (prefix, configuration_segment, timestamp) if segment
+    ]
+    base_path = "/".join(base_path_parts) if base_path_parts else timestamp
+
+    csv_key = f"{base_path}/cut-list.csv"
+    svg_key = f"{base_path}/nesting.svg"
+
+    artifacts.cut_list_csv.seek(0)
+    csv_object = storage.upload_fileobj(
+        artifacts.cut_list_csv,
+        csv_key,
+        content_type="text/csv",
+    )
+
+    artifacts.nesting_svg.seek(0)
+    svg_object = storage.upload_fileobj(
+        artifacts.nesting_svg,
+        svg_key,
+        content_type="image/svg+xml",
+    )
+
+    placements = [
+        CNCNestingPlacement(
+            panel_id=placement.panel_id,
+            x=placement.x,
+            y=placement.y,
+            rotation=placement.rotation,
+            sheet_index=placement.sheet_index,
+        )
+        for placement in artifacts.nesting.placements
+    ]
+
+    return CNCExportResponse(
+        panels=artifacts.panels,
+        cut_list=_to_stored_artifact(csv_object),
+        nesting=CNCNestingMetadata(
+            sheet_width=artifacts.nesting.sheet_width,
+            sheet_height=artifacts.nesting.sheet_height,
+            placements=placements,
+            svg=_to_stored_artifact(svg_object),
+        ),
+    )
+
 
 @router.post("/cnc", response_model=CNCExportResponse)
 def export_cnc(
@@ -45,81 +131,29 @@ def export_cnc(
     """Generate CNC export artifacts and store them via the configured storage client."""
 
     try:
-        module_rows = db.query(models.Module).all()
-        material_rows = db.query(models.Material).all()
-
-        modules_by_id: Dict[str, ModuleDTO] = {
-            module.id: ModuleDTO.model_validate(module) for module in module_rows
-        }
-        materials_by_id: Dict[str, MaterialDTO] = {
-            material.id: MaterialDTO.model_validate(material)
-            for material in material_rows
-        }
-
-        artifacts = _cnc_service.export(
-            request=payload,
-            modules_by_id=modules_by_id,
-            materials_by_id=materials_by_id,
-        )
-
-        timestamp = datetime.now(timezone.utc).strftime("%Y%m%dT%H%M%S")
-        prefix = settings.cnc_exports_prefix.strip("/")
-        configuration_segment = payload.configuration_id.replace(" ", "-")
-        base_path_parts = [
-            segment for segment in (prefix, configuration_segment, timestamp) if segment
-        ]
-        base_path = "/".join(base_path_parts) if base_path_parts else timestamp
-
-        csv_key = f"{base_path}/cut-list.csv"
-        svg_key = f"{base_path}/nesting.svg"
-
-        artifacts.cut_list_csv.seek(0)
-        csv_object = storage.upload_fileobj(
-            artifacts.cut_list_csv,
-            csv_key,
-            content_type="text/csv",
-        )
+        return _export_cnc(payload, db, storage, settings)
+    except HTTPException:
+        raise
+    except Exception as exc:  # noqa: BLE001
+        logger.exception("Error exporting CNC")
+        raise HTTPException(status_code=500, detail=str(exc)) from exc
 
-        artifacts.nesting_svg.seek(0)
-        svg_object = storage.upload_fileobj(
-            artifacts.nesting_svg,
-            svg_key,
-            content_type="image/svg+xml",
-        )
 
-        placements = [
-            CNCNestingPlacement(
-                panel_id=placement.panel_id,
-                x=placement.x,
-                y=placement.y,
-                rotation=placement.rotation,
-                sheet_index=placement.sheet_index,
-            )
-            for placement in artifacts.nesting.placements
-        ]
-
-        return CNCExportResponse(
-            panels=artifacts.panels,
-            cut_list=StoredArtifact(
-                bucket=csv_object.bucket,
-                key=csv_object.key,
-                url=csv_object.url,
-                content_type=csv_object.content_type,
-            ),
-            nesting=CNCNestingMetadata(
-                sheet_width=artifacts.nesting.sheet_width,
-                sheet_height=artifacts.nesting.sheet_height,
-                placements=placements,
-                svg=StoredArtifact(
-                    bucket=svg_object.bucket,
-                    key=svg_object.key,
-                    url=svg_object.url,
-                    content_type=svg_object.content_type,
-                ),
-            ),
-        )
+@legacy_router.post(
+    "/export",
+    response_model=CNCExportResponse,
+    include_in_schema=False,
+)
+def export_cnc_legacy(
+    payload: CNCExportRequest,
+    db: Session = Depends(get_db),
+    storage: StorageClient = Depends(get_storage_client),
+    settings: Settings = Depends(get_settings),
+) -> CNCExportResponse:
+    try:
+        return _export_cnc(payload, db, storage, settings)
     except HTTPException:
         raise
     except Exception as exc:  # noqa: BLE001
-        logger.exception("Error exporting CNC")
+        logger.exception("Error exporting CNC (legacy path)")
         raise HTTPException(status_code=500, detail=str(exc)) from exc

backend/api/main.py

@@ -24,12 +24,11 @@
     record_http_request,
     suppress_prometheus_http_metrics,
 )
-from api.orders import router as orders_router
-from api.routes import router as api_router
+from api.exports import legacy_router as legacy_exports_router
 from api.exports import router as exports_router
+from api.routes import router as api_router
 from api.routes_catalog import router as catalog_router
 from api.routes_catalog import router_mesh as catalog_mesh_router
-from api.exports import router as exports_router
 from api.routes_designs import router as design_router
 from api.routes_materials import router as materials_router
 from api.routes_modules import router as modules_router
@@ -125,13 +124,13 @@ async def dispatch(self, request: Request, call_next):  # type: ignore[override]
 
 # Include API router
 app.include_router(api_router)
-app.include_router(orders_router)
 app.include_router(catalog_router)
 app.include_router(catalog_mesh_router)
 app.include_router(materials_router)
 app.include_router(modules_router)
 app.include_router(pricing_router)
 app.include_router(exports_router)
+app.include_router(legacy_exports_router)
 app.include_router(design_router)
 if sync_router is not None:
     app.include_router(sync_router)

backend/api/models.py

@@ -13,10 +13,12 @@
 from datetime import datetime
 from typing import Any
 
-from sqlalchemy import Float, ForeignKey, String, TIMESTAMP, UniqueConstraint, func
+from sqlalchemy import Float, String, TIMESTAMP, UniqueConstraint, func
 from sqlalchemy.orm import Mapped, mapped_column
 
-from models import (
+from models.base import Base
+from models.order import Order
+from models.pricing import (
     JSON_COMPAT,
     Finish,
     HardwareKit,
@@ -28,7 +30,6 @@
     QuoteRun,
     QuoteRunTier,
 )
-from models.base import Base
 
 __all__ = [
     "Material",
@@ -73,31 +74,6 @@ class ProjectQuote(Base):
     )
 
 
-class Order(Base):
-    """Sales order record persisted after a quote is accepted."""
-
-    __tablename__ = "orders"
-
-    id: Mapped[str] = mapped_column(
-        String(36), primary_key=True, default=lambda: str(uuid.uuid4())
-    )
-    quote_id: Mapped[str] = mapped_column(
-        String(36), ForeignKey("project_quotes.id"), nullable=False
-    )
-    status: Mapped[str] = mapped_column(String(50), nullable=False, default="pending")
-    order_number: Mapped[str | None] = mapped_column(String(100), nullable=True)
-    currency: Mapped[str] = mapped_column(String(3), nullable=False, default="USD")
-    total_amount: Mapped[float] = mapped_column(Float, nullable=False)
-    customer_name: Mapped[str | None] = mapped_column(String(255), nullable=True)
-
-    created_at: Mapped[datetime] = mapped_column(
-        TIMESTAMP(timezone=True), server_default=func.now(), nullable=False
-    )
-    updated_at: Mapped[datetime] = mapped_column(
-        TIMESTAMP(timezone=True), server_default=func.now(), onupdate=func.now()
-    )
-
-
 class SyncEvent(Base):
     """Webhook deduplication store to prevent replay processing."""
 

backend/api/orders.py

@@ -6,7 +6,7 @@
 from datetime import datetime
 from typing import List
 
-from fastapi import APIRouter, Depends, HTTPException, status
+from fastapi import APIRouter, Depends, HTTPException, Response, status
 from pydantic import BaseModel, ConfigDict, Field
 from sqlalchemy import select
 from sqlalchemy.exc import SQLAlchemyError
@@ -170,7 +170,7 @@ def update_order(
     return order
 
 
-@router.delete("/{order_id}", status_code=status.HTTP_204_NO_CONTENT)
+@router.delete("/{order_id}")
 def delete_order(
     order_id: str,
     db: Session = Depends(get_db),
@@ -190,3 +190,4 @@ def delete_order(
             detail="failed to delete order",
         ) from exc
 
+    return Response(status_code=status.HTTP_204_NO_CONTENT)

backend/models/order.py

@@ -60,12 +60,12 @@ class Order(Base):
         Index("ix_orders_quote_id", "quote_id"),
     )
 
-    @property
-    def metadata(self) -> dict[str, Any] | None:  # pragma: no cover - passthrough
+    def metadata_dict(self) -> dict[str, Any] | None:
         """Return additional metadata stored with the order."""
 
         return self.metadata_
 
-    @metadata.setter
-    def metadata(self, value: dict[str, Any] | None) -> None:
+    def set_metadata_dict(self, value: dict[str, Any] | None) -> None:
+        """Update additional metadata stored with the order."""
+
         self.metadata_ = value