feat(abm): abm completo de ciclos lectivos, aulas y reservas con proteccion de integridad y pruebas automatizadas
This commit is contained in:
@@ -1387,6 +1387,53 @@ def set_current_academic_term(id):
|
||||
'message': f'"{term.name}" establecido como ciclo activo.'
|
||||
}), 200
|
||||
|
||||
@api_admin_bp.route('/academic-terms/<int:id>/toggle', methods=['POST'])
|
||||
@jwt_required
|
||||
def toggle_academic_term(id):
|
||||
term = AcademicTerm.query.get_or_404(id)
|
||||
if term.is_current and term.is_active:
|
||||
return jsonify({
|
||||
'error': 'Conflict',
|
||||
'message': 'No se puede desactivar el ciclo lectivo actualmente activo. Seleccione otro ciclo activo primero.'
|
||||
}), 400
|
||||
term.is_active = not term.is_active
|
||||
db.session.commit()
|
||||
return jsonify({
|
||||
'status': 'success',
|
||||
'id': term.id,
|
||||
'is_active': term.is_active,
|
||||
'message': f'Ciclo lectivo {"habilitado" if term.is_active else "desactivado"} correctamente.'
|
||||
}), 200
|
||||
|
||||
@api_admin_bp.route('/academic-terms/<int:id>', methods=['DELETE'])
|
||||
@jwt_required
|
||||
def delete_academic_term(id):
|
||||
term = AcademicTerm.query.get_or_404(id)
|
||||
if term.is_current:
|
||||
return jsonify({
|
||||
'error': 'Conflict',
|
||||
'message': 'No se puede eliminar el ciclo lectivo actualmente activo. Seleccione otro ciclo activo primero.'
|
||||
}), 400
|
||||
|
||||
commissions_count = Commission.query.filter_by(academic_term_id=id).count()
|
||||
if commissions_count > 0:
|
||||
# Soft delete para preservar integridad de comisiones
|
||||
term.is_active = False
|
||||
db.session.commit()
|
||||
return jsonify({
|
||||
'status': 'success',
|
||||
'soft_deleted': True,
|
||||
'message': f'El ciclo lectivo tiene {commissions_count} comisiones asociadas. Ha sido desactivado para proteger el historial académico.'
|
||||
}), 200
|
||||
|
||||
db.session.delete(term)
|
||||
db.session.commit()
|
||||
return jsonify({
|
||||
'status': 'success',
|
||||
'soft_deleted': False,
|
||||
'message': 'Ciclo lectivo eliminado permanentemente.'
|
||||
}), 200
|
||||
|
||||
# ---------------------------------------------------------
|
||||
# MILESTONE TYPES CRUD
|
||||
# ---------------------------------------------------------
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
from flask import Blueprint, request, jsonify, g
|
||||
from pydantic import ValidationError
|
||||
|
||||
from app import db
|
||||
from app.models.classroom import Classroom
|
||||
from app.services.classroom_service import ClassroomService
|
||||
from app.schemas.classroom_dto import ClassroomCreateDTO, ClassroomUpdateDTO, ClassroomResponseDTO
|
||||
from app.utils.jwt_decorators import jwt_required, jwt_role_required
|
||||
@@ -117,3 +119,17 @@ def delete_classroom(classroom_id: int):
|
||||
return jsonify({'error': 'NotFound', 'message': f'Aula {classroom_id} no encontrada.'}), 404
|
||||
|
||||
return jsonify({'message': f'Aula {classroom_id} eliminada/desactivada correctamente.'}), 200
|
||||
|
||||
@api_classrooms_bp.route('/<int:classroom_id>/toggle', methods=['POST'])
|
||||
@jwt_role_required('ADMIN', 'ADMINISTRADOR', 'BEDELIA')
|
||||
def toggle_classroom(classroom_id: int):
|
||||
"""Alterna el estado activo/inactivo de un aula."""
|
||||
classroom = Classroom.query.get_or_404(classroom_id)
|
||||
classroom.is_active = not classroom.is_active
|
||||
db.session.commit()
|
||||
return jsonify({
|
||||
'status': 'success',
|
||||
'id': classroom.id,
|
||||
'is_active': classroom.is_active,
|
||||
'message': f'Aula {"activada" if classroom.is_active else "desactivada"} correctamente.'
|
||||
}), 200
|
||||
|
||||
@@ -2,6 +2,8 @@ from flask import Blueprint, request, jsonify, g
|
||||
from datetime import datetime, timedelta, date
|
||||
from pydantic import ValidationError
|
||||
|
||||
from app import db
|
||||
from app.models.reservation import Reservation
|
||||
from app.services.reservation_service import ReservationService
|
||||
from app.schemas.reservation_dto import ReservationCreateDTO, ReservationUpdateDTO
|
||||
from app.utils.jwt_decorators import jwt_required, jwt_role_required
|
||||
@@ -218,13 +220,33 @@ def update_reservation(reservation_id: int):
|
||||
@api_reservations_bp.route('/<int:reservation_id>', methods=['DELETE'])
|
||||
@jwt_required
|
||||
def cancel_reservation(reservation_id: int):
|
||||
"""Cancela una reserva."""
|
||||
"""Cancela o elimina una reserva según el parámetro hard."""
|
||||
hard_delete = request.args.get('hard', '').lower() in ['true', '1']
|
||||
if hard_delete:
|
||||
res = Reservation.query.get(reservation_id)
|
||||
if not res:
|
||||
return jsonify({'error': 'NotFound', 'message': f'Reserva {reservation_id} no encontrada.'}), 404
|
||||
db.session.delete(res)
|
||||
db.session.commit()
|
||||
return jsonify({'message': f'Reserva {reservation_id} eliminada permanentemente.'}), 200
|
||||
|
||||
cancelled = reservation_service.cancel_reservation(reservation_id)
|
||||
if not cancelled:
|
||||
return jsonify({'error': 'NotFound', 'message': f'Reserva {reservation_id} no encontrada.'}), 404
|
||||
|
||||
return jsonify({'message': f'Reserva {reservation_id} cancelada correctamente.'}), 200
|
||||
|
||||
@api_reservations_bp.route('/<int:reservation_id>/delete', methods=['POST'])
|
||||
@jwt_required
|
||||
def delete_reservation_post(reservation_id: int):
|
||||
"""Elimina permanentemente una reserva."""
|
||||
res = Reservation.query.get(reservation_id)
|
||||
if not res:
|
||||
return jsonify({'error': 'NotFound', 'message': f'Reserva {reservation_id} no encontrada.'}), 404
|
||||
db.session.delete(res)
|
||||
db.session.commit()
|
||||
return jsonify({'message': f'Reserva {reservation_id} eliminada permanentemente.'}), 200
|
||||
|
||||
@api_reservations_bp.route('/<int:reservation_id>/cancel', methods=['POST'])
|
||||
@jwt_required
|
||||
def cancel_reservation_post(reservation_id: int):
|
||||
|
||||
@@ -20,14 +20,17 @@ def jwt_required(f):
|
||||
token = request.cookies.get('access_token')
|
||||
|
||||
if not token:
|
||||
from flask_login import current_user
|
||||
if current_user.is_authenticated and current_user.is_active:
|
||||
g.jwt_user = current_user
|
||||
g.jwt_payload = {'sub': str(current_user.id), 'role': getattr(current_user, 'role', '')}
|
||||
g.jwt_token = None
|
||||
g.real_admin_user = current_user
|
||||
g.is_impersonating = False
|
||||
return f(*args, **kwargs)
|
||||
try:
|
||||
from flask_login import current_user
|
||||
if current_user.is_authenticated and current_user.is_active:
|
||||
g.jwt_user = current_user
|
||||
g.jwt_payload = {'sub': str(current_user.id), 'role': getattr(current_user, 'role', '')}
|
||||
g.jwt_token = None
|
||||
g.real_admin_user = current_user
|
||||
g.is_impersonating = False
|
||||
return f(*args, **kwargs)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
return jsonify({
|
||||
'error': 'Unauthorized',
|
||||
|
||||
Reference in New Issue
Block a user