feat: agregar contadores de usuarios por rol y paginacion reforzada (v3.8.13)
This commit is contained in:
@@ -32,7 +32,7 @@ admin_router = APIRouter(prefix="/api/v1", tags=["Administration & Settings"])
|
||||
@admin_router.get("/admin/users")
|
||||
def get_users(
|
||||
search: Optional[str] = Query(None),
|
||||
role_id: Optional[int] = Query(None, alias="role"),
|
||||
role_filter: Optional[str] = Query(None, alias="role"),
|
||||
status_filter: Optional[str] = Query(None, alias="status"),
|
||||
page: int = Query(1, ge=1),
|
||||
per_page: int = Query(25, ge=1, le=200),
|
||||
@@ -53,8 +53,15 @@ def get_users(
|
||||
User.last_name.ilike(f'%{s_clean}%')
|
||||
)
|
||||
)
|
||||
if role_id:
|
||||
query = query.filter(User.role_id == role_id)
|
||||
if role_filter and role_filter.strip():
|
||||
rf = role_filter.strip()
|
||||
if rf.isdigit():
|
||||
rid = int(rf)
|
||||
query = query.filter(or_(User.role_id == rid, User.role == rf))
|
||||
else:
|
||||
rf_lower = rf.lower()
|
||||
query = query.filter(or_(func.lower(User.role) == rf_lower, User.role.ilike(f'%{rf}%')))
|
||||
|
||||
if status_filter == 'active':
|
||||
query = query.filter(User.is_active == True)
|
||||
elif status_filter == 'inactive':
|
||||
@@ -64,6 +71,37 @@ def get_users(
|
||||
roles = Role.query.order_by(Role.name.asc()).all()
|
||||
roles_data = [{'id': r.id, 'name': r.name} for r in roles]
|
||||
|
||||
# Métricas agregadas de usuarios para contadores en la vista
|
||||
total_users_count = db.session.query(func.count(User.id)).scalar() or 0
|
||||
active_users_count = db.session.query(func.count(User.id)).filter(User.is_active == True).scalar() or 0
|
||||
inactive_users_count = db.session.query(func.count(User.id)).filter(User.is_active == False).scalar() or 0
|
||||
|
||||
admin_count = db.session.query(func.count(User.id)).filter(
|
||||
or_(User.role_id == 1, func.lower(User.role) == 'admin')
|
||||
).scalar() or 0
|
||||
|
||||
bedelia_count = db.session.query(func.count(User.id)).filter(
|
||||
or_(User.role_id == 7, func.lower(User.role) == 'bedelia')
|
||||
).scalar() or 0
|
||||
|
||||
docente_count = db.session.query(func.count(User.id)).filter(
|
||||
or_(User.role_id == 2, func.lower(User.role).in_(['docente', 'profesor']))
|
||||
).scalar() or 0
|
||||
|
||||
alumno_count = db.session.query(func.count(User.id)).filter(
|
||||
or_(User.role_id == 6, func.lower(User.role).in_(['alumno', 'estudiante']))
|
||||
).scalar() or 0
|
||||
|
||||
role_counts = {
|
||||
'total': total_users_count,
|
||||
'active': active_users_count,
|
||||
'inactive': inactive_users_count,
|
||||
'admin': admin_count,
|
||||
'bedelia': bedelia_count,
|
||||
'docente': docente_count,
|
||||
'alumno': alumno_count
|
||||
}
|
||||
|
||||
if all_records:
|
||||
users = query.order_by(User.id.asc()).limit(1000).all()
|
||||
pages = 1
|
||||
@@ -92,7 +130,8 @@ def get_users(
|
||||
'has_next': page < pages,
|
||||
'users': users_data,
|
||||
'roles': roles_data,
|
||||
'document_types': DOCUMENT_TYPES
|
||||
'document_types': DOCUMENT_TYPES,
|
||||
'role_counts': role_counts
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user