Добавлена ветка prod_prep

app/handlers/mybookings.py

@@ -1,88 +1,95 @@
+"""My bookings handler - view, edit, cancel bookings."""
 from aiogram import Router, F
 from aiogram.types import Message, CallbackQuery
 from aiogram.fsm.context import FSMContext
 
-from app.db.memory import get_user_bookings, cancel_booking, update_booking
-from app.keyboards.menu import menu
+from app.config import USE_POSTGRES
+from app.services.booking_service import get_user_bookings, cancel_booking
 from app.keyboards.my_booking import get_booking_actions
+from app.keyboards.services import get_services_keyboard
+from app.states.booking import BookingState
 from app.logger import logger
 
 router = Router()
 
 
-@router.message(
-    F.text == "📄 Мои записи"
-)
-async def my_bookings(
-        message: Message
-):
+@router.message(F.text == "\U0001f4c4 \u041c\u043e\u0438 \u0437\u0430\u043f\u0438\u0441\u0438")
+async def my_bookings(message: Message):
     logger.info("User {uid} opened My Bookings", uid=message.from_user.id)
     try:
-        bookings = get_user_bookings(
-            message.from_user.id
-        )
+        bookings = await get_user_bookings(message.from_user.id)
         logger.debug("Found {n} bookings", n=len(bookings))
 
         if not bookings:
-            await message.answer(
-                "У вас нет активных записей"
-            )
+            await message.answer("У вас нет активных записей")
             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"]
-                )
+        # Group all bookings into one message
+        lines = []
+        for b in bookings:
+            bid = b["id"]
+            svc = b["service"]
+            mst = b["master"]
+            dat = b["date"]
+            tim = b["time"]
+            lines.append(
+                f"#{bid} \U0001f486 {svc}\n"
+                f"\U0001f464 {mst}\n"
+                f"\U0001f4c5 {dat}\U0001f552 {tim}"
             )
+
+        full_text = "\u0423 \u0432\u0430\u0441 " + str(len(bookings)) + " \u0437\u0430\u043f\u0438\u0441\u0438:\n\n" + "\n\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\n".join(lines)
+        await message.answer(full_text)
+
+        # Send action buttons for each booking
+        for b in bookings:
+            await message.answer(
+                f"#{b['id']}: {b['service']}",
+                reply_markup=get_booking_actions(b["id"])
+            )
+
     except Exception as e:
         logger.exception("Error in my_bookings: {error}", error=e)
-        await message.answer(
-            "Произошла ошибка. Попробуйте позже."
-        )
+        await message.answer("Произошла ошибка. Попробуйте позже.")
 
 
-@router.callback_query(
-    F.data.startswith("cancel_booking_")
-)
+@router.callback_query(F.data.startswith("cancel_booking_"))
 async def cancel_booking_handler(callback: CallbackQuery):
     booking_id = int(callback.data.split("_")[2])
     logger.info("User {uid} cancelled booking #{bid}", uid=callback.from_user.id, bid=booking_id)
-    cancel_booking(
-        booking_id
-    )
-    await callback.message.edit_text(
-        "Запись отменена"
-    )
+    await cancel_booking(booking_id)
+    await callback.message.edit_text("\u2705 Запись отменена")
     await callback.answer()
 
 
-@router.callback_query(
-    F.data.startswith("edit_booking_")
-)
-async def edit_booking_handler(
-        callback: CallbackQuery,
-        state: FSMContext
-):
+@router.callback_query(F.data.startswith("edit_booking_"))
+async def edit_booking_handler(callback: CallbackQuery, state: FSMContext):
     booking_id = int(callback.data.split("_")[2])
 
-    update_booking(
-        booking_id=booking_id,
-        service="",
-        master="",
-        date="",
-        time=""
-    )
+    if USE_POSTGRES:
+        from app.db.postgres import PostgresDB
+        booking = await PostgresDB.get_booking_by_id(booking_id)
+    else:
+        from app.db.memory import load_bookings
+        bookings = load_bookings()
+        booking = next((b for b in bookings if b["id"] == booking_id), None)
 
-    await callback.answer(
-        "Редактирование не поддерживается"
+    if not booking:
+        await callback.message.edit_text("Запись не найдена")
+        await callback.answer()
+        return
+
+    await state.set_data({
+        "editing_booking_id": booking_id,
+        "service": booking.get("service", ""),
+        "master": booking.get("master", ""),
+        "date": booking.get("date", ""),
+        "time": booking.get("time", ""),
+    })
+
+    await state.set_state(BookingState.service)
+    await callback.message.edit_text(
+        "\u270f\ufe0f Редактирование записи #" + str(booking_id) + "\n\nВыберите новую услугу:",
+        reply_markup=get_services_keyboard()
     )
+    await callback.answer()