fix(qa): resolver diagnosticos estaticos, sincronizacion moodle y actualizar docs v3.6.4

This commit is contained in:
2026-10-19 14:05:58 -03:00
parent 9ad70d69e9
commit 6057b6d206
47 changed files with 372 additions and 232 deletions
+2 -2
View File
@@ -1,5 +1,5 @@
from app import db
from datetime import datetime
from datetime import datetime, timezone
class AcademicTerm(db.Model):
"""Modelo para Ciclos Lectivos y Períodos Académicos"""
@@ -14,7 +14,7 @@ class AcademicTerm(db.Model):
end_date = db.Column(db.Date, nullable=True)
is_current = db.Column(db.Boolean, default=False, nullable=False, index=True)
is_active = db.Column(db.Boolean, default=True, nullable=False)
created_at = db.Column(db.DateTime, default=datetime.utcnow)
created_at = db.Column(db.DateTime, default=lambda: datetime.now(timezone.utc).replace(tzinfo=None))
def __init__(self, **kwargs):
super().__init__(**kwargs)
+12 -12
View File
@@ -1,5 +1,5 @@
from app import db
from datetime import datetime
from datetime import datetime, timezone
class AuditLog(db.Model):
"""
@@ -16,22 +16,22 @@ class AuditLog(db.Model):
entity_id = db.Column(db.Integer, nullable=True) # ID del registro afectado
details = db.Column(db.Text, nullable=True) # Detalles de cambios o parámetros
ip_address = db.Column(db.String(45), nullable=True) # Soporta IPv4 e IPv6
created_at = db.Column(db.DateTime, default=datetime.utcnow, nullable=False, index=True)
created_at = db.Column(db.DateTime, default=lambda: datetime.now(timezone.utc).replace(tzinfo=None), nullable=False, index=True)
# Relación con usuario
user = db.relationship('User', foreign_keys=[user_id], backref=db.backref('audit_records', lazy='dynamic'))
def __init__(self, user_id=None, user_email=None, action=None, module=None, entity_id=None, details=None, ip_address=None, **kwargs):
super().__init__(
user_id=user_id,
user_email=user_email,
action=action,
module=module,
entity_id=entity_id,
details=details,
ip_address=ip_address,
**kwargs
)
super().__init__()
self.user_id = user_id
self.user_email = user_email
self.action = action
self.module = module
self.entity_id = entity_id
self.details = details
self.ip_address = ip_address
for k, v in kwargs.items():
setattr(self, k, v)
def __repr__(self):
return f"<AuditLog #{self.id} {self.action} on {self.module} by {self.user_email or 'System'}>"
+3 -3
View File
@@ -1,5 +1,5 @@
from app import db
from datetime import datetime
from datetime import datetime, timezone
class Building(db.Model):
__tablename__ = 'buildings'
@@ -11,8 +11,8 @@ class Building(db.Model):
floors = db.Column(db.Integer, default=1, nullable=False)
description = db.Column(db.Text, nullable=True)
is_active = db.Column(db.Boolean, default=True, nullable=False)
created_at = db.Column(db.DateTime, default=datetime.utcnow)
updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
created_at = db.Column(db.DateTime, default=lambda: datetime.now(timezone.utc).replace(tzinfo=None))
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
classrooms = db.relationship('Classroom', backref='building_entity', lazy=True, foreign_keys='Classroom.building_id')
+8 -3
View File
@@ -1,17 +1,22 @@
from app import db
from datetime import datetime
from datetime import datetime, timezone
from typing import TYPE_CHECKING, List, Any
if TYPE_CHECKING:
from app.models.subject import Subject
class Career(db.Model):
__tablename__ = 'careers'
__allow_unmapped__ = True
id = db.Column(db.Integer, primary_key=True)
name = db.Column(db.String(150), unique=True, nullable=False, index=True)
code = db.Column(db.String(50), nullable=True)
description = db.Column(db.Text, nullable=True)
created_at = db.Column(db.DateTime, default=datetime.utcnow)
created_at = db.Column(db.DateTime, default=lambda: datetime.now(timezone.utc).replace(tzinfo=None))
# Relationships
subjects = db.relationship('Subject', backref='career_obj', lazy=True)
subjects: Any = db.relationship('Subject', backref='career_obj', lazy=True)
def __init__(self, **kwargs):
super().__init__(**kwargs)
+15 -5
View File
@@ -1,8 +1,18 @@
from app import db
from datetime import datetime
from datetime import datetime, timezone
from typing import TYPE_CHECKING, Optional, List
if TYPE_CHECKING:
from app.models.building import Building
from app.models.reservation import Reservation
class Classroom(db.Model):
__tablename__ = 'classrooms'
__allow_unmapped__ = True
if TYPE_CHECKING:
building_entity: Optional['Building']
reservations: List['Reservation']
id = db.Column(db.Integer, primary_key=True)
campus_id = db.Column(db.Integer, nullable=True) # Maps to campus_id in DB
@@ -13,8 +23,8 @@ class Classroom(db.Model):
capacity = db.Column(db.Integer, nullable=False)
description = db.Column(db.Text)
is_active = db.Column('active', db.Boolean, default=True, nullable=False) # Maps to active column in DB
created_at = db.Column(db.DateTime, default=datetime.utcnow)
updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
created_at = db.Column(db.DateTime, default=lambda: datetime.now(timezone.utc).replace(tzinfo=None))
updated_at = db.Column(db.DateTime, default=lambda: datetime.now(timezone.utc).replace(tzinfo=None), onupdate=lambda: datetime.now(timezone.utc).replace(tzinfo=None))
def __init__(self, **kwargs):
super().__init__(**kwargs)
@@ -207,8 +217,8 @@ class ClassroomResource(db.Model):
specifications = db.Column(db.Text)
functional = db.Column(db.Boolean, default=True)
last_maintenance_date = db.Column(db.DateTime)
created_at = db.Column(db.DateTime, default=datetime.utcnow)
updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
created_at = db.Column(db.DateTime, default=lambda: datetime.now(timezone.utc).replace(tzinfo=None))
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
classroom = db.relationship('Classroom', backref=db.backref('resources', lazy=True, cascade='all, delete-orphan'))
+3
View File
@@ -0,0 +1,3 @@
from app.models.subject import CommissionTeacher
__all__ = ['CommissionTeacher']
+3 -3
View File
@@ -1,5 +1,5 @@
from app import db
from datetime import datetime
from datetime import datetime, timezone
class StudentEnrollment(db.Model):
@@ -20,8 +20,8 @@ class StudentEnrollment(db.Model):
index=True
)
status = db.Column(db.String(20), nullable=False, default='activo') # activo | retirado | condicional
enrolled_at = db.Column(db.DateTime, default=datetime.utcnow, nullable=False)
updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
enrolled_at = db.Column(db.DateTime, default=lambda: datetime.now(timezone.utc).replace(tzinfo=None), nullable=False)
updated_at = db.Column(db.DateTime, default=lambda: datetime.now(timezone.utc).replace(tzinfo=None), onupdate=lambda: datetime.now(timezone.utc).replace(tzinfo=None))
notes = db.Column(db.Text, nullable=True)
allow_same_day_exception = db.Column(db.Boolean, default=False, nullable=True)
exception_reason = db.Column(db.String(255), nullable=True)
+11 -9
View File
@@ -1,13 +1,15 @@
import random
import copy
from datetime import datetime, timedelta
from typing import List, Dict, Tuple, Optional
import logging
from datetime import datetime, timedelta, timezone
from typing import List, Dict, Tuple, Optional, Any
from dataclasses import dataclass
from app import db
from app.models.classroom import Classroom
from app.models.reservation import Reservation, ReservationStatus
from app.models.subject import Commission
logger = logging.getLogger(__name__)
@dataclass
class ReservationRequest:
@@ -19,7 +21,7 @@ class ReservationRequest:
preferred_end_time: datetime
priority: int = 1 # 1=highest, 5=lowest
flexibility_hours: int = 2 # How flexible the start time can be
subject_requirements: Dict = None # Special requirements for the subject
subject_requirements: Optional[Dict[str, Any]] = None # Special requirements for the subject
def __post_init__(self):
if self.subject_requirements is None:
@@ -145,7 +147,7 @@ class Individual:
return -conflicts * 0.5 # Penalty for each conflict
return 1.0
def _calculate_resource_score(self, classroom: Classroom, requirements: Dict) -> float:
def _calculate_resource_score(self, classroom: Classroom, requirements: Optional[Dict[str, Any]] = None) -> float:
"""Check if classroom meets subject requirements"""
if not requirements:
return 1.0
@@ -326,14 +328,14 @@ class ReservationOptimizer:
def optimize_schedule(self, commission_ids: List[int],
admin_user_id: int,
start_date: datetime = None,
end_date: datetime = None,
start_date: Optional[datetime] = None,
end_date: Optional[datetime] = None,
progress_callback = None) -> Dict:
"""Optimize reservation schedule for given commissions"""
# Default date range if not provided
if not start_date:
start_date = datetime.utcnow()
start_date = datetime.now(timezone.utc).replace(tzinfo=None)
if not end_date:
end_date = start_date + timedelta(days=30)
@@ -391,7 +393,7 @@ class ReservationOptimizer:
def _calculate_preferred_time(self, commission: Commission) -> Dict:
"""Calculate preferred time slots for a commission based on shift and schedule"""
current_date = datetime.utcnow()
current_date = datetime.now(timezone.utc).replace(tzinfo=None)
# Determine day of week from commission schedule or default to Monday
target_weekday = 0 # Monday
@@ -462,7 +464,7 @@ class ReservationOptimizer:
db.session.add(reservation)
applied_reservations.append(reservation)
else:
current_app.logger.warning(f"Conflict detected for reservation during genetic apply: {data}")
logger.warning(f"Conflict detected for reservation during genetic apply: {data}")
try:
db.session.commit()
+3 -3
View File
@@ -1,4 +1,4 @@
from datetime import datetime
from datetime import datetime, timezone
from app import db
@@ -36,8 +36,8 @@ class MilestoneGrade(db.Model):
db.ForeignKey('users.id', ondelete='SET NULL'),
nullable=True
)
graded_at = db.Column(db.DateTime, default=datetime.utcnow)
updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
graded_at = db.Column(db.DateTime, default=lambda: datetime.now(timezone.utc).replace(tzinfo=None))
updated_at = db.Column(db.DateTime, default=lambda: datetime.now(timezone.utc).replace(tzinfo=None), onupdate=lambda: datetime.now(timezone.utc).replace(tzinfo=None))
# Restricción de unicidad: un estudiante tiene una única nota por hito
__table_args__ = (
+10 -5
View File
@@ -1,4 +1,5 @@
from datetime import datetime
from datetime import datetime, timezone
from typing import TYPE_CHECKING, Optional
from app import db
class MilestoneType(db.Model):
@@ -15,8 +16,8 @@ class MilestoneType(db.Model):
description = db.Column(db.String(255), nullable=True)
sort_order = db.Column(db.Integer, default=0) # Orden de aparición en selects
is_active = db.Column(db.Boolean, default=True, nullable=False) # Activo / Inactivo
created_at = db.Column(db.DateTime, default=datetime.utcnow)
updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
created_at = db.Column(db.DateTime, default=lambda: datetime.now(timezone.utc).replace(tzinfo=None))
updated_at = db.Column(db.DateTime, default=lambda: datetime.now(timezone.utc).replace(tzinfo=None), onupdate=lambda: datetime.now(timezone.utc).replace(tzinfo=None))
# Relación uno-a-muchos con AcademicMilestone
milestones = db.relationship('AcademicMilestone', backref='type_obj', lazy='dynamic', cascade='all, delete-orphan')
@@ -45,6 +46,10 @@ class AcademicMilestone(db.Model):
Hito o evento académico programado para una materia/comisión (Examen, TP, Entrega).
"""
__tablename__ = 'academic_milestones'
__allow_unmapped__ = True
if TYPE_CHECKING:
type_obj: Optional['MilestoneType']
id = db.Column(db.Integer, primary_key=True)
title = db.Column(db.String(150), nullable=True)
@@ -57,8 +62,8 @@ class AcademicMilestone(db.Model):
link = db.Column(db.String(255), nullable=True) # Link Teams / Meet / Zoom si aplica
notes = db.Column(db.Text, nullable=True) # Temario, consignas o notas
is_active = db.Column(db.Boolean, default=True, nullable=False)
created_at = db.Column(db.DateTime, default=datetime.utcnow)
updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
created_at = db.Column(db.DateTime, default=lambda: datetime.now(timezone.utc).replace(tzinfo=None))
updated_at = db.Column(db.DateTime, default=lambda: datetime.now(timezone.utc).replace(tzinfo=None), onupdate=lambda: datetime.now(timezone.utc).replace(tzinfo=None))
# Relación con Asignatura y Comisión
subject = db.relationship('Subject', backref=db.backref('milestones', lazy='dynamic'))
+19 -3
View File
@@ -1,5 +1,9 @@
from app import db
from datetime import datetime
from datetime import datetime, timezone
from typing import TYPE_CHECKING, List, Any
if TYPE_CHECKING:
from app.models.user import User
# Definition of system modules available for RBAC permissions
SYSTEM_MODULES = [
@@ -86,16 +90,17 @@ ACCESS_LEVELS = ['none', 'read', 'read_write']
class Role(db.Model):
__tablename__ = 'roles'
__allow_unmapped__ = True
id = db.Column(db.Integer, primary_key=True)
name = db.Column(db.String(80), unique=True, nullable=False, index=True)
description = db.Column(db.String(255))
is_system = db.Column(db.Boolean, default=False, nullable=False)
created_at = db.Column(db.DateTime, default=datetime.utcnow)
created_at = db.Column(db.DateTime, default=lambda: datetime.now(timezone.utc).replace(tzinfo=None))
# Relationships
permissions = db.relationship('Permission', backref='role', lazy='joined', cascade='all, delete-orphan')
users = db.relationship('User', backref='role_obj', lazy='select')
users: Any = db.relationship('User', backref='role_obj', lazy='select')
def __init__(self, **kwargs):
super().__init__(**kwargs)
@@ -161,6 +166,17 @@ class Permission(db.Model):
__table_args__ = (
db.UniqueConstraint('role_id', 'module', name='uq_role_module'),
)
def __init__(self, role=None, role_id=None, module=None, access_level='none', **kwargs):
super().__init__()
if role is not None:
self.role = role
if role_id is not None:
self.role_id = role_id
self.module = module
self.access_level = access_level
for k, v in kwargs.items():
setattr(self, k, v)
def __repr__(self):
return f'<Permission role={self.role_id} module={self.module} level={self.access_level}>'
+29 -8
View File
@@ -1,5 +1,9 @@
from app import db
from datetime import datetime
from datetime import datetime, timezone
from typing import TYPE_CHECKING, Optional, List, Any
if TYPE_CHECKING:
from app.models.career import Career
# Tabla asociativa Many-to-Many para materias compartidas entre carreras
subject_careers = db.Table(
@@ -10,6 +14,10 @@ subject_careers = db.Table(
class Subject(db.Model):
__tablename__ = 'subjects'
__allow_unmapped__ = True
if TYPE_CHECKING:
career_obj: Any
id = db.Column(db.Integer, primary_key=True)
code = db.Column(db.String(50), unique=True, nullable=False, index=True)
@@ -20,12 +28,12 @@ class Subject(db.Model):
career_id = db.Column(db.Integer, db.ForeignKey('careers.id', ondelete='SET NULL'), nullable=True)
is_active = db.Column('active', db.Boolean, default=True, nullable=False) # Maps to active column in DB
is_short_course = db.Column(db.Boolean, default=False, nullable=True) # True para talleres/cursos cortos
created_at = db.Column(db.DateTime, default=datetime.utcnow)
updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
created_at = db.Column(db.DateTime, default=lambda: datetime.now(timezone.utc).replace(tzinfo=None))
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 = 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))
commissions: Any = db.relationship('Commission', backref='subject', lazy=True, cascade='all, delete-orphan')
careers: Any = db.relationship('Career', secondary=subject_careers, lazy='subquery', backref=db.backref('shared_subjects', lazy=True))
def __init__(self, **kwargs):
super().__init__(**kwargs)
@@ -64,6 +72,10 @@ class Subject(db.Model):
class Commission(db.Model):
__tablename__ = 'commissions'
__allow_unmapped__ = True
if TYPE_CHECKING:
subject: Any
id = db.Column(db.Integer, primary_key=True)
subject_id = db.Column(db.Integer, db.ForeignKey('subjects.id'), nullable=False)
@@ -88,8 +100,8 @@ class Commission(db.Model):
academic_term_id = db.Column(db.Integer, db.ForeignKey('academic_terms.id', ondelete='SET NULL'), nullable=True)
academic_term = db.relationship('AcademicTerm', foreign_keys=[academic_term_id])
created_at = db.Column(db.DateTime, default=datetime.utcnow)
updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
created_at = db.Column(db.DateTime, default=lambda: datetime.now(timezone.utc).replace(tzinfo=None))
updated_at = db.Column(db.DateTime, default=lambda: datetime.now(timezone.utc).replace(tzinfo=None), onupdate=lambda: datetime.now(timezone.utc).replace(tzinfo=None))
def __init__(self, **kwargs):
super().__init__(**kwargs)
@@ -236,7 +248,7 @@ class CommissionTeacher(db.Model):
user_id = db.Column(db.Integer, db.ForeignKey('users.id', ondelete='CASCADE'), nullable=False, index=True)
role = db.Column(db.String(50), default='Titular', nullable=False) # Titular, Adjunto, JTP, Ayudante
is_primary = db.Column(db.Boolean, default=False, nullable=False)
created_at = db.Column(db.DateTime, default=datetime.utcnow)
created_at = db.Column(db.DateTime, default=lambda: datetime.now(timezone.utc).replace(tzinfo=None))
# Relationships
commission = db.relationship('Commission', backref=db.backref('teachers_association', cascade='all, delete-orphan', lazy='joined'))
@@ -244,6 +256,15 @@ class CommissionTeacher(db.Model):
__table_args__ = (db.UniqueConstraint('commission_id', 'user_id'),)
def __init__(self, commission_id=None, user_id=None, role='Titular', is_primary=False, **kwargs):
super().__init__()
self.commission_id = commission_id
self.user_id = user_id
self.role = role
self.is_primary = is_primary
for k, v in kwargs.items():
setattr(self, k, v)
def to_dict(self):
return {
'id': self.id,
+4 -4
View File
@@ -1,5 +1,5 @@
from app import db
from datetime import datetime
from datetime import datetime, timezone
import json
class MoodleSyncTask(db.Model):
@@ -19,9 +19,9 @@ class MoodleSyncTask(db.Model):
attempts = db.Column(db.Integer, default=0)
max_attempts = db.Column(db.Integer, default=5)
error_message = db.Column(db.Text, nullable=True)
next_retry_at = db.Column(db.DateTime, default=datetime.utcnow, index=True)
created_at = db.Column(db.DateTime, default=datetime.utcnow)
updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
next_retry_at = db.Column(db.DateTime, default=lambda: datetime.now(timezone.utc).replace(tzinfo=None), index=True)
created_at = db.Column(db.DateTime, default=lambda: datetime.now(timezone.utc).replace(tzinfo=None))
updated_at = db.Column(db.DateTime, default=lambda: datetime.now(timezone.utc).replace(tzinfo=None), onupdate=lambda: datetime.now(timezone.utc).replace(tzinfo=None))
def __init__(self, **kwargs):
if 'payload' in kwargs:
+3 -3
View File
@@ -1,7 +1,7 @@
from typing import Any, TYPE_CHECKING
from app import db
from werkzeug.security import generate_password_hash, check_password_hash
from datetime import datetime
from datetime import datetime, timezone
class User(db.Model):
__tablename__ = 'users'
@@ -16,7 +16,7 @@ class User(db.Model):
name = db.Column(db.String(100), nullable=False)
role = db.Column(db.String(50), nullable=False)
is_active = db.Column(db.Boolean, default=True, nullable=False)
created_at = db.Column(db.DateTime, default=datetime.utcnow)
created_at = db.Column(db.DateTime, default=lambda: datetime.now(timezone.utc).replace(tzinfo=None))
last_login = db.Column(db.DateTime)
preferred_language = db.Column(db.String(10), default=None, nullable=True)
theme_preference = db.Column(db.String(10), default='auto', nullable=False)
@@ -146,7 +146,7 @@ class User(db.Model):
def update_last_login(self):
"""Update last login timestamp"""
self.last_login = datetime.utcnow()
self.last_login = datetime.now(timezone.utc).replace(tzinfo=None)
db.session.commit()
def to_dict(self):