{sub.tariff_key ||
- at("user_history_no_tariff", {}, "Без тарифа")}{subscriptionDisplayLabel(sub)}
{at(
diff --git a/tests/test_admin_user_reset_trial.py b/tests/test_admin_user_reset_trial.py
index 8954bc2..c24a7e2 100644
--- a/tests/test_admin_user_reset_trial.py
+++ b/tests/test_admin_user_reset_trial.py
@@ -1,8 +1,10 @@
import json
import unittest
+from datetime import datetime, timezone
from types import SimpleNamespace
from unittest.mock import AsyncMock, patch
+from bot.app.web.admin_api_impl import common as admin_common
from bot.app.web.admin_api_impl import users as admin_users
@@ -73,5 +75,68 @@ class AdminUserResetTrialRouteTests(unittest.IsolatedAsyncioTestCase):
self.assertFalse(session.rolled_back)
+class AdminUserTrialPresentationTests(unittest.TestCase):
+ def test_trial_subscription_serializes_display_label(self):
+ start_at = datetime(2026, 1, 2, 3, 4, tzinfo=timezone.utc)
+ end_at = datetime(2026, 1, 9, 3, 4, tzinfo=timezone.utc)
+ sub = SimpleNamespace(
+ subscription_id=7,
+ panel_user_uuid="panel-user",
+ panel_subscription_uuid=None,
+ start_date=start_at,
+ end_date=end_at,
+ duration_months=None,
+ is_active=False,
+ status_from_panel="EXPIRED",
+ traffic_limit_bytes=10,
+ traffic_used_bytes=2,
+ tier_baseline_bytes=0,
+ topup_balance_bytes=0,
+ premium_used_bytes=0,
+ premium_baseline_bytes=0,
+ premium_topup_balance_bytes=0,
+ premium_topup_used_bytes=0,
+ premium_bonus_bytes=0,
+ regular_bonus_bytes=0,
+ regular_unlimited_override=False,
+ premium_unlimited_override=False,
+ premium_is_limited=False,
+ tariff_key=None,
+ auto_renew_enabled=False,
+ provider="trial",
+ is_throttled=False,
+ )
+
+ payload = admin_common._serialize_subscription(sub)
+
+ self.assertTrue(payload["is_trial"])
+ self.assertEqual(payload["display_label"], "Trial")
+ self.assertIsNone(payload["tariff_key"])
+
+ def test_trial_summary_includes_usage_dates_and_reset_marker(self):
+ first_at = datetime(2026, 1, 2, 3, 4, tzinfo=timezone.utc)
+ latest_at = datetime(2026, 2, 3, 4, 5, tzinfo=timezone.utc)
+ latest_end = datetime(2026, 2, 10, 4, 5, tzinfo=timezone.utc)
+ reset_at = datetime(2026, 3, 1, tzinfo=timezone.utc)
+ user = SimpleNamespace(trial_eligibility_reset_at=reset_at)
+ trial_subs = [
+ SimpleNamespace(
+ start_date=first_at,
+ end_date=datetime(2026, 1, 9, tzinfo=timezone.utc),
+ ),
+ SimpleNamespace(start_date=latest_at, end_date=latest_end, is_active=True),
+ ]
+
+ payload = admin_users._serialize_trial_summary(user, trial_subs)
+
+ self.assertTrue(payload["used"])
+ self.assertTrue(payload["active"])
+ self.assertEqual(payload["count"], 2)
+ self.assertEqual(payload["first_activated_at"], first_at.isoformat())
+ self.assertEqual(payload["latest_activated_at"], latest_at.isoformat())
+ self.assertEqual(payload["latest_end_date"], latest_end.isoformat())
+ self.assertEqual(payload["last_reset_at"], reset_at.isoformat())
+
+
if __name__ == "__main__":
unittest.main()
diff --git a/tests/test_webapp_trial_activation.py b/tests/test_webapp_trial_activation.py
new file mode 100644
index 0000000..f073a5c
--- /dev/null
+++ b/tests/test_webapp_trial_activation.py
@@ -0,0 +1,117 @@
+import json
+from datetime import datetime, timezone
+from types import SimpleNamespace
+from unittest import IsolatedAsyncioTestCase
+from unittest.mock import AsyncMock, patch
+
+import bot.app.web.subscription_webapp # noqa: F401
+from bot.app.web.webapp import billing as billing_module
+
+
+class _Session:
+ def __init__(self):
+ self.commit_count = 0
+ self.rollback_count = 0
+
+ async def __aenter__(self):
+ return self
+
+ async def __aexit__(self, exc_type, exc, tb):
+ return False
+
+ async def commit(self):
+ self.commit_count += 1
+
+ async def rollback(self):
+ self.rollback_count += 1
+
+
+class _SessionFactory:
+ def __init__(self, session):
+ self.session = session
+
+ def __call__(self):
+ return self.session
+
+
+class WebAppTrialActivationTests(IsolatedAsyncioTestCase):
+ async def test_email_only_trial_activation_is_written_to_admin_logs(self):
+ session = _Session()
+ end_date = datetime(2026, 1, 9, 3, 4, tzinfo=timezone.utc)
+ settings = SimpleNamespace(
+ TRIAL_ENABLED=True,
+ TRIAL_DURATION_DAYS=7,
+ TRIAL_TRAFFIC_LIMIT_GB=10,
+ LOG_TRIAL_ACTIVATIONS=False,
+ )
+ db_user = SimpleNamespace(
+ user_id=42,
+ is_banned=False,
+ username=None,
+ first_name=None,
+ email="email-only@example.com",
+ )
+ subscription_service = SimpleNamespace(
+ activate_trial_subscription=AsyncMock(
+ return_value={
+ "activated": True,
+ "days": 7,
+ "end_date": end_date,
+ "traffic_gb": 10,
+ "subscription_url": "https://panel.example/sub",
+ }
+ )
+ )
+ request = SimpleNamespace(
+ app={
+ "settings": settings,
+ "async_session_factory": _SessionFactory(session),
+ "subscription_service": subscription_service,
+ }
+ )
+
+ with (
+ patch.object(billing_module, "_require_user_id", return_value=42),
+ patch.object(
+ billing_module,
+ "_enforce_webapp_rate_limit",
+ AsyncMock(return_value=None),
+ ),
+ patch.object(
+ billing_module.user_dal,
+ "get_user_by_id",
+ AsyncMock(return_value=db_user),
+ ),
+ patch.object(
+ billing_module,
+ "prepare_config_links",
+ AsyncMock(return_value=("https://panel.example/sub", "https://connect.example")),
+ ),
+ patch.object(
+ billing_module.message_log_dal,
+ "create_message_log_no_commit",
+ AsyncMock(),
+ ) as create_log,
+ patch.object(
+ billing_module,
+ "invalidate_webapp_user_caches",
+ AsyncMock(),
+ ),
+ patch("db.dal.ad_dal.mark_trial_activated", AsyncMock()) as mark_trial_activated,
+ ):
+ response = await billing_module.activate_trial_route(request)
+
+ payload = json.loads(response.text)
+ self.assertEqual(response.status, 200)
+ self.assertTrue(payload["activated"])
+ subscription_service.activate_trial_subscription.assert_awaited_once_with(session, 42)
+ create_log.assert_awaited_once()
+ log_payload = create_log.await_args.args[1]
+ self.assertEqual(log_payload["user_id"], 42)
+ self.assertEqual(log_payload["target_user_id"], 42)
+ self.assertEqual(log_payload["event_type"], "webapp_trial_activate")
+ self.assertFalse(log_payload["is_admin_event"])
+ self.assertIn("email-only@example.com", log_payload["content"])
+ mark_trial_activated.assert_awaited_once_with(session, 42)
+ self.assertEqual(session.commit_count, 2)
+ self.assertEqual(session.rollback_count, 0)
From 4263cb7c99b88e10432809ba0c5ecd20a258f6ed Mon Sep 17 00:00:00 2001
From: 3252a8 <3252a8@proton.me>
Date: Tue, 2 Jun 2026 14:03:14 +0300
Subject: [PATCH 5/7] fix(webapp): show expiring subscription countdown
---
frontend/src/styles/webapp.css | 25 +++++++
frontend/src/webapp/screens/HomeScreen.svelte | 65 ++++++++++++++++++-
2 files changed, 87 insertions(+), 3 deletions(-)
diff --git a/frontend/src/styles/webapp.css b/frontend/src/styles/webapp.css
index ec2bae6..24d631b 100644
--- a/frontend/src/styles/webapp.css
+++ b/frontend/src/styles/webapp.css
@@ -233,6 +233,31 @@ a {
color: var(--danger);
}
+.status-card-warning {
+ border-color: var(--warning-border);
+ background:
+ linear-gradient(
+ 135deg,
+ color-mix(in srgb, var(--warning) 14%, var(--surface-sheen-soft)),
+ color-mix(in srgb, var(--warning) 8%, var(--surface-sheen-soft))
+ ),
+ var(--panel);
+ box-shadow:
+ var(--shadow-soft),
+ 0 0 0 1px color-mix(in srgb, var(--warning) 20%, transparent),
+ inset 0 1px 0 var(--inset-highlight);
+}
+
+.status-card-warning .sub-status {
+ color: var(--warning-text);
+}
+
+.status-card-warning .subscription-end-line {
+ color: var(--warning-text);
+ font-variant-numeric: tabular-nums;
+ opacity: 1;
+}
+
.sub-status-inactive {
min-height: 0;
justify-content: flex-start;
diff --git a/frontend/src/webapp/screens/HomeScreen.svelte b/frontend/src/webapp/screens/HomeScreen.svelte
index 429ee1f..bce6606 100644
--- a/frontend/src/webapp/screens/HomeScreen.svelte
+++ b/frontend/src/webapp/screens/HomeScreen.svelte
@@ -1,4 +1,5 @@