delete activ status
This commit is contained in:
parent
c39bb33282
commit
0e66a05b90
6 changed files with 218 additions and 108 deletions
|
|
@ -118,7 +118,6 @@ def get_users():
|
|||
tu.last_name,
|
||||
tu.created_at,
|
||||
COUNT(ug.id) as gamer_count,
|
||||
SUM(CASE WHEN ug.is_active = 1 THEN 1 ELSE 0 END) as active_gamers,
|
||||
SUM(CASE WHEN ug.period_minutes > 0 THEN 1 ELSE 0 END) as monitored_gamers
|
||||
FROM telegram_users tu
|
||||
LEFT JOIN user_gamers ug ON tu.user_id = ug.user_id
|
||||
|
|
@ -137,8 +136,7 @@ def get_users():
|
|||
'last_name': row[3],
|
||||
'created_at': row[4],
|
||||
'gamer_count': row[5],
|
||||
'active_gamers': row[6],
|
||||
'monitored_gamers': row[7]
|
||||
'monitored_gamers': row[6]
|
||||
})
|
||||
|
||||
# Получаем общее количество игроков (уникальных)
|
||||
|
|
@ -187,7 +185,6 @@ def get_user_gamers(user_id):
|
|||
g.id,
|
||||
g.username,
|
||||
ug.token,
|
||||
ug.is_active,
|
||||
ug.period_minutes,
|
||||
ug.created_at
|
||||
FROM user_gamers ug
|
||||
|
|
@ -204,9 +201,8 @@ def get_user_gamers(user_id):
|
|||
'id': row[0],
|
||||
'username': row[1],
|
||||
'has_token': bool(row[2]), # Token from user_gamers, not gamers
|
||||
'is_active': bool(row[3]),
|
||||
'period_minutes': row[4],
|
||||
'created_at': row[5]
|
||||
'period_minutes': row[3],
|
||||
'created_at': row[4]
|
||||
})
|
||||
|
||||
return jsonify({
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue