Update modules/database/sql_db.py

modules/database/sql_db.py

@@ -10,28 +10,18 @@ logger = logging.getLogger(__name__)
 
 #########################################
 def get_user(username, role=None):
-    """Obtiene un usuario por su username"""
     container = get_container("users")
     try:
-        query = f"SELECT * FROM c WHERE c.id = @username"
-        params = [{"name": "@username", "value": username}]
-        
+        query = f"SELECT * FROM c WHERE c.id = '{username}'"
         if role:
-            query += " AND c.role = @role"
-            params.append({"name": "@role", "value": role})
-            
-        items = list(container.query_items(
-            query=query,
-            parameters=params,
-            enable_cross_partition_query=True
-        ))
-        
+            query += f" AND c.role = '{role}'"
+        items = list(container.query_items(query=query))
         return items[0] if items else None
-        
     except Exception as e:
         logger.error(f"Error al obtener usuario {username}: {str(e)}")
         return None
 
+
 #########################################
 def get_admin_user(username):
     return get_user(username, role='Administrador')
@@ -56,46 +46,26 @@ def create_user(username, password, role, additional_info=None):
         return False
         
     try:
-        # Verificar que no exista el usuario
-        existing_user = get_user(username)
-        if existing_user:
-            logger.warning(f"Usuario {username} ya existe")
-            return False
-
-        # Crear documento del usuario
         user_data = {
             'id': username,
-            'password': password,  # Ya viene hasheado de auth.py
+            'password': password,
             'role': role,
             'timestamp': datetime.now(timezone.utc).isoformat(),
-            'additional_info': additional_info or {}
+            'additional_info': additional_info or {},
+            'partitionKey': username  # Agregar partition key
         }
         
-        # Crear el item sin referenciar partition key
-        result = container.create_item(
-            body=user_data,
-            enable_cross_partition_query=True
-        )
+        # Crear item sin especificar partition_key en el método
+        container.create_item(body=user_data)
+        logger.info(f"Usuario {role} creado: {username}")
+        return True
         
-        if result:
-            logger.info(f"Usuario {role} creado exitosamente: {username}")
-            return True
-        else:
-            logger.error(f"No se pudo crear el usuario {username}")
-            return False
-            
     except Exception as e:
-        logger.error(f"Error al crear usuario {role} {username}: {str(e)}")
+        logger.error(f"Error al crear usuario {role}: {str(e)}")
         return False
 
 #########################################
 def create_student_user(username, password, additional_info=None):
-    """Crea un nuevo usuario estudiante"""
-    # Verificar que la contraseña esté hasheada
-    if not password.startswith('$2b$'):
-        logger.error("Intento de crear usuario con contraseña no hasheada")
-        return False
-        
     return create_user(username, password, 'Estudiante', additional_info)
 
 #########################################
@@ -133,7 +103,6 @@ def record_login(username):
         return None
 
 #########################################
-
 def record_logout(username, session_id):
     """Registra el cierre de sesión y calcula la duración"""
     try:
@@ -148,11 +117,9 @@ def record_logout(username, session_id):
             {"name": "@username", "value": username}
         ]
         
-        # Agregar enable_cross_partition_query=True
         items = list(container.query_items(
             query=query,
-            parameters=params,
-            enable_cross_partition_query=True
+            parameters=params
         ))
 
         if not items:
@@ -166,7 +133,8 @@ def record_logout(username, session_id):
 
         session.update({
             "logoutTime": logout_time.isoformat(),
-            "sessionDuration": duration
+            "sessionDuration": duration,
+            "partitionKey": username
         })
 
         container.upsert_item(body=session)
@@ -193,14 +161,11 @@ def get_recent_sessions(limit=10):
         OFFSET 0 LIMIT @limit
         """
         
-        # Agregar enable_cross_partition_query=True
         sessions = list(container.query_items(
             query=query,
-            parameters=[{"name": "@limit", "value": limit}],
-            enable_cross_partition_query=True
+            parameters=[{"name": "@limit", "value": limit}]
         ))
 
-        # Validar y limpiar los datos
         clean_sessions = []
         for session in sessions:
             try:
@@ -220,7 +185,6 @@ def get_recent_sessions(limit=10):
         return []
 
 #########################################
-
 def get_user_total_time(username):
     """Obtiene el tiempo total que un usuario ha pasado en la plataforma"""
     try:
@@ -236,11 +200,9 @@ def get_user_total_time(username):
         AND IS_DEFINED(c.sessionDuration)
         """
         
-        # Agregar enable_cross_partition_query=True
         result = list(container.query_items(
             query=query,
-            parameters=[{"name": "@username", "value": username}],
-            enable_cross_partition_query=True
+            parameters=[{"name": "@username", "value": username}]
         ))
 
         return result[0] if result and result[0] is not None else 0