From 0f621bfe5a2dbfb9a52f7e2bf5ff088939df88f1 Mon Sep 17 00:00:00 2001
From: gy9vin <Gy9vin@gmail.com>
Date: Tue, 30 Sep 2025 12:42:17 +0300
Subject: [PATCH] =?UTF-8?q?Revert=20"=D0=9E=D0=B6=D0=B8=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=B2=D0=B8=D0=B4=D0=B6=D0=B5=D1=82=D0=B0?=
 =?UTF-8?q?=20"=D0=94=D0=B5=D1=82=D0=B0=D0=BB=D1=8C=D0=BD=D0=B0=D1=8F=20?=
 =?UTF-8?q?=D1=81=D1=82=D0=B0=D1=82=D0=B8=D1=81=D1=82=D0=B8=D0=BA=D0=B0=20?=
 =?UTF-8?q?=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D0=B5?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=B9""?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 400cc5a32e0d63746fc582271022264a305456dd.
---
 app/handlers/admin/users.py | 53 ++++++++++++++++++++++++++-----------
 1 file changed, 38 insertions(+), 15 deletions(-)

diff --git a/app/handlers/admin/users.py b/app/handlers/admin/users.py
index c786c1cc..dcd29959 100644
--- a/app/handlers/admin/users.py
+++ b/app/handlers/admin/users.py
@@ -23,7 +23,6 @@ from app.localization.texts import get_texts
 from app.services.user_service import UserService
 from app.services.admin_notification_service import AdminNotificationService
 from app.database.crud.promo_group import get_promo_groups_with_counts
-from app.database.crud.subscription import get_subscriptions_statistics
 from app.utils.decorators import admin_required, error_handler
 from app.utils.formatters import format_datetime, format_time_ago
 from app.services.remnawave_service import RemnaWaveService
@@ -899,30 +898,54 @@ async def show_users_statistics(
     
     user_service = UserService()
     stats = await user_service.get_user_statistics(db)
+    
+    from sqlalchemy import select, func, or_
 
-    from sqlalchemy import select, func
+    current_time = datetime.utcnow()
 
-    sub_stats = await get_subscriptions_statistics(db)
+    active_subscription_query = (
+        select(func.count(Subscription.id))
+        .join(User, Subscription.user_id == User.id)
+        .where(
+            User.status == UserStatus.ACTIVE.value,
+            Subscription.status.in_(
+                [
+                    SubscriptionStatus.ACTIVE.value,
+                    SubscriptionStatus.TRIAL.value,
+                ]
+            ),
+            Subscription.end_date > current_time,
+        )
+    )
+    users_with_subscription = (
+        await db.execute(active_subscription_query)
+    ).scalar() or 0
 
-    users_with_subscription = int(sub_stats.get("active_subscriptions", 0) or 0)
-    trial_users = int(sub_stats.get("trial_subscriptions", 0) or 0)
-    paid_users = max(users_with_subscription - trial_users, 0)
+    trial_subscription_query = (
+        select(func.count(Subscription.id))
+        .join(User, Subscription.user_id == User.id)
+        .where(
+            User.status == UserStatus.ACTIVE.value,
+            Subscription.end_date > current_time,
+            or_(
+                Subscription.status == SubscriptionStatus.TRIAL.value,
+                Subscription.is_trial.is_(True),
+            ),
+        )
+    )
+    trial_users = (await db.execute(trial_subscription_query)).scalar() or 0
 
     users_without_subscription = max(
         stats["active_users"] - users_with_subscription,
         0,
     )
-
+    
     avg_balance_result = await db.execute(
         select(func.avg(User.balance_kopeks))
         .where(User.status == UserStatus.ACTIVE.value)
     )
     avg_balance = avg_balance_result.scalar() or 0
-    avg_balance_kopeks = int(round(avg_balance))
-
-    conversion_percent = (paid_users / max(stats["active_users"], 1) * 100)
-    trial_share_percent = (trial_users / max(users_with_subscription, 1) * 100)
-
+    
     text = f"""
 📊 <b>Детальная статистика пользователей</b>
 
@@ -937,7 +960,7 @@ async def show_users_statistics(
 • Без подписки: {users_without_subscription}
 
 💰 <b>Финансы:</b>
-• Средний баланс: {settings.format_price(avg_balance_kopeks)}
+• Средний баланс: {settings.format_price(int(avg_balance))}
 
 📈 <b>Регистрации:</b>
 • Сегодня: {stats['new_today']}
@@ -945,8 +968,8 @@ async def show_users_statistics(
 • За месяц: {stats['new_month']}
 
 📊 <b>Активность:</b>
-• Конверсия в подписку: {conversion_percent:.1f}%
-• Доля триальных: {trial_share_percent:.1f}%
+• Конверсия в подписку: {(users_with_subscription / max(stats['active_users'], 1) * 100):.1f}%
+• Доля триальных: {(trial_users / max(users_with_subscription, 1) * 100):.1f}%
 """
     
     await callback.message.edit_text(