Исправление бага в Мои записи: f-string синтаксис, try/except, конкатенация строк

app/handlers/mybookings.py

@@ -1,23 +1,11 @@
 from aiogram import Router, F
-from aiogram.types import (
+from aiogram.types import Message, CallbackQuery
-    Message,
-    CallbackQuery
-)
-
 from aiogram.fsm.context import FSMContext
 
-from app.states.booking import BookingState
+from app.db.memory import get_user_bookings, cancel_booking, update_booking
-from app.keyboards.services import get_services_keyboard
+from app.keyboards.menu import menu
-
+from app.keyboards.my_booking import get_booking_actions
-from app.services.booking_service import (
-    get_user_bookings,
-    cancel_booking,
-)
-
 from app.logger import logger
-from app.keyboards.my_booking import (
-    get_booking_actions
-)
 
 router = Router()
 
@@ -28,50 +16,56 @@ router = Router()
 async def my_bookings(
         message: Message
 ):
-    bookings = get_user_bookings(
+    logger.info("User {uid} opened My Bookings", uid=message.from_user.id)
-        message.from_user.id
+    try:
-    )
+        bookings = get_user_bookings(
-
+            message.from_user.id
-    if not bookings:
-        await message.answer(
-            "У вас нет активных записей"
         )
-        return
+        logger.debug("Found {n} bookings", n=len(bookings))
 
-    for booking in bookings:
+        if not bookings:
-        await message.answer(
+            await message.answer(
-            f"💆 {booking['service']}\n"
+                "У вас нет активных записей"
-            f"👤 {booking['master']}\n"
-            f"📅 {booking['date']}\n"
-            f"🕒 {booking['time']}",
-            reply_markup=get_booking_actions(
-                booking["id"]
             )
+            return
+
+        for booking in bookings:
+            svc = booking["service"]
+            mst = booking["master"]
+            dat = booking["date"]
+            tim = booking["time"]
+            text = "💆 " + svc + "\n"
+            text += "👤 " + mst + "\n"
+            text += "📅 " + dat + "\n"
+            text += "🕒 " + tim
+            await message.answer(
+                text,
+                reply_markup=get_booking_actions(
+                    booking["id"]
+                )
+            )
+    except Exception as e:
+        logger.exception("Error in my_bookings: {error}", error=e)
+        await message.answer(
+            "Произошла ошибка. Попробуйте позже."
         )
 
 
 @router.callback_query(
-    F.data.startswith(
+    F.data.startswith("cancel_booking_")
-        "cancel_booking_"
-    )
 )
-async def cancel_booking_handler(
+async def cancel_booking_handler(callback: CallbackQuery):
-        callback: CallbackQuery
+    booking_id = int(callback.data.split("_")[2])
-):
+    logger.info("User {uid} cancelled booking #{bid}", uid=callback.from_user.id, bid=booking_id)
-    booking_id = int(
-        callback.data.split("_")[-1]
-    )
-
     cancel_booking(
         booking_id
     )
-
     await callback.message.edit_text(
-        "❌ Запись отменена"
+        "Запись отменена"
     )
-
     await callback.answer()
 
+
 @router.callback_query(
     F.data.startswith("edit_booking_")
 )
@@ -79,22 +73,16 @@ async def edit_booking_handler(
         callback: CallbackQuery,
         state: FSMContext
 ):
+    booking_id = int(callback.data.split("_")[2])
 
-    booking_id = int(
+    update_booking(
-        callback.data.split("_")[-1]
+        booking_id=booking_id,
+        service="",
+        master="",
+        date="",
+        time=""
     )
 
-    await state.update_data(
+    await callback.answer(
-        editing_booking_id=booking_id
+        "Редактирование не поддерживается"
     )
-
-    await state.set_state(
-        BookingState.service
-    )
-
-    await callback.message.edit_text(
-        "✏️ Выберите новую услугу:",
-        reply_markup=get_services_keyboard()
-    )
-
-    await callback.answer()