feat: completar Fase 2 del Roadmap MVP (Co-docencia, Matriz de Conflictos y Regla Diaria) y auditoria de seguridad

2026-09-19 14:05:16 -03:00
parent 05e197e49f
commit ada39248d7
36 changed files with 3037 additions and 443 deletions
@@ -59,3 +59,22 @@ class ReservationRepository(BaseRepository[Reservation]):
        return Reservation.query.filter_by(
            commission_id=commission_id
        ).order_by(Reservation.start_time.asc()).all()
+
+    def find_teacher_conflicts(self, teacher_id: int, start_time: datetime, end_time: datetime,
+                               exclude_reservation_id: Optional[int] = None) -> List[Reservation]:
+        """
+        Encuentra reservas activas donde el docente ya está asignado en la misma franja horaria.
+        Condición de solapamiento: (start_time < existing.end_time) AND (end_time > existing.start_time).
+        """
+        query = Reservation.query.options(
+            joinedload(Reservation.classroom),
+            joinedload(Reservation.commission)
+        ).filter(
+            Reservation.user_id == teacher_id,
+            Reservation.status != ReservationStatus.CANCELLED.value,
+            Reservation.start_time < end_time,
+            Reservation.end_time > start_time
+        )
+        if exclude_reservation_id:
+            query = query.filter(Reservation.id != exclude_reservation_id)
+        return query.all()