fix: Use User.name instead of first_name/last_name
User model has single 'name' field, not separate first/last name fields. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
parent
684235ad2a
commit
538957875d
9
app.py
9
app.py
@ -5838,8 +5838,7 @@ def admin_ai_usage():
|
||||
# ========================================
|
||||
user_query = db.query(
|
||||
User.id,
|
||||
User.first_name,
|
||||
User.last_name,
|
||||
User.name.label('user_name'),
|
||||
User.email,
|
||||
Company.name.label('company_name'),
|
||||
func.count(AIUsageLog.id).label('requests'),
|
||||
@ -5853,7 +5852,7 @@ def admin_ai_usage():
|
||||
)
|
||||
user_query = period_filter(user_query)
|
||||
user_stats = user_query.group_by(
|
||||
User.id, User.first_name, User.last_name, User.email, Company.name
|
||||
User.id, User.name, User.email, Company.name
|
||||
).order_by(desc('cost_cents')).limit(20).all()
|
||||
|
||||
# Format user stats
|
||||
@ -5861,7 +5860,7 @@ def admin_ai_usage():
|
||||
for u in user_stats:
|
||||
user_rankings.append({
|
||||
'id': u.id,
|
||||
'name': f"{u.first_name or ''} {u.last_name or ''}".strip() or u.email,
|
||||
'name': u.user_name or u.email,
|
||||
'email': u.email,
|
||||
'company': u.company_name or '-',
|
||||
'requests': u.requests,
|
||||
@ -5914,7 +5913,7 @@ def admin_ai_usage():
|
||||
if log.user_id:
|
||||
user = db.query(User).filter_by(id=log.user_id).first()
|
||||
if user:
|
||||
log.user_name = f"{user.first_name or ''} {user.last_name or ''}".strip() or user.email
|
||||
log.user_name = user.name or user.email
|
||||
else:
|
||||
log.user_name = None
|
||||
else:
|
||||
|
||||
Loading…
Reference in New Issue
Block a user