fix: corregir layout de dashboard, resiliencia en filtros de asignaturas y paginacion de bd (v3.8.12)
This commit is contained in:
+88
-12
@@ -7,6 +7,7 @@ from typing import Optional, List, Dict, Any
|
||||
from fastapi import APIRouter, Depends, HTTPException, Query, status, Request
|
||||
from sqlalchemy import func, or_
|
||||
from datetime import datetime, timezone
|
||||
import math
|
||||
|
||||
from app import db
|
||||
from app.models.user import User
|
||||
@@ -33,9 +34,12 @@ def get_users(
|
||||
search: Optional[str] = Query(None),
|
||||
role_id: Optional[int] = 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),
|
||||
all_records: bool = Query(False, alias="all"),
|
||||
current_user: User = Depends(require_roles(["ADMIN", "BEDELIA"]))
|
||||
):
|
||||
"""Lista usuarios del sistema con filtros de búsqueda y rol."""
|
||||
"""Lista usuarios del sistema con filtros de búsqueda, rol y paginación server-side."""
|
||||
query = User.query
|
||||
if search:
|
||||
s_clean = search.strip().lower()
|
||||
@@ -56,8 +60,18 @@ def get_users(
|
||||
elif status_filter == 'inactive':
|
||||
query = query.filter(User.is_active == False)
|
||||
|
||||
users = query.order_by(User.id.asc()).all()
|
||||
total = query.count()
|
||||
roles = Role.query.order_by(Role.name.asc()).all()
|
||||
roles_data = [{'id': r.id, 'name': r.name} for r in roles]
|
||||
|
||||
if all_records:
|
||||
users = query.order_by(User.id.asc()).limit(1000).all()
|
||||
pages = 1
|
||||
page = 1
|
||||
per_page = total or 1
|
||||
else:
|
||||
pages = math.ceil(total / per_page) if total > 0 else 1
|
||||
users = query.order_by(User.id.asc()).offset((page - 1) * per_page).limit(per_page).all()
|
||||
|
||||
users_data = []
|
||||
for u in users:
|
||||
@@ -68,17 +82,63 @@ def get_users(
|
||||
} if u.role_obj else {'id': 1, 'name': u.role or 'Admin'}
|
||||
users_data.append(d)
|
||||
|
||||
roles_data = [{'id': r.id, 'name': r.name} for r in roles]
|
||||
|
||||
return {
|
||||
'status': 'success',
|
||||
'total': len(users_data),
|
||||
'total': total,
|
||||
'page': page,
|
||||
'per_page': per_page,
|
||||
'pages': pages,
|
||||
'has_prev': page > 1,
|
||||
'has_next': page < pages,
|
||||
'users': users_data,
|
||||
'roles': roles_data,
|
||||
'document_types': DOCUMENT_TYPES
|
||||
}
|
||||
|
||||
|
||||
@admin_router.get("/users/teachers")
|
||||
@admin_router.get("/admin/users/teachers")
|
||||
def get_teachers(
|
||||
search: Optional[str] = Query(None),
|
||||
current_user: User = Depends(get_current_user)
|
||||
):
|
||||
"""Retorna una lista ligera de docentes activos para selectores y comisiones."""
|
||||
query = User.query.filter(User.is_active == True)
|
||||
query = query.filter(
|
||||
or_(
|
||||
User.role.ilike('%docent%'),
|
||||
User.role.ilike('%prof%'),
|
||||
User.role.ilike('%bedel%'),
|
||||
User.role.ilike('%admin%')
|
||||
)
|
||||
)
|
||||
if search:
|
||||
s_clean = search.strip().lower()
|
||||
query = query.filter(
|
||||
or_(
|
||||
User.name.ilike(f'%{s_clean}%'),
|
||||
User.email.ilike(f'%{s_clean}%'),
|
||||
User.document_number.ilike(f'%{s_clean}%')
|
||||
)
|
||||
)
|
||||
teachers = query.order_by(User.name.asc()).all()
|
||||
teachers_data = [
|
||||
{
|
||||
'id': t.id,
|
||||
'name': t.name,
|
||||
'email': t.email,
|
||||
'document_number': t.document_number,
|
||||
'role': t.role
|
||||
}
|
||||
for t in teachers
|
||||
]
|
||||
return {
|
||||
'status': 'success',
|
||||
'total': len(teachers_data),
|
||||
'teachers': teachers_data
|
||||
}
|
||||
|
||||
|
||||
@admin_router.post("/users", status_code=status.HTTP_201_CREATED)
|
||||
@admin_router.post("/admin/users", status_code=status.HTTP_201_CREATED)
|
||||
async def create_user(
|
||||
@@ -601,25 +661,41 @@ def get_audit_logs(
|
||||
module: Optional[str] = Query(None),
|
||||
action: Optional[str] = Query(None),
|
||||
user_id: Optional[int] = Query(None),
|
||||
limit: int = Query(50),
|
||||
search: Optional[str] = Query(None),
|
||||
page: int = Query(1, ge=1),
|
||||
per_page: int = Query(25, ge=1, le=100),
|
||||
limit: Optional[int] = Query(None),
|
||||
current_user: User = Depends(require_roles(["ADMIN"]))
|
||||
):
|
||||
"""Consulta la bitácora inmutable de auditoría del sistema."""
|
||||
logs = AuditService.get_logs(module=module, action=action, user_id=user_id, limit=limit)
|
||||
"""Consulta la bitácora inmutable de auditoría del sistema con paginación server-side."""
|
||||
actual_per_page = limit if (limit and not per_page) else per_page
|
||||
logs, total = AuditService.get_paginated_logs(
|
||||
module=module,
|
||||
action=action,
|
||||
user_id=user_id,
|
||||
search=search,
|
||||
page=page,
|
||||
per_page=actual_per_page
|
||||
)
|
||||
pages = math.ceil(total / actual_per_page) if total > 0 else 1
|
||||
|
||||
distinct_modules = [m[0] for m in db.session.query(AuditLog.module).distinct().all() if m[0]]
|
||||
distinct_actions = [a[0] for a in db.session.query(AuditLog.action).distinct().all() if a[0]]
|
||||
all_modules = sorted(list(set(distinct_modules + ['auth', 'admin', 'reservations', 'classrooms', 'buildings', 'academic', 'moodle'])))
|
||||
all_actions = sorted(list(set(distinct_actions + ['LOGIN', 'LOGIN_FAILED', 'LOGOUT', 'CREATE', 'UPDATE', 'DELETE', 'IMPERSONATE_START', 'IMPERSONATE_END'])))
|
||||
return {
|
||||
'status': 'success',
|
||||
'total': len(logs),
|
||||
'total': total,
|
||||
'logs': [log.to_dict() for log in logs],
|
||||
'modules': all_modules,
|
||||
'actions': all_actions,
|
||||
'pagination': {
|
||||
'page': 1,
|
||||
'per_page': limit,
|
||||
'total': len(logs)
|
||||
'page': page,
|
||||
'per_page': actual_per_page,
|
||||
'total': total,
|
||||
'pages': pages,
|
||||
'has_prev': page > 1,
|
||||
'has_next': page < pages
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user