fix(typing): resolucion integral de advertencias de tipado, extraccion de payload con get_request_payload y limpieza de modelos
This commit is contained in:
+15
-85
@@ -16,7 +16,7 @@ from app.models.user import User
|
||||
from app.models.enrollment import StudentEnrollment
|
||||
from app.services.enrollment_service import EnrollmentService
|
||||
from app.services.gradebook_service import GradebookService
|
||||
from dependencies import get_current_user, require_roles
|
||||
from dependencies import get_request_payload, get_current_user, require_roles
|
||||
|
||||
academic_router = APIRouter(prefix="/api/v1", tags=["Academic Management"])
|
||||
|
||||
@@ -54,12 +54,7 @@ async def create_career(
|
||||
current_user: User = Depends(require_roles(["ADMIN", "BEDELIA"]))
|
||||
):
|
||||
"""Crea una nueva carrera en la institución."""
|
||||
data = {}
|
||||
try:
|
||||
data = await request.json()
|
||||
except Exception:
|
||||
form = await request.form()
|
||||
data = dict(form)
|
||||
data = await get_request_payload(request)
|
||||
|
||||
name = (data.get('name') or '').strip()
|
||||
code = (data.get('code') or '').strip()
|
||||
@@ -89,12 +84,7 @@ async def update_career(
|
||||
current_user: User = Depends(require_roles(["ADMIN", "BEDELIA"]))
|
||||
):
|
||||
"""Actualiza una carrera existente."""
|
||||
data = {}
|
||||
try:
|
||||
data = await request.json()
|
||||
except Exception:
|
||||
form = await request.form()
|
||||
data = dict(form)
|
||||
data = await get_request_payload(request)
|
||||
|
||||
career = Career.query.get(id)
|
||||
if not career:
|
||||
@@ -206,12 +196,7 @@ async def create_subject(
|
||||
current_user: User = Depends(require_roles(["ADMIN", "BEDELIA"]))
|
||||
):
|
||||
"""Crea una nueva asignatura y la vincula a una o varias carreras."""
|
||||
data = {}
|
||||
try:
|
||||
data = await request.json()
|
||||
except Exception:
|
||||
form = await request.form()
|
||||
data = dict(form)
|
||||
data = await get_request_payload(request)
|
||||
|
||||
code = (data.get('code') or '').strip().upper()
|
||||
name = (data.get('name') or '').strip()
|
||||
@@ -279,12 +264,7 @@ async def update_subject(
|
||||
current_user: User = Depends(require_roles(["ADMIN", "BEDELIA"]))
|
||||
):
|
||||
"""Actualiza una asignatura existente."""
|
||||
data = {}
|
||||
try:
|
||||
data = await request.json()
|
||||
except Exception:
|
||||
form = await request.form()
|
||||
data = dict(form)
|
||||
data = await get_request_payload(request)
|
||||
|
||||
subject = Subject.query.get(id)
|
||||
if not subject:
|
||||
@@ -437,12 +417,7 @@ async def create_commission(
|
||||
current_user: User = Depends(require_roles(["ADMIN", "BEDELIA"]))
|
||||
):
|
||||
"""Crea una comisión vinculada a una asignatura, ciclo lectivo y docente(s)."""
|
||||
data = {}
|
||||
try:
|
||||
data = await request.json()
|
||||
except Exception:
|
||||
form = await request.form()
|
||||
data = dict(form)
|
||||
data = await get_request_payload(request)
|
||||
|
||||
subject_id = data.get('subject_id')
|
||||
code = (data.get('code') or '').strip()
|
||||
@@ -575,12 +550,7 @@ async def update_commission(
|
||||
current_user: User = Depends(require_roles(["ADMIN", "BEDELIA"]))
|
||||
):
|
||||
"""Actualiza los datos de una comisión."""
|
||||
data = {}
|
||||
try:
|
||||
data = await request.json()
|
||||
except Exception:
|
||||
form = await request.form()
|
||||
data = dict(form)
|
||||
data = await get_request_payload(request)
|
||||
|
||||
comm = Commission.query.get(id)
|
||||
if not comm:
|
||||
@@ -716,12 +686,7 @@ async def create_academic_term(
|
||||
current_user: User = Depends(require_roles(["ADMIN", "BEDELIA"]))
|
||||
):
|
||||
"""Crea un nuevo ciclo lectivo en el sistema."""
|
||||
data = {}
|
||||
try:
|
||||
data = await request.json()
|
||||
except Exception:
|
||||
form = await request.form()
|
||||
data = dict(form)
|
||||
data = await get_request_payload(request)
|
||||
|
||||
code = (data.get('code') or '').strip().upper()
|
||||
name = (data.get('name') or '').strip()
|
||||
@@ -838,12 +803,7 @@ async def assign_commission_teacher(
|
||||
current_user: User = Depends(require_roles(["ADMIN", "BEDELIA"]))
|
||||
):
|
||||
"""Asigna el docente titular a una comisión."""
|
||||
data = {}
|
||||
try:
|
||||
data = await request.json()
|
||||
except Exception:
|
||||
form = await request.form()
|
||||
data = dict(form)
|
||||
data = await get_request_payload(request)
|
||||
|
||||
comm = Commission.query.get(id)
|
||||
if not comm:
|
||||
@@ -883,12 +843,7 @@ async def add_commission_teacher(
|
||||
current_user: User = Depends(require_roles(["ADMIN", "BEDELIA"]))
|
||||
):
|
||||
"""Agrega un docente (titular o adjunto/co-docente) a una comisión."""
|
||||
data = {}
|
||||
try:
|
||||
data = await request.json()
|
||||
except Exception:
|
||||
form = await request.form()
|
||||
data = dict(form)
|
||||
data = await get_request_payload(request)
|
||||
|
||||
user_id = data.get('user_id') or data.get('teacher_id')
|
||||
if not user_id:
|
||||
@@ -994,12 +949,7 @@ async def enroll_commission_student(
|
||||
current_user: User = Depends(require_roles(["ADMIN", "BEDELIA"]))
|
||||
):
|
||||
"""Matricula a un estudiante en una comisión."""
|
||||
data = {}
|
||||
try:
|
||||
data = await request.json()
|
||||
except Exception:
|
||||
form = await request.form()
|
||||
data = dict(form)
|
||||
data = await get_request_payload(request)
|
||||
|
||||
student_id = data.get('student_id')
|
||||
notes = data.get('notes')
|
||||
@@ -1050,12 +1000,7 @@ async def update_commission_enrollment(
|
||||
current_user: User = Depends(require_roles(["ADMIN", "BEDELIA"]))
|
||||
):
|
||||
"""Actualiza el estado de matrícula de un estudiante."""
|
||||
data = {}
|
||||
try:
|
||||
data = await request.json()
|
||||
except Exception:
|
||||
form = await request.form()
|
||||
data = dict(form)
|
||||
data = await get_request_payload(request)
|
||||
|
||||
status_val = data.get('status', 'activo')
|
||||
notes = data.get('notes')
|
||||
@@ -1102,12 +1047,7 @@ async def save_commission_grades(
|
||||
current_user: User = Depends(get_current_user)
|
||||
):
|
||||
"""Carga de notas individual o masiva para hitos evaluativos."""
|
||||
data = {}
|
||||
try:
|
||||
data = await request.json()
|
||||
except Exception:
|
||||
form = await request.form()
|
||||
data = dict(form)
|
||||
data = await get_request_payload(request)
|
||||
|
||||
try:
|
||||
if 'grades' in data and isinstance(data['grades'], list):
|
||||
@@ -1212,12 +1152,7 @@ async def create_milestone_type(
|
||||
current_user: User = Depends(require_roles(["ADMIN", "BEDELIA"]))
|
||||
):
|
||||
"""Crea una nueva tipificación de hito evaluativo."""
|
||||
data = {}
|
||||
try:
|
||||
data = await request.json()
|
||||
except Exception:
|
||||
form = await request.form()
|
||||
data = dict(form)
|
||||
data = await get_request_payload(request)
|
||||
|
||||
name = str(data.get('name', '')).strip()
|
||||
code = str(data.get('code', '')).strip().lower().replace(' ', '_')
|
||||
@@ -1263,12 +1198,7 @@ async def update_milestone_type(
|
||||
current_user: User = Depends(require_roles(["ADMIN", "BEDELIA"]))
|
||||
):
|
||||
"""Actualiza una tipificación de hito evaluativo existente."""
|
||||
data = {}
|
||||
try:
|
||||
data = await request.json()
|
||||
except Exception:
|
||||
form = await request.form()
|
||||
data = dict(form)
|
||||
data = await get_request_payload(request)
|
||||
|
||||
mt = MilestoneType.query.get(id)
|
||||
if not mt:
|
||||
|
||||
+17
-97
@@ -18,7 +18,7 @@ from app.services.audit_service import AuditService
|
||||
from app.services.jwt_service import JWTService
|
||||
from app.services.moodle_queue_service import moodle_queue_service
|
||||
from app.constants.document_types import DOCUMENT_TYPES, validate_document
|
||||
from dependencies import get_current_user, require_roles, get_token_from_request
|
||||
from dependencies import get_request_payload, get_current_user, require_roles, get_token_from_request
|
||||
|
||||
admin_router = APIRouter(prefix="/api/v1", tags=["Administration & Settings"])
|
||||
|
||||
@@ -86,12 +86,7 @@ async def create_user(
|
||||
current_user: User = Depends(require_roles(["ADMIN", "BEDELIA"]))
|
||||
):
|
||||
"""Crea un nuevo usuario en la plataforma con soporte para sincronización hacia Moodle."""
|
||||
data = {}
|
||||
try:
|
||||
data = await request.json()
|
||||
except Exception:
|
||||
form = await request.form()
|
||||
data = dict(form)
|
||||
data = await get_request_payload(request)
|
||||
|
||||
email = (data.get('email') or '').strip().lower()
|
||||
first_name = (data.get('first_name') or '').strip()
|
||||
@@ -194,12 +189,7 @@ async def update_user(
|
||||
current_user: User = Depends(require_roles(["ADMIN", "BEDELIA"]))
|
||||
):
|
||||
"""Actualiza los datos de un usuario."""
|
||||
data = {}
|
||||
try:
|
||||
data = await request.json()
|
||||
except Exception:
|
||||
form = await request.form()
|
||||
data = dict(form)
|
||||
data = await get_request_payload(request)
|
||||
|
||||
user = User.query.get(id)
|
||||
if not user:
|
||||
@@ -372,12 +362,7 @@ async def create_role(
|
||||
current_user: User = Depends(require_roles(["ADMIN"]))
|
||||
):
|
||||
"""Crea un nuevo rol y configura sus permisos iniciales."""
|
||||
data = {}
|
||||
try:
|
||||
data = await request.json()
|
||||
except Exception:
|
||||
form = await request.form()
|
||||
data = dict(form)
|
||||
data = await get_request_payload(request)
|
||||
|
||||
name = (data.get('name') or '').strip()
|
||||
description = (data.get('description') or '').strip()
|
||||
@@ -445,12 +430,7 @@ async def impersonate_user(
|
||||
current_user: User = Depends(require_roles(["ADMIN"]))
|
||||
):
|
||||
"""Permite a un administrador auditar el sistema bajo la perspectiva de otro usuario."""
|
||||
data = {}
|
||||
try:
|
||||
data = await request.json()
|
||||
except Exception:
|
||||
form = await request.form()
|
||||
data = dict(form)
|
||||
data = await get_request_payload(request)
|
||||
|
||||
user_id = data.get('user_id') or data.get('target_user_id')
|
||||
if not user_id:
|
||||
@@ -529,12 +509,7 @@ async def reset_system(
|
||||
Reinicializa el sistema depurando historiales, reservas, espacios y datos académicos.
|
||||
Preserva intactas las cuentas de usuario, roles RBAC y configuraciones institucionales.
|
||||
"""
|
||||
data = {}
|
||||
try:
|
||||
data = await request.json()
|
||||
except Exception:
|
||||
form = await request.form()
|
||||
data = dict(form)
|
||||
data = await get_request_payload(request)
|
||||
|
||||
password = str(data.get('password') or '').strip()
|
||||
if not password:
|
||||
@@ -673,12 +648,7 @@ async def reset_user_password(
|
||||
current_user: User = Depends(require_roles(["ADMIN"]))
|
||||
):
|
||||
"""Permite a los administradores institucionales restablecer la contraseña de un usuario."""
|
||||
data = {}
|
||||
try:
|
||||
data = await request.json()
|
||||
except Exception:
|
||||
form = await request.form()
|
||||
data = dict(form)
|
||||
data = await get_request_payload(request)
|
||||
|
||||
new_password = str(data.get('password') or data.get('new_password') or '').strip()
|
||||
if not new_password or len(new_password) < 6:
|
||||
@@ -775,12 +745,7 @@ async def update_smtp_settings(
|
||||
current_user: User = Depends(require_roles(["ADMIN"]))
|
||||
):
|
||||
"""Actualiza la configuración del servidor de correo SMTP."""
|
||||
data = {}
|
||||
try:
|
||||
data = await request.json()
|
||||
except Exception:
|
||||
form = await request.form()
|
||||
data = dict(form)
|
||||
data = await get_request_payload(request)
|
||||
|
||||
host = str(data.get('host', '')).strip()
|
||||
port = str(data.get('port', 587)).strip()
|
||||
@@ -825,12 +790,7 @@ async def test_smtp_connection(
|
||||
from email.mime.text import MIMEText
|
||||
from email.mime.multipart import MIMEMultipart
|
||||
|
||||
data = {}
|
||||
try:
|
||||
data = await request.json()
|
||||
except Exception:
|
||||
form = await request.form()
|
||||
data = dict(form)
|
||||
data = await get_request_payload(request)
|
||||
|
||||
test_recipient = str(data.get('test_email') or current_user.email).strip()
|
||||
|
||||
@@ -900,12 +860,7 @@ async def update_auth_providers(
|
||||
current_user: User = Depends(require_roles(["ADMIN"]))
|
||||
):
|
||||
"""Habilita o deshabilita los proveedores de autenticación del sistema."""
|
||||
data = {}
|
||||
try:
|
||||
data = await request.json()
|
||||
except Exception:
|
||||
form = await request.form()
|
||||
data = dict(form)
|
||||
data = await get_request_payload(request)
|
||||
|
||||
local_input = data.get('local_enabled') if 'local_enabled' in data else data.get('local', True)
|
||||
google_input = data.get('google_enabled') if 'google_enabled' in data else data.get('google', False)
|
||||
@@ -947,12 +902,7 @@ async def update_ui_settings(
|
||||
current_user: User = Depends(require_roles(["ADMIN"]))
|
||||
):
|
||||
"""Actualiza preferencias de interfaz institucional."""
|
||||
data = {}
|
||||
try:
|
||||
data = await request.json()
|
||||
except Exception:
|
||||
form = await request.form()
|
||||
data = dict(form)
|
||||
data = await get_request_payload(request)
|
||||
|
||||
show_banner_input = data.get('show_role_banner')
|
||||
if show_banner_input is None:
|
||||
@@ -998,12 +948,7 @@ async def toggle_demo_mode(
|
||||
current_user: User = Depends(require_roles(["ADMIN"]))
|
||||
):
|
||||
"""Habilita o deshabilita el modo demo institucional."""
|
||||
data = {}
|
||||
try:
|
||||
data = await request.json()
|
||||
except Exception:
|
||||
form = await request.form()
|
||||
data = dict(form)
|
||||
data = await get_request_payload(request)
|
||||
|
||||
demo_emails = ['bedelia@edu-space.com', 'docente@edu-space.com', 'alumno@edu-space.com']
|
||||
|
||||
@@ -1052,12 +997,7 @@ async def update_google_oauth_settings(
|
||||
current_user: User = Depends(require_roles(["ADMIN"]))
|
||||
):
|
||||
"""Actualiza las credenciales de Google OAuth2."""
|
||||
data = {}
|
||||
try:
|
||||
data = await request.json()
|
||||
except Exception:
|
||||
form = await request.form()
|
||||
data = dict(form)
|
||||
data = await get_request_payload(request)
|
||||
|
||||
client_id = str(data.get('client_id', '')).strip()
|
||||
client_secret = str(data.get('client_secret', '')).strip()
|
||||
@@ -1090,12 +1030,7 @@ async def update_moodle_settings(
|
||||
current_user: User = Depends(require_roles(["ADMIN"]))
|
||||
):
|
||||
"""Actualiza los parámetros de conexión con Moodle 4.1."""
|
||||
data = {}
|
||||
try:
|
||||
data = await request.json()
|
||||
except Exception:
|
||||
form = await request.form()
|
||||
data = dict(form)
|
||||
data = await get_request_payload(request)
|
||||
|
||||
server_url = str(data.get('server_url', 'http://10.0.0.207/moodle')).strip().rstrip('/')
|
||||
ws_token = str(data.get('ws_token', '')).strip()
|
||||
@@ -1131,12 +1066,7 @@ async def test_moodle_connection(
|
||||
):
|
||||
"""Prueba la conectividad y validez del WebService de Moodle 4.1."""
|
||||
from app.services.moodle_client import moodle_client
|
||||
data = {}
|
||||
try:
|
||||
data = await request.json()
|
||||
except Exception:
|
||||
form = await request.form()
|
||||
data = dict(form)
|
||||
data = await get_request_payload(request)
|
||||
|
||||
server_url = data.get('server_url')
|
||||
token = data.get('ws_token')
|
||||
@@ -1320,12 +1250,7 @@ async def update_sheets_config(
|
||||
"""Actualiza la URL del Google Sheet institucional."""
|
||||
from app.services.sheets_importer import normalize_sheets_url
|
||||
|
||||
data = {}
|
||||
try:
|
||||
data = await request.json()
|
||||
except Exception:
|
||||
form = await request.form()
|
||||
data = dict(form)
|
||||
data = await get_request_payload(request)
|
||||
|
||||
url = (data.get('url') or data.get('google_sheets_url') or '').strip()
|
||||
if not url:
|
||||
@@ -1354,12 +1279,7 @@ async def reset_academic_data(
|
||||
"""Herramienta de limpieza/purga de datos académicos para pruebas del importador."""
|
||||
from scripts.reset_academic_data import execute_academic_reset
|
||||
|
||||
data = {}
|
||||
try:
|
||||
data = await request.json()
|
||||
except Exception:
|
||||
form = await request.form()
|
||||
data = dict(form)
|
||||
data = await get_request_payload(request)
|
||||
|
||||
reset_all = data.get('all', False) in [True, 'true', '1', 'on']
|
||||
reset_reservations = reset_all or data.get('reservations', True) in [True, 'true', '1', 'on']
|
||||
|
||||
Reference in New Issue
Block a user