fixes

Author: ilyarolf

handlers/user/all_categories.py

@@ -45,19 +45,20 @@ async def all_categories(**kwargs):
     language: Language = kwargs.get("language")
     state_data = await state.get_data()
     if callback_data.is_filter_enabled and state_data.get('filter') is not None:
-        msg, kb_builder = await CategoryService.get_buttons(callback_data, state, session, language)
+        media, kb_builder = await CategoryService.get_buttons(callback_data, state, session, language)
     elif callback_data.is_filter_enabled:
-        msg, kb_builder = await enable_search(callback_data,
+        item_type_value = callback_data.item_type.value if callback_data.item_type else None
+        media, kb_builder = await enable_search(callback_data,
                                                 EntityType.CATEGORY,
-                                                {"item_type": callback_data.item_type.value},
+                                                {"item_type": item_type_value},
                                                 state,
                                                 UserStates.filter_items,
                                                 language)
     else:
         await state.update_data(filter=None)
         await state.set_state()
-        msg, kb_builder = await CategoryService.get_buttons(callback_data, state, session, language)
-    await callback.message.edit_caption(caption=msg, reply_markup=kb_builder.as_markup())
+        media, kb_builder = await CategoryService.get_buttons(callback_data, state, session, language)
+    await callback.message.edit_media(media=media, reply_markup=kb_builder.as_markup())
 
 
 async def show_subcategories_in_category(**kwargs):
@@ -70,10 +71,11 @@ async def show_subcategories_in_category(**kwargs):
     if callback_data.is_filter_enabled and state_data.get('filter') is not None:
         media, kb_builder = await SubcategoryService.get_buttons(callback_data, state, session, language)
     elif callback_data.is_filter_enabled:
+        item_type_value = callback_data.item_type.value if callback_data.item_type else None
         media, kb_builder = await enable_search(callback_data,
                                                 EntityType.SUBCATEGORY,
                                                 {"category_id": callback_data.category_id,
-                                                 "item_type": callback_data.item_type.value},
+                                                 "item_type": item_type_value},
                                                 state,
                                                 UserStates.filter_items,
                                                 language)

services/category.py

@@ -24,7 +24,9 @@ async def get_buttons(
             state: FSMContext,
             session: AsyncSession,
             language: Language
-    ) -> tuple[str, InlineKeyboardBuilder]:
+    ) -> tuple[InputMediaPhoto |
+               InputMediaAnimation |
+               InputMediaVideo, InlineKeyboardBuilder]:
         state_data = await state.get_data()
         callback_data = callback_data or AllCategoriesCallback.create(1, **state_data.get("entity_id_dict"))
         sort_pairs, filters = await get_filters_settings(state, callback_data)
@@ -43,14 +45,14 @@ async def get_buttons(
 
         has_categories = len(categories) > 0
         if not has_categories:
-            msg = get_text(language, BotEntity.USER, "no_categories")
+            caption = get_text(language, BotEntity.USER, "no_categories")
         else:
             kb_builder.adjust(2)
             if callback_data.item_type:
                 item_type = callback_data.item_type.get_localized(language)
             else:
                 item_type = get_text(language, BotEntity.COMMON, "all")
-            msg = get_text(language, BotEntity.USER, "pick_category").format(
+            caption = get_text(language, BotEntity.USER, "pick_category").format(
                 item_type=item_type
             )
             kb_builder.row(
@@ -68,4 +70,8 @@ async def get_buttons(
             kb_builder, callback_data, CategoryRepository.get_maximum_page(filters, session),
             callback_data.get_back_button(language, 0), language
         )
-        return msg, kb_builder
+        button_media = await ButtonMediaRepository.get_by_button(
+            KeyboardButton.ALL_CATEGORIES, session
+        )
+        media = MediaService.convert_to_media(button_media.media_id, caption=caption)
+        return media, kb_builder

services/subcategory.py

@@ -29,7 +29,7 @@ async def get_buttons(callback_data: AllCategoriesCallback | None,
                                                        InputMediaAnimation |
                                                        InputMediaVideo, InlineKeyboardBuilder]:
         state_data = await state.get_data()
-        callback_data = callback_data or AllCategoriesCallback.create(1, **state_data.get("entity_id_dict"))
+        callback_data = callback_data or AllCategoriesCallback.create(2, **state_data.get("entity_id_dict"))
         sort_pairs, filters = await get_filters_settings(state, callback_data)
         kb_builder = InlineKeyboardBuilder()
         items = await SubcategoryRepository.get_paginated_by_category_id(sort_pairs, filters,