feat: Поддержка stp_database 1.1

Signed-off-by: Roman Chursanov <[email protected]>

Author: AuthFailed

tgbot/handlers/head/group/game/history.py

@@ -149,8 +149,8 @@ async def head_transaction_detail_view(
 <b>📅 Дата создания</b>
 {transaction.created_at.strftime("%d.%m.%Y в %H:%M")}"""
 
-    if transaction.comment:
-        message_text += f"\n\n<b>💬 Комментарий</b>\n<blockquote expandable>{transaction.comment}</blockquote>"
+    if transaction.use:
+        message_text += f"\n\n<b>💬 Комментарий</b>\n<blockquote expandable>{transaction.user_comment}</blockquote>"
 
     await callback.message.edit_text(
         message_text, reply_markup=head_transaction_detail_kb(page)

tgbot/handlers/head/group/members.py

@@ -909,8 +909,8 @@ async def view_member_transaction_detail(
 <b>📅 Дата создания</b>
 {transaction.created_at.strftime("%d.%m.%Y в %H:%M")}"""
 
-        if transaction.comment:
-            message_text += f"\n\n<b>💬 Комментарий</b>\n<blockquote expandable>{transaction.comment}</blockquote>"
+        if transaction.user_comment:
+            message_text += f"\n\n<b>💬 Комментарий</b>\n<blockquote expandable>{transaction.user_comment}</blockquote>"
 
         await callback.message.edit_text(
             message_text,

tgbot/handlers/user/game/history.py

@@ -156,8 +156,8 @@ async def transaction_detail_view(
 <b>📅 Дата создания</b>
 {transaction.created_at.strftime("%d.%m.%Y в %H:%M")}"""
 
-    if transaction.comment:
-        message_text += f"\n\n<b>💬 Комментарий</b>\n<blockquote expandable>{transaction.comment}</blockquote>"
+    if transaction.user_comment:
+        message_text += f"\n\n<b>💬 Комментарий</b>\n<blockquote expandable>{transaction.user_comment}</blockquote>"
 
     await callback.message.edit_text(
         message_text, reply_markup=transaction_detail_kb(page)

tgbot/handlers/user/game/inventory.py

@@ -194,8 +194,8 @@ async def product_detail_view(
 <blockquote expandable><b>📅 Дата покупки</b>  
 {user_product.bought_at.strftime("%d.%m.%Y в %H:%M")}</blockquote>"""
 
-    if user_product.comment:
-        message_text += f"\n\n<b>💬 Комментарий</b>\n└ {user_product.comment}"
+    if user_product.user_comment:
+        message_text += f"\n\n<b>💬 Комментарий</b>\n└ {user_product.user_comment}"
 
     if user_product.updated_by_user_id:
         manager = await stp_repo.employee.get_user(
@@ -289,8 +289,8 @@ async def product_detail_view_from_shop(
 <blockquote expandable><b>📅 Дата покупки</b>  
 {user_product.bought_at.strftime("%d.%m.%Y в %H:%M")}</blockquote>"""
 
-    if user_product.comment:
-        message_text += f"\n\n<b>💬 Комментарий</b>\n└ {user_product.comment}"
+    if user_product.user_comment:
+        message_text += f"\n\n<b>💬 Комментарий</b>\n└ {user_product.user_comment}"
 
     if user_product.updated_by_user_id:
         manager = await stp_repo.employee.get_user(

tgbot/keyboards/admin/schedule/list.py

@@ -2,7 +2,7 @@
 
 from aiogram.filters.callback_data import CallbackData
 from aiogram.types import InlineKeyboardButton, InlineKeyboardMarkup
-from stp_database.models.STP.schedules import Schedules
+from stp_database.models import Schedule
 
 from tgbot.keyboards.user.main import MainMenu
 
@@ -58,7 +58,7 @@ class RestoreConfirmMenu(CallbackData, prefix="admin_restore_confirm"):
 
 
 def list_db_files_paginated_kb(
-    current_page: int, total_pages: int, page_files: Sequence[Schedules] = None
+    current_page: int, total_pages: int, page_files: Sequence[Schedule] = None
 ) -> InlineKeyboardMarkup:
     """
     Клавиатура пагинации для файлов графиков в базе данных с кнопками выбора файлов.
@@ -179,7 +179,7 @@ def list_db_files_paginated_kb(
 
 
 def list_db_files_kb(
-    schedule_files: Sequence[Schedules],
+    schedule_files: Sequence[Schedule],
 ) -> InlineKeyboardMarkup:
     """
     Клавиатура меню файлов графиков в базе данных (legacy compatibility).
@@ -485,7 +485,7 @@ def schedule_list_back_kb() -> InlineKeyboardMarkup:
 
 
 def file_versions_list_kb(
-    file_versions: Sequence[Schedules],
+    file_versions: Sequence[Schedule],
     filename: str,
     current_page: int = 1,
     total_pages: int = 1,

tgbot/keyboards/mip/schedule/list.py

@@ -2,7 +2,7 @@
 
 from aiogram.filters.callback_data import CallbackData
 from aiogram.types import InlineKeyboardButton, InlineKeyboardMarkup
-from stp_database.models.STP.schedules import Schedules
+from stp_database.models.STP.schedule import Schedule
 
 from tgbot.keyboards.user.main import MainMenu
 
@@ -58,7 +58,7 @@ class RestoreConfirmMenu(CallbackData, prefix="restore_confirm"):
 
 
 def list_db_files_paginated_kb(
-    current_page: int, total_pages: int, page_files: Sequence[Schedules] = None
+    current_page: int, total_pages: int, page_files: Sequence[Schedule] = None
 ) -> InlineKeyboardMarkup:
     """
     Клавиатура пагинации для файлов графиков в базе данных с кнопками выбора файлов.
@@ -179,7 +179,7 @@ def list_db_files_paginated_kb(
 
 
 def list_db_files_kb(
-    schedule_files: Sequence[Schedules],
+    schedule_files: Sequence[Schedule],
 ) -> InlineKeyboardMarkup:
     """
     Клавиатура меню файлов графиков в базе данных (legacy compatibility).
@@ -485,7 +485,7 @@ def schedule_list_back_kb() -> InlineKeyboardMarkup:
 
 
 def file_versions_list_kb(
-    file_versions: Sequence[Schedules],
+    file_versions: Sequence[Schedule],
     filename: str,
     current_page: int = 1,
     total_pages: int = 1,