fix(classrooms): sincronizar salas virtuales con dashboard y dinamizar fechas (v3.8.10)
This commit is contained in:
@@ -7,7 +7,7 @@ from typing import Any
|
||||
from database import db, get_db, engine, SessionLocal, session
|
||||
from config.config import Config
|
||||
|
||||
__version__ = "3.8.9"
|
||||
__version__ = "3.8.10"
|
||||
|
||||
class DummyContext:
|
||||
def __enter__(self):
|
||||
|
||||
@@ -394,6 +394,14 @@ class DashboardService:
|
||||
)
|
||||
comm_ids_virtual.update(comm_in_virtual_res)
|
||||
|
||||
res_map_comm_all: Dict[int, List[Reservation]] = {}
|
||||
all_reservations_comm = Reservation.query.filter(
|
||||
Reservation.commission_id.isnot(None)
|
||||
).order_by(Reservation.start_time.asc()).all()
|
||||
for r in all_reservations_comm:
|
||||
if r.commission_id is not None:
|
||||
res_map_comm_all.setdefault(int(r.commission_id), []).append(r)
|
||||
|
||||
virtual_rooms_data = []
|
||||
for comm in all_active_commissions:
|
||||
if comm.id in comm_ids_virtual:
|
||||
@@ -401,10 +409,12 @@ class DashboardService:
|
||||
res_tomorrow = res_map_comm_tomorrow.get(comm.id, [])
|
||||
res_week = res_map_comm_week.get(comm.id, [])
|
||||
res_month = res_map_comm_month.get(comm.id, [])
|
||||
res_all = res_map_comm_all.get(comm.id, [])
|
||||
v_link = comm.virtual_link or (res_today[0].virtual_link if res_today and res_today[0].virtual_link else '')
|
||||
virtual_rooms_data.append({
|
||||
'id': comm.id,
|
||||
'commission_id': comm.id,
|
||||
'commission_code': comm.code,
|
||||
'code': comm.code,
|
||||
'full_code': comm.get_full_code(),
|
||||
'subject_name': comm.subject.name if comm.subject else 'Sin materia',
|
||||
@@ -419,14 +429,19 @@ class DashboardService:
|
||||
'is_virtual': True,
|
||||
'building': 'Campus Virtual',
|
||||
'floor': 'Remoto ∞',
|
||||
'day_count': len(res_today),
|
||||
'today_classes': len(res_today),
|
||||
'tomorrow_classes': len(res_tomorrow),
|
||||
'week_count': len(res_week),
|
||||
'week_classes': len(res_week),
|
||||
'month_count': len(res_month),
|
||||
'month_classes': len(res_month),
|
||||
'res_count': len(res_month),
|
||||
'res_count': len(res_all) if len(res_all) > 0 else len(res_month),
|
||||
'total_count': len(res_all),
|
||||
'is_active_today': len(res_today) > 0,
|
||||
'is_active_tomorrow': len(res_tomorrow) > 0,
|
||||
'assigned_summary': f"{comm.subject.name if comm.subject else 'Clase Virtual'} ({comm.schedule or 'Remoto'})"
|
||||
'assigned_summary': f"{comm.subject.name if comm.subject else 'Clase Virtual'} ({comm.schedule or 'Remoto'})",
|
||||
'reservations': [self.serialize_reservation(r) for r in res_all]
|
||||
})
|
||||
|
||||
if virtual_rooms_data:
|
||||
|
||||
@@ -9,6 +9,7 @@ from fastapi import APIRouter, Depends, HTTPException, Query, status
|
||||
from app import db
|
||||
from app.models.classroom import Classroom
|
||||
from app.services.classroom_service import ClassroomService
|
||||
from app.services.dashboard_service import DashboardService
|
||||
from app.services.audit_service import AuditService
|
||||
from app.schemas.classroom_dto import ClassroomCreateDTO, ClassroomUpdateDTO
|
||||
from dependencies import get_current_user, require_roles
|
||||
@@ -16,6 +17,7 @@ from app.models.user import User
|
||||
|
||||
classrooms_router = APIRouter(prefix="/api/v1/classrooms", tags=["Classrooms"])
|
||||
classroom_service = ClassroomService()
|
||||
dashboard_service = DashboardService()
|
||||
|
||||
|
||||
@classrooms_router.get("")
|
||||
@@ -56,6 +58,31 @@ def list_classrooms(
|
||||
return {'total': len(result), 'classrooms': result}
|
||||
|
||||
|
||||
@classrooms_router.get("/virtual-rooms")
|
||||
def get_virtual_rooms(current_user: User = Depends(get_current_user)):
|
||||
"""Retorna el catálogo consolidado de salas virtuales operativas en el Campus Virtual."""
|
||||
stats = dashboard_service.get_stats(current_user=current_user)
|
||||
vrooms = stats.get('bedelia', {}).get('virtual_rooms', [])
|
||||
|
||||
today_cnt = sum(r.get('today_classes', 0) for r in vrooms)
|
||||
week_cnt = sum(r.get('week_classes', 0) for r in vrooms)
|
||||
month_cnt = sum(r.get('month_classes', 0) for r in vrooms)
|
||||
total_cnt = sum(r.get('total_count', r.get('res_count', 0)) for r in vrooms)
|
||||
|
||||
return {
|
||||
'total': len(vrooms),
|
||||
'virtual_rooms': vrooms,
|
||||
'virtual_classrooms_count': len(vrooms),
|
||||
'metrics': {
|
||||
'today_count': today_cnt,
|
||||
'week_count': week_cnt,
|
||||
'month_count': month_cnt,
|
||||
'commissions_count': len(vrooms),
|
||||
'total_count': total_cnt
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@classrooms_router.get("/{classroom_id}")
|
||||
def get_classroom(
|
||||
classroom_id: int,
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
|
||||
|
||||
setup(
|
||||
name="edu-space-admin",
|
||||
version="3.8.9",
|
||||
version="3.8.10",
|
||||
description="Administrative interface for Edu-Space Classroom Management System (FastAPI ASGI Core)",
|
||||
author="Edu-Space Development Team",
|
||||
author_email="admin@edu-space.com",
|
||||
|
||||
@@ -75,3 +75,11 @@ def test_fastapi_full_flow_auth_and_classrooms(init_database):
|
||||
classrooms_res = client.get('/api/v1/classrooms', headers={'Authorization': f'Bearer {token}'})
|
||||
assert classrooms_res.status_code == 200
|
||||
assert 'classrooms' in classrooms_res.json()
|
||||
|
||||
# 5. GET /classrooms/virtual-rooms
|
||||
vrooms_res = client.get('/api/v1/classrooms/virtual-rooms', headers={'Authorization': f'Bearer {token}'})
|
||||
assert vrooms_res.status_code == 200
|
||||
vrooms_data = vrooms_res.json()
|
||||
assert 'virtual_rooms' in vrooms_data
|
||||
assert 'metrics' in vrooms_data
|
||||
assert 'commissions_count' in vrooms_data['metrics']
|
||||
|
||||
Reference in New Issue
Block a user