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

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

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

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

@@ -1,10 +1,10 @@
 shared_lib/__init__.py,sha256=Wxuw1wbvCOsKqs6WfIQ05cx_vndhPs6rH2krMatFRqA,45
-shared_lib/database.py,sha256=ZAsi33HNxc3exhTCMgqvaEoqDqLq28k4c1H5GFGGcY4,13066
+shared_lib/database.py,sha256=CjjJ9HX_70IXOJ6aIS8xoD63Srj3Y-WHUqZ0zPCJsYc,15554
 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.24.dist-info/METADATA,sha256=k7iTiY6Xgo687DlgG6hSmc8VsX3RRjjUyM8knFWJ-k0,395
-matplobbot_shared-0.1.24.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-matplobbot_shared-0.1.24.dist-info/top_level.txt,sha256=L8mrC50YWCe19jmh_zrUZFvXSkhsnES5K6y027G1838,11
-matplobbot_shared-0.1.24.dist-info/RECORD,,
+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,,

shared_lib/database.py

@@ -282,4 +282,63 @@ async def get_user_profile_data_from_db(db_conn, user_id: int, page: int = 1, pa
     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"]}
+    return {"user_details": user_details, "actions": actions, "total_actions": first_row["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'):
+    """Извлекает пагинированный список уникальных пользователей, совершивших определенное действие."""
+    # Note: action_type for messages is 'text_message' in the DB
+    db_action_type = 'text_message' if action_type == 'message' else action_type
+    offset = (page - 1) * page_size
+
+    # --- Безопасная сортировка ---
+    allowed_sort_columns = ['user_id', 'full_name', 'username'] # These are u columns
+    if sort_by not in allowed_sort_columns:
+        sort_by = 'full_name' # Значение по умолчанию
+    sort_order = 'DESC' if sort_order.lower() == 'desc' else 'ASC' # Безопасное определение порядка
+    order_by_clause = f"ORDER BY u.{sort_by} {sort_order}"
+
+    # Query for total count of distinct users
+    count_query = """
+        SELECT COUNT(DISTINCT u.user_id)
+        FROM users u
+        JOIN user_actions ua ON u.user_id = ua.user_id
+        WHERE ua.action_type = $1 AND ua.action_details = $2;
+    """
+    total_users = await db_conn.fetchval(count_query, db_action_type, action_details)
+
+    # Query for the paginated list of users
+    users_query = f"""
+        SELECT DISTINCT
+            u.user_id,
+            u.full_name,
+            COALESCE(u.username, 'Нет username') AS username
+        FROM users u
+        JOIN user_actions ua ON u.user_id = ua.user_id
+        WHERE ua.action_type = $1 AND ua.action_details = $2
+        {order_by_clause}
+        LIMIT $3 OFFSET $4;
+    """
+    rows = await db_conn.fetch(users_query, db_action_type, action_details, page_size, offset)
+    users = [dict(row) for row in rows]
+
+    return {
+        "users": users,
+        "total_users": total_users
+    }
+    
+
+async def get_all_user_actions(db_conn, user_id: int):
+    """Извлекает ВСЕ действия для указанного пользователя без пагинации."""
+    query = """
+        SELECT
+            id,
+            action_type,
+            action_details,
+            TO_CHAR(timestamp, 'YYYY-MM-DD HH24:MI:SS') AS timestamp
+        FROM user_actions
+        WHERE user_id = $1
+        ORDER BY timestamp DESC;
+    """
+    rows = await db_conn.fetch(query, user_id)
+    return [dict(row) for row in rows]