feat(import): estandarizacion de formato de fecha DD/MM/AAAA en importador de google sheets (v3.8.6)
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.5"
|
||||
__version__ = "3.8.6"
|
||||
|
||||
class DummyContext:
|
||||
def __enter__(self):
|
||||
|
||||
@@ -140,6 +140,28 @@ SHEETS_CONFIG = [
|
||||
|
||||
TIME_REGEX = re.compile(r'(\d{1,2})(?::(\d{2}))?\s*(?:a|-|to)\s*(\d{1,2})(?::(\d{2}))?', re.IGNORECASE)
|
||||
|
||||
def parse_flexible_date(val: Any) -> Optional[date]:
|
||||
"""
|
||||
Parsea flexiblemente fechas provistas en formato DD/MM/AAAA (%d/%m/%Y),
|
||||
DD-MM-AAAA (%d-%m-%Y), ISO YYYY-MM-DD (%Y-%m-%d) o instancias de date / datetime.
|
||||
"""
|
||||
if not val:
|
||||
return None
|
||||
if isinstance(val, datetime):
|
||||
return val.date()
|
||||
if isinstance(val, date):
|
||||
return val
|
||||
if isinstance(val, str):
|
||||
cleaned = val.strip()
|
||||
if not cleaned:
|
||||
return None
|
||||
for fmt in ('%d/%m/%Y', '%Y-%m-%d', '%d-%m-%Y', '%Y/%m/%d'):
|
||||
try:
|
||||
return datetime.strptime(cleaned, fmt).date()
|
||||
except ValueError:
|
||||
continue
|
||||
return None
|
||||
|
||||
class GoogleSheetsImporter:
|
||||
"""
|
||||
Servicio para descargar, parsear y sincronizar cursadas académicas,
|
||||
@@ -390,15 +412,7 @@ class GoogleSheetsImporter:
|
||||
allowed_days = [nd]
|
||||
|
||||
# Normalizar fecha manual para fecha inferida base
|
||||
manual_dt = None
|
||||
if manual_date:
|
||||
try:
|
||||
if isinstance(manual_date, (datetime, date)):
|
||||
manual_dt = manual_date if isinstance(manual_date, date) else manual_date.date()
|
||||
elif isinstance(manual_date, str) and manual_date.strip():
|
||||
manual_dt = datetime.strptime(manual_date.strip(), '%Y-%m-%d').date()
|
||||
except Exception:
|
||||
pass
|
||||
manual_dt = parse_flexible_date(manual_date)
|
||||
|
||||
# Referencia de semana base: lunes 5 de octubre de 2026 (semana activa del 2° cuatrimestre)
|
||||
ref_monday = date(2026, 10, 5)
|
||||
@@ -494,6 +508,7 @@ class GoogleSheetsImporter:
|
||||
'horario': r.get('horario', ''),
|
||||
'turno': r.get('turno', 'Mañana'),
|
||||
'inferred_date': target_date.strftime('%Y-%m-%d'),
|
||||
'inferred_date_display': target_date.strftime('%d/%m/%Y'),
|
||||
'is_valid': is_valid,
|
||||
'has_warning': has_warning,
|
||||
'warning_msg': warning_msg
|
||||
@@ -557,42 +572,11 @@ class GoogleSheetsImporter:
|
||||
dias_esp = ['Lunes', 'Martes', 'Miércoles', 'Jueves', 'Viernes', 'Sábado', 'Domingo']
|
||||
|
||||
# Normalizar fecha manual si fue provista
|
||||
manual_dt: Optional[date] = None
|
||||
if manual_date:
|
||||
try:
|
||||
if isinstance(manual_date, datetime):
|
||||
manual_dt = manual_date.date()
|
||||
elif isinstance(manual_date, date):
|
||||
manual_dt = manual_date
|
||||
elif isinstance(manual_date, str) and manual_date.strip():
|
||||
manual_dt = datetime.strptime(manual_date.strip(), '%Y-%m-%d').date()
|
||||
except Exception:
|
||||
pass
|
||||
manual_dt = parse_flexible_date(manual_date)
|
||||
|
||||
# Normalizar rango de fechas (date_from y date_to)
|
||||
date_from_dt: Optional[date] = None
|
||||
if date_from:
|
||||
try:
|
||||
if isinstance(date_from, datetime):
|
||||
date_from_dt = date_from.date()
|
||||
elif isinstance(date_from, date):
|
||||
date_from_dt = date_from
|
||||
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: Optional[date] = None
|
||||
if date_to:
|
||||
try:
|
||||
if isinstance(date_to, datetime):
|
||||
date_to_dt = date_to.date()
|
||||
elif isinstance(date_to, date):
|
||||
date_to_dt = date_to
|
||||
elif isinstance(date_to, str) and date_to.strip():
|
||||
date_to_dt = datetime.strptime(date_to.strip(), '%Y-%m-%d').date()
|
||||
except Exception:
|
||||
pass
|
||||
date_from_dt = parse_flexible_date(date_from)
|
||||
date_to_dt = parse_flexible_date(date_to)
|
||||
|
||||
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
|
||||
@@ -935,18 +919,8 @@ class GoogleSheetsImporter:
|
||||
|
||||
# Determinar fechas a generar: específica de la fila (datepicker), puntual o 16 semanas
|
||||
dates_to_generate = []
|
||||
row_specific_date: Optional[date] = None
|
||||
raw_row_date = rec.get('date') or rec.get('inferred_date')
|
||||
if raw_row_date:
|
||||
try:
|
||||
if isinstance(raw_row_date, datetime):
|
||||
row_specific_date = raw_row_date.date()
|
||||
elif isinstance(raw_row_date, date):
|
||||
row_specific_date = raw_row_date
|
||||
elif isinstance(raw_row_date, str) and raw_row_date.strip():
|
||||
row_specific_date = datetime.strptime(raw_row_date.strip(), '%Y-%m-%d').date()
|
||||
except Exception:
|
||||
pass
|
||||
row_specific_date: Optional[date] = parse_flexible_date(raw_row_date)
|
||||
|
||||
if row_specific_date:
|
||||
dates_to_generate = [row_specific_date]
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
|
||||
|
||||
setup(
|
||||
name="edu-space-admin",
|
||||
version="3.8.5",
|
||||
version="3.8.6",
|
||||
description="Administrative interface for Edu-Space Classroom Management System (FastAPI ASGI Core)",
|
||||
author="Edu-Space Development Team",
|
||||
author_email="admin@edu-space.com",
|
||||
|
||||
@@ -150,3 +150,53 @@ def test_sync_sheets_api_date_from_greater_than_date_to_returns_400(init_databas
|
||||
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']
|
||||
|
||||
|
||||
def test_sync_with_ddmmaaaa_dates(init_database, app_context):
|
||||
"""Verifica que fechas provistas en formato DD/MM/AAAA sean parseadas correctamente."""
|
||||
_ensure_seed()
|
||||
importer = GoogleSheetsImporter()
|
||||
row = {
|
||||
'dia': 'Miércoles',
|
||||
'codigo': 'TEST-DDMMAAAA-01',
|
||||
'asignatura': 'Materia Test DD/MM/AAAA',
|
||||
'aula': '101',
|
||||
'carrera': 'DATOS (CCC)',
|
||||
'horario': '08:30 a 11:30hs',
|
||||
'turno': 'Mañana'
|
||||
}
|
||||
stats = importer.sync(
|
||||
selected_rows=[row],
|
||||
manual_date='21/10/2026',
|
||||
single_date_only=True
|
||||
)
|
||||
assert len(stats['errors']) == 0
|
||||
assert stats['reservations_created'] == 1
|
||||
|
||||
res = Reservation.query.filter(Reservation.purpose.like('%TEST-DDMMAAAA-01%')).first()
|
||||
assert res is not None
|
||||
assert res.start_time.date() == date(2026, 10, 21)
|
||||
|
||||
|
||||
def test_sync_with_row_date_ddmmaaaa(init_database, app_context):
|
||||
"""Verifica que fechas en filas individuales en formato DD/MM/AAAA se respeten."""
|
||||
_ensure_seed()
|
||||
importer = GoogleSheetsImporter()
|
||||
row = {
|
||||
'dia': 'Jueves',
|
||||
'codigo': 'TEST-DDMMAAAA-ROW',
|
||||
'asignatura': 'Materia Row DD/MM/AAAA',
|
||||
'aula': '101',
|
||||
'carrera': 'DATOS (CCC)',
|
||||
'horario': '18:30 a 21:30hs',
|
||||
'turno': 'Tarde',
|
||||
'date': '22/10/2026'
|
||||
}
|
||||
stats = importer.sync(selected_rows=[row])
|
||||
assert len(stats['errors']) == 0
|
||||
assert stats['reservations_created'] == 1
|
||||
|
||||
res = Reservation.query.filter(Reservation.purpose.like('%TEST-DDMMAAAA-ROW%')).first()
|
||||
assert res is not None
|
||||
assert res.start_time.date() == date(2026, 10, 22)
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user