fix(qa): resolver diagnosticos estaticos, sincronizacion moodle y actualizar docs v3.6.4
This commit is contained in:
@@ -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:
|
||||
|
||||
Reference in New Issue
Block a user