201 előtti mentés

backend/app/api/v1/endpoints/expenses.py

@@ -3,39 +3,65 @@ from fastapi import APIRouter, Depends, HTTPException
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy import select
 from app.api.deps import get_db, get_current_user
-from app.models import Asset, AssetCost # JAVÍTVA
-from pydantic import BaseModel
-from datetime import date
+from app.models import Asset, AssetCost
+from app.schemas.asset_cost import AssetCostCreate
+from datetime import datetime
 
 router = APIRouter()
 
-class ExpenseCreate(BaseModel):
-    asset_id: str
-    category: str
-    amount: float
-    date: date
-
-@router.post("/add")
-async def add_expense(expense: ExpenseCreate, db: AsyncSession = Depends(get_db), current_user = Depends(get_current_user)):
+@router.post("/", status_code=201)
+async def create_expense(
+    expense: AssetCostCreate,
+    db: AsyncSession = Depends(get_db),
+    current_user = Depends(get_current_user)
+):
+    """
+    Create a new expense (fuel, service, tax, insurance) for an asset.
+    Uses AssetCostCreate schema which includes mileage_at_cost, cost_type, etc.
+    """
+    # Validate asset exists
     stmt = select(Asset).where(Asset.id == expense.asset_id)
     result = await db.execute(stmt)
     asset = result.scalar_one_or_none()
     if not asset:
-        raise HTTPException(status_code=404, detail="Jármű nem található.")
+        raise HTTPException(status_code=404, detail="Asset not found.")
     
-    # Determine organization_id from asset
+    # Determine organization_id from asset (required by AssetCost model)
     organization_id = asset.current_organization_id or asset.owner_org_id
     if not organization_id:
-        raise HTTPException(status_code=400, detail="Az eszközhez nincs társított szervezet.")
+        raise HTTPException(status_code=400, detail="Asset has no associated organization.")
     
+    # Map cost_type to cost_category (AssetCost uses cost_category)
+    cost_category = expense.cost_type
+    
+    # Prepare data JSON for extra fields (mileage_at_cost, description, etc.)
+    data = expense.data.copy() if expense.data else {}
+    if expense.mileage_at_cost is not None:
+        data["mileage_at_cost"] = expense.mileage_at_cost
+    if expense.description:
+        data["description"] = expense.description
+    
+    # Create AssetCost instance
     new_cost = AssetCost(
         asset_id=expense.asset_id,
-        cost_category=expense.category,
-        amount_net=expense.amount,
-        currency="HUF",
+        organization_id=organization_id,
+        cost_category=cost_category,
+        amount_net=expense.amount_local,
+        currency=expense.currency_local,
         date=expense.date,
-        organization_id=organization_id
+        invoice_number=data.get("invoice_number"),
+        data=data
     )
+    
     db.add(new_cost)
     await db.commit()
-    return {"status": "success"}
+    await db.refresh(new_cost)
+    
+    return {
+        "status": "success",
+        "id": new_cost.id,
+        "asset_id": new_cost.asset_id,
+        "cost_category": new_cost.cost_category,
+        "amount_net": new_cost.amount_net,
+        "date": new_cost.date
+    }