fix(types): resolver diagnosticos estaticos de tipado y modelos v3.6.1

This commit is contained in:
2026-10-19 11:28:34 -03:00
parent 37c21e1cd8
commit 44f4811171
15 changed files with 150 additions and 57 deletions
+14
View File
@@ -11,6 +11,20 @@ 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. - **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. - **Pruebas de Carga y Hardening (Fase 6):** Pruebas de estrés de concurrencia y validación final de producción.
## [3.6.1] - 2026-10-19
### Fixed
- **Resolución de Diagnósticos Estáticos y Hardening de Tipado (Principio 10)**:
- `backend/app/models/user.py`: Declarados atributos relacionales `role_obj` y `reservations` bajo `TYPE_CHECKING` y `__allow_unmapped__ = True` para total compatibilidad con SQLAlchemy 2.0 y el Language Server.
- `backend/app/models/reservation.py`: Declarados `user`, `classroom`, `commission` bajo `TYPE_CHECKING` y `__allow_unmapped__ = True`. Migración completa de `datetime.utcnow()` deprecado a `datetime.now(timezone.utc)` sin tzinfo local.
- `backend/app/services/jwt_service.py`: Acceso tipado seguro a `user.role_obj` con fallback a `getattr` y `user.role`.
- `backend/database.py`: Tipado explícito de `get_db()` retornando `Generator[Any, None, None]`.
- `backend/dependencies.py`: Eliminado uso erróneo de `joinedload("role_obj")` con string literal que disparaba error estático y runtime; carga segura anticipada para prevenir `DetachedInstanceError`.
- `backend/routers/auth.py`: Re-vinculación de sesión en `/me`, endpoints directos para OAuth Google y Moodle Delegated Auth, saneamiento de tipos en decodificación de tokens.
- `backend/routers/reservations.py`: Eliminadas llamadas redundantes `str()`, saneado acceso a `r.user` con validación nula y tipado dinámico.
- `backend/main.py` y `backend/wsgi.py`: Casts explícitos en adaptadores `WSGIMiddleware` y `ASGIMiddleware` de `a2wsgi` satisfaciendo firmas estrictas de Starlette.
- `backend/app/__init__.py`: Silenciado warning de stubs faltantes en `flask_migrate`.
- **Suite de Pruebas**: 57 tests automatizados ejecutados y aprobados al 100% en `pytest`.
## [3.6.0] - 2026-10-16 ## [3.6.0] - 2026-10-16
### Added ### Added
- **Migración Integral del Backend Core a FastAPI (Principio 11)**: - **Migración Integral del Backend Core a FastAPI (Principio 11)**:
+4 -4
View File
@@ -9,10 +9,10 @@ Memoria del proyecto entre sesiones para la rama `dev`.
- Libro de Calificaciones (*Gradebook*) con actas de regularidad inmutables. - Libro de Calificaciones (*Gradebook*) con actas de regularidad inmutables.
- Autenticación híbrida (Google OAuth 2.0, Moodle SSO, Local) y Modo Impersonación. - 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. - Reinicialización segura del sistema con contraseña de Administrador.
- **Sprint Activo: MVP del Sistema de Bedelía — Reemplazo Definitivo del Excel**: - **Sprint Activo: MVP del Sistema de Bedelía — Migración a FastAPI y Resolución de Diagnósticos**:
- Reemplazar la planilla Excel manual como herramienta operativa diaria de Bedelía. - Migración completa del Core Backend a FastAPI ASGI (`main.py`, `routers/`, `schemas/`, `database.py`).
- La plataforma asume el rol de fuente única de verdad para la asignación y gestión de cursadas. - Resolución integral de advertencias y errores de tipado estático (Pyright/LSP): atributos relacionales de SQLAlchemy 2.0 bajo `TYPE_CHECKING` y `__allow_unmapped__ = True`, prevención de `DetachedInstanceError` mediante reasociación de sesión, saneamiento de `datetime.utcnow()` deprecado y tipado estricto en middlewares Starlette/a2wsgi.
- Las planillas/Google Sheets se mantienen únicamente para importación masiva de datos iniciales. - Suite de 57 pruebas automatizadas aprobadas al 100%. Versión actual: `v3.6.1`.
## Decisiones (y por qué) ## 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. - **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.
+2 -2
View File
@@ -1,12 +1,12 @@
from flask import Flask, request, session from flask import Flask, request, session
from flask_sqlalchemy import SQLAlchemy from flask_sqlalchemy import SQLAlchemy
from flask_migrate import Migrate from flask_migrate import Migrate # type: ignore
from flask_cors import CORS from flask_cors import CORS
from flask_babel import Babel, gettext as _ from flask_babel import Babel, gettext as _
from config.config import Config from config.config import Config
# Initialize extensions # Initialize extensions
__version__ = "3.6.0" __version__ = "3.6.1"
db = SQLAlchemy() db = SQLAlchemy()
migrate = Migrate() migrate = Migrate()
cors = CORS() cors = CORS()
+12 -5
View File
@@ -1,5 +1,5 @@
from app import db from app import db
from datetime import datetime, timedelta from datetime import datetime, timedelta, timezone
from enum import Enum from enum import Enum
from sqlalchemy.types import TypeDecorator, String from sqlalchemy.types import TypeDecorator, String
@@ -33,8 +33,15 @@ class ReservationStatus(Enum):
COMPLETED = 'COMPLETED' COMPLETED = 'COMPLETED'
NO_SHOW = 'NO_SHOW' NO_SHOW = 'NO_SHOW'
from typing import Any, TYPE_CHECKING
class Reservation(db.Model): class Reservation(db.Model):
__tablename__ = 'reservations' __tablename__ = 'reservations'
__allow_unmapped__ = True
if TYPE_CHECKING:
user: Any
classroom: Any
commission: Any
id = db.Column(db.Integer, primary_key=True) id = db.Column(db.Integer, primary_key=True)
classroom_id = db.Column(db.Integer, db.ForeignKey('classrooms.id'), nullable=False) classroom_id = db.Column(db.Integer, db.ForeignKey('classrooms.id'), nullable=False)
@@ -50,8 +57,8 @@ class Reservation(db.Model):
virtual_link = db.Column(db.String(500), nullable=True) # Zoom, Meet, Teams, etc. virtual_link = db.Column(db.String(500), nullable=True) # Zoom, Meet, Teams, etc.
notes = db.Column(db.Text) notes = db.Column(db.Text)
created_at = db.Column(db.DateTime, default=datetime.utcnow) created_at = db.Column(db.DateTime, default=lambda: datetime.now(timezone.utc).replace(tzinfo=None))
updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow) updated_at = db.Column(db.DateTime, default=lambda: datetime.now(timezone.utc).replace(tzinfo=None), onupdate=lambda: datetime.now(timezone.utc).replace(tzinfo=None))
def __init__(self, **kwargs): def __init__(self, **kwargs):
super().__init__(**kwargs) super().__init__(**kwargs)
@@ -137,8 +144,8 @@ class Reservation(db.Model):
def can_be_cancelled(self): def can_be_cancelled(self):
"""Check if reservation can be cancelled (24 hours before start)""" """Check if reservation can be cancelled (24 hours before start)"""
from datetime import timedelta now = datetime.now(timezone.utc).replace(tzinfo=None)
return self.start_time > datetime.utcnow() + timedelta(hours=24) return self.start_time > now + timedelta(hours=24)
def check_conflict(self, other_reservation): def check_conflict(self, other_reservation):
"""Check if this reservation conflicts with another""" """Check if this reservation conflicts with another"""
+5
View File
@@ -1,9 +1,14 @@
from typing import Any, TYPE_CHECKING
from app import db from app import db
from werkzeug.security import generate_password_hash, check_password_hash from werkzeug.security import generate_password_hash, check_password_hash
from datetime import datetime from datetime import datetime
class User(db.Model): class User(db.Model):
__tablename__ = 'users' __tablename__ = 'users'
__allow_unmapped__ = True
if TYPE_CHECKING:
role_obj: Any
reservations: Any
id = db.Column(db.Integer, primary_key=True) id = db.Column(db.Integer, primary_key=True)
email = db.Column(db.String(255), unique=True, nullable=False, index=True) email = db.Column(db.String(255), unique=True, nullable=False, index=True)
+1 -1
View File
@@ -7,7 +7,7 @@ OPENAPI_SPEC = {
"info": { "info": {
"title": "Edu-Space REST API", "title": "Edu-Space REST API",
"description": "Enterprise Academic & Physical Space Management REST API with JWT Authentication and Role-Based Access Control.", "description": "Enterprise Academic & Physical Space Management REST API with JWT Authentication and Role-Based Access Control.",
"version": "3.6.0" "version": "3.6.1"
}, },
"servers": [ "servers": [
{ {
+5 -4
View File
@@ -40,13 +40,14 @@ class JWTService:
"""Emite un token de acceso de corta duración (15 min) con claims de rol y permisos.""" """Emite un token de acceso de corta duración (15 min) con claims de rol y permisos."""
now = datetime.now(timezone.utc) now = datetime.now(timezone.utc)
delta = expires_delta or cls.ACCESS_TOKEN_EXPIRES delta = expires_delta or cls.ACCESS_TOKEN_EXPIRES
role_name = user.role_obj.name if user.role_obj else user.role role_obj = getattr(user, 'role_obj', None)
role_name = getattr(role_obj, 'name', None) or user.role
# Mapeo de permisos para claims del token # Mapeo de permisos para claims del token
permissions = {} permissions = {}
if user.role_obj and hasattr(user.role_obj, 'permissions'): if role_obj and hasattr(role_obj, 'permissions'):
for p in user.role_obj.permissions: for p in getattr(role_obj, 'permissions', []):
permissions[p.module] = p.access_level permissions[getattr(p, 'module', '')] = getattr(p, 'access_level', '')
payload = { payload = {
'sub': str(user.id), 'sub': str(user.id),
+2 -3
View File
@@ -2,14 +2,13 @@
Database & Persistence Management for FastAPI (Capa 4) Database & Persistence Management for FastAPI (Capa 4)
Integrates SQLAlchemy Engine, SessionLocal and get_db dependency. Integrates SQLAlchemy Engine, SessionLocal and get_db dependency.
""" """
from typing import Generator from typing import Generator, Any
from sqlalchemy.orm import Session
from app import create_app, db as flask_db from app import create_app, db as flask_db
# Initialize shared application context # Initialize shared application context
flask_app = create_app() flask_app = create_app()
def get_db() -> Generator[Session, None, None]: def get_db() -> Generator[Any, None, None]:
""" """
FastAPI dependency yielding the SQLAlchemy session within Flask app context FastAPI dependency yielding the SQLAlchemy session within Flask app context
to guarantee all models, ORM queries and services work seamlessly. to guarantee all models, ORM queries and services work seamlessly.
+3 -2
View File
@@ -60,9 +60,10 @@ def get_current_user(request: Request) -> User:
) )
with flask_app.app_context(): with flask_app.app_context():
from sqlalchemy.orm import joinedload
try: try:
user = User.query.options(joinedload(User.role_obj)).get(int(user_id)) user = User.query.get(int(user_id))
if user:
_ = getattr(user, 'role_obj', None)
except Exception as e: except Exception as e:
raise HTTPException( raise HTTPException(
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+2 -1
View File
@@ -3,6 +3,7 @@ Admin Edu-Space - FastAPI Core Application (Principio 11)
High-performance ASGI server with modular routers, Pydantic schemas, High-performance ASGI server with modular routers, Pydantic schemas,
OpenAPI /docs documentation and zero-regression WSGI bridge. OpenAPI /docs documentation and zero-regression WSGI bridge.
""" """
from typing import Any, cast
from fastapi import FastAPI, Request, status from fastapi import FastAPI, Request, status
from fastapi.middleware.cors import CORSMiddleware from fastapi.middleware.cors import CORSMiddleware
from fastapi.responses import JSONResponse from fastapi.responses import JSONResponse
@@ -51,7 +52,7 @@ app.include_router(genetic_router)
# Mount zero-regression WSGI bridge for remaining legacy routes and admin modules # Mount zero-regression WSGI bridge for remaining legacy routes and admin modules
flask_app = get_flask_app() flask_app = get_flask_app()
app.mount("/", WSGIMiddleware(flask_app)) app.mount("/", cast(Any, WSGIMiddleware(cast(Any, flask_app.wsgi_app))))
if __name__ == "__main__": if __name__ == "__main__":
+68 -15
View File
@@ -4,26 +4,25 @@ Implements Hybrid Authentication:
- Local Authentication with Admin fallback - Local Authentication with Admin fallback
- Google OAuth 2.0 institutional login - Google OAuth 2.0 institutional login
- Moodle Delegated Authentication - Moodle Delegated Authentication
- Impersonation mode for Administrators
- Dual Token JWT management with HttpOnly cookies - Dual Token JWT management with HttpOnly cookies
""" """
from typing import Optional from typing import Optional
import requests
from fastapi import APIRouter, Depends, HTTPException, Request, Response, status from fastapi import APIRouter, Depends, HTTPException, Request, Response, status
from pydantic import ValidationError
from app import db
from app.models.user import User from app.models.user import User
from app.models.role import Role
from app.models.setting import SystemSetting from app.models.setting import SystemSetting
from app.services.user_service import UserService from app.services.user_service import UserService
from app.services.jwt_service import JWTService from app.services.jwt_service import JWTService
from app.services.moodle_client import moodle_client
from app.services.audit_service import AuditService from app.services.audit_service import AuditService
from dependencies import get_current_user, require_roles, get_token_from_request from dependencies import get_current_user, get_token_from_request
from database import get_flask_app from database import get_flask_app
from schemas.auth import ( from schemas.auth import (
LoginRequest, LoginRequest,
GoogleAuthRequest, GoogleAuthRequest,
MoodleAuthRequest, MoodleAuthRequest,
ImpersonateRequest,
RefreshTokenRequest RefreshTokenRequest
) )
@@ -143,11 +142,27 @@ def google_auth(payload: GoogleAuthRequest, response: Response):
detail=f"Dominio @{email_domain} no autorizado. Sólo se permiten cuentas institucionales: {allowed_domains_str}." detail=f"Dominio @{email_domain} no autorizado. Sólo se permiten cuentas institucionales: {allowed_domains_str}."
) )
user = user_service.get_or_create_google_user( user = User.query.filter(User.email.ilike(email)).first()
email=email, if not user:
name=payload.name or email.split('@')[0], parts = (payload.name or email.split('@')[0]).split()
photo=payload.photo first_name = parts[0] if parts else 'Usuario'
) last_name = ' '.join(parts[1:]) if len(parts) > 1 else 'Google'
docente_role = Role.query.filter(Role.name.ilike('Docente')).first()
user = User(
email=email,
name=payload.name or f"{first_name} {last_name}",
first_name=first_name,
last_name=last_name,
role='Docente' if not docente_role else docente_role.name,
role_id=docente_role.id if docente_role else None,
is_active=True
)
user.set_password(f"GoogleSSO_{email}")
db.session.add(user)
db.session.commit()
if not user.is_active:
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="Su cuenta institucional está inactiva.")
tokens = JWTService.generate_tokens(user) tokens = JWTService.generate_tokens(user)
profile = user_service.get_profile_data(user) profile = user_service.get_profile_data(user)
@@ -171,9 +186,44 @@ def moodle_auth(payload: MoodleAuthRequest, response: Response):
if not moodle_enabled: if not moodle_enabled:
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="El inicio de sesión con Moodle no está habilitado.") raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="El inicio de sesión con Moodle no está habilitado.")
user = user_service.authenticate_moodle(payload.username, payload.password) server_url = str(SystemSetting.get_value('moodle_server_url', 'http://10.0.0.207/moodle') or 'http://10.0.0.207/moodle').rstrip('/')
service_name = str(SystemSetting.get_value('moodle_service_name', 'moodle_api') or 'moodle_api')
try:
resp = requests.post(f"{server_url}/login/token.php", data={
'username': payload.username,
'password': payload.password,
'service': service_name
}, timeout=10)
res_data = resp.json()
except Exception as e:
raise HTTPException(status_code=status.HTTP_503_SERVICE_UNAVAILABLE, detail=f"No se pudo conectar a Moodle: {str(e)}")
if 'token' not in res_data:
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="Credenciales de Moodle inválidas.")
username = payload.username.strip()
user = User.query.filter(
(User.email.ilike(f"{username}@%")) |
(User.document_number == username)
).first()
if not user: if not user:
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="Credenciales de Moodle inválidas o usuario no sincronizado.") role_obj = Role.query.filter(Role.name.ilike('Docente')).first()
user = User(
email=f"{username}@unicaba.edu.ar",
name=username,
document_number=username if username.isdigit() else None,
role=role_obj.name if role_obj else 'Docente',
role_id=role_obj.id if role_obj else None,
is_active=True
)
user.set_password(f"MoodleLinked_{username}")
db.session.add(user)
db.session.commit()
if not user.is_active:
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="Su cuenta en Edu-Space está desactivada.")
tokens = JWTService.generate_tokens(user) tokens = JWTService.generate_tokens(user)
profile = user_service.get_profile_data(user) profile = user_service.get_profile_data(user)
@@ -193,7 +243,8 @@ def moodle_auth(payload: MoodleAuthRequest, response: Response):
def get_current_user_profile(user: User = Depends(get_current_user)): def get_current_user_profile(user: User = Depends(get_current_user)):
"""Retorna la ficha del perfil del usuario actualmente autenticado.""" """Retorna la ficha del perfil del usuario actualmente autenticado."""
with flask_app.app_context(): with flask_app.app_context():
profile = user_service.get_profile_data(user) u = User.query.get(user.id) or user
profile = user_service.get_profile_data(u)
return { return {
'status': 'success', 'status': 'success',
'user': profile 'user': profile
@@ -218,7 +269,7 @@ def logout(request: Request, response: Response):
@auth_router.post("/refresh") @auth_router.post("/refresh")
def refresh_token(request: Request, response: Response, payload: Optional[RefreshTokenRequest] = None): def refresh_token(request: Request, response: Response, payload: Optional[RefreshTokenRequest] = None):
"""Renueva el token de acceso a partir de un refresh token válido.""" """Renueva el token de acceso a partir de un refresh token válido."""
token = (payload and payload.refresh_token) or request.cookies.get('refresh_token') token: Optional[str] = (payload.refresh_token if payload else None) or request.cookies.get('refresh_token')
if not token: if not token:
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="No se proporcionó refresh token.") raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="No se proporcionó refresh token.")
@@ -226,7 +277,9 @@ def refresh_token(request: Request, response: Response, payload: Optional[Refres
try: try:
decoded = JWTService.decode_token(token, expected_type='refresh') decoded = JWTService.decode_token(token, expected_type='refresh')
user_id = decoded.get('sub') user_id = decoded.get('sub')
user = User.query.get(int(user_id)) if not user_id:
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="Token no contiene sub válido.")
user = User.query.get(int(str(user_id)))
if not user or not user.is_active: if not user or not user.is_active:
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="Usuario no encontrado o inactivo.") raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="Usuario no encontrado o inactivo.")
+28 -17
View File
@@ -3,7 +3,7 @@ FastAPI Reservations Router (/api/v1/reservations)
Handles creation, listing, updating, cancelling, confirmation and full conflict matrix validation. Handles creation, listing, updating, cancelling, confirmation and full conflict matrix validation.
""" """
from typing import Optional, Any, Dict from typing import Optional, Any, Dict
from datetime import datetime, timedelta from datetime import datetime, timedelta, timezone
from fastapi import APIRouter, Depends, HTTPException, Query, status, Request from fastapi import APIRouter, Depends, HTTPException, Query, status, Request
from app import db from app import db
@@ -33,7 +33,7 @@ def list_reservations(
): ):
"""Consulta de reservas por rango de fechas y/o aula.""" """Consulta de reservas por rango de fechas y/o aula."""
with flask_app.app_context(): with flask_app.app_context():
now = datetime.utcnow() now = datetime.now(timezone.utc).replace(tzinfo=None)
try: try:
start_dt = datetime.strptime(start_date, '%Y-%m-%d') if start_date else now.replace(hour=0, minute=0, second=0) start_dt = datetime.strptime(start_date, '%Y-%m-%d') if start_date else now.replace(hour=0, minute=0, second=0)
except ValueError: except ValueError:
@@ -52,19 +52,26 @@ def list_reservations(
is_virt = bool(r.is_virtual or (r.classroom and r.classroom.is_virtual)) is_virt = bool(r.is_virtual or (r.classroom and r.classroom.is_virtual))
if is_hide_virtual and is_virt: if is_hide_virtual and is_virt:
continue continue
if floor and r.classroom and str(r.classroom.floor).strip().lower() != str(floor).strip().lower(): if floor and r.classroom and str(r.classroom.floor).strip().lower() != floor.strip().lower():
continue continue
if shift and r.shift and shift.lower() not in r.shift.lower(): if shift and r.shift and shift.lower() not in r.shift.lower():
continue continue
r_user: Any = getattr(r, 'user', None)
u_name = (getattr(r_user, 'name', '') or '').lower() if r_user else ''
if search: if search:
s_lower = search.lower() s_lower = search.lower()
subj_n = (r.subject_name or '').lower() subj_n = (r.subject_name or '').lower()
subj_c = (r.subject_code or '').lower() subj_c = (r.subject_code or '').lower()
c_name = (r.classroom.code if r.classroom else '').lower() c_name = (r.classroom.code if r.classroom else '').lower()
u_name = (r.user.name if r.user else '').lower()
if s_lower not in subj_n and s_lower not in subj_c and s_lower not in c_name and s_lower not in u_name: if s_lower not in subj_n and s_lower not in subj_c and s_lower not in c_name and s_lower not in u_name:
continue continue
user_dict = {
'id': getattr(r_user, 'id', None),
'name': getattr(r_user, 'name', None),
'email': getattr(r_user, 'email', None)
} if r_user else None
result.append({ result.append({
'id': r.id, 'id': r.id,
'classroom_id': r.classroom_id, 'classroom_id': r.classroom_id,
@@ -86,12 +93,8 @@ def list_reservations(
'virtual_link': r.commission.virtual_link, 'virtual_link': r.commission.virtual_link,
'max_students': r.commission.max_students 'max_students': r.commission.max_students
} if r.commission else None, } if r.commission else None,
'teacher_name': r.user.name if r.user else None, 'teacher_name': getattr(r_user, 'name', None) if r_user else None,
'user': { 'user': user_dict,
'id': r.user.id,
'name': r.user.name,
'email': r.user.email
} if r.user else None,
'start_time': r.start_time.isoformat(), 'start_time': r.start_time.isoformat(),
'end_time': r.end_time.isoformat(), 'end_time': r.end_time.isoformat(),
'purpose': r.purpose, 'purpose': r.purpose,
@@ -128,6 +131,14 @@ def get_reservation(reservation_id: int, current_user: User = Depends(get_curren
duration_min = int((r.end_time - r.start_time).total_seconds() / 60) if (r.start_time and r.end_time) else 120 duration_min = int((r.end_time - r.start_time).total_seconds() / 60) if (r.start_time and r.end_time) else 120
is_virt = bool(r.is_virtual or (r.classroom and r.classroom.is_virtual)) is_virt = bool(r.is_virtual or (r.classroom and r.classroom.is_virtual))
r_user: Any = getattr(r, 'user', None)
u_name = getattr(r_user, 'name', None) if r_user else None
u_id = getattr(r_user, 'id', None) if r_user else None
u_email = getattr(r_user, 'email', None) if r_user else None
name_parts = str(u_name).split() if u_name else []
first_name = getattr(r_user, 'first_name', name_parts[0] if name_parts else 'Usuario') if r_user else 'Usuario'
last_name = getattr(r_user, 'last_name', ' '.join(name_parts[1:]) if len(name_parts) > 1 else '') if r_user else ''
return { return {
'id': r.id, 'id': r.id,
'classroom_id': r.classroom_id, 'classroom_id': r.classroom_id,
@@ -160,14 +171,14 @@ def get_reservation(reservation_id: int, current_user: User = Depends(get_curren
} if (r.commission and r.commission.subject) else None } if (r.commission and r.commission.subject) else None
} if r.commission else None, } if r.commission else None,
'teacher_id': r.user_id, 'teacher_id': r.user_id,
'teacher_name': r.user.name if r.user else None, 'teacher_name': u_name,
'user': { 'user': {
'id': r.user.id, 'id': u_id,
'name': r.user.name, 'name': u_name,
'first_name': getattr(r.user, 'first_name', r.user.name.split()[0] if r.user.name else 'Usuario'), 'first_name': first_name,
'last_name': getattr(r.user, 'last_name', ' '.join(r.user.name.split()[1:]) if r.user.name and len(r.user.name.split()) > 1 else ''), 'last_name': last_name,
'email': r.user.email 'email': u_email
} if r.user else None, } if r_user else None,
'start_time': r.start_time.isoformat(), 'start_time': r.start_time.isoformat(),
'end_time': r.end_time.isoformat(), 'end_time': r.end_time.isoformat(),
'duration': duration_min, 'duration': duration_min,
+1 -1
View File
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
setup( setup(
name="edu-space-admin", name="edu-space-admin",
version="3.6.0", version="3.6.1",
description="Administrative interface for Edu-Space Classroom Management System", description="Administrative interface for Edu-Space Classroom Management System",
author="Edu-Space Development Team", author="Edu-Space Development Team",
author_email="admin@edu-space.com", author_email="admin@edu-space.com",
+2 -1
View File
@@ -2,11 +2,12 @@
WSGI / ASGI compatibility bridge for Gunicorn and systemd. WSGI / ASGI compatibility bridge for Gunicorn and systemd.
Exports FastAPI application adapted via a2wsgi.ASGIMiddleware for zero-downtime compatibility. Exports FastAPI application adapted via a2wsgi.ASGIMiddleware for zero-downtime compatibility.
""" """
from typing import Any, cast
from main import app as fastapi_app from main import app as fastapi_app
from a2wsgi import ASGIMiddleware from a2wsgi import ASGIMiddleware
# Adapt ASGI FastAPI app into WSGI callable for Gunicorn # Adapt ASGI FastAPI app into WSGI callable for Gunicorn
app = ASGIMiddleware(fastapi_app) app = ASGIMiddleware(cast(Any, fastapi_app))
if __name__ == '__main__': if __name__ == '__main__':
import uvicorn import uvicorn
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "frontend", "name": "frontend",
"version": "3.6.0", "version": "3.6.1",
"description": "", "description": "",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {