ORM update and lots of improvements

handlers/admin/management/management_handler.py

@@ -2,8 +2,10 @@ from aiogram import F, Router
 from aiogram.fsm.context import FSMContext
 from aiogram.fsm.state import State, StatesGroup
 from aiogram.types import CallbackQuery, Message
-from asyncpg import Connection
+from sqlalchemy import func, select, update
+from sqlalchemy.ext.asyncio import AsyncSession
 
+from database.models import Key
 from filters.admin import IsAdminFilter
 from logger import logger
 from middlewares import maintenance
@@ -11,7 +13,6 @@ from middlewares import maintenance
 from ..panel.keyboard import build_admin_back_kb
 from .keyboard import AdminPanelCallback, build_management_kb
 
-
 router = Router()
 
 
@@ -19,7 +20,9 @@ class AdminManagementStates(StatesGroup):
     waiting_for_new_domain = State()
 
 
-@router.callback_query(AdminPanelCallback.filter(F.action == "management"), IsAdminFilter())
+@router.callback_query(
+    AdminPanelCallback.filter(F.action == "management"), IsAdminFilter()
+)
 async def handle_management(callback_query: CallbackQuery):
     await callback_query.message.edit_text(
         text="🤖 Управление ботом",
@@ -27,7 +30,9 @@ async def handle_management(callback_query: CallbackQuery):
     )
 
 
-@router.callback_query(AdminPanelCallback.filter(F.action == "change_domain"), IsAdminFilter())
+@router.callback_query(
+    AdminPanelCallback.filter(F.action == "change_domain"), IsAdminFilter()
+)
 async def request_new_domain(callback_query: CallbackQuery, state: FSMContext):
     """Запрашивает у администратора новый домен."""
     await state.set_state(AdminManagementStates.waiting_for_new_domain)
@@ -37,10 +42,14 @@ async def request_new_domain(callback_query: CallbackQuery, state: FSMContext):
 
 
 @router.message(AdminManagementStates.waiting_for_new_domain)
-async def process_new_domain(message: Message, state: FSMContext, session: Connection):
+async def process_new_domain(
+    message: Message, state: FSMContext, session: AsyncSession
+):
     """Обновляет домен в таблице keys."""
     new_domain = message.text.strip()
-    logger.info(f"[DomainChange] Новый домен, введённый администратором: '{new_domain}'")
+    logger.info(
+        f"[DomainChange] Новый домен, введённый администратором: '{new_domain}'"
+    )
 
     if not new_domain or " " in new_domain or not new_domain.replace(".", "").isalnum():
         logger.warning("[DomainChange] Некорректный домен")
@@ -53,26 +62,34 @@ async def process_new_domain(message: Message, state: FSMContext, session: Conne
     new_domain_url = f"https://{new_domain}"
     logger.info(f"[DomainChange] Новый домен с протоколом: '{new_domain_url}'")
 
-    query = """
-        UPDATE keys
-        SET key = regexp_replace(key, '^https://[^/]+', $1::TEXT)
-        WHERE key NOT LIKE $1 || '%'
-    """
     try:
-        await session.execute(query, new_domain_url)
+        stmt = (
+            update(Key)
+            .where(~Key.key.startswith(new_domain_url))
+            .values(key=func.regexp_replace(Key.key, r"^https://[^/]+", new_domain_url))
+        )
+        await session.execute(stmt)
+        await session.commit()
         logger.info("[DomainChange] Запрос на обновление домена выполнен успешно.")
     except Exception as e:
         logger.error(f"[DomainChange] Ошибка при выполнении запроса: {e}")
-        await message.answer(f"❌ Ошибка при обновлении домена: {e}", reply_markup=build_admin_back_kb("admin"))
+        await message.answer(
+            f"❌ Ошибка при обновлении домена: {e}",
+            reply_markup=build_admin_back_kb("admin"),
+        )
         return
 
     try:
-        sample = await session.fetchrow("SELECT key FROM keys LIMIT 1")
-        logger.info(f"[DomainChange] Пример обновленной записи: {sample}")
+        sample = await session.execute(select(Key.key).limit(1))
+        example = sample.scalar()
+        logger.info(f"[DomainChange] Пример обновленной записи: {example}")
     except Exception as e:
         logger.error(f"[DomainChange] Ошибка при выборке обновленной записи: {e}")
 
-    await message.answer(f"✅ Домен успешно изменен на {new_domain}!", reply_markup=build_admin_back_kb("admin"))
+    await message.answer(
+        f"✅ Домен успешно изменен на {new_domain}!",
+        reply_markup=build_admin_back_kb("admin"),
+    )
     await state.clear()