Upload 94 files

app/api/analytics.py

@@ -1,11 +1,11 @@
 from fastapi import APIRouter, Depends, Query, HTTPException
 from sqlalchemy.ext.asyncio import AsyncSession
-from sqlalchemy import select, func, cast, Date, and_, distinct
+from sqlalchemy import select, func, cast, Date, and_, distinct, case
 from datetime import datetime, timedelta
 from typing import Dict, Any, Optional
 from ..core.dependencies import get_current_active_user
 from ..db.database import get_db
-from ..db.models import Order, Product, User, Brand
+from ..db.models import Order, Product, User, Brand, OrderItem
 
 router = APIRouter()
 
@@ -101,16 +101,18 @@ async def get_product_analytics(
     # Top selling products
     stmt = select(
         Product,
-        func.sum(Order.total_amount).label('total_revenue'),
+        func.sum(OrderItem.price * OrderItem.quantity).label('total_revenue'),
         func.count().label('total_orders')
     ).join(
-        Order, Product.id == Order.id
+        OrderItem, Product.id == OrderItem.product_id
+    ).join(
+        Order, OrderItem.order_id == Order.id
     ).where(
-        and_(*conditions)
+        and_(*conditions, Order.status.in_(['completed', 'delivered']))
     ).group_by(
         Product.id
     ).order_by(
-        func.sum(Order.total_amount).desc()
+        func.sum(OrderItem.price * OrderItem.quantity).desc()
     ).limit(10)
     
     result = await db.execute(stmt)
@@ -131,13 +133,15 @@ async def get_product_analytics(
             {
                 "id": product.id,
                 "name": product.name,
-                "total_revenue": revenue,
-                "total_orders": orders
+                "category": product.category,
+                "total_revenue": float(revenue or 0),
+                "total_orders": int(orders or 0),
+                "inventory_count": product.inventory_count
             }
             for product, revenue, orders in top_products
         ],
-        "total_products": total_products,
-        "low_stock_products": low_stock_count
+        "total_products": total_products or 0,
+        "low_stock_products": low_stock_count or 0
     }
 
 @router.get("/customers")

app/services/pos_analytics.py

@@ -14,9 +14,11 @@ import aiohttp
 class POSAnalyticsService:
     def __init__(self):
         self.pos_api_url = settings.POS_API_URL
-        self.service_token = settings.SERVICE_TOKEN
+        self.pos_api_key = settings.POS_API_KEY
+        self.pos_api_version = settings.POS_API_VERSION
         self._headers = {
-            "Authorization": f"Bearer {self.service_token}",
+            "Authorization": f"Bearer {self.pos_api_key}",
+            "X-API-Version": self.pos_api_version,
             "Content-Type": "application/json"
         }
         self._last_sync_time = None