feat: alcance temporal configurable en importador y fix multi-carrera en ORM (v3.8.3)

This commit is contained in:
2026-10-19 17:27:36 -03:00
parent 4dd3e30698
commit c14ab0d49f
17 changed files with 682 additions and 39 deletions
+1 -1
View File
@@ -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.2"
__version__ = "3.8.3"
class DummyContext:
def __enter__(self):
+1 -1
View File
@@ -16,7 +16,7 @@ class Career(db.Model):
created_at = db.Column(db.DateTime, default=lambda: datetime.now(timezone.utc).replace(tzinfo=None))
# Relationships
subjects: Any = db.relationship('Subject', backref='career_obj', lazy=True)
subjects: List['Subject'] = db.relationship('Subject', backref='career_obj', lazy=True)
def __init__(self, **kwargs):
super().__init__(**kwargs)
+2 -2
View File
@@ -32,8 +32,8 @@ class Subject(db.Model):
updated_at = db.Column(db.DateTime, default=lambda: datetime.now(timezone.utc).replace(tzinfo=None), onupdate=lambda: datetime.now(timezone.utc).replace(tzinfo=None))
# Relationships
commissions: Any = db.relationship('Commission', backref='subject', lazy=True, uselist=True, cascade='all, delete-orphan')
careers: Any = db.relationship('Career', secondary=subject_careers, lazy='subquery', backref=db.backref('shared_subjects', lazy=True))
commissions: List['Commission'] = db.relationship('Commission', backref='subject', lazy=True, cascade='all, delete-orphan')
careers: List['Career'] = db.relationship('Career', secondary=subject_careers, lazy='subquery', backref=db.backref('shared_subjects', lazy=True))
def __init__(self, **kwargs):
super().__init__(**kwargs)
+10 -1
View File
@@ -626,6 +626,9 @@ class DashboardService:
filter_days = data.get('filter_days')
manual_date = data.get('manual_date')
single_date_only = bool(data.get('single_date_only', False))
weeks_to_generate = data.get('weeks_to_generate', 16)
date_from = data.get('date_from')
date_to = data.get('date_to')
custom_url = data.get('sheets_url') or data.get('base_url')
import_careers = data.get('import_careers', True)
@@ -646,6 +649,9 @@ class DashboardService:
filter_days=filter_days,
manual_date=manual_date,
single_date_only=single_date_only,
weeks_to_generate=weeks_to_generate,
date_from=date_from,
date_to=date_to,
import_careers=import_careers,
import_subjects=import_subjects,
import_commissions=import_commissions,
@@ -666,7 +672,10 @@ class DashboardService:
'filter_day': filter_day,
'filter_days': filter_days,
'single_date_only': single_date_only,
'manual_date': manual_date
'manual_date': manual_date,
'weeks_to_generate': weeks_to_generate,
'date_from': date_from,
'date_to': date_to
},
status='success'
)
+74 -5
View File
@@ -518,15 +518,35 @@ class GoogleSheetsImporter:
'preview_rows': preview_rows
}
def sync(self, filter_career=None, filter_subject=None, filter_day=None, filter_days=None, manual_date=None, single_date_only=False, import_careers=True, import_subjects=True, import_commissions=True, import_classrooms=True, import_reservations=True, selected_rows=None):
def sync(
self,
filter_career=None,
filter_subject=None,
filter_day=None,
filter_days=None,
manual_date=None,
single_date_only=False,
weeks_to_generate=16,
date_from=None,
date_to=None,
import_careers=True,
import_subjects=True,
import_commissions=True,
import_classrooms=True,
import_reservations=True,
selected_rows=None
):
"""
Proceso principal de sincronización con soporte de filtros, entidades granulares y filas seleccionadas:
Proceso principal de sincronización con soporte de filtros, entidades granulares y alcance temporal:
:param filter_career: Filtrar por carrera específica (ej. 'DATOS (CCC)')
:param filter_subject: Filtrar por código o nombre de materia (ej. 'ASIG00113')
:param filter_day: Filtrar por día específico ('Lunes'..'Sábado' o 'ALL')
:param filter_days: Lista o cadena de días específicos (ej. ['Lunes', 'Martes'])
:param manual_date: Fecha manual específica (YYYY-MM-DD o objeto date)
:param single_date_only: Si es True y hay manual_date, crea reserva solo para esa fecha puntual
:param weeks_to_generate: Número de semanas consecutivas a generar (1..30, defecto 16)
:param date_from: Fecha de inicio de rango (YYYY-MM-DD)
:param date_to: Fecha de fin de rango (YYYY-MM-DD)
:param import_careers: Booleano para importar/crear carreras
:param import_subjects: Booleano para importar/crear asignaturas
:param import_commissions: Booleano para importar/crear comisiones
@@ -547,6 +567,38 @@ class GoogleSheetsImporter:
except Exception:
pass
# Normalizar rango de fechas (date_from y date_to)
date_from_dt = None
if date_from:
try:
if isinstance(date_from, (datetime, date)):
date_from_dt = date_from if isinstance(date_from, date) else date_from.date()
elif isinstance(date_from, str) and date_from.strip():
date_from_dt = datetime.strptime(date_from.strip(), '%Y-%m-%d').date()
except Exception:
pass
date_to_dt = None
if date_to:
try:
if isinstance(date_to, (datetime, date)):
date_to_dt = date_to if isinstance(date_to, date) else date_to.date()
elif isinstance(date_to, str) and date_to.strip():
date_to_dt = datetime.strptime(date_to.strip(), '%Y-%m-%d').date()
except Exception:
pass
if date_from_dt and date_to_dt and date_from_dt > date_to_dt:
date_from_dt, date_to_dt = date_to_dt, date_from_dt
# Normalizar número de semanas a generar
num_weeks = 16
if weeks_to_generate is not None:
try:
num_weeks = max(1, min(30, int(weeks_to_generate)))
except (ValueError, TypeError):
num_weeks = 16
# Normalizar días permitidos
allowed_days = None
if filter_days:
@@ -585,6 +637,10 @@ class GoogleSheetsImporter:
'days': allowed_days or ['Todos los Días'],
'manual_date': manual_dt.strftime('%Y-%m-%d') if manual_dt else None,
'single_date_only': bool(single_date_only and manual_dt),
'weeks_to_generate': num_weeks,
'date_from': date_from_dt.strftime('%Y-%m-%d') if date_from_dt else None,
'date_to': date_to_dt.strftime('%Y-%m-%d') if date_to_dt else None,
'temporal_scope': 'single_date' if (single_date_only and manual_dt) else ('date_range' if (date_from_dt and date_to_dt) else 'weeks'),
'entities': {
'careers': bool(import_careers),
'subjects': bool(import_subjects),
@@ -674,11 +730,13 @@ class GoogleSheetsImporter:
classrooms_cache = {(c.building.strip().upper(), c.code.strip().upper()): c for c in Classroom.query.all()}
subjects_cache = {s.code.strip().upper(): s for s in Subject.query.all()}
# Calculate semester dates (anchored on academic year 2026 or manual date base)
# Calculate semester dates (anchored on academic year 2026, manual date, or date_from)
base_monday = date(2026, 8, 31)
if manual_dt and not single_date_only:
base_monday = manual_dt - timedelta(days=manual_dt.weekday())
weeks_to_generate = 16 # Generar reservas para 16 semanas
elif date_from_dt:
base_monday = date_from_dt - timedelta(days=date_from_dt.weekday())
weeks_to_generate = num_weeks
for rec, day_idx in all_raw_records:
try:
@@ -886,8 +944,17 @@ class GoogleSheetsImporter:
dates_to_generate = [row_specific_date]
elif single_date_only and manual_dt:
dates_to_generate = [manual_dt]
elif date_from_dt and date_to_dt:
# Rango de fechas: calcular todos los días correspondientes a effective_day_idx entre date_from_dt y date_to_dt
days_ahead = (effective_day_idx - date_from_dt.weekday()) % 7
first_date = date_from_dt + timedelta(days=days_ahead)
dates_to_generate = []
cur = first_date
while cur <= date_to_dt:
dates_to_generate.append(cur)
cur += timedelta(days=7)
else:
dates_to_generate = [base_monday + timedelta(days=effective_day_idx, weeks=w) for w in range(weeks_to_generate)]
dates_to_generate = [base_monday + timedelta(days=effective_day_idx, weeks=w) for w in range(num_weeks)]
for class_date in dates_to_generate:
dt_start = datetime.combine(class_date, t_start)
@@ -944,6 +1011,8 @@ class GoogleSheetsImporter:
})
except Exception as row_err:
import traceback
traceback.print_exc()
stats['errors'].append(f"Error en fila '{rec.get('codigo', '?')}': {str(row_err)}")
db.session.commit()
+8
View File
@@ -27,6 +27,14 @@ def sync_google_sheets(
current_user: User = Depends(get_current_user)
):
"""Ejecuta la sincronización con Google Sheets con filtros y selección granular."""
date_from = payload.get('date_from')
date_to = payload.get('date_to')
if date_from and date_to and str(date_from).strip() > str(date_to).strip():
raise HTTPException(
status_code=status.HTTP_400_BAD_REQUEST,
detail="La fecha de inicio (date_from) no puede ser posterior a la fecha de fin (date_to)."
)
try:
ip = request.client.host if request.client else '127.0.0.1'
return dashboard_service.sync_google_sheets(payload, current_user=current_user, ip_address=ip)
+1 -1
View File
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
setup(
name="edu-space-admin",
version="3.8.2",
version="3.8.3",
description="Administrative interface for Edu-Space Classroom Management System (FastAPI ASGI Core)",
author="Edu-Space Development Team",
author_email="admin@edu-space.com",
@@ -0,0 +1,152 @@
import pytest
from datetime import date, datetime, timedelta
from app import db
from app.models.career import Career
from app.models.classroom import Classroom
from app.models.subject import Subject, Commission
from app.models.reservation import Reservation
from app.models.building import Building
from app.models.user import User
from app.services.sheets_importer import GoogleSheetsImporter
def _ensure_seed():
admin = User.query.filter_by(email='admin@edu-space.com').first()
if not admin:
admin = User(email='admin@edu-space.com', name='Admin', role='ADMIN', is_active=True)
admin.set_password('admin123')
db.session.add(admin)
b = Building.query.filter_by(name='Edificio Central').first()
if not b:
b = Building(name='Edificio Central', code='CENTRAL', floors=4)
db.session.add(b)
db.session.flush()
c = Classroom.query.filter_by(code='101').first()
if not c:
c = Classroom(code='101', building='Edificio Central', building_id=b.id, floor='1', capacity=35, is_active=True)
db.session.add(c)
db.session.commit()
def test_sync_single_date_only_creates_one_reservation(init_database, app_context):
_ensure_seed()
importer = GoogleSheetsImporter()
row = {
'dia': 'Lunes',
'codigo': 'TEST-001',
'asignatura': 'Materia Test Puntual',
'aula': '101',
'carrera': 'DATOS (CCC)',
'horario': '08:00 a 10:00hs',
'turno': 'Mañana'
}
manual_dt_str = '2026-10-19'
stats = importer.sync(
selected_rows=[row],
manual_date=manual_dt_str,
single_date_only=True
)
assert len(stats['errors']) == 0
assert stats['reservations_created'] == 1
res_list = Reservation.query.filter(Reservation.purpose.like('%TEST-001%')).all()
assert len(res_list) == 1
assert res_list[0].start_time.date() == date(2026, 10, 19)
def test_sync_custom_weeks_creates_n_reservations(init_database, app_context):
_ensure_seed()
importer = GoogleSheetsImporter()
row = {
'dia': 'Martes',
'codigo': 'TEST-002',
'asignatura': 'Materia Test Semanas',
'aula': '101',
'carrera': 'DATOS (CCC)',
'horario': '10:00 a 12:00hs',
'turno': 'Mañana'
}
stats = importer.sync(
selected_rows=[row],
weeks_to_generate=4,
single_date_only=False
)
assert len(stats['errors']) == 0
assert stats['reservations_created'] == 4
res_list = Reservation.query.filter(Reservation.purpose.like('%TEST-002%')).order_by(Reservation.start_time.asc()).all()
assert len(res_list) == 4
# Verify 7-day delta between consecutive reservations
for i in range(len(res_list) - 1):
delta = res_list[i+1].start_time.date() - res_list[i].start_time.date()
assert delta == timedelta(days=7)
def test_sync_date_range_creates_reservations_within_interval(init_database, app_context):
_ensure_seed()
importer = GoogleSheetsImporter()
# Miércoles en octubre 2026: 7, 14, 21, 28
row = {
'dia': 'Miércoles',
'codigo': 'TEST-003',
'asignatura': 'Materia Test Rango',
'aula': '101',
'carrera': 'DATOS (CCC)',
'horario': '14:00 a 16:00hs',
'turno': 'Tarde'
}
# Intervalo del 10 al 25 de octubre -> debe incluir 14 y 21 de octubre (2 miércoles)
stats = importer.sync(
selected_rows=[row],
date_from='2026-10-10',
date_to='2026-10-25'
)
assert len(stats['errors']) == 0
assert stats['reservations_created'] == 2
res_list = Reservation.query.filter(Reservation.purpose.like('%TEST-003%')).order_by(Reservation.start_time.asc()).all()
assert len(res_list) == 2
dates = [r.start_time.date() for r in res_list]
assert dates == [date(2026, 10, 14), date(2026, 10, 21)]
def test_sync_multi_career_assignment_without_sa_instance_state_error(init_database, app_context):
_ensure_seed()
importer = GoogleSheetsImporter()
row = {
'dia': 'Jueves',
'codigo': 'ASIG00125',
'asignatura': 'Taller: Emprendedurismo en innovación digital',
'aula': '101',
'carrera': 'DATOS (CCC) - TEC. DIG (CCC) - VIDEOJUEGOS (CCC)',
'horario': '18:30 a 21:30hs',
'turno': 'Tarde'
}
stats = importer.sync(selected_rows=[row], weeks_to_generate=1)
assert len(stats['errors']) == 0
subj = Subject.query.filter_by(code='ASIG00125').first()
assert subj is not None
assert len(subj.careers) == 3
c_names = [c.name for c in subj.careers]
assert 'DATOS (CCC)' in c_names
assert 'TEC. DIG. (CCC)' in c_names or 'TEC. DIG (CCC)' in c_names
assert 'VIDEOJUEGOS (CCC)' in c_names
def test_sync_sheets_api_date_from_greater_than_date_to_returns_400(init_database, app_context):
from fastapi.testclient import TestClient
from main import app as fastapi_app
from app.services.jwt_service import JWTService
_ensure_seed()
admin = User.query.filter_by(role='ADMIN').first()
assert admin is not None
token = JWTService.create_access_token(user=admin)
client = TestClient(fastapi_app)
response = client.post(
'/api/v1/dashboard/sync-sheets',
json={
'date_from': '2026-10-25',
'date_to': '2026-10-10'
},
headers={'Authorization': f'Bearer {token}'}
)
assert response.status_code == 400
assert 'La fecha de inicio (date_from) no puede ser posterior a la fecha de fin (date_to).' in response.json()['detail']