admin frontend elkezdése, járművek tisztázása, frontend fejleszts

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

@@ -18,6 +18,8 @@ from app.services.asset_service import AssetService
 from app.schemas.asset_cost import AssetCostCreate, AssetCostResponse
 from app.schemas.asset import AssetResponse, AssetCreate, AssetUpdate
 
+logger = logging.getLogger(__name__)
+
 
 class ArchiveVehicleRequest(BaseModel):
     """Payload a jármű archiválásához (Soft Delete)."""
@@ -26,8 +28,6 @@ class ArchiveVehicleRequest(BaseModel):
 
 router = APIRouter()
 
-logger = logging.getLogger(__name__)
-
 
 @router.get("/vehicles/quota-status")
 async def get_vehicle_quota_status(
@@ -249,13 +249,36 @@ async def list_asset_costs(
     """Tételes költséglista lapozással (Pagination)."""
     stmt = (
         select(AssetCost)
+        .options(selectinload(AssetCost.category))
         .where(AssetCost.asset_id == asset_id)
         .order_by(desc(AssetCost.date))
         .offset(skip)
         .limit(limit)
     )
     res = await db.execute(stmt)
-    return res.scalars().all()
+    costs = res.scalars().all()
+    
+    # Map DB models to response, enriching with category info and data fields
+    result = []
+    for cost in costs:
+        cost_dict = {
+            "id": cost.id,
+            "asset_id": cost.asset_id,
+            "organization_id": cost.organization_id,
+            "amount_net": cost.amount_net,
+            "currency": cost.currency,
+            "date": cost.date,
+            "invoice_number": cost.invoice_number,
+            "data": cost.data or {},
+            "category_id": cost.category_id,
+            "category_name": cost.category.name if cost.category else None,
+            "category_code": cost.category.code if cost.category else None,
+            "description": (cost.data or {}).get("description"),
+            "mileage_at_cost": (cost.data or {}).get("mileage_at_cost"),
+        }
+        result.append(AssetCostResponse(**cost_dict))
+    
+    return result
 
 
 @router.get("/{asset_id}", response_model=AssetResponse)
@@ -373,7 +396,6 @@ async def create_or_claim_vehicle(
         # első elérhető szervezetét a fleet.organization_members táblában
         if org_id is None:
             from app.models.marketplace.organization import OrganizationMember
-            from sqlalchemy import select
             member_stmt = (
                 select(OrganizationMember.organization_id)
                 .where(OrganizationMember.user_id == current_user.id)
@@ -405,7 +427,6 @@ async def create_or_claim_vehicle(
     except HTTPException:
         raise
     except Exception as e:
-        logger = logging.getLogger(__name__)
         logger.error(f"Vehicle creation error: {e}")
         raise HTTPException(status_code=500, detail="Belső szerverhiba a jármű létrehozásakor")
 
@@ -487,7 +508,6 @@ async def update_vehicle(
         
     except Exception as e:
         await db.rollback()
-        logger = logging.getLogger(__name__)
         logger.error(f"Vehicle update error: {e}")
         raise HTTPException(status_code=500, detail="Belső szerverhiba a jármű frissítésekor")
 
@@ -685,7 +705,6 @@ async def create_maintenance_record(
         )
     except Exception as e:
         await db.rollback()
-        logger = logging.getLogger(__name__)
         logger.error(f"Maintenance record creation error: {e}")
         raise HTTPException(
             status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,