Spaces:
Sleeping
Sleeping
File size: 12,441 Bytes
90537f3 |
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 |
"""
Optimized database queries for better performance
"""
from sqlalchemy.orm import Session, joinedload, selectinload
from sqlalchemy import and_, or_, func, text
from typing import List, Optional, Dict, Any
from datetime import datetime, timedelta
import logging
from ..database import Order, OrderItem, Dish, Person, Table
logger = logging.getLogger(__name__)
class OptimizedQueryService:
"""Service for optimized database queries with caching and performance improvements"""
def __init__(self):
self.query_cache = {}
self.cache_ttl = {
'menu': 300, # 5 minutes
'categories': 900, # 15 minutes
'specials': 300, # 5 minutes
'offers': 300, # 5 minutes
}
def get_menu_optimized(self, db: Session, category: Optional[str] = None) -> List[Dict]:
"""Optimized menu query with eager loading and caching"""
try:
# Build optimized query
query = db.query(Dish).filter(
Dish.is_visible == True
)
if category and category != 'All':
query = query.filter(Dish.category == category)
# Order by category and name for consistent results
query = query.order_by(Dish.category, Dish.name)
# Execute query
dishes = query.all()
# Convert to dict for JSON serialization
result = []
for dish in dishes:
dish_dict = {
'id': dish.id,
'name': dish.name,
'description': dish.description,
'price': float(dish.price),
'category': dish.category,
'image_path': dish.image_path,
'is_offer': dish.is_offer,
'discount': float(dish.discount) if dish.discount else 0,
'is_visible': dish.is_visible,
'created_at': dish.created_at.isoformat() if dish.created_at else None
}
result.append(dish_dict)
return result
except Exception as e:
logger.error(f"Error in get_menu_optimized: {str(e)}")
raise
def get_orders_optimized(self, db: Session, person_id: Optional[int] = None,
table_number: Optional[int] = None,
status: Optional[str] = None) -> List[Dict]:
"""Optimized order query with eager loading of related data"""
try:
# Build base query with eager loading
query = db.query(Order).options(
selectinload(Order.items).selectinload(OrderItem.dish),
joinedload(Order.person)
)
# Apply filters
filters = []
if person_id:
filters.append(Order.person_id == person_id)
if table_number:
filters.append(Order.table_number == table_number)
if status:
filters.append(Order.status == status)
if filters:
query = query.filter(and_(*filters))
# Order by creation time (newest first)
query = query.order_by(Order.created_at.desc())
# Execute query
orders = query.all()
# Convert to dict with optimized serialization
result = []
for order in orders:
order_dict = {
'id': order.id,
'table_number': order.table_number,
'unique_id': order.unique_id,
'person_id': order.person_id,
'status': order.status,
'created_at': order.created_at.isoformat() if order.created_at else None,
'updated_at': order.updated_at.isoformat() if order.updated_at else None,
'items': []
}
# Add order items
for item in order.items:
item_dict = {
'id': item.id,
'dish_id': item.dish_id,
'dish_name': item.dish.name if item.dish else 'Unknown',
'quantity': item.quantity,
'price': float(item.price),
'remarks': item.remarks,
'position': item.position
}
order_dict['items'].append(item_dict)
result.append(order_dict)
return result
except Exception as e:
logger.error(f"Error in get_orders_optimized: {str(e)}")
raise
def get_chef_orders_optimized(self, db: Session, status: str) -> List[Dict]:
"""Optimized chef order query with minimal data transfer"""
try:
# Use raw SQL for better performance on chef queries
sql = text("""
SELECT
o.id,
o.table_number,
o.status,
o.created_at,
o.updated_at,
COUNT(oi.id) as item_count,
GROUP_CONCAT(
CONCAT(d.name, ' (', oi.quantity, ')')
SEPARATOR ', '
) as items_summary
FROM orders o
LEFT JOIN order_items oi ON o.id = oi.order_id
LEFT JOIN dishes d ON oi.dish_id = d.id
WHERE o.status = :status
GROUP BY o.id, o.table_number, o.status, o.created_at, o.updated_at
ORDER BY o.created_at ASC
""")
result = db.execute(sql, {'status': status}).fetchall()
# Convert to dict
orders = []
for row in result:
order_dict = {
'id': row.id,
'table_number': row.table_number,
'status': row.status,
'created_at': row.created_at.isoformat() if row.created_at else None,
'updated_at': row.updated_at.isoformat() if row.updated_at else None,
'item_count': row.item_count,
'items_summary': row.items_summary or ''
}
orders.append(order_dict)
return orders
except Exception as e:
logger.error(f"Error in get_chef_orders_optimized: {str(e)}")
# Fallback to regular query
return self._get_chef_orders_fallback(db, status)
def _get_chef_orders_fallback(self, db: Session, status: str) -> List[Dict]:
"""Fallback method for chef orders if raw SQL fails"""
try:
orders = db.query(Order).options(
selectinload(Order.items).selectinload(OrderItem.dish)
).filter(Order.status == status).order_by(Order.created_at.asc()).all()
result = []
for order in orders:
items_summary = ', '.join([
f"{item.dish.name if item.dish else 'Unknown'} ({item.quantity})"
for item in order.items
])
order_dict = {
'id': order.id,
'table_number': order.table_number,
'status': order.status,
'created_at': order.created_at.isoformat() if order.created_at else None,
'updated_at': order.updated_at.isoformat() if order.updated_at else None,
'item_count': len(order.items),
'items_summary': items_summary
}
result.append(order_dict)
return result
except Exception as e:
logger.error(f"Error in chef orders fallback: {str(e)}")
raise
def get_table_status_optimized(self, db: Session) -> List[Dict]:
"""Optimized table status query"""
try:
# Use raw SQL for better performance
sql = text("""
SELECT
t.table_number,
t.is_occupied,
t.current_order_id,
t.updated_at,
o.status as order_status,
COUNT(oi.id) as item_count
FROM tables t
LEFT JOIN orders o ON t.current_order_id = o.id
LEFT JOIN order_items oi ON o.id = oi.order_id
GROUP BY t.table_number, t.is_occupied, t.current_order_id, t.updated_at, o.status
ORDER BY t.table_number
""")
result = db.execute(sql).fetchall()
tables = []
for row in result:
table_dict = {
'table_number': row.table_number,
'is_occupied': bool(row.is_occupied),
'current_order_id': row.current_order_id,
'updated_at': row.updated_at.isoformat() if row.updated_at else None,
'order_status': row.order_status,
'item_count': row.item_count or 0
}
tables.append(table_dict)
return tables
except Exception as e:
logger.error(f"Error in get_table_status_optimized: {str(e)}")
raise
def get_analytics_data_optimized(self, db: Session, start_date: datetime,
end_date: datetime) -> Dict[str, Any]:
"""Optimized analytics query with aggregations"""
try:
# Use raw SQL for complex aggregations
sql = text("""
SELECT
DATE(o.created_at) as order_date,
COUNT(DISTINCT o.id) as total_orders,
COUNT(DISTINCT o.table_number) as unique_tables,
SUM(oi.quantity * oi.price) as total_revenue,
AVG(oi.quantity * oi.price) as avg_order_value,
d.category,
COUNT(oi.id) as items_sold
FROM orders o
JOIN order_items oi ON o.id = oi.order_id
JOIN dishes d ON oi.dish_id = d.id
WHERE o.created_at BETWEEN :start_date AND :end_date
AND o.status = 'paid'
GROUP BY DATE(o.created_at), d.category
ORDER BY order_date DESC, d.category
""")
result = db.execute(sql, {
'start_date': start_date,
'end_date': end_date
}).fetchall()
# Process results
analytics = {
'daily_stats': {},
'category_stats': {},
'summary': {
'total_orders': 0,
'total_revenue': 0,
'avg_order_value': 0
}
}
for row in result:
date_str = row.order_date.isoformat()
if date_str not in analytics['daily_stats']:
analytics['daily_stats'][date_str] = {
'orders': row.total_orders,
'revenue': float(row.total_revenue),
'avg_value': float(row.avg_order_value),
'unique_tables': row.unique_tables
}
category = row.category
if category not in analytics['category_stats']:
analytics['category_stats'][category] = {
'items_sold': 0,
'revenue': 0
}
analytics['category_stats'][category]['items_sold'] += row.items_sold
return analytics
except Exception as e:
logger.error(f"Error in get_analytics_data_optimized: {str(e)}")
raise
# Create singleton instance
optimized_queries = OptimizedQueryService()
|