Migrating to Postgres from sqlite3

bot/handlers/admin/common.py

@@ -3,11 +3,13 @@ from aiogram import Router, F, types, Bot
 from aiogram.filters import Command
 from aiogram.fsm.context import FSMContext
 from typing import Optional
+from sqlalchemy.ext.asyncio import AsyncSession
 
 from config.settings import Settings
 from bot.keyboards.inline.admin_keyboards import get_admin_panel_keyboard
 from bot.middlewares.i18n import JsonI18n
 from bot.services.panel_api_service import PanelApiService
+from bot.services.subscription_service import SubscriptionService
 
 from . import broadcast as admin_broadcast_handlers
 from . import promo_codes as admin_promo_handlers
@@ -20,10 +22,12 @@ router = Router(name="admin_common_router")
 
 
 @router.message(Command("admin"))
-async def admin_panel_command_handler(message: types.Message,
-                                      settings: Settings, i18n_data: dict):
-    current_lang = i18n_data.get("current_language",
-                                 getattr(settings, 'DEFAULT_LANGUAGE', 'en'))
+async def admin_panel_command_handler(
+    message: types.Message,
+    settings: Settings,
+    i18n_data: dict,
+):
+    current_lang = i18n_data.get("current_language", settings.DEFAULT_LANGUAGE)
     i18n: Optional[JsonI18n] = i18n_data.get("i18n_instance")
     if not i18n:
         logging.error("i18n missing in admin_panel_command_handler")
@@ -37,16 +41,14 @@ async def admin_panel_command_handler(message: types.Message,
 
 
 @router.callback_query(F.data.startswith("admin_action:"))
-async def admin_panel_actions_callback_handler(callback: types.CallbackQuery,
-                                               state: FSMContext,
-                                               settings: Settings,
-                                               i18n_data: dict, bot: Bot,
-                                               panel_service: PanelApiService):
+async def admin_panel_actions_callback_handler(
+        callback: types.CallbackQuery, state: FSMContext, settings: Settings,
+        i18n_data: dict, bot: Bot, panel_service: PanelApiService,
+        subscription_service: SubscriptionService, session: AsyncSession):
     action_parts = callback.data.split(":")
     action = action_parts[1]
 
-    current_lang = i18n_data.get("current_language",
-                                 getattr(settings, 'DEFAULT_LANGUAGE', 'en'))
+    current_lang = i18n_data.get("current_language", settings.DEFAULT_LANGUAGE)
     i18n: Optional[JsonI18n] = i18n_data.get("i18n_instance")
     if not i18n:
         logging.error("i18n missing in admin_panel_actions_callback_handler")
@@ -56,7 +58,7 @@ async def admin_panel_actions_callback_handler(callback: types.CallbackQuery,
 
     if not callback.message:
         logging.error(
-            f"CallbackQuery {callback.id} from {callback.from_user.id} has no message for action {action}"
+            f"CallbackQuery {callback.id} from {callback.from_user.id} has no message for admin_action {action}"
         )
         await callback.answer("Error processing action: message context lost.",
                               show_alert=True)
@@ -64,36 +66,38 @@ async def admin_panel_actions_callback_handler(callback: types.CallbackQuery,
 
     if action == "stats":
         await admin_stats_handlers.show_statistics_handler(
-            callback, i18n_data, settings)
+            callback, i18n_data, settings, session)
     elif action == "broadcast":
         await admin_broadcast_handlers.broadcast_message_prompt_handler(
-            callback, state, i18n_data, settings)
+            callback, state, i18n_data, settings, session)
     elif action == "create_promo":
         await admin_promo_handlers.create_promo_prompt_handler(
-            callback, state, i18n_data, settings)
+            callback, state, i18n_data, settings, session)
     elif action == "view_promos":
         await admin_promo_handlers.view_promo_codes_handler(
-            callback, i18n_data, settings)
+            callback, i18n_data, settings, session)
     elif action == "ban_user_prompt":
         await admin_user_mgmnt_handlers.ban_user_prompt_handler(
-            callback, state, i18n_data, settings)
+            callback, state, i18n_data, settings, session)
     elif action == "unban_user_prompt":
         await admin_user_mgmnt_handlers.unban_user_prompt_handler(
-            callback, state, i18n_data, settings)
+            callback, state, i18n_data, settings, session)
     elif action == "view_banned":
 
         await admin_user_mgmnt_handlers.view_banned_users_handler(
-            callback, i18n_data, settings, state)
+            callback, state, i18n_data, settings, session)
     elif action == "view_logs_menu":
         await admin_logs_handlers.display_logs_menu(callback, i18n_data,
-                                                    settings)
+                                                    settings, session)
     elif action == "sync_panel":
+
         await admin_sync_handlers.sync_command_handler(
-            callback.message,
+            message_event=callback,
             bot=bot,
             settings=settings,
             i18n_data=i18n_data,
-            panel_service=panel_service)
+            panel_service=panel_service,
+            session=session)
         await callback.answer(_("admin_sync_initiated_from_panel"))
     elif action == "main":
         try: