hisham-cmd commited on
Commit
4b6ec31
·
verified ·
1 Parent(s): 38ff36f

Upload app/api/admin.py

Browse files
Files changed (1) hide show
  1. app/api/admin.py +103 -4
app/api/admin.py CHANGED
@@ -30,23 +30,65 @@ def get_dashboard_stats(
30
  # Time ranges
31
  now = datetime.utcnow()
32
  last_30_days = now - timedelta(days=30)
 
33
 
34
  # 1. Total Revenue
35
  revenue_result = db.query(func.sum(Order.total_price)).filter(
36
  Order.status != OrderStatus.CANCELLED,
37
  Order.created_at >= last_30_days
38
  ).scalar()
39
- total_revenue = revenue_result if revenue_result else 0.0
40
 
 
 
 
 
 
 
 
 
 
 
 
 
 
41
  # 2. Total Orders
42
  total_orders = db.query(func.count(Order.id)).filter(
43
  Order.created_at >= last_30_days
44
- ).scalar()
 
 
 
 
 
 
 
 
 
 
 
45
 
46
  # 3. Total Customers
47
  total_customers = db.query(func.count(User.id)).filter(
48
  User.role == UserRole.CUSTOMER
49
- ).scalar()
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
50
 
51
  # 4. Low Stock Products
52
  low_stock_count = db.query(func.count(Product.id)).filter(
@@ -81,9 +123,12 @@ def get_dashboard_stats(
81
  "isSuccess": True,
82
  "value": {
83
  "stats": {
84
- "revenue_30d": float(total_revenue),
 
85
  "orders_30d": total_orders,
 
86
  "total_customers": total_customers,
 
87
  "low_stock_products": low_stock_count
88
  },
89
  "recent_orders": recent_orders_data,
@@ -92,6 +137,60 @@ def get_dashboard_stats(
92
  "statusCode": 200
93
  }
94
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
95
  @router.get("/payments")
96
  def get_payment_records(
97
  current_user_id: int = Depends(get_current_user),
 
30
  # Time ranges
31
  now = datetime.utcnow()
32
  last_30_days = now - timedelta(days=30)
33
+ previous_30_days = now - timedelta(days=60)
34
 
35
  # 1. Total Revenue
36
  revenue_result = db.query(func.sum(Order.total_price)).filter(
37
  Order.status != OrderStatus.CANCELLED,
38
  Order.created_at >= last_30_days
39
  ).scalar()
40
+ total_revenue = float(revenue_result) if revenue_result else 0.0
41
 
42
+ prev_revenue_result = db.query(func.sum(Order.total_price)).filter(
43
+ Order.status != OrderStatus.CANCELLED,
44
+ Order.created_at >= previous_30_days,
45
+ Order.created_at < last_30_days
46
+ ).scalar()
47
+ prev_revenue = float(prev_revenue_result) if prev_revenue_result else 0.0
48
+
49
+ revenue_trend = 0.0
50
+ if prev_revenue > 0:
51
+ revenue_trend = ((total_revenue - prev_revenue) / prev_revenue) * 100
52
+ elif total_revenue > 0:
53
+ revenue_trend = 100.0
54
+
55
  # 2. Total Orders
56
  total_orders = db.query(func.count(Order.id)).filter(
57
  Order.created_at >= last_30_days
58
+ ).scalar() or 0
59
+
60
+ prev_orders = db.query(func.count(Order.id)).filter(
61
+ Order.created_at >= previous_30_days,
62
+ Order.created_at < last_30_days
63
+ ).scalar() or 0
64
+
65
+ orders_trend = 0.0
66
+ if prev_orders > 0:
67
+ orders_trend = ((total_orders - prev_orders) / prev_orders) * 100
68
+ elif total_orders > 0:
69
+ orders_trend = 100.0
70
 
71
  # 3. Total Customers
72
  total_customers = db.query(func.count(User.id)).filter(
73
  User.role == UserRole.CUSTOMER
74
+ ).scalar() or 0
75
+
76
+ new_customers = db.query(func.count(User.id)).filter(
77
+ User.role == UserRole.CUSTOMER,
78
+ User.created_at >= last_30_days
79
+ ).scalar() or 0
80
+
81
+ prev_new_customers = db.query(func.count(User.id)).filter(
82
+ User.role == UserRole.CUSTOMER,
83
+ User.created_at >= previous_30_days,
84
+ User.created_at < last_30_days
85
+ ).scalar() or 0
86
+
87
+ customers_trend = 0.0
88
+ if prev_new_customers > 0:
89
+ customers_trend = ((new_customers - prev_new_customers) / prev_new_customers) * 100
90
+ elif new_customers > 0:
91
+ customers_trend = 100.0
92
 
93
  # 4. Low Stock Products
94
  low_stock_count = db.query(func.count(Product.id)).filter(
 
123
  "isSuccess": True,
124
  "value": {
125
  "stats": {
126
+ "revenue_30d": total_revenue,
127
+ "revenue_trend": round(float(revenue_trend), 1),
128
  "orders_30d": total_orders,
129
+ "orders_trend": round(float(orders_trend), 1),
130
  "total_customers": total_customers,
131
+ "customers_trend": round(float(customers_trend), 1),
132
  "low_stock_products": low_stock_count
133
  },
134
  "recent_orders": recent_orders_data,
 
137
  "statusCode": 200
138
  }
139
 
140
+ @router.get("/dashboard/chart-data")
141
+ def get_chart_data(
142
+ current_user_id: int = Depends(get_current_user),
143
+ db: Session = Depends(get_db)
144
+ ):
145
+ """
146
+ Get daily chart data for revenue and orders over the last 30 days.
147
+ """
148
+ check_admin(current_user_id, db)
149
+ now = datetime.utcnow()
150
+ last_30_days = now - timedelta(days=30)
151
+
152
+ orders = db.query(
153
+ func.date(Order.created_at).label("date"),
154
+ func.count(Order.id).label("orders_count"),
155
+ func.sum(Order.total_price).label("daily_revenue")
156
+ ).filter(
157
+ Order.status != OrderStatus.CANCELLED,
158
+ Order.created_at >= last_30_days
159
+ ).group_by(func.date(Order.created_at)).all()
160
+
161
+ # Create a dictionary of results
162
+ data_map = {}
163
+ for o in orders:
164
+ data_map[str(o.date)] = {
165
+ "orders": o.orders_count,
166
+ "revenue": float(o.daily_revenue) if o.daily_revenue else 0.0
167
+ }
168
+
169
+ # Fill missing days with 0
170
+ results = []
171
+ for i in range(29, -1, -1):
172
+ target_date = (now - timedelta(days=i)).date()
173
+ date_str = str(target_date)
174
+ if date_str in data_map:
175
+ val = data_map[date_str]
176
+ results.append({
177
+ "date": date_str,
178
+ "revenue": val["revenue"],
179
+ "orders": val["orders"]
180
+ })
181
+ else:
182
+ results.append({
183
+ "date": date_str,
184
+ "revenue": 0.0,
185
+ "orders": 0
186
+ })
187
+
188
+ return {
189
+ "isSuccess": True,
190
+ "value": results,
191
+ "statusCode": 200
192
+ }
193
+
194
  @router.get("/payments")
195
  def get_payment_records(
196
  current_user_id: int = Depends(get_current_user),