fix(init_db): eliminada creacion de materias y datos muestra en init_db, solo cuentas de test y bump a v3.8.2
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.1"
|
||||
__version__ = "3.8.2"
|
||||
|
||||
class DummyContext:
|
||||
def __enter__(self):
|
||||
|
||||
@@ -270,43 +270,51 @@ class DashboardService:
|
||||
# Mapas de reservas por aula en cada período
|
||||
res_map_classroom_today: Dict[int, List[Reservation]] = {}
|
||||
for r in today_reservations_q:
|
||||
if r.classroom_id:
|
||||
res_map_classroom_today.setdefault(r.classroom_id, []).append(r)
|
||||
cid = getattr(r, 'classroom_id', None)
|
||||
if cid is not None:
|
||||
res_map_classroom_today.setdefault(int(cid), []).append(r)
|
||||
|
||||
res_map_classroom_tomorrow: Dict[int, List[Reservation]] = {}
|
||||
for r in tomorrow_reservations_q:
|
||||
if r.classroom_id:
|
||||
res_map_classroom_tomorrow.setdefault(r.classroom_id, []).append(r)
|
||||
cid = getattr(r, 'classroom_id', None)
|
||||
if cid is not None:
|
||||
res_map_classroom_tomorrow.setdefault(int(cid), []).append(r)
|
||||
|
||||
res_map_classroom_week: Dict[int, List[Reservation]] = {}
|
||||
for r in week_reservations_q:
|
||||
if r.classroom_id:
|
||||
res_map_classroom_week.setdefault(r.classroom_id, []).append(r)
|
||||
cid = getattr(r, 'classroom_id', None)
|
||||
if cid is not None:
|
||||
res_map_classroom_week.setdefault(int(cid), []).append(r)
|
||||
|
||||
res_map_classroom_month: Dict[int, List[Reservation]] = {}
|
||||
for r in month_reservations_q:
|
||||
if r.classroom_id:
|
||||
res_map_classroom_month.setdefault(r.classroom_id, []).append(r)
|
||||
cid = getattr(r, 'classroom_id', None)
|
||||
if cid is not None:
|
||||
res_map_classroom_month.setdefault(int(cid), []).append(r)
|
||||
|
||||
res_map_comm_today: Dict[int, List[Reservation]] = {}
|
||||
for r in today_reservations_q:
|
||||
if r.commission_id:
|
||||
res_map_comm_today.setdefault(r.commission_id, []).append(r)
|
||||
comm_id = getattr(r, 'commission_id', None)
|
||||
if comm_id is not None:
|
||||
res_map_comm_today.setdefault(int(comm_id), []).append(r)
|
||||
|
||||
res_map_comm_tomorrow: Dict[int, List[Reservation]] = {}
|
||||
for r in tomorrow_reservations_q:
|
||||
if r.commission_id:
|
||||
res_map_comm_tomorrow.setdefault(r.commission_id, []).append(r)
|
||||
comm_id = getattr(r, 'commission_id', None)
|
||||
if comm_id is not None:
|
||||
res_map_comm_tomorrow.setdefault(int(comm_id), []).append(r)
|
||||
|
||||
res_map_comm_week: Dict[int, List[Reservation]] = {}
|
||||
for r in week_reservations_q:
|
||||
if r.commission_id:
|
||||
res_map_comm_week.setdefault(r.commission_id, []).append(r)
|
||||
comm_id = getattr(r, 'commission_id', None)
|
||||
if comm_id is not None:
|
||||
res_map_comm_week.setdefault(int(comm_id), []).append(r)
|
||||
|
||||
res_map_comm_month: Dict[int, List[Reservation]] = {}
|
||||
for r in month_reservations_q:
|
||||
if r.commission_id:
|
||||
res_map_comm_month.setdefault(r.commission_id, []).append(r)
|
||||
comm_id = getattr(r, 'commission_id', None)
|
||||
if comm_id is not None:
|
||||
res_map_comm_month.setdefault(int(comm_id), []).append(r)
|
||||
|
||||
all_active_commissions = Commission.query.filter_by(active=True).all()
|
||||
total_active_commissions = len(all_active_commissions)
|
||||
|
||||
+4
-76
@@ -290,7 +290,7 @@ def init_database():
|
||||
if isinstance(perms, dict):
|
||||
for mod in module_ids:
|
||||
level = perms.get(mod, 'none')
|
||||
role.set_permission(mod, str(level))
|
||||
role.set_permission(mod, level)
|
||||
else:
|
||||
for mod in module_ids:
|
||||
role.set_permission(mod, 'none')
|
||||
@@ -485,81 +485,9 @@ def init_database():
|
||||
db.session.commit()
|
||||
print(f"[OK] Catalogo de tipificaciones inicializado ({MilestoneType.query.count()} tipos disponibles).")
|
||||
|
||||
# 7. Inicializar aulas, materias, comisiones y reservas de muestra
|
||||
if not empty_academic:
|
||||
from app.models.classroom import Classroom
|
||||
from app.models.subject import Subject, Commission
|
||||
from app.models.reservation import Reservation, ReservationStatus
|
||||
from datetime import datetime, timedelta, date
|
||||
|
||||
if Classroom.query.count() == 0 and b_central is not None and b_virtual is not None:
|
||||
print("[*] Generando catalogo de aulas...")
|
||||
for floor in ['PB', '1', '2', '3']:
|
||||
for num in range(1, 8):
|
||||
code = f'{floor}0{num}' if floor != 'PB' else f'PB-0{num}'
|
||||
c = Classroom(
|
||||
code=code,
|
||||
building=b_central.name,
|
||||
building_id=b_central.id,
|
||||
floor=floor,
|
||||
capacity=30 + (num * 5),
|
||||
description=f'Aula física estándar {code} en {b_central.name}',
|
||||
is_active=True
|
||||
)
|
||||
db.session.add(c)
|
||||
|
||||
for v in range(1, 4):
|
||||
vc = Classroom(
|
||||
code=f'VIRTUAL-0{v}',
|
||||
building=b_virtual.name,
|
||||
building_id=b_virtual.id,
|
||||
floor='0',
|
||||
capacity=100,
|
||||
description=f'Sala virtual Microsoft Teams {v}',
|
||||
is_active=True
|
||||
)
|
||||
db.session.add(vc)
|
||||
db.session.commit()
|
||||
print(f"[OK] {Classroom.query.count()} aulas creadas.")
|
||||
|
||||
# Materia y Comisión
|
||||
s = Subject.query.filter_by(code='ARQ-101').first()
|
||||
if not s:
|
||||
s = Subject(name='Arquitectura de Software', code='ARQ-101', is_active=True)
|
||||
db.session.add(s)
|
||||
db.session.commit()
|
||||
|
||||
comm = Commission.query.filter_by(code='COM-A').first()
|
||||
if not comm:
|
||||
comm = Commission(code='COM-A', subject_id=s.id, shift='Noche', semester=2, year=2026, max_students=40, is_active=True)
|
||||
db.session.add(comm)
|
||||
db.session.commit()
|
||||
|
||||
# Reservas de Hoy
|
||||
if Reservation.query.count() == 0:
|
||||
print("[*] Generando reservas de muestra...")
|
||||
today = date.today()
|
||||
classrooms = Classroom.query.all()
|
||||
docente = User.query.filter_by(email='docente@edu-space.com').first()
|
||||
for idx, cl in enumerate(classrooms[:19]):
|
||||
start_hour = 8 + (idx % 6) * 2
|
||||
r = Reservation(
|
||||
classroom_id=cl.id,
|
||||
commission_id=comm.id,
|
||||
user_id=docente.id if docente else 1,
|
||||
start_time=datetime.combine(today, datetime.min.time()) + timedelta(hours=start_hour),
|
||||
end_time=datetime.combine(today, datetime.min.time()) + timedelta(hours=start_hour + 2),
|
||||
purpose='Clase Regular',
|
||||
status=ReservationStatus.CONFIRMED.value,
|
||||
shift='Noche' if start_hour >= 18 else 'Tarde' if start_hour >= 13 else 'Mañana',
|
||||
expected_attendees=cl.capacity - 5
|
||||
)
|
||||
db.session.add(r)
|
||||
db.session.commit()
|
||||
print(f"[OK] {Reservation.query.count()} reservas creadas.")
|
||||
else:
|
||||
print("[*] Modo --empty-academic: Omitiendo creación de aulas, materias, comisiones y reservas de muestra.")
|
||||
print("[OK] Base de datos creada con tablas vacías para gestión académica y de espacios desde cero.")
|
||||
# 7. Gestión académica limpia: la inicialización solo crea registros para cuentas de test y roles.
|
||||
# No se crean materias, comisiones ni reservas de muestra por defecto.
|
||||
print("[OK] Base de datos lista: tablas académicas limpias (sin materias de muestra).")
|
||||
|
||||
print("\n[LISTO] Base de datos inicializada y lista para usar.")
|
||||
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
|
||||
|
||||
setup(
|
||||
name="edu-space-admin",
|
||||
version="3.8.1",
|
||||
version="3.8.2",
|
||||
description="Administrative interface for Edu-Space Classroom Management System (FastAPI ASGI Core)",
|
||||
author="Edu-Space Development Team",
|
||||
author_email="admin@edu-space.com",
|
||||
|
||||
Reference in New Issue
Block a user