matplobbot-shared 0.1.26__tar.gz → 0.1.29__tar.gz

{matplobbot_shared-0.1.26 → matplobbot_shared-0.1.29}/PKG-INFO

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

{matplobbot_shared-0.1.26 → matplobbot_shared-0.1.29}/README.md

@@ -1,5 +1,5 @@
 <div align="center" style="border: none; padding: 0; margin: 0;">
-  <img src="image/notes/thelogo.png" alt="Matplobbot Logo" width="400" style="border: none; outline: none;">
+  <img src="image/logo/thelogo.png" alt="Matplobbot Logo" width="400" style="border: none; outline: none;">
   <h1>Matplobbot & Stats Dashboard</h1>
   <strong>A comprehensive solution: An Aiogram 3 Telegram bot for advanced code interaction and a FastAPI dashboard for real-time analytics.</strong>
   <br>

{matplobbot_shared-0.1.26 → matplobbot_shared-0.1.29}/matplobbot_shared.egg-info/PKG-INFO

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

{matplobbot_shared-0.1.26 → matplobbot_shared-0.1.29}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="matplobbot-shared",
-    version="0.1.26", # Let's use the version from your requirements.txt
+    version="0.1.29", # Let's use the version from your requirements.txt
     packages=find_packages(include=['shared_lib', 'shared_lib.*']),
     description="Shared library for the Matplobbot ecosystem (database, services, i18n).",
     author="Ackrome",

{matplobbot_shared-0.1.26 → matplobbot_shared-0.1.29}/shared_lib/database.py

@@ -7,13 +7,10 @@ import os
 logger = logging.getLogger(__name__)
 
 # --- PostgreSQL Database Configuration ---
-POSTGRES_USER = os.getenv("POSTGRES_USER", "user")
-POSTGRES_PASSWORD = os.getenv("POSTGRES_PASSWORD", "password")
-POSTGRES_HOST = os.getenv("POSTGRES_HOST", "localhost")
-POSTGRES_PORT = os.getenv("POSTGRES_PORT", "5432")
-POSTGRES_DB = os.getenv("POSTGRES_DB", "matplobbot_db")
-
-DATABASE_URL = f"postgresql://{POSTGRES_USER}:{POSTGRES_PASSWORD}@{POSTGRES_HOST}:{POSTGRES_PORT}/{POSTGRES_DB}"
+# The DATABASE_URL should be a complete connection string.
+# Example for Docker: postgresql://user:password@postgres:5432/matplobbot_db
+# Example for local:  postgresql://user:password@localhost:5432/matplobbot_db
+DATABASE_URL = os.getenv("DATABASE_URL")
 
 # Global connection pool
 pool = None
@@ -22,6 +19,9 @@ async def init_db_pool():
     global pool
     if pool is None:
         try:
+            if not DATABASE_URL:
+                logger.critical("DATABASE_URL environment variable is not set. Cannot initialize database pool.")
+                raise ValueError("DATABASE_URL is not set.")
             pool = await asyncpg.create_pool(DATABASE_URL, min_size=5, max_size=20)
             logger.info("Shared DB Pool: Database connection pool created successfully.")
         except Exception as e:
@@ -80,6 +80,7 @@ async def init_db():
                 id SERIAL PRIMARY KEY,
                 user_id BIGINT NOT NULL REFERENCES users(user_id) ON DELETE CASCADE,
                 code_path TEXT NOT NULL,
+                added_at TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP,
                 UNIQUE(user_id, code_path)
             )
             ''')
@@ -95,6 +96,7 @@ async def init_db():
                 id SERIAL PRIMARY KEY,
                 user_id BIGINT NOT NULL REFERENCES users(user_id) ON DELETE CASCADE,
                 repo_path TEXT NOT NULL,
+                added_at TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP,
                 UNIQUE(user_id, repo_path)
             )
             ''')
@@ -213,6 +215,42 @@ async def add_schedule_subscription(user_id: int, entity_type: str, entity_id: s
         except Exception as e:
             logger.error(f"Failed to add schedule subscription for user {user_id}: {e}", exc_info=True)
             return False
+ 
+async def get_user_subscriptions(user_id: int, page: int = 0, page_size: int = 5) -> tuple[list, int]:
+    """
+    Gets a paginated list of active schedule subscriptions for a specific user.
+    Returns a tuple: (list of subscriptions, total count).
+    """
+    if not pool:
+        raise ConnectionError("Database pool is not initialized.")
+    async with pool.acquire() as connection:
+        # Query to get the paginated list
+        offset = page * page_size
+        rows = await connection.fetch("""
+            SELECT id, entity_type, entity_id, entity_name, TO_CHAR(notification_time, 'HH24:MI') as notification_time
+            FROM user_schedule_subscriptions
+            WHERE user_id = $1 AND is_active = TRUE
+            ORDER BY entity_name, notification_time
+            LIMIT $2 OFFSET $3
+        """, user_id, page_size, offset)
+        
+        # Query to get the total count for pagination
+        total_count = await connection.fetchval("SELECT COUNT(*) FROM user_schedule_subscriptions WHERE user_id = $1 AND is_active = TRUE", user_id)
+
+        return [dict(row) for row in rows], total_count or 0
+
+async def remove_schedule_subscription(subscription_id: int, user_id: int) -> str | None:
+    """
+    Removes a specific schedule subscription for a user, ensuring ownership.
+    Returns the entity_name of the deleted subscription on success, otherwise None.
+    """
+    if not pool:
+        raise ConnectionError("Database pool is not initialized.")
+    async with pool.acquire() as connection:
+        deleted_name = await connection.fetchval(
+            "DELETE FROM user_schedule_subscriptions WHERE id = $1 AND user_id = $2 RETURNING entity_name",
+            subscription_id, user_id)
+        return deleted_name
 
 async def get_subscriptions_for_notification(notification_time: str) -> list:
     async with pool.acquire() as connection:
@@ -225,10 +263,19 @@ async def get_subscriptions_for_notification(notification_time: str) -> list:
 
 # --- FastAPI Specific Queries ---
 async def get_leaderboard_data_from_db(db_conn):
+    # The timestamp is stored in UTC (TIMESTAMPTZ). We convert it to Moscow time for display.
     query = """
-        SELECT u.user_id, u.full_name, COALESCE(u.username, 'N/A') AS username, u.avatar_pic_url, COUNT(ua.id)::int AS actions_count
-        FROM users u JOIN user_actions ua ON u.user_id = ua.user_id
-        GROUP BY u.user_id ORDER BY actions_count DESC LIMIT 100;
+        SELECT
+            u.user_id,
+            u.full_name,
+            COALESCE(u.username, 'N/A') AS username,
+            u.avatar_pic_url,
+            COUNT(ua.id)::int AS actions_count,
+            TO_CHAR(MAX(ua.timestamp AT TIME ZONE 'Europe/Moscow'), 'YYYY-MM-DD HH24:MI:SS') AS last_action_time
+        FROM users u
+        JOIN user_actions ua ON u.user_id = ua.user_id
+        GROUP BY u.user_id, u.full_name, u.username, u.avatar_pic_url
+        ORDER BY actions_count DESC LIMIT 100;
     """
     rows = await db_conn.fetch(query)
     return [dict(row) for row in rows]
@@ -258,32 +305,103 @@ async def get_action_types_distribution_from_db(db_conn):
 
 async def get_activity_over_time_data_from_db(db_conn, period='day'):
     date_format = {'day': 'YYYY-MM-DD', 'week': 'IYYY-IW', 'month': 'YYYY-MM'}.get(period, 'YYYY-MM-DD')
-    query = f"SELECT TO_CHAR(timestamp, '{date_format}') as period_start, COUNT(id) as actions_count FROM user_actions GROUP BY period_start ORDER BY period_start ASC;"
+    # Convert timestamp to Moscow time before grouping
+    query = f"""
+        SELECT TO_CHAR(timestamp AT TIME ZONE 'Europe/Moscow', '{date_format}') as period_start, COUNT(id) as actions_count 
+        FROM user_actions GROUP BY period_start ORDER BY period_start ASC;
+    """
     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 AT TIME ZONE 'Europe/Moscow', '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 +444,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):
     """Извлекает ВСЕ действия для указанного пользователя без пагинации."""
@@ -335,7 +452,7 @@ async def get_all_user_actions(db_conn, user_id: int):
             id,
             action_type,
             action_details,
-            TO_CHAR(timestamp, 'YYYY-MM-DD HH24:MI:SS') AS timestamp
+            TO_CHAR(timestamp AT TIME ZONE 'Europe/Moscow', 'YYYY-MM-DD HH24:MI:SS') AS timestamp
         FROM user_actions
         WHERE user_id = $1
         ORDER BY timestamp DESC;

matplobbot_shared-0.1.29/shared_lib/services/schedule_service.py

@@ -0,0 +1,40 @@
+# bot/services/schedule_service.py
+
+from typing import List, Dict, Any
+from datetime import datetime, date
+
+def format_schedule(schedule_data: List[Dict[str, Any]], lang: str, entity_name: str, start_date: date) -> str:
+    """Formats a list of lessons into a readable daily schedule."""
+    if not schedule_data:
+        return f"🗓 *Расписание для \"{entity_name}\"*\n\nНа запрошенный день занятий нет."
+
+    # Group lessons by date
+    days = {}
+    for lesson in schedule_data:
+        date_str = lesson['date']
+        if date_str not in days:
+            days[date_str] = []
+        days[date_str].append(lesson)
+
+    # Find the first day with lessons that is on or after the start_date
+    for date_str, lessons in sorted(days.items()):
+        date_obj = datetime.strptime(date_str, "%Y-%m-%d").date()
+        if date_obj >= start_date:
+            # Found the first relevant day, format it and return immediately.
+            day_header = f"🗓 *Расписание на {date_obj.strftime('%d.%m.%Y')} для \"{entity_name}\"*"
+            
+            formatted_lessons = []
+            for lesson in sorted(lessons, key=lambda x: x['beginLesson']):
+                formatted_lessons.append(
+                    f"`{lesson['beginLesson']} - {lesson['endLesson']}`\n"
+                    f"{lesson['discipline']}\n"
+                    f"{lesson['kindOfWork']}\n"
+                    f"{lesson['auditorium']} ({lesson['building']})\n"
+                    f"{lesson['lecturer_title'].replace('_',' ')}\n"
+                    f"{lesson['lecturerEmail']}\n"
+                )
+            
+            return f"{day_header}\n" + "\n\n".join(formatted_lessons)
+
+    # If no lessons were found in the entire fetched range
+    return f"🗓 *Расписание для \"{entity_name}\"*\n\nВ ближайшую неделю занятий не найдено."

matplobbot_shared-0.1.26/shared_lib/services/schedule_service.py

@@ -1,39 +0,0 @@
-# bot/services/schedule_service.py
-
-from typing import List, Dict, Any
-from datetime import datetime
-
-def format_schedule(schedule_data: List[Dict[str, Any]], lang: str, entity_name: str) -> str:
-    """Formats a list of lessons into a readable daily schedule."""
-    if not schedule_data:
-        # This part is now handled in the handler to provide more context.
-        return f"🗓 *Расписание на {datetime.now().strftime('%d.%m.%Y')} для \"{entity_name}\"*\n\nНа этот день занятий нет."
-    # Group lessons by date
-    days = {}
-    for lesson in schedule_data:
-        date_str = lesson['date']
-        if date_str not in days:
-            days[date_str] = []
-        days[date_str].append(lesson)
-
-    # Format each day's schedule
-    formatted_days = []
-    for date_str, lessons in sorted(days.items()):
-        date_obj = datetime.strptime(date_str, "%Y-%m-%d")
-        # Example format, we'll use i18n later
-        day_header = f"🗓 *Расписание на {date_obj.strftime('%d.%m.%Y')} для \"{entity_name}\"*"
-        
-        formatted_lessons = []
-        for lesson in sorted(lessons, key=lambda x: x['beginLesson']):
-            formatted_lessons.append(
-                f"    `{lesson['beginLesson']} - {lesson['endLesson']}`\n"
-                f"    *Предмет:* {lesson['discipline']}\n"
-                f"    *Тип:* {lesson['kindOfWork']}\n"
-                f"    *Аудитория:* {lesson['auditorium']} ({lesson['building']})\n"
-                f"    *Преподаватель:* {lesson['lecturer_title']}\n"
-                f"    *Почта преподавателя:* {lesson['lecturerEmail']}\n"
-            )
-        
-        formatted_days.append(f"{day_header}\n" + "\n\n".join(formatted_lessons))
-
-    return "\n\n---\n\n".join(formatted_days)