Refactor notification service and enhance user management features

- Replaced legacy payment notification functions with a new NotificationService for improved code organization and maintainability.
- Updated user management handlers to utilize the new notification system for payment confirmations.
- Enhanced user card formatting with localized labels for better clarity and user experience.
- Introduced context management for the PanelApiService to ensure proper session handling.
- Updated localization files to include new labels and messages for user management and notifications.

bot/services/crypto_pay_service.py

@@ -14,7 +14,7 @@ from bot.middlewares.i18n import JsonI18n
 from bot.services.subscription_service import SubscriptionService
 from bot.services.referral_service import ReferralService
 from bot.keyboards.inline.user_keyboards import get_connect_and_main_keyboard
-from bot.services.notification_service import notify_admin_new_payment
+from bot.services.notification_service import NotificationService
 from db.dal import payment_dal, user_dal
 
 
@@ -194,15 +194,20 @@ class CryptoPayService:
             except Exception as e:
                 logging.error(f"Failed to send CryptoPay success message: {e}")
 
-            await notify_admin_new_payment(
-                bot,
-                settings,
-                i18n,
-                user_id,
-                months,
-                float(invoice.amount),
-                currency=invoice.asset or settings.DEFAULT_CURRENCY_SYMBOL,
-            )
+            # Send notification about payment
+            try:
+                notification_service = NotificationService(bot, settings, i18n)
+                user = await user_dal.get_user_by_id(session, user_id)
+                await notification_service.notify_payment_received(
+                    user_id=user_id,
+                    amount=float(invoice.amount),
+                    currency=invoice.asset or settings.DEFAULT_CURRENCY_SYMBOL,
+                    months=months,
+                    payment_provider="crypto_pay",
+                    username=user.username if user else None
+                )
+            except Exception as e:
+                logging.error(f"Failed to send crypto_pay payment notification: {e}")
 
     async def webhook_route(self, request: web.Request) -> web.Response:
         if not self.configured or not self.client:

bot/services/notification_service.py

@@ -220,20 +220,7 @@ async def notify_admin_new_trial(bot: Bot, settings: Settings, i18n: JsonI18n,
     await notification_service.notify_trial_activation(user_id, end_date)
 
 
-async def notify_admin_new_payment(bot: Bot, settings: Settings, i18n: JsonI18n,
-                                   user_id: int, months: int, amount: float,
-                                   currency: str | None = None) -> None:
-    currency_symbol = currency or settings.DEFAULT_CURRENCY_SYMBOL
-    await notify_admins(
-        bot,
-        settings,
-        i18n,
-        "admin_new_payment_notification",
-        user_id=user_id,
-        months=months,
-        amount=f"{amount:.2f}",
-        currency=currency_symbol,
-    )
+
 
 
 async def notify_admin_promo_activation(bot: Bot, settings: Settings,

bot/services/panel_api_service.py

@@ -21,6 +21,14 @@ class PanelApiService:
         self.api_key = settings.PANEL_API_KEY
         self._session: Optional[aiohttp.ClientSession] = None
         self.default_client_ip = "127.0.0.1"
+    
+    async def __aenter__(self):
+        """Context manager entry"""
+        return self
+    
+    async def __aexit__(self, exc_type, exc_val, exc_tb):
+        """Context manager exit - automatically close session"""
+        await self.close_session()
 
     async def _get_session(self) -> aiohttp.ClientSession:
         if self._session is None or self._session.closed:
@@ -32,7 +40,7 @@ class PanelApiService:
         if self._session and not self._session.closed:
             await self._session.close()
             self._session = None
-            logging.info("Panel API service HTTP session closed.")
+            logging.debug("Panel API service HTTP session closed.")
 
     async def close(self):
         """Alias for close_session for API consistency."""

bot/services/stars_service.py

@@ -10,7 +10,7 @@ from db.dal import payment_dal, user_dal
 from .subscription_service import SubscriptionService
 from .referral_service import ReferralService
 from bot.middlewares.i18n import JsonI18n
-from .notification_service import notify_admin_new_payment
+from .notification_service import NotificationService
 from bot.keyboards.inline.user_keyboards import get_connect_and_main_keyboard
 
 
@@ -153,13 +153,18 @@ class StarsService:
             logging.error(
                 f"Failed to send stars payment success message: {e_send}")
 
-        await notify_admin_new_payment(
-            self.bot,
-            self.settings,
-            self.i18n,
-            message.from_user.id,
-            months,
-            float(stars_amount),
-            currency="XTR",
-        )
+        # Send notification about payment
+        try:
+            notification_service = NotificationService(self.bot, self.settings, self.i18n)
+            user = await user_dal.get_user_by_id(session, message.from_user.id)
+            await notification_service.notify_payment_received(
+                user_id=message.from_user.id,
+                amount=float(stars_amount),
+                currency="XTR",
+                months=months,
+                payment_provider="stars",
+                username=user.username if user else None
+            )
+        except Exception as e:
+            logging.error(f"Failed to send stars payment notification: {e}")
 

bot/services/tribute_service.py

@@ -13,7 +13,7 @@ from bot.middlewares.i18n import JsonI18n
 from bot.services.subscription_service import SubscriptionService
 from bot.services.panel_api_service import PanelApiService
 from bot.services.referral_service import ReferralService
-from .notification_service import notify_admin_new_payment
+from .notification_service import NotificationService
 from bot.keyboards.inline.user_keyboards import get_connect_and_main_keyboard
 from db.dal import payment_dal, user_dal, subscription_dal
 
@@ -187,15 +187,20 @@ class TributeService:
                         logging.error(
                             f"Failed to send Tribute payment success message to user {user_id}: {e}")
 
-                await notify_admin_new_payment(
-                    bot,
-                    settings,
-                    i18n,
-                    user_id,
-                    months,
-                    float(price_rub),
-                    currency="RUB",
-                )
+                # Send notification about payment
+                try:
+                    notification_service = NotificationService(bot, settings, i18n)
+                    user = await user_dal.get_user_by_id(session, user_id)
+                    await notification_service.notify_payment_received(
+                        user_id=user_id,
+                        amount=float(price_rub),
+                        currency="RUB",
+                        months=months,
+                        payment_provider="tribute",
+                        username=user.username if user else None
+                    )
+                except Exception as e:
+                    logging.error(f"Failed to send tribute payment notification: {e}")
             else:
                 await session.commit()
         return web.Response(status=200, text="ok")