matplobbot-shared 0.1.26__py3-none-any.whl → 0.1.27__py3-none-any.whl

{matplobbot_shared-0.1.26.dist-info → matplobbot_shared-0.1.27.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: matplobbot-shared
-Version: 0.1.26
+Version: 0.1.27
 Summary: Shared library for the Matplobbot ecosystem (database, services, i18n).
 Author: Ackrome
 Author-email: ivansergeyevich@gmail.com

{matplobbot_shared-0.1.26.dist-info → matplobbot_shared-0.1.27.dist-info}/RECORD

@@ -1,10 +1,10 @@
 shared_lib/__init__.py,sha256=Wxuw1wbvCOsKqs6WfIQ05cx_vndhPs6rH2krMatFRqA,45
-shared_lib/database.py,sha256=CjjJ9HX_70IXOJ6aIS8xoD63Srj3Y-WHUqZ0zPCJsYc,15554
+shared_lib/database.py,sha256=qsZ3yrj--81XXVQ94R1i0DMZoSITAN0LpB6WeHwPMf4,18268
 shared_lib/i18n.py,sha256=VBWQWVF-k_HDiidYo_RUPyUCM7oL897z5hOw9jvOoYY,1762
 shared_lib/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 shared_lib/services/schedule_service.py,sha256=tKXgwZQWeaagQeqG_tKP2gLflWo_6kxKZOhW9PFvbK4,1835
 shared_lib/services/university_api.py,sha256=Ui-zjfKOHCCf2Imh8CNtVOWegwuep7IB8gO9IKNUrrE,1898
-matplobbot_shared-0.1.26.dist-info/METADATA,sha256=SEK0yxxYSavWzGQSx2C9EcgYaWdNL9TB3sdI2orLF8k,395
-matplobbot_shared-0.1.26.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-matplobbot_shared-0.1.26.dist-info/top_level.txt,sha256=L8mrC50YWCe19jmh_zrUZFvXSkhsnES5K6y027G1838,11
-matplobbot_shared-0.1.26.dist-info/RECORD,,
+matplobbot_shared-0.1.27.dist-info/METADATA,sha256=ESW_E1TGaLOtTLFjusGQZhQVvsgDUyOg6ZCW0vOYJ0U,395
+matplobbot_shared-0.1.27.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+matplobbot_shared-0.1.27.dist-info/top_level.txt,sha256=L8mrC50YWCe19jmh_zrUZFvXSkhsnES5K6y027G1838,11
+matplobbot_shared-0.1.27.dist-info/RECORD,,

shared_lib/database.py

@@ -262,28 +262,95 @@ async def get_activity_over_time_data_from_db(db_conn, period='day'):
     rows = await db_conn.fetch(query)
     return [{"period": row['period_start'], "count": row['actions_count']} for row in rows]
 
-async def get_user_profile_data_from_db(db_conn, user_id: int, page: int = 1, page_size: int = 50):
-    offset = (page - 1) * page_size
-    query = """
+
+async def get_user_profile_data_from_db(
+    db_conn,
+    user_id: int,
+    page: int = 1,
+    page_size: int = 50,
+    sort_by: str = 'timestamp',
+    sort_order: str = 'desc'
+):
+    """Извлекает детали профиля пользователя и пагинированный список его действий."""
+    # --- Безопасная сортировка ---
+    allowed_sort_columns = ['id', 'action_type', 'action_details', 'timestamp'] # These are ua columns
+    if sort_by not in allowed_sort_columns:
+        sort_by = 'timestamp' # Значение по умолчанию
+    sort_order = 'ASC' if sort_order.lower() == 'asc' else 'DESC' # Безопасное определение порядка
+
+    # --- Единый запрос для получения всех данных ---
+    # Используем CTE и оконные функции для эффективности.
+    # 1. Выбираем все действия пользователя.
+    # 2. С помощью оконной функции COUNT(*) OVER () получаем общее количество действий без дополнительного запроса.
+    # 3. Присоединяем информацию о пользователе.
+    # 4. Применяем пагинацию и сортировку.
+    query = f"""
         WITH UserActions AS (
-            SELECT id, action_type, action_details, TO_CHAR(timestamp, 'YYYY-MM-DD HH24:MI:SS') AS timestamp
-            FROM user_actions WHERE user_id = $1
+            SELECT
+                id,
+                action_type,
+                action_details,
+                TO_CHAR(timestamp, 'YYYY-MM-DD HH24:MI:SS') AS timestamp
+            FROM user_actions
+            WHERE user_id = $1
         )
-        SELECT u.user_id, u.full_name, COALESCE(u.username, 'N/A') AS username, u.avatar_pic_url,
-               (SELECT COUNT(*) FROM UserActions) as total_actions,
-               ua.id as action_id, ua.action_type, ua.action_details, ua.timestamp
-        FROM users u LEFT JOIN UserActions ua ON 1=1
-        WHERE u.user_id = $2 ORDER BY ua.timestamp DESC LIMIT $3 OFFSET $4;
+        SELECT
+            u.user_id,
+            u.full_name,
+            COALESCE(u.username, 'Нет username') AS username,
+            u.avatar_pic_url,
+            (SELECT COUNT(*) FROM UserActions) as total_actions,
+            ua.id as action_id,
+            ua.action_type,
+            ua.action_details,
+            ua.timestamp
+        FROM users u
+        LEFT JOIN UserActions ua ON 1=1
+        WHERE u.user_id = $2
+        ORDER BY ua.{sort_by} {sort_order}
+        LIMIT $3 OFFSET $4;
     """
+    offset = (page - 1) * page_size
     rows = await db_conn.fetch(query, user_id, user_id, page_size, offset)
-    if not rows: return None
-    
+    if not rows:
+        # If user exists but has no actions, we might get no rows. Check user existence separately.
+        user_exists = await db_conn.fetchrow("SELECT 1 FROM users WHERE user_id = $1", user_id)
+        if not user_exists:
+            return None # User not found
+        # User exists but has no actions, return empty actions list
+        user_details_row = await db_conn.fetchrow("SELECT user_id, full_name, COALESCE(username, 'Нет username') AS username, avatar_pic_url FROM users WHERE user_id = $1", user_id)
+        return {
+            "user_details": dict(user_details_row),
+            "actions": [],
+            "total_actions": 0
+        }
+
     first_row = dict(rows[0])
-    user_details = {k: first_row[k] for k in ["user_id", "full_name", "username", "avatar_pic_url"]}
-    actions = [dict(r) for r in rows if r["action_id"] is not None]
-    
-    return {"user_details": user_details, "actions": actions, "total_actions": first_row["total_actions"]}
+    user_details = {
+        "user_id": first_row["user_id"],
+        "full_name": first_row["full_name"],
+        "username": first_row["username"],
+        "avatar_pic_url": first_row["avatar_pic_url"]
+    }
+    total_actions = first_row["total_actions"]
+
+    # Собираем действия, если они есть (может быть пользователь без действий)
+    actions = []
+    for row in rows:
+        row_dict = dict(row)
+        if row_dict["action_id"] is not None: # action_id не NULL
+            actions.append({
+                "id": row_dict["action_id"],
+                "action_type": row_dict["action_type"],
+                "action_details": row_dict["action_details"],
+                "timestamp": row_dict["timestamp"]
+            })
 
+    return {
+        "user_details": user_details,
+        "actions": actions,
+        "total_actions": total_actions
+    }
 
 async def get_users_for_action(db_conn, action_type: str, action_details: str, page: int = 1, page_size: int = 15, sort_by: str = 'full_name', sort_order: str = 'asc'):
     """Извлекает пагинированный список уникальных пользователей, совершивших определенное действие."""
@@ -326,7 +393,6 @@ async def get_users_for_action(db_conn, action_type: str, action_details: str, p
         "users": users,
         "total_users": total_users
     }
-    
 
 async def get_all_user_actions(db_conn, user_id: int):
     """Извлекает ВСЕ действия для указанного пользователя без пагинации."""