x

src/api/inventory/dashboard_routes.py

@@ -28,15 +28,25 @@ async def get_dashboard(
     db_session: AsyncSession = Depends(get_db_session),
     current_user: User = Depends(get_current_active_user)
 ):
-    product_count = await db_session.scalar(select(func.count(Product.id)).where(Product.is_active == True))
+    material_count = await db_session.scalar(
+        select(func.count(Product.id)).where(Product.is_active == True, Product.item_type == "material")
+    ) or 0
+    finished_product_count = await db_session.scalar(
+        select(func.count(Product.id)).where(Product.is_active == True, Product.item_type == "finished")
+    ) or 0
     supplier_count = await db_session.scalar(select(func.count(Supplier.id)).where(Supplier.is_active == True))
     customer_count = await db_session.scalar(select(func.count(Customer.id)).where(Customer.is_active == True))
     warehouse_count = await db_session.scalar(select(func.count(Warehouse.id)).where(Warehouse.is_active == True))
     
-    total_stock = await db_session.scalar(select(func.sum(Inventory.quantity))) or 0
+    total_stock = await db_session.scalar(
+        select(func.sum(Inventory.quantity))
+        .join(Product, Inventory.product_id == Product.id)
+        .where(Product.item_type == "material")
+    ) or 0
     total_value = await db_session.scalar(
         select(func.sum(Inventory.quantity * Product.cost_price))
         .join(Product, Inventory.product_id == Product.id)
+        .where(Product.item_type == "material")
     ) or 0
     
     pending_purchase = await db_session.scalar(
@@ -49,6 +59,7 @@ async def get_dashboard(
     low_stock_products = await db_session.execute(
         select(Product, Inventory)
         .join(Inventory, Product.id == Inventory.product_id)
+        .where(Product.item_type == "material")
         .where(Inventory.quantity <= Product.min_stock)
         .limit(10)
     )
@@ -58,7 +69,8 @@ async def get_dashboard(
     ]
     
     return {
-        "product_count": product_count,
+        "product_count": finished_product_count,
+        "material_count": material_count,
         "supplier_count": supplier_count,
         "customer_count": customer_count,
         "warehouse_count": warehouse_count,