diff --git a/AGENTS.md b/AGENTS.md index fc8adb9..5587f08 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -3,7 +3,7 @@ Plataforma web de gestión de espacios áulicos, sincronización académica y as ## Stack y Estructura - **Arquitectura**: Desacoplada (Backend Core REST API + Frontend BFF). -- **Backend Core**: Python 3.12/3.14, FastAPI 0.115+, Uvicorn (ASGI) + Flask 3.1 / WSGI bridge (`a2wsgi`), SQLAlchemy ORM 2.0, SQLite / PostgreSQL 15, Pydantic v2 DTOs (`BaseModel`), PyJWT / Flask-JWT-Extended (HS256 stateless). +- **Backend Core**: Python 3.12/3.14, FastAPI 0.115+ (100% Nativo ASGI puro con Uvicorn, routers modulares y OpenAPI /docs), SQLAlchemy ORM 2.0, PostgreSQL 15 / SQLite, Pydantic v2 DTOs (`BaseModel`), PyJWT (HS256 stateless). - **Frontend BFF**: Node.js v20+, Express.js, motor de plantillas Nunjucks, cliente Axios con interceptores de autorización Bearer, Bootstrap 5 + Vanilla CSS. - **Integraciones Clave**: - Google OAuth 2.0 para autenticación institucional restringida a `@unicaba.edu.ar`. diff --git a/CHANGELOG.md b/CHANGELOG.md index 19f6621..b563588 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,26 @@ El formato está basado en [Keep a Changelog](https://keepachangelog.com/es-ES/1 - **Sincronización Continua Moodle (Fase 6):** Automatización de workers persistentes en background para el procesamiento continuo de la cola de Web Services Moodle 4.1. - **Pruebas de Carga y Hardening (Fase 6):** Pruebas de estrés de concurrencia y validación final de producción. +## [3.7.0] - 2026-10-19 +### Added +- **Migración Integral a FastAPI 100% Nativo (Principio 11)**: + - Creados routers modulares en `backend/routers/`: + - `backend/routers/buildings.py`: Endpoints RESTful para gestión física de edificios y sedes institucionales. + - `backend/routers/academic.py`: Gestión integral de Carreras, Asignaturas, Comisiones, Ciclos Lectivos, Tipificaciones de Hitos, Asignación de Docentes, Matrículas de Estudiantes y Libro de Calificaciones/Actas (Gradebook). + - `backend/routers/admin.py`: Administración de Usuarios, Roles RBAC, Modo Impersonación, Reseteo del Sistema, Auditoría Inmutable, Configuración Global (SMTP, Google OAuth, Moodle, UI, Demo Mode) y Cola Asíncrona de Moodle (DLQ y reprocesamiento). + - Incorporado soporte dual para rutas raíz `/version`, `/health` y bajo `/api/v1/version` en `backend/routers/version.py`. + - Agregado endpoint `/api/v1/reservations/drag-update` en `backend/routers/reservations.py` para reprogramación visual interactiva en la grilla horaria. + +### Removed +- **Retiro Completo del Puente WSGIMiddleware**: + - Eliminado el montaje residual `app.mount("/", WSGIMiddleware(...))` de `backend/main.py`. + - El servidor ASGI Uvicorn ejecuta ahora 100% FastAPI nativo con 118 rutas expuestas directamente en OpenAPI Swagger UI (`/docs`). + +### Changed +- **Relaciones Relacionales y Tipado Defensivo**: + - `backend/app/models/subject.py`: Forzado explícito `uselist=True` en `Subject.commissions` garantizando que siempre se evalúe como colección de comisiones. + - `backend/routers/academic.py`: Cómputo robusto de `commissions_count` protegiendo contra posibles desvíos de tipo. + ## [3.6.4] - 2026-10-19 ### Fixed - **Resolución Completa de Diagnósticos Estáticos (QA & Principio 10 - Tolerancia Cero)**: diff --git a/MEMORY.md b/MEMORY.md index 196445d..9d1ef76 100644 --- a/MEMORY.md +++ b/MEMORY.md @@ -9,18 +9,16 @@ Memoria del proyecto entre sesiones para la rama `dev`. - Libro de Calificaciones (*Gradebook*) con actas de regularidad inmutables. - Autenticación híbrida (Google OAuth 2.0, Moodle SSO, Local) y Modo Impersonación. - Reinicialización segura del sistema con contraseña de Administrador. -- **Sprint Activo: MVP del Sistema de Bedelía — v3.6.4 (QA Completo, Tolerancia Cero y Sincronización Resiliente Moodle)**: - - Core REST API con FastAPI ASGI (`main.py`, `routers/`, `schemas/`, `database.py`) y puente WSGI `a2wsgi`. - - **QA Integral & Tolerancia Cero (Principio 10)**: - - Remediados al 100% todos los errores y advertencias estáticas de Pyright en modelos (`commission_teacher.py`, `subject.py`, `audit_log.py`, `career.py`, `classroom.py`, `genetic_algorithm.py`, `milestone.py`, `role.py`), repositorios (`base_repository.py`, `classroom_repository.py`), esquemas DTO (`classroom_dto.py`, `reservation_dto.py`), servicios (`email_service.py`, `gradebook_service.py`, `optimizer_service.py`, `sheets_importer.py`, `user_service.py`, `cache_service.py`) y controladores (`admin.py`, `auth.py`, `buildings.py`, `classrooms.py`, `main.py`, `my_subjects.py`, `reservations.py`, `schedule.py`). - - Migración exhaustiva de `datetime.utcnow()` deprecado a `datetime.now(timezone.utc).replace(tzinfo=None)`. - - Eliminación de conversiones redundantes `str()` e `int()`. - - **Sincronización Resiliente Moodle 4.1 (`core_user_update_users`)**: - - `MoodleClient.update_users` autodescubre el ID numérico de Moodle por `email`/`username` o realiza fallback transparente a creación (`create_users`), eliminando la excepción `Moodle Exception [invalidparameter]`. - - `MoodleQueueService` maneja tipos seguros, timestamps UTC y persistencia resiliente con DLQ. - - **Frontend UX**: - - Removido el selector flotante artificial `.role-view-selector` ("VER PANEL COMO ROL") en `dashboard.html`. La visualización se basa exclusivamente en los permisos institucionales del usuario autenticado. - - **Suite de Pruebas**: 57 pruebas automatizadas (`pytest tests -v`) ejecutadas y aprobadas al 100% con 0 fallos. Versión actual: `v3.6.4`. +- **Sprint Activo: Migración Integral a FastAPI 100% Nativo — v3.7.0 (Principio 11 y Retiro Total de WSGIMiddleware)**: + - **FastAPI Core REST API Pura**: Desacoplado por completo el puente residual `WSGIMiddleware` de `backend/main.py`. + - **Routers Modulares Nativos**: + - `backend/routers/buildings.py`: ABM de edificios y sedes institucionales. + - `backend/routers/academic.py`: Carreras, Asignaturas, Comisiones, Ciclos Lectivos, Tipos de Hitos, Docentes de Comisiones, Matrículas y Actas/Gradebook. + - `backend/routers/admin.py`: Usuarios, Roles RBAC, Impersonación, System Reset, Auditoría Inmutable, Configuración Global (SMTP, OAuth, Moodle, UI, Demo Mode) y Cola Moodle (DLQ). + - `backend/routers/reservations.py`: Incorporado endpoint interactivo `drag-update`. + - `backend/routers/version.py`: Soporte para `/version` y `/health` a nivel raíz y bajo `/api/v1/version`. + - **OpenAPI /docs Swagger UI**: Expone 118 endpoints RESTful de FastAPI nativos listos para documentación y consumo interactivo. + - **Suite de Pruebas**: 57 pruebas automatizadas (`pytest tests -v`) ejecutadas y aprobadas al 100% (57 passed, 0 failed). Versión actual: `v3.7.0`. ## Decisiones (y por qué) - **Flujo Secuencial de Bedelía (9 Pasos)**: Estandarizar la carga operativa en: 1) Sede -> 2) Aula -> 3) Ciclo Lectivo -> 4) Carrera -> 5) Materia (vinculada a Carrera) -> 6) Comisión (asociada a Materia, Carrera y Ciclo) -> 7) Profesores -> 8) Alumnos -> 9) Reserva de Espacio. Esto asegura consistencia e integridad relacional. diff --git a/backend/app/__init__.py b/backend/app/__init__.py index 2c2bccf..df76e3c 100644 --- a/backend/app/__init__.py +++ b/backend/app/__init__.py @@ -6,7 +6,7 @@ from flask_babel import Babel, gettext as _ from config.config import Config # Initialize extensions -__version__ = "3.6.4" +__version__ = "3.7.0" db = SQLAlchemy() migrate = Migrate() cors = CORS() diff --git a/backend/app/models/subject.py b/backend/app/models/subject.py index b649a02..10f258d 100644 --- a/backend/app/models/subject.py +++ b/backend/app/models/subject.py @@ -32,7 +32,7 @@ class Subject(db.Model): updated_at = db.Column(db.DateTime, default=lambda: datetime.now(timezone.utc).replace(tzinfo=None), onupdate=lambda: datetime.now(timezone.utc).replace(tzinfo=None)) # Relationships - commissions: Any = db.relationship('Commission', backref='subject', lazy=True, cascade='all, delete-orphan') + commissions: Any = db.relationship('Commission', backref='subject', lazy=True, uselist=True, cascade='all, delete-orphan') careers: Any = db.relationship('Career', secondary=subject_careers, lazy='subquery', backref=db.backref('shared_subjects', lazy=True)) def __init__(self, **kwargs): diff --git a/backend/app/routes/api/openapi.py b/backend/app/routes/api/openapi.py index 055cb8f..8e1bcd6 100644 --- a/backend/app/routes/api/openapi.py +++ b/backend/app/routes/api/openapi.py @@ -7,7 +7,7 @@ OPENAPI_SPEC = { "info": { "title": "Edu-Space REST API", "description": "Enterprise Academic & Physical Space Management REST API with JWT Authentication and Role-Based Access Control.", - "version": "3.6.4" + "version": "3.7.0" }, "servers": [ { diff --git a/backend/main.py b/backend/main.py index 2ca7110..8bf23bb 100644 --- a/backend/main.py +++ b/backend/main.py @@ -1,22 +1,21 @@ """ Admin Edu-Space - FastAPI Core Application (Principio 11) High-performance ASGI server with modular routers, Pydantic schemas, -OpenAPI /docs documentation and zero-regression WSGI bridge. +OpenAPI /docs documentation and 100% native FastAPI routers. """ -from typing import Any, cast -from fastapi import FastAPI, Request, status +from fastapi import FastAPI from fastapi.middleware.cors import CORSMiddleware -from fastapi.responses import JSONResponse -from a2wsgi import WSGIMiddleware from app import __version__ -from database import get_flask_app # Import modular FastAPI routers from routers.version import version_router from routers.auth import auth_router from routers.classrooms import classrooms_router +from routers.buildings import buildings_router from routers.reservations import reservations_router +from routers.academic import academic_router +from routers.admin import admin_router from routers.students import students_router from routers.dashboard import dashboard_router from routers.optimizer import optimizer_router, genetic_router @@ -40,20 +39,19 @@ app.add_middleware( allow_headers=["*"], ) -# Register high-performance FastAPI Routers +# Register high-performance FastAPI Routers (100% Native FastAPI) app.include_router(version_router) app.include_router(auth_router) app.include_router(classrooms_router) +app.include_router(buildings_router) app.include_router(reservations_router) +app.include_router(academic_router) +app.include_router(admin_router) app.include_router(students_router) app.include_router(dashboard_router) app.include_router(optimizer_router) app.include_router(genetic_router) -# Mount zero-regression WSGI bridge for remaining legacy routes and admin modules -flask_app = get_flask_app() -app.mount("/", cast(Any, WSGIMiddleware(cast(Any, flask_app.wsgi_app)))) - if __name__ == "__main__": import uvicorn diff --git a/backend/routers/academic.py b/backend/routers/academic.py new file mode 100644 index 0000000..f0bff76 --- /dev/null +++ b/backend/routers/academic.py @@ -0,0 +1,1381 @@ +""" +FastAPI Academic Router (/api/v1) +Provides modular endpoints for Careers, Subjects, Commissions, Academic Terms and Milestone Types. +""" +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 + +from app import db +from app.models.career import Career +from app.models.subject import Subject, Commission, CommissionTeacher +from app.models.academic_term import AcademicTerm +from app.models.milestone import MilestoneType, AcademicMilestone +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 database import get_flask_app + +academic_router = APIRouter(prefix="/api/v1", tags=["Academic Management"]) +flask_app = get_flask_app() + + +# ========================================================= +# CAREERS ENDPOINTS +# ========================================================= + +@academic_router.get("/careers") +def list_careers( + search: Optional[str] = Query(None), + current_user: User = Depends(get_current_user) +): + """Lista todas las carreras académicas registradas.""" + with flask_app.app_context(): + query = Career.query + if search: + s_clean = search.strip().lower() + query = query.filter( + or_( + Career.name.ilike(f'%{s_clean}%'), + Career.code.ilike(f'%{s_clean}%') + ) + ) + careers = query.order_by(Career.name.asc()).all() + return { + 'status': 'success', + 'total': len(careers), + 'careers': [c.to_dict() for c in careers] + } + + +@academic_router.post("/careers", status_code=status.HTTP_201_CREATED) +async def create_career( + request: Request, + 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) + + with flask_app.app_context(): + name = (data.get('name') or '').strip() + code = (data.get('code') or '').strip() + description = (data.get('description') or '').strip() + + if not name: + raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="El nombre de la carrera es obligatorio.") + + if Career.query.filter(Career.name.ilike(name)).first(): + raise HTTPException(status_code=status.HTTP_409_CONFLICT, detail=f"Ya existe una carrera con el nombre {name}.") + + career = Career(name=name, code=code or None, description=description or None) + db.session.add(career) + db.session.commit() + + return { + 'status': 'success', + 'message': 'Carrera creada exitosamente.', + 'career': career.to_dict() + } + + +@academic_router.put("/careers/{id}") +async def update_career( + id: int, + request: Request, + 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) + + with flask_app.app_context(): + career = Career.query.get(id) + if not career: + raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=f"Carrera con ID {id} no encontrada.") + + if 'name' in data and data['name']: + name = (data['name'] or '').strip() + existing = Career.query.filter(Career.name.ilike(name), Career.id != id).first() + if existing: + raise HTTPException(status_code=status.HTTP_409_CONFLICT, detail=f"Ya existe otra carrera con el nombre {name}.") + career.name = name + + if 'code' in data: + career.code = (data['code'] or '').strip() or None + + if 'description' in data: + career.description = (data['description'] or '').strip() or None + + db.session.commit() + return { + 'status': 'success', + 'message': 'Carrera actualizada correctamente.', + 'career': career.to_dict() + } + + +@academic_router.delete("/careers/{id}") +def delete_career( + id: int, + current_user: User = Depends(require_roles(["ADMIN", "BEDELIA"])) +): + """Elimina una carrera si no posee asignaturas vinculadas.""" + with flask_app.app_context(): + career = Career.query.get(id) + if not career: + raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=f"Carrera con ID {id} no encontrada.") + + if career.subjects and len(career.subjects) > 0: + raise HTTPException( + status_code=status.HTTP_409_CONFLICT, + detail=f"No se puede eliminar la carrera porque tiene {len(career.subjects)} asignaturas vinculadas." + ) + + db.session.delete(career) + db.session.commit() + return { + 'status': 'success', + 'message': 'Carrera eliminada permanentemente.' + } + + +# ========================================================= +# SUBJECTS ENDPOINTS +# ========================================================= + +@academic_router.get("/subjects") +def list_subjects( + search: Optional[str] = Query(None), + career_id: Optional[int] = Query(None), + active: Optional[str] = Query(None), + current_user: User = Depends(get_current_user) +): + """Lista las asignaturas con filtros opcionales de búsqueda, carrera y estado.""" + with flask_app.app_context(): + query = Subject.query + if search: + s_clean = search.strip().lower() + query = query.filter( + or_( + Subject.name.ilike(f'%{s_clean}%'), + Subject.code.ilike(f'%{s_clean}%'), + Subject.department.ilike(f'%{s_clean}%'), + Subject.careers.any(Career.name.ilike(f'%{s_clean}%')) + ) + ) + if career_id: + query = query.filter(or_(Subject.career_id == career_id, Subject.careers.any(Career.id == career_id))) + if active == 'true': + query = query.filter(Subject.is_active == True) + elif active == 'false': + query = query.filter(Subject.is_active == False) + + subjects = query.order_by(Subject.id.asc()).all() + careers = Career.query.order_by(Career.name.asc()).all() + + subjects_data = [] + for s in subjects: + d = s.to_dict() + if isinstance(s.commissions, list): + d['commissions_count'] = len(s.commissions) + d['commissions'] = [{'id': c.id, 'code': c.code, 'schedule': c.schedule} for c in s.commissions] + elif s.commissions is not None: + d['commissions_count'] = 1 + d['commissions'] = [{'id': s.commissions.id, 'code': s.commissions.code, 'schedule': s.commissions.schedule}] + else: + d['commissions_count'] = 0 + d['commissions'] = [] + subjects_data.append(d) + + return { + 'status': 'success', + 'total': len(subjects_data), + 'subjects': subjects_data, + 'careers': [c.to_dict() for c in careers] + } + + +@academic_router.post("/subjects", status_code=status.HTTP_201_CREATED) +async def create_subject( + request: Request, + 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) + + with flask_app.app_context(): + code = (data.get('code') or '').strip().upper() + name = (data.get('name') or '').strip() + department = (data.get('department') or '').strip() + try: + credits = int(data.get('credits', 4) or 4) + except (ValueError, TypeError): + credits = 4 + career_id = data.get('career_id') + description = (data.get('description') or '').strip() + career_ids = data.get('career_ids') + is_short_course = data.get('is_short_course', False) + if isinstance(is_short_course, str): + is_short_course = is_short_course.lower() in ['true', '1', 'on'] + + if not code or not name: + raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="El código y nombre de la asignatura son obligatorios.") + + if Subject.query.filter(Subject.code == code).first(): + raise HTTPException(status_code=status.HTTP_409_CONFLICT, detail=f"Ya existe una asignatura con el código {code}.") + + c_id = int(career_id) if (career_id and str(career_id).strip()) else None + + c_id_list = [] + if isinstance(career_ids, str): + c_id_list = [int(x.strip()) for x in career_ids.split(',') if x.strip().isdigit()] + elif isinstance(career_ids, list): + c_id_list = [int(x) for x in career_ids if str(x).isdigit()] + + if not c_id and c_id_list: + c_id = c_id_list[0] + + subject = Subject( + code=code, + name=name, + department=department, + credits=credits, + career_id=c_id, + description=description or None, + is_short_course=bool(is_short_course), + is_active=True + ) + + if c_id_list: + subject.careers = Career.query.filter(Career.id.in_(c_id_list)).all() + elif c_id: + c_obj = Career.query.get(c_id) + if c_obj: + subject.careers = [c_obj] + + db.session.add(subject) + db.session.commit() + + return { + 'status': 'success', + 'message': 'Asignatura creada exitosamente.', + 'subject': subject.to_dict() + } + + +@academic_router.put("/subjects/{id}") +async def update_subject( + id: int, + request: Request, + 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) + + with flask_app.app_context(): + subject = Subject.query.get(id) + if not subject: + raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=f"Asignatura con ID {id} no encontrada.") + + if 'code' in data and data['code']: + code = (data['code'] or '').strip().upper() + existing = Subject.query.filter(Subject.code == code, Subject.id != id).first() + if existing: + raise HTTPException(status_code=status.HTTP_409_CONFLICT, detail=f"Ya existe otra asignatura con el código {code}.") + subject.code = code + + if 'name' in data and data['name']: + subject.name = (data['name'] or '').strip() + + if 'department' in data: + subject.department = (data['department'] or '').strip() + + if 'credits' in data and data['credits'] is not None: + try: + subject.credits = int(data['credits']) + except (ValueError, TypeError): + pass + + if 'career_id' in data: + c_id = data['career_id'] + subject.career_id = int(c_id) if c_id else None + + if 'career_ids' in data: + career_ids = data.get('career_ids') + if isinstance(career_ids, str): + c_id_list = [int(x.strip()) for x in career_ids.split(',') if x.strip().isdigit()] + elif isinstance(career_ids, list): + c_id_list = [int(x) for x in career_ids if str(x).isdigit()] + else: + c_id_list = [] + if c_id_list: + c_objs = Career.query.filter(Career.id.in_(c_id_list)).all() + subject.careers = c_objs + if c_objs and not subject.career_id: + subject.career_id = c_objs[0].id + else: + subject.careers = [] + elif 'career_id' in data and subject.career_id: + c_obj = Career.query.get(subject.career_id) + if c_obj and c_obj not in subject.careers: + subject.careers = [c_obj] + + if 'description' in data: + subject.description = (data['description'] or '').strip() + + if 'is_active' in data: + val = data['is_active'] + subject.is_active = val in [True, 'true', '1', 'on'] + + db.session.commit() + return { + 'status': 'success', + 'message': 'Asignatura actualizada correctamente.', + 'subject': subject.to_dict() + } + + +@academic_router.post("/subjects/{id}/toggle") +def toggle_subject( + id: int, + current_user: User = Depends(require_roles(["ADMIN", "BEDELIA"])) +): + """Conmuta el estado activo de una asignatura.""" + with flask_app.app_context(): + subject = Subject.query.get(id) + if not subject: + raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=f"Asignatura con ID {id} no encontrada.") + subject.is_active = not subject.is_active + db.session.commit() + return { + 'status': 'success', + 'id': subject.id, + 'is_active': subject.is_active, + 'message': f'Asignatura {"activada" if subject.is_active else "desactivada"} correctamente.' + } + + +@academic_router.delete("/subjects/{id}") +def delete_subject( + id: int, + current_user: User = Depends(require_roles(["ADMIN", "BEDELIA"])) +): + """Elimina una asignatura o la desactiva si tiene comisiones vinculadas.""" + with flask_app.app_context(): + subject = Subject.query.get(id) + if not subject: + raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=f"Asignatura con ID {id} no encontrada.") + + if subject.commissions and len(subject.commissions) > 0: + subject.is_active = False + db.session.commit() + return { + 'status': 'deactivated', + 'action': 'deactivated', + 'message': f'La asignatura "{subject.name}" tiene {len(subject.commissions)} comisión(es) vinculada(s). Se ha desactivado en su lugar para proteger el historial académico.' + } + + name = subject.name + db.session.delete(subject) + db.session.commit() + return { + 'status': 'deleted', + 'action': 'deleted', + 'message': f'Asignatura "{name}" eliminada permanentemente del sistema.' + } + + +# ========================================================= +# COMMISSIONS ENDPOINTS +# ========================================================= + +@academic_router.get("/commissions") +def list_commissions( + subject_id: Optional[int] = Query(None), + career_id: Optional[int] = Query(None), + shift: Optional[str] = Query(None), + active: Optional[str] = Query(None), + current_user: User = Depends(get_current_user) +): + """Lista las comisiones académicas con soporte para filtros de carrera, materia y turno.""" + with flask_app.app_context(): + query = Commission.query + if subject_id: + query = query.filter(Commission.subject_id == subject_id) + if career_id: + query = query.join(Subject, Commission.subject_id == Subject.id).filter( + or_(Subject.career_id == career_id, Subject.careers.any(Career.id == career_id)) + ) + if shift: + query = query.filter(Commission.shift == shift) + if active == 'true': + query = query.filter(Commission.active == True) + elif active == 'false': + query = query.filter(Commission.active == False) + + commissions = query.order_by(Commission.year.desc(), Commission.semester.desc(), Commission.code.asc()).all() + return { + 'status': 'success', + 'total': len(commissions), + 'commissions': [c.to_dict() for c in commissions] + } + + +@academic_router.post("/commissions", status_code=status.HTTP_201_CREATED) +async def create_commission( + request: Request, + 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) + + with flask_app.app_context(): + subject_id = data.get('subject_id') + code = (data.get('code') or '').strip() + semester = (data.get('semester') or '1C').strip() + try: + year = int(data.get('year', datetime.now().year) or datetime.now().year) + except (ValueError, TypeError): + year = datetime.now().year + academic_term_id = data.get('academic_term_id') + academic_term_id = int(academic_term_id) if (academic_term_id and str(academic_term_id).strip().isdigit()) else None + + if academic_term_id: + term_obj = AcademicTerm.query.get(academic_term_id) + if term_obj: + if not data.get('year') or int(data.get('year')) == datetime.now().year: + year = term_obj.year + if not data.get('semester') or data.get('semester') == '1C': + p_text = f"{term_obj.name} {term_obj.period_type or ''} {term_obj.code}".lower() + if '2c' in p_text or 'segundo' in p_text or '2º' in p_text or '2do' in p_text: + semester = '2C' + elif 'anual' in p_text: + semester = 'Anual' + else: + semester = '1C' + + teacher_id = data.get('teacher_id') + teacher_id = int(teacher_id) if (teacher_id and str(teacher_id).strip().isdigit()) else None + try: + max_students = int(data.get('max_students', 35) or 35) + except (ValueError, TypeError): + max_students = 35 + schedule = (data.get('schedule') or '').strip() + shift = (data.get('shift') or 'Mañana').strip() + virtual_link = (data.get('virtual_link') or '').strip() + active = data.get('active', True) + if isinstance(active, str): + active = active.lower() in ['true', '1', 'on'] + + if not subject_id or not code: + raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="La asignatura y código de comisión son obligatorios.") + + subject = Subject.query.get(int(subject_id)) + if not subject: + raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=f"La asignatura con ID {subject_id} no existe.") + + virtual_link = virtual_link or None + + existing = Commission.query.filter_by( + subject_id=int(subject_id), + code=code, + semester=semester, + year=year + ).first() + + if existing: + existing.teacher_id = teacher_id + existing.max_students = max_students + existing.schedule = schedule + existing.shift = shift + if academic_term_id: + existing.academic_term_id = academic_term_id + if virtual_link: + existing.virtual_link = virtual_link + existing.active = bool(active) + if teacher_id: + ct = CommissionTeacher.query.filter_by(commission_id=existing.id, user_id=teacher_id).first() + if not ct: + db.session.add(CommissionTeacher(commission_id=existing.id, user_id=teacher_id, role='Titular', is_primary=True)) + db.session.commit() + return { + 'status': 'success', + 'message': f'Comisión {code} asociada a {subject.name} actualizada exitosamente.', + 'commission': existing.to_dict() + } + + commission = Commission( + subject_id=int(subject_id), + code=code, + semester=semester, + year=year, + teacher_id=teacher_id, + max_students=max_students, + schedule=schedule, + shift=shift, + virtual_link=virtual_link, + academic_term_id=academic_term_id, + active=bool(active) + ) + db.session.add(commission) + db.session.flush() + + if teacher_id: + db.session.add(CommissionTeacher(commission_id=commission.id, user_id=teacher_id, role='Titular', is_primary=True)) + + extra_teachers = data.get('teacher_ids') or data.get('teachers') or [] + for et in extra_teachers: + u_id = et.get('user_id') if isinstance(et, dict) else et + u_role = et.get('role', 'Adjunto') if isinstance(et, dict) else 'Adjunto' + if u_id and int(u_id) != teacher_id: + db.session.add(CommissionTeacher(commission_id=commission.id, user_id=int(u_id), role=u_role, is_primary=False)) + + db.session.commit() + + return { + 'status': 'success', + 'message': f'Comisión {code} asociada exitosamente a {subject.name}.', + 'commission': commission.to_dict() + } + + +@academic_router.get("/commissions/{id}") +def get_commission( + id: int, + current_user: User = Depends(get_current_user) +): + """Obtiene los detalles de una comisión.""" + with flask_app.app_context(): + comm = Commission.query.get(id) + if not comm: + raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=f"Comisión con ID {id} no encontrada.") + return { + 'status': 'success', + 'commission': comm.to_dict() + } + + +@academic_router.put("/commissions/{id}") +async def update_commission( + id: int, + request: Request, + 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) + + with flask_app.app_context(): + comm = Commission.query.get(id) + if not comm: + raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=f"Comisión con ID {id} no encontrada.") + + if 'subject_id' in data and data['subject_id']: + comm.subject_id = int(data['subject_id']) + if 'academic_term_id' in data: + t_id = data['academic_term_id'] + comm.academic_term_id = int(t_id) if (t_id and str(t_id).strip().isdigit()) else None + if 'code' in data and data['code']: + comm.code = (data['code'] or '').strip() + if 'semester' in data and data['semester']: + comm.semester = (data['semester'] or '').strip() + if 'year' in data and data['year']: + comm.year = int(data['year']) + if 'teacher_id' in data: + t_id = data['teacher_id'] + comm.teacher_id = int(t_id) if (t_id and str(t_id).strip().isdigit()) else None + if comm.teacher_id: + ct = CommissionTeacher.query.filter_by(commission_id=comm.id, user_id=comm.teacher_id).first() + if not ct: + db.session.add(CommissionTeacher(commission_id=comm.id, user_id=comm.teacher_id, role='Titular', is_primary=True)) + else: + ct.is_primary = True + if 'max_students' in data and data['max_students']: + comm.max_students = int(data['max_students']) + if 'schedule' in data: + comm.schedule = (data['schedule'] or '').strip() + if 'shift' in data and data['shift']: + comm.shift = (data['shift'] or '').strip() + if 'virtual_link' in data: + vl = (data['virtual_link'] or '').strip() + comm.virtual_link = vl or None + if 'active' in data: + val = data['active'] + comm.active = val in [True, 'true', '1', 'on'] + + db.session.commit() + return { + 'status': 'success', + 'message': 'Comisión actualizada correctamente.', + 'commission': comm.to_dict() + } + + +@academic_router.post("/commissions/{id}/toggle") +def toggle_commission( + id: int, + current_user: User = Depends(require_roles(["ADMIN", "BEDELIA"])) +): + """Conmuta el estado activo de una comisión.""" + with flask_app.app_context(): + comm = Commission.query.get(id) + if not comm: + raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=f"Comisión con ID {id} no encontrada.") + comm.active = not comm.active + db.session.commit() + return { + 'status': 'success', + 'id': comm.id, + 'active': comm.active, + 'message': f'Comisión {"activada" if comm.active else "desactivada"} correctamente.' + } + + +@academic_router.delete("/commissions/{id}") +def delete_commission( + id: int, + current_user: User = Depends(require_roles(["ADMIN", "BEDELIA"])) +): + """Elimina una comisión o la desactiva si contiene reservas históricas.""" + with flask_app.app_context(): + comm = Commission.query.get(id) + if not comm: + raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=f"Comisión con ID {id} no encontrada.") + + from app.models.reservation import Reservation + res_count = Reservation.query.filter_by(commission_id=id).count() + if res_count > 0: + comm.active = False + db.session.commit() + return { + 'status': 'deactivated', + 'action': 'deactivated', + 'message': f'La comisión tiene {res_count} reservas vinculadas. Se ha desactivado en su lugar.' + } + + db.session.delete(comm) + db.session.commit() + return { + 'status': 'deleted', + 'action': 'deleted', + 'message': 'Comisión eliminada permanentemente.' + } + + +# ========================================================= +# ACADEMIC TERMS ENDPOINTS +# ========================================================= + +@academic_router.get("/academic-terms") +@academic_router.get("/admin/academic-terms") +def list_academic_terms( + search: Optional[str] = Query(None), + year: Optional[int] = Query(None), + current_user: User = Depends(get_current_user) +): + """Lista todos los ciclos lectivos registrados.""" + with flask_app.app_context(): + query = AcademicTerm.query + if search: + s_clean = search.strip().lower() + query = query.filter( + or_( + AcademicTerm.name.ilike(f'%{s_clean}%'), + AcademicTerm.code.ilike(f'%{s_clean}%'), + AcademicTerm.period_type.ilike(f'%{s_clean}%') + ) + ) + if year: + query = query.filter(AcademicTerm.year == year) + + terms = query.order_by(AcademicTerm.year.desc(), AcademicTerm.id.desc()).all() + return { + 'status': 'success', + 'total': len(terms), + 'terms': [t.to_dict() for t in terms] + } + + +@academic_router.post("/academic-terms", status_code=status.HTTP_201_CREATED) +async def create_academic_term( + request: Request, + 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) + + with flask_app.app_context(): + code = (data.get('code') or '').strip().upper() + name = (data.get('name') or '').strip() + try: + year = int(data.get('year', datetime.now().year) or datetime.now().year) + except (ValueError, TypeError): + year = datetime.now().year + period_type = (data.get('period_type') or 'Segundo Cuatrimestre').strip() + start_date = data.get('start_date') + end_date = data.get('end_date') + is_current = data.get('is_current', False) + if isinstance(is_current, str): + is_current = is_current.lower() in ['true', '1', 'on'] + + if not code or not name: + raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="El código y nombre del período lectivo son obligatorios.") + + if AcademicTerm.query.filter(AcademicTerm.code == code).first(): + raise HTTPException(status_code=status.HTTP_409_CONFLICT, detail=f"Ya existe un período lectivo con el código {code}.") + + if is_current: + AcademicTerm.query.update({'is_current': False}) + + term = AcademicTerm( + code=code, + name=name, + year=year, + period_type=period_type, + start_date=datetime.strptime(start_date, '%Y-%m-%d').date() if start_date else None, + end_date=datetime.strptime(end_date, '%Y-%m-%d').date() if end_date else None, + is_current=bool(is_current), + is_active=True + ) + db.session.add(term) + db.session.commit() + + return { + 'status': 'success', + 'message': f'Período lectivo "{name}" creado con éxito.', + 'term': term.to_dict() + } + + +@academic_router.post("/academic-terms/{id}/set-current") +def set_current_academic_term( + id: int, + current_user: User = Depends(require_roles(["ADMIN", "BEDELIA"])) +): + """Marca un ciclo lectivo como el período vigente institucional.""" + with flask_app.app_context(): + term = AcademicTerm.query.get(id) + if not term: + raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=f"Período lectivo con ID {id} no encontrado.") + + AcademicTerm.query.update({'is_current': False}) + term.is_current = True + term.is_active = True + db.session.commit() + + return { + 'status': 'success', + 'message': f'El período "{term.name}" ha sido establecido como el ciclo lectivo activo actual.', + 'term': term.to_dict() + } + + +@academic_router.post("/academic-terms/{id}/toggle") +def toggle_academic_term( + id: int, + current_user: User = Depends(require_roles(["ADMIN", "BEDELIA"])) +): + """Conmuta el estado activo de un ciclo lectivo.""" + with flask_app.app_context(): + term = AcademicTerm.query.get(id) + if not term: + raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=f"Período lectivo con ID {id} no encontrado.") + term.is_active = not term.is_active + db.session.commit() + return { + 'status': 'success', + 'message': f'Período {"activado" if term.is_active else "desactivado"} exitosamente.', + 'term': term.to_dict() + } + + +@academic_router.delete("/academic-terms/{id}") +def delete_academic_term( + id: int, + current_user: User = Depends(require_roles(["ADMIN", "BEDELIA"])) +): + """Elimina un ciclo lectivo.""" + with flask_app.app_context(): + term = AcademicTerm.query.get(id) + if not term: + raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=f"Período lectivo con ID {id} no encontrado.") + name = term.name + db.session.delete(term) + db.session.commit() + return { + 'status': 'success', + 'message': f'Período lectivo "{name}" eliminado correctamente.' + } + + +# ========================================================= +# COMMISSION TEACHERS MANAGEMENT +# ========================================================= + +@academic_router.post("/commissions/{id}/assign-teacher") +async def assign_commission_teacher( + id: int, + request: Request, + 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) + + with flask_app.app_context(): + comm = Commission.query.get(id) + if not comm: + raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=f"Comisión {id} no encontrada.") + + t_id = data.get('teacher_id') or data.get('user_id') + role = (data.get('role') or 'Titular').strip() + + if t_id: + t_id = int(t_id) + comm.teacher_id = t_id + ct = CommissionTeacher.query.filter_by(commission_id=comm.id, user_id=t_id).first() + if not ct: + ct = CommissionTeacher(commission_id=comm.id, user_id=t_id, role=role, is_primary=True) + db.session.add(ct) + else: + ct.role = role + ct.is_primary = True + else: + comm.teacher_id = None + + db.session.commit() + return { + 'status': 'success', + 'id': comm.id, + 'teacher_id': comm.teacher_id, + 'teacher_name': comm.teacher_name, + 'teachers': comm.teachers, + 'message': 'Docente asignado correctamente.' + } + + +@academic_router.post("/commissions/{id}/teachers") +async def add_commission_teacher( + id: int, + request: Request, + 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) + + user_id = data.get('user_id') or data.get('teacher_id') + if not user_id: + raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="El docente es requerido.") + + with flask_app.app_context(): + comm = Commission.query.get(id) + if not comm: + raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=f"Comisión {id} no encontrada.") + + user = User.query.get(int(user_id)) + if not user: + raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=f"El usuario docente con ID {user_id} no existe.") + + role = (data.get('role') or 'Adjunto').strip() + is_primary = data.get('is_primary', False) + if isinstance(is_primary, str): + is_primary = is_primary.lower() in ['true', '1', 'on'] + + existing = CommissionTeacher.query.filter_by(commission_id=comm.id, user_id=user.id).first() + if existing: + existing.role = role + existing.is_primary = bool(is_primary) + else: + if is_primary or comm.teacher_id is None: + comm.teacher_id = user.id + is_primary = True + ct = CommissionTeacher( + commission_id=comm.id, + user_id=user.id, + role=role, + is_primary=bool(is_primary) + ) + db.session.add(ct) + + db.session.commit() + return { + 'status': 'success', + 'message': f'{user.name} asignado/a como {role} en la comisión.', + 'teachers': comm.teachers, + 'commission': comm.to_dict() + } + + +@academic_router.delete("/commissions/{id}/teachers/{user_id}") +def remove_commission_teacher( + id: int, + user_id: int, + current_user: User = Depends(require_roles(["ADMIN", "BEDELIA"])) +): + """Desvincula a un docente de una comisión.""" + with flask_app.app_context(): + comm = Commission.query.get(id) + if not comm: + raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=f"Comisión {id} no encontrada.") + + ct = CommissionTeacher.query.filter_by(commission_id=comm.id, user_id=user_id).first() + if ct: + db.session.delete(ct) + + if comm.teacher_id == user_id: + other = CommissionTeacher.query.filter(CommissionTeacher.commission_id == comm.id, CommissionTeacher.user_id != user_id).first() + comm.teacher_id = other.user_id if other else None + if other: + other.is_primary = True + + db.session.commit() + return { + 'status': 'success', + 'message': 'Docente desvinculado de la comisión correctamente.', + 'teachers': comm.teachers, + 'commission': comm.to_dict() + } + + +# ========================================================= +# COMMISSION ENROLLMENTS +# ========================================================= + +@academic_router.get("/commissions/{id}/enrollments") +def get_commission_enrollments( + id: int, + current_user: User = Depends(get_current_user) +): + """Lista los estudiantes matriculados en una comisión.""" + with flask_app.app_context(): + comm = Commission.query.get(id) + if not comm: + raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=f"Comisión {id} no encontrada.") + + enrollments = EnrollmentService.list_enrollments(comm.id) + return { + 'commission_id': comm.id, + 'commission_code': comm.code, + 'count': len(enrollments), + 'max_students': comm.max_students, + 'current_students': comm.current_students, + 'enrollments': enrollments + } + + +@academic_router.post("/commissions/{id}/enrollments", status_code=status.HTTP_201_CREATED) +async def enroll_commission_student( + id: int, + request: Request, + 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) + + student_id = data.get('student_id') + notes = data.get('notes') + allow_same_day_exception = bool(data.get('allow_same_day_exception', False)) + exception_reason = data.get('exception_reason') + + if not student_id: + raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="student_id es obligatorio.") + + with flask_app.app_context(): + try: + enrollment = EnrollmentService.enroll_student( + commission_id=id, + student_id=int(student_id), + notes=notes, + allow_same_day_exception=allow_same_day_exception, + exception_reason=exception_reason + ) + return { + 'status': 'success', + 'message': 'Estudiante matriculado exitosamente en la comisión.', + 'enrollment': enrollment.to_dict() + } + except ValueError as e: + raise HTTPException(status_code=status.HTTP_409_CONFLICT, detail=str(e)) + + +@academic_router.delete("/commissions/{id}/enrollments/{student_id}") +def unenroll_commission_student( + id: int, + student_id: int, + current_user: User = Depends(require_roles(["ADMIN", "BEDELIA"])) +): + """Desmatricula a un estudiante de una comisión.""" + with flask_app.app_context(): + success = EnrollmentService.unenroll_student(commission_id=id, student_id=student_id) + if not success: + raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Matrícula no encontrada para este estudiante.") + return { + 'status': 'success', + 'message': 'Estudiante desvinculado de la comisión exitosamente.' + } + + +@academic_router.put("/commissions/{id}/enrollments/{student_id}") +async def update_commission_enrollment( + id: int, + student_id: int, + request: Request, + 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) + + status_val = data.get('status', 'activo') + notes = data.get('notes') + + with flask_app.app_context(): + enrollment = EnrollmentService.update_enrollment_status( + commission_id=id, + student_id=student_id, + status=status_val, + notes=notes + ) + if not enrollment: + raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Matrícula no encontrada.") + return { + 'status': 'success', + 'message': 'Estado de matrícula actualizado.', + 'enrollment': enrollment.to_dict() + } + + +# ========================================================= +# GRADEBOOK & ACTAS DE REGULARIDAD +# ========================================================= + +@academic_router.get("/commissions/{id}/gradebook") +def get_commission_gradebook( + id: int, + current_user: User = Depends(get_current_user) +): + """Obtiene la sábana completa de notas y regularidad de la comisión.""" + with flask_app.app_context(): + try: + data = GradebookService.get_commission_gradebook(id) + return {'status': 'success', 'data': data} + except ValueError as e: + raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=str(e)) + except Exception as e: + raise HTTPException(status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=str(e)) + + +@academic_router.post("/commissions/{id}/gradebook/grades") +@academic_router.put("/commissions/{id}/gradebook/grades") +async def save_commission_grades( + id: int, + request: Request, + 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) + + with flask_app.app_context(): + try: + if 'grades' in data and isinstance(data['grades'], list): + res = GradebookService.bulk_save_grades( + commission_id=id, + grades_data=data['grades'], + grader_id=current_user.id + ) + return {'status': 'success', 'message': f"{res['saved_count']} calificaciones guardadas.", 'data': res} + else: + milestone_id = data.get('milestone_id') + student_id = data.get('student_id') + score = data.get('score') + is_absent = bool(data.get('is_absent', False)) + feedback = data.get('feedback', '') + + if not milestone_id or not student_id: + raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="milestone_id y student_id son obligatorios.") + + grade = GradebookService.save_single_grade( + commission_id=id, + milestone_id=int(milestone_id), + student_id=int(student_id), + score=float(score) if score is not None and str(score).strip() != '' else None, + is_absent=is_absent, + feedback=feedback, + grader_id=current_user.id + ) + return {'status': 'success', 'message': 'Calificación guardada.', 'grade': grade.to_dict()} + except ValueError as e: + raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail=str(e)) + except Exception as e: + raise HTTPException(status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=str(e)) + + +@academic_router.post("/commissions/{id}/gradebook/close") +async def close_commission_gradebook( + id: int, + request: Request, + current_user: User = Depends(require_roles(["ADMIN", "BEDELIA", "DOCENTE"])) +): + """Cierre formal del acta de calificaciones de la comisión.""" + data = {} + try: + data = await request.json() + except Exception: + pass + notes = data.get('notes', '') + + with flask_app.app_context(): + try: + res = GradebookService.close_gradebook(commission_id=id, user_id=current_user.id, notes=notes) + return {'status': 'success', **res} + except ValueError as e: + raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail=str(e)) + except Exception as e: + raise HTTPException(status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=str(e)) + + +@academic_router.post("/commissions/{id}/gradebook/reopen") +async def reopen_commission_gradebook( + id: int, + request: Request, + current_user: User = Depends(require_roles(["ADMIN", "BEDELIA"])) +): + """Reapertura administrativa del acta de calificaciones.""" + data = {} + try: + data = await request.json() + except Exception: + pass + reason = data.get('reason', '') + + with flask_app.app_context(): + try: + res = GradebookService.reopen_gradebook(commission_id=id, user_id=current_user.id, reason=reason) + return {'status': 'success', **res} + except ValueError as e: + raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail=str(e)) + except Exception as e: + raise HTTPException(status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=str(e)) + + +# ========================================================= +# MILESTONE TYPES CRUD +# ========================================================= + +@academic_router.get("/milestone-types") +def get_milestone_types( + current_user: User = Depends(get_current_user) +): + """Lista las tipificaciones de hitos académicos disponibles.""" + with flask_app.app_context(): + types = MilestoneType.query.order_by(MilestoneType.sort_order.asc(), MilestoneType.id.asc()).all() + return { + 'status': 'success', + 'total': len(types), + 'milestone_types': [t.to_dict() for t in types] + } + + +@academic_router.post("/milestone-types", status_code=status.HTTP_201_CREATED) +async def create_milestone_type( + request: Request, + 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) + + name = str(data.get('name', '')).strip() + code = str(data.get('code', '')).strip().lower().replace(' ', '_') + color = str(data.get('color', '#0d6efd')).strip() + description = str(data.get('description', '')).strip() + try: + sort_order = int(data.get('sort_order', 0) or 0) + except (ValueError, TypeError): + sort_order = 0 + is_active = data.get('is_active', True) + if isinstance(is_active, str): + is_active = is_active.lower() in ['true', '1', 'on'] + + if not name or not code: + raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="Nombre y código son obligatorios.") + + with flask_app.app_context(): + existing = MilestoneType.query.filter_by(code=code).first() + if existing: + raise HTTPException(status_code=status.HTTP_409_CONFLICT, detail=f"Ya existe una tipificación con el código {code}.") + + mt = MilestoneType( + name=name, + code=code, + color=color, + description=description, + sort_order=sort_order, + is_active=bool(is_active) + ) + db.session.add(mt) + db.session.commit() + + return { + 'status': 'success', + 'message': 'Tipificación de hito creada correctamente.', + 'milestone_type': mt.to_dict() + } + + +@academic_router.put("/milestone-types/{id}") +async def update_milestone_type( + id: int, + request: Request, + 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) + + with flask_app.app_context(): + mt = MilestoneType.query.get(id) + if not mt: + raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=f"Tipificación con ID {id} no encontrada.") + + if 'name' in data and data['name']: + mt.name = str(data['name']).strip() + if 'code' in data and data['code']: + code = str(data['code']).strip().lower().replace(' ', '_') + existing = MilestoneType.query.filter(MilestoneType.code == code, MilestoneType.id != id).first() + if existing: + raise HTTPException(status_code=status.HTTP_409_CONFLICT, detail=f"Ya existe otra tipificación con el código {code}.") + mt.code = code + if 'color' in data: + mt.color = str(data['color']).strip() + if 'description' in data: + mt.description = str(data['description']).strip() + if 'sort_order' in data: + try: + mt.sort_order = int(data['sort_order']) + except (ValueError, TypeError): + pass + if 'is_active' in data: + mt.is_active = data['is_active'] in [True, 'true', '1', 'on'] + + db.session.commit() + return { + 'status': 'success', + 'message': 'Tipificación actualizada correctamente.', + 'milestone_type': mt.to_dict() + } + + +@academic_router.post("/milestone-types/{id}/toggle") +def toggle_milestone_type( + id: int, + current_user: User = Depends(require_roles(["ADMIN", "BEDELIA"])) +): + """Conmuta el estado activo de una tipificación de hito.""" + with flask_app.app_context(): + mt = MilestoneType.query.get(id) + if not mt: + raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=f"Tipificación con ID {id} no encontrada.") + mt.is_active = not mt.is_active + db.session.commit() + return { + 'status': 'success', + 'id': mt.id, + 'is_active': mt.is_active, + 'message': f'Tipificación {"activada" if mt.is_active else "desactivada"} correctamente.' + } + + +@academic_router.delete("/milestone-types/{id}") +def delete_milestone_type( + id: int, + current_user: User = Depends(require_roles(["ADMIN", "BEDELIA"])) +): + """Elimina o desactiva una tipificación de hito.""" + with flask_app.app_context(): + mt = MilestoneType.query.get(id) + if not mt: + raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=f"Tipificación con ID {id} no encontrada.") + + milestone_count = AcademicMilestone.query.filter_by(milestone_type_id=id).count() + if milestone_count > 0: + mt.is_active = False + db.session.commit() + return { + 'status': 'success', + 'message': f'La tipificación tiene {milestone_count} hitos registrados. Se ha desactivado en su lugar.' + } + + db.session.delete(mt) + db.session.commit() + return { + 'status': 'success', + 'message': 'Tipificación eliminada permanentemente.' + } diff --git a/backend/routers/admin.py b/backend/routers/admin.py new file mode 100644 index 0000000..46f3c6b --- /dev/null +++ b/backend/routers/admin.py @@ -0,0 +1,1455 @@ +""" +FastAPI Admin Router (/api/v1) +Provides modular endpoints for User Administration, RBAC Roles, Security Impersonation, +System Reset, Audit Logs, Settings (SMTP/Moodle/Google) and Moodle Queue operations. +""" +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 + +from app import db +from app.models.user import User +from app.models.role import Role, Permission, SYSTEM_MODULES +from app.models.audit_log import AuditLog +from app.models.setting import SystemSetting +from app.models.sync_task import MoodleSyncTask +from app.services.audit_service import AuditService +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 +from database import get_flask_app + +admin_router = APIRouter(prefix="/api/v1", tags=["Administration & Settings"]) +flask_app = get_flask_app() + + +# ========================================================= +# USERS CRUD ENDPOINTS +# ========================================================= + +@admin_router.get("/users") +@admin_router.get("/admin/users") +def get_users( + search: Optional[str] = Query(None), + role_id: Optional[int] = Query(None, alias="role"), + status_filter: Optional[str] = Query(None, alias="status"), + current_user: User = Depends(require_roles(["ADMIN", "BEDELIA"])) +): + """Lista usuarios del sistema con filtros de búsqueda y rol.""" + with flask_app.app_context(): + query = User.query + if search: + s_clean = search.strip().lower() + query = query.filter( + or_( + User.name.ilike(f'%{s_clean}%'), + User.email.ilike(f'%{s_clean}%'), + User.personal_email.ilike(f'%{s_clean}%'), + User.document_number.ilike(f'%{s_clean}%'), + User.first_name.ilike(f'%{s_clean}%'), + User.last_name.ilike(f'%{s_clean}%') + ) + ) + if role_id: + query = query.filter(User.role_id == role_id) + if status_filter == 'active': + query = query.filter(User.is_active == True) + elif status_filter == 'inactive': + query = query.filter(User.is_active == False) + + users = query.order_by(User.id.asc()).all() + roles = Role.query.order_by(Role.name.asc()).all() + + users_data = [] + for u in users: + d = u.to_dict() + d['role_obj'] = { + 'id': u.role_obj.id, + 'name': u.role_obj.name + } 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), + 'users': users_data, + 'roles': roles_data, + 'document_types': DOCUMENT_TYPES + } + + +@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( + request: Request, + 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) + + with flask_app.app_context(): + email = (data.get('email') or '').strip().lower() + first_name = (data.get('first_name') or '').strip() + last_name = (data.get('last_name') or '').strip() + name = (data.get('name') or f"{first_name} {last_name}").strip() + role_name = (data.get('role') or 'docente').strip().upper() + role_id = data.get('role_id') + phone = (data.get('phone') or '').strip() + personal_email = (data.get('personal_email') or '').strip().lower() + address = (data.get('address') or '').strip() + document_type = (data.get('document_type') or 'DNI').strip().upper() + document_number = (data.get('document_number') or '').strip() + password = data.get('password') + is_active = data.get('is_active', True) + if isinstance(is_active, str): + is_active = is_active.lower() in ['true', '1', 'on'] + + if not email or not name: + raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="El email y nombre completo son requeridos.") + + if User.query.filter(User.email.ilike(email)).first(): + raise HTTPException(status_code=status.HTTP_409_CONFLICT, detail=f"Ya existe un usuario con el email {email}.") + + if document_number: + is_valid, clean_doc, err_msg = validate_document(document_type, document_number) + if not is_valid: + raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail=err_msg) + document_number = clean_doc + + if User.query.filter_by(document_type=document_type, document_number=document_number).first(): + raise HTTPException(status_code=status.HTTP_409_CONFLICT, detail=f"El documento {document_type} {document_number} ya está registrado.") + + user = User( + email=email, + name=name, + first_name=first_name or (name.split()[0] if name else ''), + last_name=last_name or (' '.join(name.split()[1:]) if len(name.split()) > 1 else ''), + phone=phone or None, + personal_email=personal_email or None, + address=address or None, + document_type=document_type, + document_number=document_number, + role=role_name, + role_id=int(role_id) if (role_id and str(role_id).strip().isdigit()) else None, + is_active=bool(is_active) + ) + user.set_password(password or 'edu-space2026') + db.session.add(user) + db.session.commit() + + # Encolar creación en Moodle si aplica + try: + username = user.email.split('@')[0].lower() + moodle_queue_service.enqueue_task( + action='CREATE_USER', + entity_type='user', + entity_id=str(user.id), + payload={ + 'username': username, + 'email': user.email, + 'firstname': user.first_name or 'Docente', + 'lastname': user.last_name or 'EduSpace', + 'password': password or 'EduSpace2026*' + } + ) + except Exception: + pass + + return { + 'status': 'success', + 'message': 'Usuario creado exitosamente.', + 'user': user.to_dict() + } + + +@admin_router.get("/users/{id}") +def get_user_detail( + id: int, + current_user: User = Depends(require_roles(["ADMIN", "BEDELIA"])) +): + """Obtiene el detalle de un usuario por su identificador.""" + with flask_app.app_context(): + user = User.query.get(id) + if not user: + raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=f"Usuario con ID {id} no encontrado.") + d = user.to_dict() + d['role_obj'] = { + 'id': user.role_obj.id, + 'name': user.role_obj.name + } if user.role_obj else {'id': 1, 'name': user.role or 'Admin'} + return { + 'status': 'success', + 'user': d + } + + +@admin_router.put("/users/{id}") +async def update_user( + id: int, + request: Request, + 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) + + with flask_app.app_context(): + user = User.query.get(id) + if not user: + raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=f"Usuario con ID {id} no encontrado.") + + first_name = (data.get('first_name', user.first_name or '')).strip() + last_name = (data.get('last_name', user.last_name or '')).strip() + name = (data.get('name') or '').strip() + + if 'first_name' in data or 'last_name' in data: + user.first_name = first_name + user.last_name = last_name + user.name = f"{first_name} {last_name}".strip() + elif name: + user.name = name + parts = name.split() + user.first_name = parts[0] if parts else '' + user.last_name = ' '.join(parts[1:]) if len(parts) > 1 else '' + + if 'phone' in data: + user.phone = (data['phone'] or '').strip() + if 'personal_email' in data: + user.personal_email = (data['personal_email'] or '').strip().lower() + if 'address' in data: + user.address = (data['address'] or '').strip() + + if 'document_type' in data or 'document_number' in data: + doc_type = (data.get('document_type') or user.document_type or 'DNI').strip().upper() + doc_num = (data.get('document_number') or user.document_number or '').strip() + if doc_num: + is_valid, clean_doc, err_msg = validate_document(doc_type, doc_num) + if not is_valid: + raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail=err_msg) + doc_num = clean_doc + + existing_doc = User.query.filter( + User.document_type == doc_type, + User.document_number == doc_num, + User.id != id + ).first() + if existing_doc: + raise HTTPException(status_code=status.HTTP_409_CONFLICT, detail=f'El documento {doc_type} {doc_num} ya está asignado a otro usuario.') + + user.document_type = doc_type + user.document_number = doc_num + + if 'email' in data and data['email']: + email = data['email'].strip().lower() + existing = User.query.filter(User.email.ilike(email), User.id != id).first() + if existing: + raise HTTPException(status_code=status.HTTP_409_CONFLICT, detail=f'El email {email} ya está registrado por otro usuario.') + user.email = email + + if 'role_id' in data: + r_id = data['role_id'] + user.role_id = int(r_id) if (r_id and str(r_id).strip().isdigit()) else None + if user.role_id: + r_obj = Role.query.get(user.role_id) + if r_obj: + user.role = r_obj.name.upper() + + if 'is_active' in data: + val = data['is_active'] + user.is_active = val in [True, 'true', '1', 'on'] + + db.session.commit() + return { + 'status': 'success', + 'message': 'Usuario actualizado exitosamente.', + 'user': user.to_dict() + } + + +@admin_router.post("/users/{id}/toggle") +def toggle_user( + id: int, + current_user: User = Depends(require_roles(["ADMIN", "BEDELIA"])) +): + """Conmuta el estado activo/inactivo de un usuario.""" + with flask_app.app_context(): + user = User.query.get(id) + if not user: + raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=f"Usuario con ID {id} no encontrado.") + user.is_active = not user.is_active + db.session.commit() + return { + 'status': 'success', + 'id': user.id, + 'is_active': user.is_active, + 'message': f'Usuario {"activado" if user.is_active else "desactivado"} correctamente.' + } + + +@admin_router.delete("/users/{id}") +def delete_user( + id: int, + current_user: User = Depends(require_roles(["ADMIN", "BEDELIA"])) +): + """Elimina permanentemente un usuario o lo desactiva si tiene reservas.""" + with flask_app.app_context(): + user = User.query.get(id) + if not user: + raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=f"Usuario con ID {id} no encontrado.") + + has_reservations = len(user.reservations) if user.reservations else 0 + if has_reservations > 0: + user.is_active = False + db.session.commit() + return { + 'status': 'success', + 'message': 'El usuario tiene reservas asociadas. Se ha desactivado en su lugar.' + } + + db.session.delete(user) + db.session.commit() + return { + 'status': 'success', + 'message': 'Usuario eliminado permanentemente.' + } + + +# ========================================================= +# ROLES & RBAC ENDPOINTS +# ========================================================= + +@admin_router.get("/roles") +@admin_router.get("/admin/roles") +def get_roles( + current_user: User = Depends(get_current_user) +): + """Lista todos los roles institucionales y sus matrices de permisos por módulo.""" + with flask_app.app_context(): + roles = Role.query.order_by(Role.id.asc()).all() + modules = [ + {'id': 'dashboard', 'name': 'Dashboard', 'icon': 'bi-speedometer2'}, + {'id': 'classrooms', 'name': 'Aulas y Espacios', 'icon': 'bi-door-open'}, + {'id': 'schedule', 'name': 'Cronograma', 'icon': 'bi-calendar3'}, + {'id': 'subjects', 'name': 'Asignaturas', 'icon': 'bi-book'}, + {'id': 'careers', 'name': 'Carreras', 'icon': 'bi-mortarboard'}, + {'id': 'commissions', 'name': 'Comisiones', 'icon': 'bi-diagram-3'}, + {'id': 'users', 'name': 'Usuarios', 'icon': 'bi-people'}, + {'id': 'roles', 'name': 'Roles (RBAC)', 'icon': 'bi-shield-check'}, + {'id': 'optimizer', 'name': 'Optimizador IA', 'icon': 'bi-cpu'}, + {'id': 'audit', 'name': 'Auditoría', 'icon': 'bi-clipboard-data'} + ] + + roles_data = [] + for r in roles: + perms_map = {} + for p in r.permissions: + perms_map[p.module] = p.access_level + + roles_data.append({ + 'id': r.id, + 'name': r.name, + 'description': r.description or f'Rol institucional de {r.name}', + 'is_system': getattr(r, 'is_system', True), + 'users_count': len(r.users) if r.users else 0, + 'users': [{'id': u.id, 'name': u.name} for u in (r.users or [])], + 'permissions': perms_map + }) + + return { + 'status': 'success', + 'roles': roles_data, + 'modules': modules + } + + +@admin_router.post("/roles", status_code=status.HTTP_201_CREATED) +async def create_role( + request: Request, + 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) + + with flask_app.app_context(): + name = (data.get('name') or '').strip() + description = (data.get('description') or '').strip() + raw_perms = data.get('permissions', {}) + if isinstance(raw_perms, str): + try: + import json + permissions = json.loads(raw_perms) + except Exception: + permissions = {} + elif isinstance(raw_perms, dict): + permissions = raw_perms + else: + permissions = {} + + if not name: + raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="El nombre del rol es obligatorio.") + + if Role.query.filter(Role.name.ilike(name)).first(): + raise HTTPException(status_code=status.HTTP_409_CONFLICT, detail=f"Ya existe un rol llamado {name}.") + + role = Role(name=name, description=description, is_system=False) + db.session.add(role) + db.session.flush() + + for mod, level in permissions.items(): + role.set_permission(mod, level) + + db.session.commit() + return { + 'status': 'success', + 'message': 'Rol creado exitosamente.', + 'role': role.to_dict() + } + + +@admin_router.delete("/roles/{id}") +def delete_role( + id: int, + current_user: User = Depends(require_roles(["ADMIN"])) +): + """Elimina un rol del sistema.""" + with flask_app.app_context(): + role = Role.query.get(id) + if not role: + raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=f"Rol con ID {id} no encontrado.") + if getattr(role, 'is_system', False): + raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="No se pueden eliminar roles protegidos del sistema.") + + db.session.delete(role) + db.session.commit() + return { + 'status': 'success', + 'message': 'Rol eliminado permanentemente.' + } + + +# ========================================================= +# IMPERSONATION ENDPOINTS +# ========================================================= + +@admin_router.post("/admin/impersonate") +async def impersonate_user( + request: Request, + 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) + + with flask_app.app_context(): + user_id = data.get('user_id') + if not user_id: + raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="Se requiere el user_id para impersonar.") + + target_user = User.query.get(int(user_id)) + if not target_user: + raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=f"Usuario destino #{user_id} no encontrado.") + + AuditService.log( + action='IMPERSONATE_START', + module='admin', + entity_id=target_user.id, + user=current_user, + details=f"Administrador {current_user.email} inició sesión como {target_user.email} ({target_user.role})" + ) + + return { + 'status': 'success', + 'message': f"Iniciando impersonación de {target_user.name} ({target_user.email})", + 'user': { + 'id': target_user.id, + 'name': target_user.name, + 'email': target_user.email, + 'role': target_user.role + } + } + + +@admin_router.post("/admin/stop-impersonating") +def stop_impersonating( + current_user: User = Depends(get_current_user) +): + """Restaura la sesión administrativa original.""" + with flask_app.app_context(): + AuditService.log( + action='IMPERSONATE_STOP', + module='admin', + entity_id=current_user.id, + user=current_user, + details=f"Finalizó la sesión de impersonación. Sesión restaurada a {current_user.email}." + ) + return { + 'status': 'success', + 'message': 'Sesión de impersonación finalizada exitosamente.' + } + + +# ========================================================= +# SYSTEM RESET ENDPOINT +# ========================================================= + +@admin_router.post("/system/reset") +@admin_router.post("/admin/system/reset") +@admin_router.post("/admin/settings/reset_system") +async def reset_system( + request: Request, + current_user: User = Depends(require_roles(["ADMIN"])) +): + """ + 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) + + password = str(data.get('password') or '').strip() + if not password: + raise HTTPException( + status_code=status.HTTP_400_BAD_REQUEST, + detail="Debe ingresar la contraseña de su usuario administrador para autorizar la reinicialización." + ) + + with flask_app.app_context(): + # Validar contraseña del administrador + admin = User.query.get(current_user.id) + if not admin or not admin.check_password(password): + try: + AuditService.log( + action='SYSTEM_RESET_FAILED', + module='admin', + entity_id=current_user.id, + user=current_user, + details="Intento de reinicialización del sistema cancelado: contraseña incorrecta." + ) + except Exception: + pass + raise HTTPException( + status_code=status.HTTP_401_UNAUTHORIZED, + detail="Contraseña de administrador incorrecta. Operación cancelada por seguridad." + ) + + from app.models.reservation import Reservation + from app.models.grade import MilestoneGrade + from app.models.enrollment import StudentEnrollment + from app.models.classroom import Classroom, ClassroomResource + from app.models.building import Building + from app.models.subject import Subject, Commission, CommissionTeacher + from app.models.career import Career + from app.models.academic_term import AcademicTerm + + reservations_deleted = Reservation.query.delete() + grades_deleted = MilestoneGrade.query.delete() + milestones_deleted = AcademicMilestone.query.delete() + enrollments_deleted = StudentEnrollment.query.delete() + teachers_deleted = CommissionTeacher.query.delete() + commissions_deleted = Commission.query.delete() + subjects_deleted = Subject.query.delete() + careers_deleted = Career.query.delete() + resources_deleted = ClassroomResource.query.delete() + classrooms_deleted = Classroom.query.delete() + buildings_deleted = Building.query.delete() + terms_deleted = AcademicTerm.query.delete() + moodle_deleted = MoodleSyncTask.query.delete() + + db.session.commit() + + AuditService.log( + action='SYSTEM_RESET_SUCCESS', + module='admin', + entity_id=current_user.id, + user=current_user, + details=f"Sistema reinicializado. Purgados: {reservations_deleted} reservas, {classrooms_deleted} aulas, {subjects_deleted} materias." + ) + + return { + 'status': 'success', + 'message': 'El sistema ha sido reinicializado exitosamente. Todos los usuarios, roles y configuraciones fueron preservados.', + 'purged': { + 'reservations': reservations_deleted, + 'grades': grades_deleted, + 'milestones': milestones_deleted, + 'enrollments': enrollments_deleted, + 'teachers_assignments': teachers_deleted, + 'commissions': commissions_deleted, + 'subjects': subjects_deleted, + 'careers': careers_deleted, + 'classrooms': classrooms_deleted, + 'buildings': buildings_deleted, + 'academic_terms': terms_deleted, + 'sync_tasks': moodle_deleted + } + } + + +# ========================================================= +# AUDIT LOGS ENDPOINTS +# ========================================================= + +@admin_router.get("/audit-logs") +@admin_router.get("/audit_logs", include_in_schema=False) +@admin_router.get("/admin/audit-logs", include_in_schema=False) +def get_audit_logs( + module: Optional[str] = Query(None), + action: Optional[str] = Query(None), + user_id: Optional[int] = Query(None), + limit: int = Query(50), + current_user: User = Depends(require_roles(["ADMIN"])) +): + """Consulta la bitácora inmutable de auditoría del sistema.""" + with flask_app.app_context(): + logs = AuditService.get_logs(module=module, action=action, user_id=user_id, limit=limit) + return { + 'status': 'success', + 'total': len(logs), + 'logs': [log.to_dict() for log in logs] + } + + +# ========================================================= +# USER AUXILIARY ENDPOINTS +# ========================================================= + +@admin_router.get("/users/document-types") +@admin_router.get("/admin/users/document-types") +def get_document_types(): + """Retorna los tipos de documentos válidos.""" + return { + 'status': 'success', + 'document_types': DOCUMENT_TYPES + } + + +@admin_router.post("/users/{id}/password") +@admin_router.put("/users/{id}/password") +@admin_router.post("/admin/users/{id}/password") +@admin_router.put("/admin/users/{id}/password") +async def reset_user_password( + id: int, + request: Request, + 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) + + new_password = str(data.get('password') or data.get('new_password') or '').strip() + if not new_password or len(new_password) < 6: + raise HTTPException( + status_code=status.HTTP_400_BAD_REQUEST, + detail="La nueva contraseña debe contener al menos 6 caracteres." + ) + + with flask_app.app_context(): + user = User.query.get(id) + if not user: + raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=f"Usuario con ID {id} no encontrado.") + + user.set_password(new_password) + db.session.commit() + + AuditService.log( + action='RESET_PASSWORD', + module='users', + entity_id=user.id, + user=current_user, + details=f"Contraseña restablecida para el usuario {user.email}" + ) + + return { + 'status': 'success', + 'message': f'Contraseña restablecida exitosamente para {user.name}.', + 'user_id': user.id + } + + +# ========================================================= +# GLOBAL SYSTEM SETTINGS (SMTP, AUTH, GOOGLE, MOODLE, UI) +# ========================================================= + +@admin_router.get("/settings/all") +@admin_router.get("/admin/settings/all") +def get_all_settings(current_user: User = Depends(require_roles(["ADMIN"]))): + """Retorna todas las configuraciones agrupadas por módulo, enmascarando contraseñas.""" + with flask_app.app_context(): + smtp_config = { + 'host': SystemSetting.get_value('smtp_host', 'smtp.gmail.com'), + 'port': int(SystemSetting.get_value('smtp_port', 587) or 587), + 'user': SystemSetting.get_value('smtp_user', ''), + 'password': SystemSetting.get_masked_value('smtp_password', ''), + 'security': SystemSetting.get_value('smtp_security', 'STARTTLS'), + 'sender_email': SystemSetting.get_value('smtp_sender_email', 'notificaciones@unicaba.edu.ar'), + 'sender_name': SystemSetting.get_value('smtp_sender_name', 'Edu-Space UniCABA'), + 'enabled': SystemSetting.get_value('smtp_enabled', 'true') in ['true', 'True', '1', True] + } + + auth_providers = { + 'local': SystemSetting.get_value('auth_local_enabled', 'true') in ['true', 'True', '1', True], + 'local_enabled': SystemSetting.get_value('auth_local_enabled', 'true') in ['true', 'True', '1', True], + 'google': SystemSetting.get_value('auth_google_enabled', 'false') in ['true', 'True', '1', True], + 'google_enabled': SystemSetting.get_value('auth_google_enabled', 'false') in ['true', 'True', '1', True], + 'moodle': SystemSetting.get_value('auth_moodle_enabled', 'false') in ['true', 'True', '1', True], + 'moodle_enabled': SystemSetting.get_value('auth_moodle_enabled', 'false') in ['true', 'True', '1', True] + } + + google_oauth = { + 'client_id': SystemSetting.get_value('google_client_id', ''), + 'client_secret': SystemSetting.get_masked_value('google_client_secret', ''), + 'callback_url': SystemSetting.get_value('google_callback_url', '/auth/google/callback'), + 'allowed_domains': SystemSetting.get_value('google_allowed_domains', 'unicaba.edu.ar,lasalle.edu.ar') + } + + moodle_config = { + 'server_url': SystemSetting.get_value('moodle_server_url', 'http://10.0.0.207/moodle'), + 'ws_token': SystemSetting.get_masked_value('moodle_ws_token', ''), + 'timeout': int(SystemSetting.get_value('moodle_timeout', 10) or 10), + 'auto_sync_enabled': SystemSetting.get_value('moodle_auto_sync_enabled', 'true') in ['true', 'True', '1', True], + 'sync_interval_minutes': int(SystemSetting.get_value('moodle_sync_interval_minutes', 15) or 15) + } + + ui_config = { + 'show_role_banner': SystemSetting.get_value('dashboard_role_banner_enabled', 'true') in ['true', 'True', '1', True] + } + + return { + 'status': 'success', + 'settings': { + 'smtp': smtp_config, + 'auth_providers': auth_providers, + 'google_oauth': google_oauth, + 'moodle': moodle_config, + 'ui': ui_config + } + } + + +@admin_router.post("/settings/smtp") +@admin_router.post("/admin/settings/smtp") +async def update_smtp_settings( + request: Request, + 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) + + host = str(data.get('host', '')).strip() + port = str(data.get('port', 587)).strip() + user = str(data.get('user', '')).strip() + password = str(data.get('password', '')).strip() + security = str(data.get('security', 'STARTTLS')).strip().upper() + sender_email = str(data.get('sender_email', '')).strip() + sender_name = str(data.get('sender_name', 'Edu-Space UniCABA')).strip() + enabled = 'true' if data.get('enabled') in [True, 'true', '1', 'on'] else 'false' + + with flask_app.app_context(): + SystemSetting.set_value('smtp_host', host, 'Host del servidor SMTP', category='smtp') + SystemSetting.set_value('smtp_port', port, 'Puerto del servidor SMTP', category='smtp') + SystemSetting.set_value('smtp_user', user, 'Usuario o email de autenticación SMTP', category='smtp') + if password and password != '••••••••••••': + SystemSetting.set_encrypted_value('smtp_password', password, 'Contraseña de autenticación SMTP cifrada', category='smtp') + SystemSetting.set_value('smtp_security', security, 'Protocolo de seguridad SMTP (NONE, SSL, STARTTLS)', category='smtp') + SystemSetting.set_value('smtp_sender_email', sender_email, 'Email remitente oficial', category='smtp') + SystemSetting.set_value('smtp_sender_name', sender_name, 'Nombre remitente oficial', category='smtp') + SystemSetting.set_value('smtp_enabled', enabled, 'Habilitación del servicio SMTP', category='smtp') + + AuditService.log( + action='UPDATE_SMTP_SETTINGS', + module='settings', + user=current_user, + details=f"Configuración SMTP actualizada (Host: {host}:{port}, Remitente: {sender_email})" + ) + + return { + 'status': 'success', + 'message': 'Configuración de servidor SMTP guardada exitosamente.' + } + + +@admin_router.post("/settings/smtp/test") +@admin_router.post("/admin/settings/smtp/test") +async def test_smtp_connection( + request: Request, + current_user: User = Depends(require_roles(["ADMIN"])) +): + """Prueba en tiempo real la conexión al servidor SMTP.""" + import smtplib + 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) + + test_recipient = str(data.get('test_email') or current_user.email).strip() + + with flask_app.app_context(): + host = data.get('host') or SystemSetting.get_value('smtp_host', 'smtp.gmail.com') + port = int(data.get('port') or SystemSetting.get_value('smtp_port', 587) or 587) + user = data.get('user') or SystemSetting.get_value('smtp_user', '') + password = data.get('password') + if not password or password == '••••••••••••': + password = SystemSetting.get_decrypted_value('smtp_password', '') + security_val = data.get('security') or SystemSetting.get_value('smtp_security', 'STARTTLS') or 'STARTTLS' + security = str(security_val).upper() + sender_email = str(data.get('sender_email') or SystemSetting.get_value('smtp_sender_email', user) or 'notificaciones@unicaba.edu.ar') + sender_name = data.get('sender_name') or SystemSetting.get_value('smtp_sender_name', 'Edu-Space UniCABA') + + if not host or not port: + raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="Host y puerto SMTP son requeridos.") + + try: + if security == 'SSL': + server = smtplib.SMTP_SSL(host, port, timeout=10) + else: + server = smtplib.SMTP(host, port, timeout=10) + if security == 'STARTTLS': + server.ehlo() + server.starttls() + server.ehlo() + + if user and password: + server.login(user, password) + + if test_recipient: + msg = MIMEMultipart('alternative') + msg['Subject'] = '✔ Prueba de Conexión SMTP - Edu-Space UniCABA' + msg['From'] = f"{sender_name} <{sender_email}>" + msg['To'] = test_recipient + + html_content = f""" +
Este es un mensaje de prueba para confirmar que los parámetros del servidor de correo han sido configurados correctamente.
+Enviado desde el Panel de Administración de UniCABA.
+