Einheiten (neu):
- Tabelle units (name, kind=count|weight|volume, factor, is_builtin); eingebaut
Stueck/Gramm/Kilogramm/Milliliter/Liter, Admin kann eigene anlegen (z.B. Pfund=500g).
- Bestaende bleiben intern in kanonischer Basis (Stueck/Gramm/Milliliter);
Product.display_unit_id und Group.min_stock_unit_id als nullable FKs.
- Neuer Umrechnungs-Service (services/conversion.py) ersetzt die feste Einheitenlogik;
Ein-/Auslagern und Gruppen-Mindestbestand rechnen ueber den Faktor.
- Gruppen-Mindestbestand mit Einheit; Gruppenbestand summiert nur Produkte
passender Art. Neue Verwaltungsseite "Einheiten" (Admin).
- Schonende Migration beim Start: ADD COLUMN IF NOT EXISTS (Postgres), damit
bestehende Installationen ihre Daten behalten.
Chargen:
- PATCH /lots/{id} und DELETE /lots/{id}: Menge/MHD korrigieren, Charge loeschen
(wird als Korrektur-Bewegung protokolliert). Bearbeitung im Produktdetail.
Auslagern:
- Optionales lot_id: gezielt aus einer bestimmten Charge/MHD abbuchen statt FEFO;
Auswahl-Dropdown in der Auslagern-Seite.
Sonstiges: Roadmap aktualisiert, Tests fuer die Umrechnung.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
146 lines
4.9 KiB
Python
146 lines
4.9 KiB
Python
from fastapi import APIRouter, Depends, HTTPException, status
|
|
from sqlalchemy.orm import Session
|
|
|
|
from ..crud import product_to_out
|
|
from ..database import get_db
|
|
from ..deps import get_current_user, require_admin
|
|
from ..models import BaseUnit, Product, User
|
|
from ..off import lookup_barcode
|
|
from ..schemas import LookupResult, ProductCreate, ProductOut, ProductUpdate
|
|
from ..services.conversion import ConversionError, resolve_product_unit
|
|
|
|
router = APIRouter(prefix="/products", tags=["products"])
|
|
|
|
|
|
@router.get("", response_model=list[ProductOut])
|
|
def list_products(
|
|
q: str | None = None,
|
|
db: Session = Depends(get_db),
|
|
_: User = Depends(get_current_user),
|
|
) -> list[ProductOut]:
|
|
query = db.query(Product)
|
|
if q:
|
|
like = f"%{q}%"
|
|
query = query.filter(Product.name.ilike(like))
|
|
products = query.order_by(Product.name).all()
|
|
return [product_to_out(db, p) for p in products]
|
|
|
|
|
|
@router.get("/lookup", response_model=LookupResult)
|
|
def lookup(
|
|
barcode: str,
|
|
db: Session = Depends(get_db),
|
|
_: User = Depends(get_current_user),
|
|
) -> LookupResult:
|
|
"""Barcode: erst lokal, dann Open Food Facts. Nur Vorschlag, legt nichts an."""
|
|
existing = db.query(Product).filter(Product.barcode == barcode).first()
|
|
if existing:
|
|
return LookupResult(found=True, existing_product=product_to_out(db, existing))
|
|
|
|
suggestion = lookup_barcode(barcode)
|
|
if suggestion:
|
|
return LookupResult(found=True, suggestion=suggestion)
|
|
return LookupResult(found=False)
|
|
|
|
|
|
@router.get("/{product_id}", response_model=ProductOut)
|
|
def get_product(
|
|
product_id: int,
|
|
db: Session = Depends(get_db),
|
|
_: User = Depends(get_current_user),
|
|
) -> ProductOut:
|
|
product = db.get(Product, product_id)
|
|
if product is None:
|
|
raise HTTPException(status.HTTP_404_NOT_FOUND, "Produkt nicht gefunden")
|
|
return product_to_out(db, product)
|
|
|
|
|
|
@router.post("", response_model=ProductOut, status_code=status.HTTP_201_CREATED)
|
|
def create_product(
|
|
payload: ProductCreate,
|
|
db: Session = Depends(get_db),
|
|
_: User = Depends(require_admin),
|
|
) -> ProductOut:
|
|
if payload.barcode:
|
|
exists = db.query(Product).filter(Product.barcode == payload.barcode).first()
|
|
if exists:
|
|
raise HTTPException(
|
|
status.HTTP_409_CONFLICT, "Ein Produkt mit diesem Barcode existiert bereits"
|
|
)
|
|
base_unit = payload.base_unit
|
|
display_unit_id = None
|
|
if payload.unit_id is not None:
|
|
try:
|
|
base_unit, display_unit_id = resolve_product_unit(db, payload.unit_id)
|
|
except ConversionError as exc:
|
|
raise HTTPException(status.HTTP_400_BAD_REQUEST, str(exc)) from exc
|
|
product = Product(
|
|
barcode=payload.barcode or None,
|
|
name=payload.name,
|
|
brand=payload.brand,
|
|
image_url=payload.image_url,
|
|
base_unit=base_unit,
|
|
display_unit_id=display_unit_id,
|
|
package_size=payload.package_size,
|
|
group_id=payload.group_id,
|
|
min_stock=payload.min_stock,
|
|
source="manual",
|
|
)
|
|
db.add(product)
|
|
db.commit()
|
|
db.refresh(product)
|
|
return product_to_out(db, product)
|
|
|
|
|
|
@router.patch("/{product_id}", response_model=ProductOut)
|
|
def update_product(
|
|
product_id: int,
|
|
payload: ProductUpdate,
|
|
db: Session = Depends(get_db),
|
|
_: User = Depends(require_admin),
|
|
) -> ProductOut:
|
|
product = db.get(Product, product_id)
|
|
if product is None:
|
|
raise HTTPException(status.HTTP_404_NOT_FOUND, "Produkt nicht gefunden")
|
|
|
|
data = payload.model_dump(exclude_unset=True)
|
|
if "barcode" in data and data["barcode"]:
|
|
clash = (
|
|
db.query(Product)
|
|
.filter(Product.barcode == data["barcode"], Product.id != product_id)
|
|
.first()
|
|
)
|
|
if clash:
|
|
raise HTTPException(
|
|
status.HTTP_409_CONFLICT, "Ein anderes Produkt hat diesen Barcode bereits"
|
|
)
|
|
# Einheit: unit_id (falls gesetzt) bestimmt base_unit + Anzeigeeinheit.
|
|
if "unit_id" in data:
|
|
unit_id = data.pop("unit_id")
|
|
data.pop("base_unit", None) # unit_id hat Vorrang
|
|
if unit_id is None:
|
|
product.display_unit_id = None
|
|
else:
|
|
try:
|
|
product.base_unit, product.display_unit_id = resolve_product_unit(db, unit_id)
|
|
except ConversionError as exc:
|
|
raise HTTPException(status.HTTP_400_BAD_REQUEST, str(exc)) from exc
|
|
for field, value in data.items():
|
|
setattr(product, field, value)
|
|
db.commit()
|
|
db.refresh(product)
|
|
return product_to_out(db, product)
|
|
|
|
|
|
@router.delete("/{product_id}", status_code=status.HTTP_204_NO_CONTENT)
|
|
def delete_product(
|
|
product_id: int,
|
|
db: Session = Depends(get_db),
|
|
_: User = Depends(require_admin),
|
|
) -> None:
|
|
product = db.get(Product, product_id)
|
|
if product is None:
|
|
raise HTTPException(status.HTTP_404_NOT_FOUND, "Produkt nicht gefunden")
|
|
db.delete(product)
|
|
db.commit()
|