feat(api): Add counter for all user status to /system

app/db/crud.py

@@ -6,7 +6,7 @@
 from enum import Enum
 from typing import Dict, List, Optional, Tuple, Union
 
-from sqlalchemy import and_, delete, or_
+from sqlalchemy import and_, delete, func, or_
 from sqlalchemy.orm import Query, Session, joinedload
 from sqlalchemy.sql.functions import coalesce
 
@@ -1480,3 +1480,10 @@ def delete_notification_reminder(db: Session, dbreminder: NotificationReminder)
     db.delete(dbreminder)
     db.commit()
     return
+
+
+def count_online_users(db: Session, hours: int = 24):
+    twenty_four_hours_ago = datetime.utcnow() - timedelta(hours=hours)
+    query = db.query(func.count(User.id)).filter(User.online_at.isnot(
+        None), func.datetime(User.online_at) >= twenty_four_hours_ago)
+    return query.scalar()

app/models/system.py

@@ -8,7 +8,12 @@ class SystemStats(BaseModel):
     cpu_cores: int
     cpu_usage: float
     total_user: int
+    online_at_last_24H: int
     users_active: int
+    users_on_hold: int
+    users_disabled: int
+    users_expired: int
+    users_limited: int
     incoming_bandwidth: int
     outgoing_bandwidth: int
     incoming_bandwidth_speed: int

app/routers/system.py

@@ -28,6 +28,19 @@ def get_system_stats(
     users_active = crud.get_users_count(
         db, status=UserStatus.active, admin=dbadmin if not admin.is_sudo else None
     )
+    users_disabled = crud.get_users_count(
+        db, status=UserStatus.disabled, admin=dbadmin if not admin.is_sudo else None
+    )
+    users_on_hold = crud.get_users_count(
+        db, status=UserStatus.on_hold, admin=dbadmin if not admin.is_sudo else None
+    )
+    users_expired = crud.get_users_count(
+        db, status=UserStatus.expired, admin=dbadmin if not admin.is_sudo else None
+    )
+    users_limited = crud.get_users_count(
+        db, status=UserStatus.limited, admin=dbadmin if not admin.is_sudo else None
+    )
+    online_users = crud.count_online_users(db, 24)
     realtime_bandwidth_stats = realtime_bandwidth()
 
     return SystemStats(
@@ -37,7 +50,12 @@ def get_system_stats(
         cpu_cores=cpu.cores,
         cpu_usage=cpu.percent,
         total_user=total_user,
+        online_at_last_24H=online_users,
         users_active=users_active,
+        users_disabled=users_disabled,
+        users_expired=users_expired,
+        users_limited=users_limited,
+        users_on_hold=users_on_hold,
         incoming_bandwidth=system.uplink,
         outgoing_bandwidth=system.downlink,
         incoming_bandwidth_speed=realtime_bandwidth_stats.incoming_bytes,