Refactor bot initialization and service registration for improved modularity

- Integrated new service building functions to streamline bot initialization, enhancing maintainability and clarity.
- Updated the dispatcher setup to include core services dynamically, reducing redundancy in service registration.
- Added support for multiple broadcast targets in the admin handler, allowing for more flexible message distribution.
- Enhanced localization for new broadcast target options, improving user experience in both English and Russian.
- Implemented new database access methods to retrieve user IDs based on subscription status, optimizing broadcast logic.

bot/app/controllers/dispatcher_controller.py

@@ -9,7 +9,7 @@ from sqlalchemy.orm import sessionmaker
 
 from config.settings import Settings
 from bot.middlewares.db_session import DBSessionMiddleware
-from bot.middlewares.i18n import I18nMiddleware, get_i18n_instance
+from bot.middlewares.i18n import I18nMiddleware, get_i18n_instance, JsonI18n
 from bot.middlewares.ban_check_middleware import BanCheckMiddleware
 from bot.middlewares.action_logger_middleware import ActionLoggerMiddleware
 from bot.middlewares.profile_sync import ProfileSyncMiddleware

bot/app/factories/build_services.py

@@ -1,8 +1,8 @@
 from aiogram import Bot
 from sqlalchemy.orm import sessionmaker
-from typing import Tuple
 
 from config.settings import Settings
+from bot.middlewares.i18n import JsonI18n
 from bot.services.yookassa_service import YooKassaService
 from bot.services.panel_api_service import PanelApiService
 from bot.services.subscription_service import SubscriptionService
@@ -14,18 +14,24 @@ from bot.services.crypto_pay_service import CryptoPayService
 from bot.services.panel_webhook_service import PanelWebhookService
 
 
-def build_core_services(settings: Settings, bot: Bot, async_session_factory: sessionmaker):
+def build_core_services(
+    settings: Settings,
+    bot: Bot,
+    async_session_factory: sessionmaker,
+    i18n: JsonI18n,
+    bot_username_for_default_return: str,
+):
     panel_service = PanelApiService(settings)
-    subscription_service = SubscriptionService(settings, panel_service, bot)
-    referral_service = ReferralService(settings, subscription_service, bot)
-    promo_code_service = PromoCodeService(settings, subscription_service, bot)
-    stars_service = StarsService(bot, settings, None, subscription_service, referral_service)
+    subscription_service = SubscriptionService(settings, panel_service, bot, i18n)
+    referral_service = ReferralService(settings, subscription_service, bot, i18n)
+    promo_code_service = PromoCodeService(settings, subscription_service, bot, i18n)
+    stars_service = StarsService(bot, settings, i18n, subscription_service, referral_service)
     cryptopay_service = CryptoPayService(
         settings.CRYPTOPAY_TOKEN,
         settings.CRYPTOPAY_NETWORK,
         bot,
         settings,
-        None,
+        i18n,
         async_session_factory,
         subscription_service,
         referral_service,
@@ -33,13 +39,20 @@ def build_core_services(settings: Settings, bot: Bot, async_session_factory: ses
     tribute_service = TributeService(
         bot,
         settings,
-        None,
+        i18n,
         async_session_factory,
         panel_service,
         subscription_service,
         referral_service,
     )
-    panel_webhook_service = PanelWebhookService(bot, settings, None, async_session_factory)
+    panel_webhook_service = PanelWebhookService(bot, settings, i18n, async_session_factory)
+    yookassa_service = YooKassaService(
+        shop_id=settings.YOOKASSA_SHOP_ID,
+        secret_key=settings.YOOKASSA_SECRET_KEY,
+        configured_return_url=settings.YOOKASSA_RETURN_URL,
+        bot_username_for_default_return=bot_username_for_default_return,
+        settings_obj=settings,
+    )
 
     return {
         "panel_service": panel_service,
@@ -50,6 +63,7 @@ def build_core_services(settings: Settings, bot: Bot, async_session_factory: ses
         "cryptopay_service": cryptopay_service,
         "tribute_service": tribute_service,
         "panel_webhook_service": panel_webhook_service,
+        "yookassa_service": yookassa_service,
     }
 
 

bot/app/web/web_server.py

@@ -19,6 +19,20 @@ async def build_and_start_web_app(
     app["dp"] = dp
     app["settings"] = settings
     app["async_session_factory"] = async_session_factory
+    # Inject shared instances used by webhook handlers
+    app["i18n"] = dp.get("i18n_instance")
+    for key in (
+        "yookassa_service",
+        "subscription_service",
+        "referral_service",
+        "panel_service",
+        "stars_service",
+        "cryptopay_service",
+        "tribute_service",
+        "panel_webhook_service",
+    ):
+        if key in dp:  # type: ignore
+            app[key] = dp[key]  # type: ignore
 
     setup_application(app, dp, bot=bot)
 
@@ -31,6 +45,7 @@ async def build_and_start_web_app(
             f"Telegram webhook route configured at: [POST] {telegram_webhook_path} (relative to base URL)"
         )
 
+    from bot.handlers.user.payment import yookassa_webhook_route
     from bot.services.tribute_service import tribute_webhook_route
     from bot.services.crypto_pay_service import cryptopay_webhook_route
     from bot.services.panel_webhook_service import panel_webhook_route
@@ -45,6 +60,12 @@ async def build_and_start_web_app(
         app.router.add_post(cp_path, cryptopay_webhook_route)
         logging.info(f"CryptoPay webhook route configured at: [POST] {cp_path}")
 
+    # YooKassa webhook (register only when base URL present and path configured)
+    yk_path = settings.yookassa_webhook_path
+    if settings.WEBHOOK_BASE_URL and yk_path and yk_path.startswith("/"):
+        app.router.add_post(yk_path, yookassa_webhook_route)
+        logging.info(f"YooKassa webhook route configured at: [POST] {yk_path}")
+
     panel_path = settings.panel_webhook_path
     if panel_path.startswith("/"):
         app.router.add_post(panel_path, panel_webhook_route)