fix(qa): resolver diagnosticos estaticos, sincronizacion moodle y actualizar docs v3.6.4
This commit is contained in:
@@ -19,7 +19,7 @@ class CacheService:
|
||||
if not cls._redis_checked:
|
||||
cls._redis_checked = True
|
||||
try:
|
||||
import redis
|
||||
import redis # type: ignore
|
||||
from app.models.setting import SystemSetting
|
||||
redis_url = SystemSetting.get_value('redis_url', 'redis://127.0.0.1:6379/0')
|
||||
client = redis.from_url(redis_url, socket_connect_timeout=2)
|
||||
|
||||
@@ -112,18 +112,22 @@ class EmailService:
|
||||
if html_content:
|
||||
msg.attach(MIMEText(html_content, 'html', 'utf-8'))
|
||||
|
||||
host_str = str(host or 'localhost')
|
||||
port_int = int(port or 587)
|
||||
from_email_str = str(from_email or 'notificaciones@unicaba.edu.ar')
|
||||
|
||||
try:
|
||||
if security == 'ssl' or port == 465:
|
||||
server = smtplib.SMTP_SSL(host, port, timeout=15)
|
||||
if security == 'ssl' or port_int == 465:
|
||||
server = smtplib.SMTP_SSL(host_str, port_int, timeout=15)
|
||||
else:
|
||||
server = smtplib.SMTP(host, port, timeout=15)
|
||||
server = smtplib.SMTP(host_str, port_int, timeout=15)
|
||||
if security in ('tls', 'starttls'):
|
||||
server.starttls()
|
||||
|
||||
if user and password:
|
||||
server.login(user, password)
|
||||
|
||||
server.sendmail(from_email, recipients, msg.as_string())
|
||||
server.sendmail(from_email_str, recipients, msg.as_string())
|
||||
server.quit()
|
||||
logger.info(f"[EmailService] Email sent successfully to {recipients}: '{subject}'")
|
||||
return True
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
from datetime import datetime, timedelta
|
||||
from datetime import datetime, timedelta, timezone
|
||||
from typing import Optional, List, Dict, Any
|
||||
from app import db
|
||||
from app.models.subject import Commission, Subject
|
||||
@@ -33,9 +33,12 @@ class GradebookService:
|
||||
).join(User).order_by(User.name.asc()).all()
|
||||
|
||||
# 3. Mapa de notas por (student_id, milestone_id)
|
||||
grades = MilestoneGrade.query.filter(
|
||||
MilestoneGrade.milestone_id.in_([m.id for m in milestones]) if milestones else False
|
||||
).all() if milestones else []
|
||||
if milestones:
|
||||
grades = MilestoneGrade.query.filter(
|
||||
MilestoneGrade.milestone_id.in_([m.id for m in milestones])
|
||||
).all()
|
||||
else:
|
||||
grades = []
|
||||
|
||||
grades_map: Dict[tuple, MilestoneGrade] = {
|
||||
(g.student_id, g.milestone_id): g for g in grades
|
||||
@@ -177,7 +180,7 @@ class GradebookService:
|
||||
is_absent=final_absent,
|
||||
feedback=feedback.strip() if feedback else '',
|
||||
graded_by_user_id=grader_id,
|
||||
graded_at=datetime.utcnow()
|
||||
graded_at=datetime.now(timezone.utc).replace(tzinfo=None)
|
||||
)
|
||||
db.session.add(grade)
|
||||
else:
|
||||
@@ -186,7 +189,7 @@ class GradebookService:
|
||||
if feedback is not None:
|
||||
grade.feedback = feedback.strip()
|
||||
grade.graded_by_user_id = grader_id
|
||||
grade.updated_at = datetime.utcnow()
|
||||
grade.updated_at = datetime.now(timezone.utc).replace(tzinfo=None)
|
||||
|
||||
db.session.commit()
|
||||
return grade
|
||||
@@ -240,7 +243,7 @@ class GradebookService:
|
||||
|
||||
acta_num = f'ACTA-{comm.year}-{comm.semester}-{comm.id:04d}'
|
||||
comm.grades_closed = True
|
||||
comm.grades_closed_at = datetime.utcnow()
|
||||
comm.grades_closed_at = datetime.now(timezone.utc).replace(tzinfo=None)
|
||||
comm.grades_closed_by = user_id
|
||||
comm.acta_number = acta_num
|
||||
|
||||
@@ -383,7 +386,7 @@ class GradebookService:
|
||||
@classmethod
|
||||
def get_student_upcoming_milestones(cls, student_id: int, limit: int = 5) -> List[Dict[str, Any]]:
|
||||
"""Obtiene las próximas evaluaciones con cálculo de cuenta regresiva para el dashboard."""
|
||||
now = datetime.utcnow()
|
||||
now = datetime.now(timezone.utc).replace(tzinfo=None)
|
||||
enrollments = StudentEnrollment.query.filter_by(student_id=student_id).all()
|
||||
commission_ids = [e.commission_id for e in enrollments]
|
||||
|
||||
|
||||
@@ -14,12 +14,12 @@ class MoodleClient:
|
||||
|
||||
@classmethod
|
||||
def get_config(cls) -> Dict[str, Any]:
|
||||
server_url = SystemSetting.get_value('moodle_server_url', 'http://10.0.0.207/moodle').rstrip('/')
|
||||
server_url = str(SystemSetting.get_value('moodle_server_url', 'http://10.0.0.207/moodle') or 'http://10.0.0.207/moodle').rstrip('/')
|
||||
token = SystemSetting.get_decrypted_value('moodle_ws_token', '')
|
||||
# Fallback a token descubierto en Moodle si no está configurado aún en BD
|
||||
if not token:
|
||||
token = '810428346d3601c68a37a315fcba8d4391629f46'
|
||||
timeout = int(SystemSetting.get_value('moodle_timeout', 10))
|
||||
timeout = int(SystemSetting.get_value('moodle_timeout', 10) or 10)
|
||||
return {
|
||||
'server_url': server_url,
|
||||
'token': token,
|
||||
@@ -131,7 +131,7 @@ class MoodleClient:
|
||||
@classmethod
|
||||
def create_user(cls, username: str, email: str, firstname: str, lastname: str, password: Optional[str] = None) -> Dict[str, Any]:
|
||||
"""Crea un nuevo usuario en Moodle (core_user_create_users)."""
|
||||
params = {
|
||||
params: Dict[str, Any] = {
|
||||
'users[0][username]': username.strip().lower(),
|
||||
'users[0][email]': email.strip().lower(),
|
||||
'users[0][firstname]': firstname.strip(),
|
||||
@@ -152,7 +152,7 @@ class MoodleClient:
|
||||
@classmethod
|
||||
def update_user(cls, moodle_user_id: int, firstname: Optional[str] = None, lastname: Optional[str] = None, email: Optional[str] = None) -> Any:
|
||||
"""Actualiza datos de un usuario en Moodle (core_user_update_users)."""
|
||||
params = {'users[0][id]': moodle_user_id}
|
||||
params: Dict[str, Any] = {'users[0][id]': moodle_user_id}
|
||||
if firstname:
|
||||
params['users[0][firstname]'] = firstname
|
||||
if lastname:
|
||||
@@ -192,7 +192,8 @@ class MoodleClient:
|
||||
def get_enrolled_users(cls, course_id: int) -> List[Dict[str, Any]]:
|
||||
"""Obtiene todos los usuarios matriculados en un curso (core_enrol_get_enrolled_users)."""
|
||||
params = {'courseid': course_id}
|
||||
return cls.call('core_enrol_get_enrolled_users', params)
|
||||
res = cls.call('core_enrol_get_enrolled_users', params)
|
||||
return res if isinstance(res, list) else []
|
||||
|
||||
# --------------------------------------------------------------------------
|
||||
# Asignación de Roles (core_role_*)
|
||||
@@ -227,11 +228,41 @@ class MoodleClient:
|
||||
|
||||
@classmethod
|
||||
def update_users(cls, users: List[Dict[str, Any]]) -> Any:
|
||||
params = {}
|
||||
for idx, u in enumerate(users):
|
||||
for k, v in u.items():
|
||||
params[f'users[{idx}][{k}]'] = v
|
||||
return cls.call('core_user_update_users', params, method='POST')
|
||||
to_update = []
|
||||
to_create = []
|
||||
for u in users:
|
||||
user_data = dict(u)
|
||||
if 'id' not in user_data or not user_data['id']:
|
||||
# Moodle requiere el ID numérico interno en core_user_update_users.
|
||||
# Buscar en Moodle por email o username para obtener su ID:
|
||||
existing = None
|
||||
if user_data.get('email'):
|
||||
existing = cls.get_user_by_email(str(user_data['email']))
|
||||
if not existing and user_data.get('username'):
|
||||
found = cls.get_users_by_criteria('username', str(user_data['username']))
|
||||
if found:
|
||||
existing = found[0]
|
||||
|
||||
if existing and 'id' in existing:
|
||||
user_data['id'] = existing['id']
|
||||
to_update.append(user_data)
|
||||
else:
|
||||
to_create.append(user_data)
|
||||
else:
|
||||
to_update.append(user_data)
|
||||
|
||||
results = []
|
||||
if to_create:
|
||||
res_c = cls.create_users(to_create)
|
||||
results.append(res_c)
|
||||
if to_update:
|
||||
params = {}
|
||||
for idx, u in enumerate(to_update):
|
||||
for k, v in u.items():
|
||||
params[f'users[{idx}][{k}]'] = v
|
||||
res_u = cls.call('core_user_update_users', params, method='POST')
|
||||
results.append(res_u)
|
||||
return results if len(results) > 1 else (results[0] if results else None)
|
||||
|
||||
@classmethod
|
||||
def enrol_users(cls, enrolments: List[Dict[str, Any]]) -> Any:
|
||||
|
||||
@@ -5,7 +5,8 @@ operations between admin-edu-space and Moodle 4.1.
|
||||
Implements Exponential Backoff and Dead Letter Queue (DLQ).
|
||||
"""
|
||||
import logging
|
||||
from datetime import datetime, timedelta
|
||||
from datetime import datetime, timedelta, timezone
|
||||
from typing import Optional
|
||||
from app import db
|
||||
from app.models.sync_task import MoodleSyncTask
|
||||
from app.services.moodle_client import moodle_client
|
||||
@@ -14,7 +15,7 @@ logger = logging.getLogger(__name__)
|
||||
|
||||
class MoodleQueueService:
|
||||
@staticmethod
|
||||
def enqueue_task(action: str, entity_type: str, entity_id: str = None, payload: dict = None, max_attempts: int = 5) -> MoodleSyncTask:
|
||||
def enqueue_task(action: str, entity_type: str, entity_id: Optional[str] = None, payload: Optional[dict] = None, max_attempts: int = 5) -> MoodleSyncTask:
|
||||
"""
|
||||
Enqueues a new synchronization task to be processed asynchronously.
|
||||
Guarantees that local transactions are never blocked by Moodle unavailability.
|
||||
@@ -22,12 +23,12 @@ class MoodleQueueService:
|
||||
task = MoodleSyncTask(
|
||||
action=action,
|
||||
entity_type=entity_type,
|
||||
entity_id=str(entity_id) if entity_id else None,
|
||||
entity_id=entity_id if entity_id is not None else None,
|
||||
payload=payload or {},
|
||||
status='PENDING',
|
||||
attempts=0,
|
||||
max_attempts=max_attempts,
|
||||
next_retry_at=datetime.utcnow()
|
||||
next_retry_at=datetime.now(timezone.utc).replace(tzinfo=None)
|
||||
)
|
||||
db.session.add(task)
|
||||
db.session.commit()
|
||||
@@ -41,7 +42,7 @@ class MoodleQueueService:
|
||||
Uses exponential backoff for retries and sends to Dead Letter Queue (FAILED)
|
||||
if max_attempts are exceeded.
|
||||
"""
|
||||
now = datetime.utcnow()
|
||||
now = datetime.now(timezone.utc).replace(tzinfo=None)
|
||||
tasks = MoodleSyncTask.query.filter(
|
||||
MoodleSyncTask.status.in_(['PENDING', 'RETRYING']),
|
||||
(MoodleSyncTask.next_retry_at == None) | (MoodleSyncTask.next_retry_at <= now)
|
||||
@@ -60,21 +61,21 @@ class MoodleQueueService:
|
||||
for task in tasks:
|
||||
results['processed'] += 1
|
||||
task.status = 'PROCESSING'
|
||||
task.updated_at = datetime.utcnow()
|
||||
task.updated_at = datetime.now(timezone.utc).replace(tzinfo=None)
|
||||
db.session.commit()
|
||||
|
||||
try:
|
||||
MoodleQueueService._execute_task_action(task)
|
||||
task.status = 'COMPLETED'
|
||||
task.error_message = None
|
||||
task.updated_at = datetime.utcnow()
|
||||
task.updated_at = datetime.now(timezone.utc).replace(tzinfo=None)
|
||||
db.session.commit()
|
||||
results['succeeded'] += 1
|
||||
logger.info(f"[MoodleQueue] Task {task.id} ({task.action}) completed successfully.")
|
||||
except Exception as e:
|
||||
task.attempts += 1
|
||||
task.error_message = str(e)
|
||||
task.updated_at = datetime.utcnow()
|
||||
task.updated_at = datetime.now(timezone.utc).replace(tzinfo=None)
|
||||
|
||||
if task.attempts >= task.max_attempts:
|
||||
task.status = 'FAILED' # Dead Letter Queue (DLQ)
|
||||
@@ -85,7 +86,7 @@ class MoodleQueueService:
|
||||
task.status = 'RETRYING'
|
||||
# Exponential Backoff: 30s, 60s, 120s, 240s... capped at 1 hour
|
||||
delay_seconds = min(3600, (2 ** task.attempts) * 30)
|
||||
task.next_retry_at = datetime.utcnow() + timedelta(seconds=delay_seconds)
|
||||
task.next_retry_at = datetime.now(timezone.utc).replace(tzinfo=None) + timedelta(seconds=delay_seconds)
|
||||
results['retrying'] += 1
|
||||
logger.warning(f"[MoodleQueue] Task {task.id} failed attempt {task.attempts}/{task.max_attempts}. Next retry in {delay_seconds}s: {e}")
|
||||
|
||||
@@ -123,16 +124,16 @@ class MoodleQueueService:
|
||||
return res
|
||||
|
||||
elif action == 'ASSIGN_ROLE':
|
||||
role_id = payload.get('role_id')
|
||||
user_id = payload.get('user_id')
|
||||
context_id = payload.get('context_id', 1)
|
||||
role_id = int(payload.get('role_id', 5))
|
||||
user_id = int(payload.get('user_id', 0))
|
||||
context_id = int(payload.get('context_id', 1))
|
||||
res = moodle_client.assign_role(role_id, user_id, context_id)
|
||||
return res
|
||||
|
||||
elif action == 'UNASSIGN_ROLE':
|
||||
role_id = payload.get('role_id')
|
||||
user_id = payload.get('user_id')
|
||||
context_id = payload.get('context_id', 1)
|
||||
role_id = int(payload.get('role_id', 5))
|
||||
user_id = int(payload.get('user_id', 0))
|
||||
context_id = int(payload.get('context_id', 1))
|
||||
res = moodle_client.unassign_role(role_id, user_id, context_id)
|
||||
return res
|
||||
|
||||
@@ -150,9 +151,9 @@ class MoodleQueueService:
|
||||
|
||||
task.status = 'PENDING'
|
||||
task.attempts = 0
|
||||
task.next_retry_at = datetime.utcnow()
|
||||
task.next_retry_at = datetime.now(timezone.utc).replace(tzinfo=None)
|
||||
task.error_message = None
|
||||
task.updated_at = datetime.utcnow()
|
||||
task.updated_at = datetime.now(timezone.utc).replace(tzinfo=None)
|
||||
db.session.commit()
|
||||
logger.info(f"[MoodleQueue] Task {task_id} manually reset to PENDING.")
|
||||
return True
|
||||
@@ -167,8 +168,8 @@ class MoodleQueueService:
|
||||
for task in failed_tasks:
|
||||
task.status = 'PENDING'
|
||||
task.attempts = 0
|
||||
task.next_retry_at = datetime.utcnow()
|
||||
task.updated_at = datetime.utcnow()
|
||||
task.next_retry_at = datetime.now(timezone.utc).replace(tzinfo=None)
|
||||
task.updated_at = datetime.now(timezone.utc).replace(tzinfo=None)
|
||||
count += 1
|
||||
db.session.commit()
|
||||
logger.info(f"[MoodleQueue] Reset {count} failed tasks back to PENDING.")
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import time
|
||||
import uuid
|
||||
import threading
|
||||
from datetime import datetime, timedelta
|
||||
from datetime import datetime, timedelta, timezone
|
||||
from enum import Enum
|
||||
from typing import List, Dict, Any, Optional
|
||||
from flask import current_app
|
||||
@@ -39,7 +39,7 @@ class OptimizerJob:
|
||||
self.reservations: List[Dict[str, Any]] = []
|
||||
self.conflicts: List[Dict[str, Any]] = []
|
||||
self.error: Optional[str] = None
|
||||
self.created_at = datetime.utcnow()
|
||||
self.created_at = datetime.now(timezone.utc).replace(tzinfo=None)
|
||||
self.started_at: Optional[datetime] = None
|
||||
self.completed_at: Optional[datetime] = None
|
||||
self.execution_time_ms: Optional[float] = None
|
||||
@@ -109,7 +109,7 @@ class OptimizerService:
|
||||
# Si no se pasó app explícitamente, intentar obtener current_app
|
||||
if app is None:
|
||||
try:
|
||||
app = current_app._get_current_object()
|
||||
app = getattr(current_app, '_get_current_object', lambda: current_app)()
|
||||
except Exception:
|
||||
app = None
|
||||
|
||||
@@ -133,14 +133,15 @@ class OptimizerService:
|
||||
t_start = time.perf_counter()
|
||||
with cls._lock:
|
||||
job.status = OptimizerJobStatus.RUNNING
|
||||
job.started_at = datetime.utcnow()
|
||||
job.started_at = datetime.now(timezone.utc).replace(tzinfo=None)
|
||||
|
||||
def progress_callback(gen: int, total_gen: int, pct: int, best_fit: float):
|
||||
with cls._lock:
|
||||
job.generation = gen
|
||||
job.total_generations = total_gen
|
||||
job.progress = pct
|
||||
job.fitness_score = best_fit
|
||||
if job:
|
||||
with cls._lock:
|
||||
job.generation = gen
|
||||
job.total_generations = total_gen
|
||||
job.progress = pct
|
||||
job.fitness_score = best_fit
|
||||
|
||||
optimizer = ReservationOptimizer(
|
||||
population_size=job.params.get("population_size", 40),
|
||||
@@ -167,7 +168,7 @@ class OptimizerService:
|
||||
job.assigned_reservations = result.get("assigned_reservations", 0)
|
||||
job.reservations = result.get("reservations", [])
|
||||
job.conflicts = result.get("conflicts", [])
|
||||
job.completed_at = datetime.utcnow()
|
||||
job.completed_at = datetime.now(timezone.utc).replace(tzinfo=None)
|
||||
job.execution_time_ms = exec_time_ms
|
||||
|
||||
try:
|
||||
@@ -180,7 +181,7 @@ class OptimizerService:
|
||||
with cls._lock:
|
||||
job.status = OptimizerJobStatus.FAILED
|
||||
job.error = str(ex)
|
||||
job.completed_at = datetime.utcnow()
|
||||
job.completed_at = datetime.now(timezone.utc).replace(tzinfo=None)
|
||||
|
||||
@classmethod
|
||||
def get_job(cls, job_id: str) -> Optional[OptimizerJob]:
|
||||
@@ -278,5 +279,5 @@ class OptimizerService:
|
||||
"conflictCount": len(best_individual.conflicts),
|
||||
"fitnessScore": round(best_individual.fitness, 2),
|
||||
"executionTimeMs": exec_ms,
|
||||
"timestamp": datetime.utcnow().isoformat() + "Z"
|
||||
"timestamp": datetime.now(timezone.utc).isoformat()
|
||||
}
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
from typing import Dict, Any, List, Optional
|
||||
import urllib.request
|
||||
import csv
|
||||
import io
|
||||
@@ -460,10 +461,10 @@ class GoogleSheetsImporter:
|
||||
row_counter += 1
|
||||
aula_raw = r.get('aula', '').strip()
|
||||
room_info = self.normalize_room(aula_raw)
|
||||
is_virtual = bool(room_info and ('VIRTUAL' in room_info.get('code', '').upper() or room_info.get('building') == 'Campus Virtual'))
|
||||
is_virtual = bool(room_info and ('VIRTUAL' in str(room_info.get('code', '')).upper() or room_info.get('building') == 'Campus Virtual'))
|
||||
|
||||
# Calcular fecha tentativa
|
||||
target_date = ref_monday + timedelta(days=day_idx)
|
||||
target_date = ref_monday + timedelta(days=int(day_idx))
|
||||
if manual_dt and norm_day == normalize_day_name(['Lunes', 'Martes', 'Miércoles', 'Jueves', 'Viernes', 'Sábado'][manual_dt.weekday()]):
|
||||
target_date = manual_dt
|
||||
|
||||
@@ -564,7 +565,7 @@ class GoogleSheetsImporter:
|
||||
if manual_w < 6:
|
||||
allowed_days = [dias_esp[manual_w]]
|
||||
|
||||
stats = {
|
||||
stats: Dict[str, Any] = {
|
||||
'total_rows_processed': 0,
|
||||
'matching_rows': 0,
|
||||
'careers_created': 0,
|
||||
@@ -734,9 +735,11 @@ class GoogleSheetsImporter:
|
||||
room_info = self.normalize_room(aula_raw)
|
||||
classroom = None
|
||||
if room_info:
|
||||
room_key = (room_info['building'].upper(), room_info['code'].upper())
|
||||
b_str = str(room_info.get('building', '')).upper()
|
||||
c_str = str(room_info.get('code', '')).upper()
|
||||
room_key = (b_str, c_str)
|
||||
classroom = classrooms_cache.get(room_key)
|
||||
b_entity = buildings_cache.get(room_info['building'].upper())
|
||||
b_entity = buildings_cache.get(b_str)
|
||||
if not classroom:
|
||||
if import_classrooms:
|
||||
classroom = Classroom(
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
from typing import Optional, Dict, Any
|
||||
from datetime import datetime
|
||||
from datetime import datetime, timezone
|
||||
from app.models.user import User
|
||||
from app.repositories.user_repository import UserRepository
|
||||
from app import db
|
||||
@@ -20,7 +20,7 @@ class UserService:
|
||||
return None
|
||||
|
||||
if user.check_password(password):
|
||||
user.last_login = datetime.utcnow()
|
||||
user.last_login = datetime.now(timezone.utc).replace(tzinfo=None)
|
||||
self.repository.save(user)
|
||||
return user
|
||||
return None
|
||||
@@ -59,3 +59,5 @@ class UserService:
|
||||
'document_number': getattr(user, 'document_number', ''),
|
||||
'personal_email': getattr(user, 'personal_email', '')
|
||||
}
|
||||
|
||||
user_service = UserService()
|
||||
|
||||
Reference in New Issue
Block a user