fix(academic): commission subjects and shared careers mapping, role-based scoping and gradebook milestones (v3.8.20)

This commit is contained in:
2026-10-26 18:31:54 -03:00
parent a692c9ce67
commit 9f1ac6d670
23 changed files with 808 additions and 139 deletions
@@ -40,6 +40,8 @@ class ReservationRepository(BaseRepository[Reservation]):
floor: Optional[str] = None,
shift: Optional[str] = None,
search: Optional[str] = None,
teacher_id: Optional[int] = None,
student_id: Optional[int] = None,
limit: int = 1000) -> List[Reservation]:
"""Obtiene reservas dentro de una ventana temporal con carga ansiosa y filtros en SQL."""
query = Reservation.query.options(
@@ -51,6 +53,29 @@ class ReservationRepository(BaseRepository[Reservation]):
Reservation.start_time <= end_dt
)
if teacher_id:
from app.models.subject import Commission, CommissionTeacher
teacher_comm_ids = db.session.query(Commission.id).filter(
or_(
Commission.teacher_id == teacher_id,
Commission.teachers_association.any(CommissionTeacher.user_id == teacher_id)
)
).subquery()
query = query.filter(
or_(
Reservation.user_id == teacher_id,
Reservation.commission_id.in_(teacher_comm_ids)
)
)
if student_id:
from app.models.enrollment import StudentEnrollment
student_comm_ids = db.session.query(StudentEnrollment.commission_id).filter_by(
student_id=student_id,
status='activo'
).subquery()
query = query.filter(Reservation.commission_id.in_(student_comm_ids))
if status and status.strip() and status.strip().lower() != 'all':
s_val = status.strip()
query = query.filter(Reservation.status == s_val)