fix: resolver tipos estaticos en modelos, importador y academic router (v3.8.4)
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.3"
|
||||
__version__ = "3.8.4"
|
||||
|
||||
class DummyContext:
|
||||
def __enter__(self):
|
||||
|
||||
@@ -16,18 +16,19 @@ class Career(db.Model):
|
||||
created_at = db.Column(db.DateTime, default=lambda: datetime.now(timezone.utc).replace(tzinfo=None))
|
||||
|
||||
# Relationships
|
||||
subjects: List['Subject'] = db.relationship('Subject', backref='career_obj', lazy=True)
|
||||
subjects = db.relationship('Subject', backref='career_obj', lazy=True)
|
||||
|
||||
def __init__(self, **kwargs):
|
||||
super().__init__(**kwargs)
|
||||
|
||||
def to_dict(self):
|
||||
subs = getattr(self, 'subjects', None)
|
||||
return {
|
||||
'id': self.id,
|
||||
'name': self.name,
|
||||
'code': self.code,
|
||||
'description': self.description,
|
||||
'subjects_count': len(self.subjects) if self.subjects else 0,
|
||||
'subjects_count': len(subs) if isinstance(subs, (list, set, tuple)) else 0,
|
||||
'created_at': self.created_at.isoformat() if self.created_at else None
|
||||
}
|
||||
|
||||
|
||||
@@ -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: 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))
|
||||
commissions = db.relationship('Commission', backref='subject', lazy=True, cascade='all, delete-orphan')
|
||||
careers = db.relationship('Career', secondary=subject_careers, lazy='subquery', backref=db.backref('shared_subjects', lazy=True))
|
||||
|
||||
def __init__(self, **kwargs):
|
||||
super().__init__(**kwargs)
|
||||
|
||||
@@ -557,32 +557,38 @@ class GoogleSheetsImporter:
|
||||
dias_esp = ['Lunes', 'Martes', 'Miércoles', 'Jueves', 'Viernes', 'Sábado', 'Domingo']
|
||||
|
||||
# Normalizar fecha manual si fue provista
|
||||
manual_dt = None
|
||||
manual_dt: Optional[date] = None
|
||||
if manual_date:
|
||||
try:
|
||||
if isinstance(manual_date, (datetime, date)):
|
||||
manual_dt = manual_date if isinstance(manual_date, date) else manual_date.date()
|
||||
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
|
||||
|
||||
# Normalizar rango de fechas (date_from y date_to)
|
||||
date_from_dt = None
|
||||
date_from_dt: Optional[date] = 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()
|
||||
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 = None
|
||||
date_to_dt: Optional[date] = 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()
|
||||
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:
|
||||
@@ -929,12 +935,14 @@ class GoogleSheetsImporter:
|
||||
|
||||
# Determinar fechas a generar: específica de la fila (datepicker), puntual o 16 semanas
|
||||
dates_to_generate = []
|
||||
row_specific_date = None
|
||||
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, date)):
|
||||
row_specific_date = raw_row_date if isinstance(raw_row_date, date) else raw_row_date.date()
|
||||
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:
|
||||
|
||||
Reference in New Issue
Block a user