refactoring

bot/handlers/menu/entities.py

@@ -5,14 +5,16 @@ from aiogram.utils.keyboard import InlineKeyboardBuilder
 from babel.support import LazyProxy
 from logging import getLogger
 from sqlmodel.ext.asyncio.session import AsyncSession
-
-from ....main import QBotApp
+from typing import TYPE_CHECKING
 from ....model.settings import Settings
 from ....model.user import UserBase
 from ..context import ContextData, CallbackCommand
 from ..common import get_send_message
 from ....model.descriptors import EntityCaptionCallable
 
+if TYPE_CHECKING:
+    from ....main import QBotApp
+
 
 logger = getLogger(__name__)
 router = Router()
@@ -21,16 +23,18 @@ router = Router()
 @router.callback_query(ContextData.filter(F.command == CallbackCommand.MENU_ENTRY_ENTITIES))
 async def menu_entry_entities(message: CallbackQuery, **kwargs):
 
-    stack = await save_navigation_context(
-        callback_data = kwargs["callback_data"],
-        state = kwargs["state"])
+    callback_data: ContextData = kwargs["callback_data"]
+    state: FSMContext = kwargs["state"]
+    state_data = await state.get_data()
+    kwargs["state_data"] = state_data
+
+    stack = save_navigation_context(callback_data = callback_data, state_data = state_data)
 
     await entities_menu(message = message, navigation_stack = stack, **kwargs) 
 
 
 async def entities_menu(message: Message | CallbackQuery,
-                        callback_data: ContextData,
-                        app: QBotApp,
+                        app: "QBotApp",
                         state: FSMContext,
                         navigation_stack: list[ContextData],
                         **kwargs):
@@ -40,12 +44,12 @@ async def entities_menu(message: Message | CallbackQuery,
     entity_metadata = app.entity_metadata
 
     for entity in entity_metadata.entity_descriptors.values():
-        if entity.caption_btn.__class__ == EntityCaptionCallable:
-            caption = entity.caption_btn(entity) or entity.name
-        elif entity.caption_btn.__class__ == LazyProxy: 
-            caption = f"{f"{entity.icon} " if entity.icon else ""}{entity.caption_btn.value or entity.name}" 
+        if entity.caption_plural.__class__ == EntityCaptionCallable:
+            caption = entity.caption_plural(entity) or entity.name
+        elif entity.caption_plural.__class__ == LazyProxy: 
+            caption = f"{f"{entity.icon} " if entity.icon else ""}{entity.caption_plural.value or entity.name}" 
         else:
-            caption = f"{f"{entity.icon} " if entity.icon else ""}{entity.caption_btn or entity.name}"
+            caption = f"{f"{entity.icon} " if entity.icon else ""}{entity.caption_plural or entity.name}"
         
         keyboard_builder.row(
             InlineKeyboardButton(
@@ -58,6 +62,9 @@ async def entities_menu(message: Message | CallbackQuery,
             InlineKeyboardButton(
                 text = (await Settings.get(Settings.APP_STRINGS_BACK_BTN)),
                 callback_data = context.pack()))
+        
+    state_data = kwargs["state_data"]
+    await state.set_data(state_data)
     
     send_message = get_send_message(message)