Stage 06.1 - journal management UI, export and system menu redesign

app/src/telegram/handlers/market.py

@@ -11,6 +11,7 @@ from src.integrations.exchange.exceptions import ExchangeError
 from src.integrations.exchange.service import ExchangeService
 from src.telegram.ui.common import mode_line
 from src.telegram.ui.exchange_error import (
+    classify_exchange_error,
     show_callback_exchange_error,
     show_message_exchange_error,
 )
@@ -20,42 +21,6 @@ from src.trading.journal.service import JournalService
 router = Router(name="market")
 
 
-def _safe_log_info(
-    journal: JournalService,
-    event_type: str,
-    message: str,
-    payload: dict | None = None,
-) -> None:
-    try:
-        journal.log_info(event_type, message, payload)
-    except Exception:
-        pass
-
-
-def _safe_log_warning(
-    journal: JournalService,
-    event_type: str,
-    message: str,
-    payload: dict | None = None,
-) -> None:
-    try:
-        journal.log_warning(event_type, message, payload)
-    except Exception:
-        pass
-
-
-def _safe_log_error(
-    journal: JournalService,
-    event_type: str,
-    message: str,
-    payload: dict | None = None,
-) -> None:
-    try:
-        journal.log_error(event_type, message, payload)
-    except Exception:
-        pass
-
-
 def _market_keyboard() -> InlineKeyboardMarkup:
     builder = InlineKeyboardBuilder()
     builder.button(text="🏠 К торговле", callback_data="trade:home")
@@ -105,33 +70,35 @@ async def _render_market_screen(
     user_id: int | None,
     chat_id: int | None,
     edit_mode: bool,
+    action: str,
 ) -> None:
     service = ExchangeService()
     journal = JournalService()
     requested_symbol = service.settings.default_symbol
 
-    _safe_log_info(
-        journal,
-        "user_open_market",
-        "Пользователь открыл экран рынка.",
-        {
-            "user_id": user_id,
-            "chat_id": chat_id,
-            "symbol": requested_symbol,
-        },
+    journal.log_ui_info(
+        event_type="market_open_requested",
+        message="Запрошено открытие экрана рынка.",
+        screen="market",
+        action=action,
+        user_id=user_id,
+        chat_id=chat_id,
+        payload={"symbol": requested_symbol},
     )
 
     validation = service.validate_symbol(requested_symbol)
 
     if not validation.is_valid:
-        _safe_log_warning(
-            journal,
-            "market_symbol_invalid",
-            f"Символ не прошел проверку: {validation.message}",
-            {
-                "user_id": user_id,
-                "chat_id": chat_id,
+        journal.log_ui_warning(
+            event_type="market_symbol_invalid",
+            message="Инструмент недоступен.",
+            screen="market",
+            action=action,
+            user_id=user_id,
+            chat_id=chat_id,
+            payload={
                 "symbol": requested_symbol,
+                "validation_message": validation.message,
             },
         )
 
@@ -172,13 +139,14 @@ async def _render_market_screen(
         tick_size=tick_size,
     )
 
-    _safe_log_info(
-        journal,
-        "market_open_success",
-        "Экран рынка успешно показан пользователю.",
-        {
-            "user_id": user_id,
-            "chat_id": chat_id,
+    journal.log_ui_info(
+        event_type="market_open_success",
+        message="Экран рынка загружен.",
+        screen="market",
+        action=action,
+        user_id=user_id,
+        chat_id=chat_id,
+        payload={
             "symbol": ticker.symbol,
             "price": ticker.price,
         },
@@ -203,13 +171,18 @@ async def open_market(message: Message, state: FSMContext) -> None:
             user_id=user_id,
             chat_id=chat_id,
             edit_mode=False,
+            action="open",
         )
     except ExchangeError as exc:
-        _safe_log_error(
-            JournalService(),
-            "market_open_error",
-            f"Не удалось открыть экран рынка: {exc}",
-            {"user_id": user_id, "chat_id": chat_id},
+        JournalService().log_ui_error(
+            event_type="market_open_error",
+            message="Не удалось загрузить экран рынка.",
+            screen="market",
+            action="open",
+            user_id=user_id,
+            chat_id=chat_id,
+            error_type=classify_exchange_error(exc),
+            raw_error=str(exc),
         )
 
         await show_message_exchange_error(
@@ -239,14 +212,19 @@ async def retry_market(callback: CallbackQuery, state: FSMContext) -> None:
             user_id=user_id,
             chat_id=chat_id,
             edit_mode=True,
+            action="retry",
         )
-        await callback.answer()
+        await callback.answer()   
     except ExchangeError as exc:
-        _safe_log_error(
-            JournalService(),
-            "market_retry_error",
-            f"Не удалось повторно открыть рынок: {exc}",
-            {"user_id": user_id, "chat_id": chat_id},
+        JournalService().log_ui_error(
+            event_type="market_retry_error",
+            message="Не удалось обновить экран рынка.",
+            screen="market",
+            action="retry",
+            user_id=user_id,
+            chat_id=chat_id,
+            error_type=classify_exchange_error(exc),
+            raw_error=str(exc),
         )
 
         await show_callback_exchange_error(