Add new table and add stats in admin

.flake8

@@ -3,4 +3,4 @@ max-line-length = 250
 ignore = E203, E266, E501, W503, F541, E704, W293, W291, E126, E121, E123, E128, E302, E131, E231, W292, E402, E261, E305, E701
 max-complexity = 25
 select = B, C, E, F, W, T4, B9
-exclude = .venv,.git,.tox,dist,doc,*lib/python*,*egg,build,.txt
+exclude = .venv,.git,.tox,dist,doc,*lib/python*,*egg,build,.txt,config.py

bot.py

@@ -6,7 +6,6 @@ from middlewares.admin import AdminMiddleware
 from middlewares.database import DatabaseMiddleware
 from middlewares.logging import LoggingMiddleware
 from middlewares.user import UserMiddleware
-from middlewares.database import DatabaseMiddleware
 
 bot = Bot(token=API_TOKEN)
 storage = MemoryStorage()

database.py

@@ -9,6 +9,21 @@ from logger import logger
 async def init_db():
     conn = await asyncpg.connect(DATABASE_URL)
 
+    # Таблица для хранения информации о платежах
+    await conn.execute(
+        """
+        CREATE TABLE IF NOT EXISTS payments (
+            id SERIAL PRIMARY KEY,
+            tg_id BIGINT NOT NULL,
+            amount REAL NOT NULL,
+            payment_system TEXT NOT NULL,
+            status TEXT DEFAULT 'success',
+            created_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP,
+            FOREIGN KEY (tg_id) REFERENCES users(tg_id)
+        )
+        """
+    )
+
     # Таблица для хранения основной информации о пользователях из Telegram
     await conn.execute(
         """
@@ -491,3 +506,29 @@ async def upsert_user(
         )
     finally:
         await conn.close()
+
+
+async def add_payment(tg_id: int, amount: float, payment_system: str):
+    """
+    Создает запись о платеже в базе данных.
+
+    Args:
+        tg_id (int): Уникальный идентификатор пользователя в Telegram
+        amount (float): Сумма платежа
+        payment_system (str): Система, через которую был совершен платеж
+    """
+    conn = await asyncpg.connect(DATABASE_URL)
+    try:
+        await conn.execute(
+            """
+            INSERT INTO payments (tg_id, amount, payment_system, status)
+            VALUES ($1, $2, $3, 'success')
+            """,
+            tg_id,
+            amount,
+            payment_system,
+        )
+    except Exception as e:
+        logger.error(f"Ошибка при добавлении платежа: {e}")
+    finally:
+        await conn.close()

handlers/admin/admin_panel.py

@@ -71,6 +71,16 @@ async def user_stats_menu(callback_query: CallbackQuery):
         total_keys = await conn.fetchval("SELECT COUNT(*) FROM keys")
         total_referrals = await conn.fetchval("SELECT COUNT(*) FROM referrals")
 
+        total_payments_today = await conn.fetchval(
+            "SELECT COALESCE(SUM(amount), 0) FROM payments WHERE created_at >= CURRENT_DATE"
+        )
+        total_payments_week = await conn.fetchval(
+            "SELECT COALESCE(SUM(amount), 0) FROM payments WHERE created_at >= date_trunc('week', CURRENT_DATE)"
+        )
+        total_payments_all_time = await conn.fetchval(
+            "SELECT COALESCE(SUM(amount), 0) FROM payments"
+        )
+
         active_keys = await conn.fetchval(
             "SELECT COUNT(*) FROM keys WHERE expiry_time > $1",
             int(datetime.utcnow().timestamp() * 1000),
@@ -79,11 +89,17 @@ async def user_stats_menu(callback_query: CallbackQuery):
 
         stats_message = (
             f"📈 <b>Подробная статистика проекта:</b>\n\n"
-            f"👤 Зарегистрированных пользователей: <b>{total_users}</b>\n"
-            f"🔑 Всего сгенерированных ключей: <b>{total_keys}</b>\n"
-            f"🤝 Привлеченных рефералов: <b>{total_referrals}</b>\n"
-            f"✅ Действующих ключей: <b>{active_keys}</b>\n"
-            f"❌ Просроченных ключей: <b>{expired_keys}</b>"
+            f"👥 Пользователи:\n"
+            f"   • Зарегистрировано: <b>{total_users}</b>\n"
+            f"   • Привлеченных рефералов: <b>{total_referrals}</b>\n\n"
+            f"🔑 Ключи:\n"
+            f"   • Всего сгенерировано: <b>{total_keys}</b>\n"
+            f"   • Действующих: <b>{active_keys}</b>\n"
+            f"   • Просроченных: <b>{expired_keys}</b>\n\n"
+            f"💰 Финансовая статистика:\n"
+            f"   • За день: <b>{total_payments_today} ₽</b>\n"
+            f"   • За неделю: <b>{total_payments_week} ₽</b>\n"
+            f"   • За все время: <b>{total_payments_all_time} ₽</b>\n"
         )
 
         builder = InlineKeyboardBuilder()
@@ -98,7 +114,7 @@ async def user_stats_menu(callback_query: CallbackQuery):
         )
     finally:
         await conn.close()
-    await callback_query.answer()
+    # await callback_query.answer()
 
 
 @router.callback_query(F.data == "send_to_alls", IsAdminFilter())
@@ -188,6 +204,9 @@ async def back_to_admin_menu(callback_query: CallbackQuery):
     builder.row(
         InlineKeyboardButton(text="🔄 Перезагрузить бота", callback_data="restart_bot")
     )
+    builder.row(
+        InlineKeyboardButton(text="⬅️ Вернуться в профиль", callback_data="view_profile")
+    )
     await bot.send_message(
         tg_id, "🤖 Панель администратора", reply_markup=builder.as_markup()
     )

handlers/donate.py

@@ -58,8 +58,7 @@ async def process_enter_donate_amount(
     builder = InlineKeyboardBuilder()
     builder.row(InlineKeyboardButton(text="⬅️ Назад", callback_data="donate"))
     await callback_query.message.edit_text(
-        f"💸 Введите сумму доната в рублях:", 
-        reply_markup=builder.as_markup()
+        f"💸 Введите сумму доната в рублях:", reply_markup=builder.as_markup()
     )
     await state.set_state(DonateState.entering_donate_amount)
     await callback_query.answer()

handlers/payments/cryprobot_pay.py

@@ -8,7 +8,7 @@ from aiohttp import web
 
 from bot import bot
 from config import CRYPTO_BOT_ENABLE, CRYPTO_BOT_TOKEN, RUB_TO_USDT
-from database import add_connection, check_connection_exists, get_key_count, update_balance
+from database import add_connection, add_payment, check_connection_exists, get_key_count, update_balance
 from handlers.texts import PAYMENT_OPTIONS
 from logger import logger
 
@@ -209,6 +209,7 @@ async def process_crypto_payment(payload):
         try:
             user_id = int(user_id_str)
             amount = int(amount_str)
+            await add_payment(int(user_id), float(amount), "cryptobot")
             logger.debug(f"Payment succeeded for user_id: {user_id}, amount: {amount}")
             await update_balance(user_id, amount)
             await send_payment_success_notification(user_id, amount)

handlers/payments/freekassa_pay.py

@@ -14,7 +14,7 @@ from aiohttp import web
 
 from bot import bot
 from config import FREEKASSA_API_KEY, FREEKASSA_SHOP_ID
-from database import update_balance
+from database import add_payment, update_balance
 from handlers.texts import PAYMENT_OPTIONS
 
 router = Router()
@@ -86,6 +86,7 @@ async def freekassa_webhook(request):
     if data["status"] == "completed":
         user_id = data["metadata"]["user_id"]
         amount = float(data["amount"])
+        await add_payment(int(user_id), float(amount), "freekassa")
 
         await update_balance(user_id, amount)
         await send_payment_success_notification(user_id, amount)

handlers/payments/robokassa_pay.py

@@ -6,13 +6,13 @@ from aiogram.fsm.state import State, StatesGroup
 from aiogram.types import InlineKeyboardButton, InlineKeyboardMarkup
 from aiogram.utils.keyboard import InlineKeyboardBuilder
 from aiohttp import web
-from logger import logger
 from robokassa import HashAlgorithm, Robokassa
 
 from bot import bot
 from config import ROBOKASSA_ENABLE, ROBOKASSA_LOGIN, ROBOKASSA_PASSWORD1, ROBOKASSA_PASSWORD2, ROBOKASSA_TEST_MODE
-from database import add_connection, check_connection_exists, get_key_count, update_balance
+from database import add_connection, add_payment, check_connection_exists, get_key_count, update_balance
 from handlers.texts import PAYMENT_OPTIONS
+from logger import logger
 
 router = Router()
 
@@ -222,6 +222,8 @@ async def robokassa_webhook(request):
         await update_balance(int(tg_id), float(amount))
         await send_payment_success_notification(tg_id, float(amount))
 
+        await add_payment(int(tg_id), float(amount), "robokassa")
+
         logger.info(f"Payment successful. Balance updated for user {tg_id}.")
 
         return web.Response(text=f"OK{inv_id}")

handlers/payments/stars_pay.py

@@ -6,7 +6,7 @@ from aiogram.utils.keyboard import InlineKeyboardBuilder
 
 from bot import bot
 from config import RUB_TO_XTR
-from database import add_connection, check_connection_exists, get_key_count, update_balance
+from database import add_connection, add_payment, check_connection_exists, get_key_count, update_balance
 from handlers.texts import PAYMENT_OPTIONS
 from logger import logger
 
@@ -237,6 +237,7 @@ async def on_successful_payment(
         user_id = int(message.from_user.id)
         amount = float(message.successful_payment.invoice_payload.split("_")[0])
         logger.debug(f"Payment succeeded for user_id: {user_id}, amount: {amount}")
+        await add_payment(int(user_id), float(amount), "stars")
         await update_balance(user_id, amount)
         await send_payment_success_notification(user_id, amount)
     except ValueError as e:

handlers/payments/yookassa_pay.py

@@ -10,7 +10,7 @@ from yookassa import Configuration, Payment
 
 from bot import bot
 from config import YOOKASSA_ENABLE, YOOKASSA_SECRET_KEY, YOOKASSA_SHOP_ID
-from database import add_connection, check_connection_exists, get_key_count, update_balance
+from database import add_connection, add_payment, check_connection_exists, get_key_count, update_balance
 from handlers.texts import PAYMENT_OPTIONS
 from logger import logger
 
@@ -224,6 +224,7 @@ async def yookassa_webhook(request):
             user_id = int(user_id_str)
             amount = float(amount_str)
             logger.debug(f"Payment succeeded for user_id: {user_id}, amount: {amount}")
+            await add_payment(int(user_id), float(amount), "yookassa")
             await update_balance(user_id, amount)
             await send_payment_success_notification(user_id, amount)
         except ValueError as e: