Upload 94 files

app/api/analytics.py

@@ -11,20 +11,24 @@ router = APIRouter()
 
 @router.get("/sales")
 async def get_sales_analytics(
-    start_date: datetime = Query(default=None),
-    end_date: datetime = Query(default=None),
+    start_date: Optional[str] = Query(None),
+    end_date: Optional[str] = Query(None),
     branch_id: Optional[int] = Query(None, description="Filter analytics by branch"),
     current_user: User = Depends(get_current_active_user),
     db: AsyncSession = Depends(get_db)
 ) -> Dict[str, Any]:
-    if not start_date:
-        start_date = datetime.now() - timedelta(days=30)
-    if not end_date:
-        end_date = datetime.now()
+    # Parse dates or use last 30 days as default
+    try:
+        end = datetime.now() if not end_date else datetime.fromisoformat(end_date)
+        start = (end - timedelta(days=30)) if not start_date else datetime.fromisoformat(start_date)
+    except ValueError:
+        # Handle invalid date format
+        end = datetime.now()
+        start = end - timedelta(days=30)
     
     # Build query conditions
     conditions = [
-        Order.created_at.between(start_date, end_date),
+        Order.created_at.between(start, end),
         Order.status.in_(['completed', 'delivered'])
     ]
     
@@ -37,7 +41,6 @@ async def get_sales_analytics(
             )
         conditions.append(Order.branch_id == branch_id)
     elif not current_user.is_superuser:
-        # Non-superusers can only see their branch's analytics
         conditions.append(Order.branch_id == current_user.branch_id)
     
     # Daily sales query
@@ -57,18 +60,22 @@ async def get_sales_analytics(
     daily_sales = result.all()
     
     # Calculate totals
-    total_revenue = sum(day.total_sales for day in daily_sales)
-    total_orders = sum(day.order_count for day in daily_sales)
+    total_revenue = sum(day.total_sales or 0 for day in daily_sales)
+    total_orders = sum(day.order_count or 0 for day in daily_sales)
     avg_order_value = total_revenue / total_orders if total_orders > 0 else 0
     
     return {
         "daily_sales": [
-            {"date": day.date, "total_sales": day.total_sales, "order_count": day.order_count}
+            {
+                "date": day.date.isoformat(),
+                "total_sales": float(day.total_sales or 0),
+                "order_count": day.order_count or 0
+            }
             for day in daily_sales
         ],
-        "total_revenue": total_revenue,
+        "total_revenue": float(total_revenue),
         "total_orders": total_orders,
-        "average_order_value": avg_order_value
+        "average_order_value": float(avg_order_value)
     }
 
 @router.get("/products")

app/db/database.py

@@ -1,59 +1,59 @@
-from sqlalchemy.ext.asyncio import create_async_engine, AsyncSession, async_sessionmaker
-from sqlalchemy.orm import declarative_base
-from ..core.config import settings
-import contextlib
-
-# Create async engine with pgbouncer configuration
-async_engine = create_async_engine(
-    "postgresql+asyncpg://postgres.mqyrkmsdgugdhxiucukb:Lovyelias5584.@aws-0-eu-central-1.pooler.supabase.com:6543/postgres",
-    echo=True,
-    future=True,
-    pool_pre_ping=True,
-    connect_args={
-        "statement_cache_size": 0,  # Required for pgbouncer
-        "prepared_statement_cache_size": 0  # Disable prepared statement cache
-    }
-)
-
-# Create async session factory
-AsyncSessionLocal = async_sessionmaker(
-    bind=async_engine,
-    class_=AsyncSession,
-    expire_on_commit=False
-)
-
-# Create declarative base for models
-Base = declarative_base()
-
-# Database dependency for FastAPI routes
-async def get_db():
-    async with AsyncSessionLocal() as session:
-        try:
-            yield session
-        finally:
-            await session.close()
-
-# Database access for background tasks and services
-class Database:
-    def __init__(self):
-        self._session_factory = AsyncSessionLocal
-
-    @contextlib.asynccontextmanager
-    async def session(self):
-        """Get a database session with automatic commit/rollback"""
-        session = self._session_factory()
-        try:
-            yield session
-            await session.commit()
-        except:
-            await session.rollback()
-            raise
-        finally:
-            await session.close()
-
-    async def get_session(self):
-        """Get a session for manual management"""
-        return self._session_factory()
-
-# Create singleton instance for database access
-db = Database()
+from sqlalchemy.ext.asyncio import create_async_engine, AsyncSession, async_sessionmaker
+from sqlalchemy.orm import declarative_base
+from ..core.config import settings
+import contextlib
+
+# Create async engine with pgbouncer configuration
+async_engine = create_async_engine(
+    "postgresql+asyncpg://postgres.mqyrkmsdgugdhxiucukb:Lovyelias5584.@aws-0-eu-central-1.pooler.supabase.com:6543/postgres",
+    echo=True,
+    future=True,
+    pool_pre_ping=True,
+    connect_args={
+        "statement_cache_size": 0,  # Required for pgbouncer
+        "prepared_statement_cache_size": 0  # Disable prepared statement cache
+    }
+)
+
+# Create async session factory
+AsyncSessionLocal = async_sessionmaker(
+    bind=async_engine,
+    class_=AsyncSession,
+    expire_on_commit=False
+)
+
+# Create declarative base for models
+Base = declarative_base()
+
+# Database dependency for FastAPI routes
+async def get_db():
+    async with AsyncSessionLocal() as session:
+        try:
+            yield session
+        finally:
+            await session.close()
+
+# Database access for background tasks and services
+class Database:
+    def __init__(self):
+        self._session_factory = AsyncSessionLocal
+
+    @contextlib.asynccontextmanager
+    async def session(self):
+        """Get a database session with automatic commit/rollback"""
+        session = self._session_factory()
+        try:
+            yield session
+            await session.commit()
+        except:
+            await session.rollback()
+            raise
+        finally:
+            await session.close()
+
+    async def get_session(self):
+        """Get a session for manual management"""
+        return self._session_factory()
+
+# Create singleton instance for database access
+db = Database()

app/main.py

@@ -31,7 +31,7 @@ background_tasks = set()
 # Configure CORS
 app.add_middleware(
     CORSMiddleware,
-    allow_origins=["*"],  # Configure appropriately for production
+    allow_origins=["http://localhost:5173", "http://localhost:3000"],
     allow_credentials=True,
     allow_methods=["*"],
     allow_headers=["*"],