Добавлен полноценный сценарий записи

- выбор услуги через inline-кнопки
- выбор даты через календарь
- выбор времени через кнопки
- подтверждение записи
- отмена записи
- редактирование записи
- сохранение времени записи
- исправлена работа FSM
- исправлены callback-обработчики
- улучшен интерфейс бота

app/handlers/booking.py

@@ -1,11 +1,17 @@
+import re
+
 from aiogram import Router, F
-from aiogram.types import Message
 from aiogram.fsm.context import FSMContext
 from aiogram.filters import StateFilter
+from aiogram.types import Message, CallbackQuery
+from app.keyboards.services import get_services_keyboard
 
 from app.states.booking import BookingState
 from app.services.booking_service import create_booking
 from app.keyboards.menu import menu, cancel_menu
+from app.keyboards.calendar import get_dates_keyboard
+from app.keyboards.time_slots import get_time_keyboard
+from app.keyboards.confirm_booking import get_confirm_booking_keyboard
 
 router = Router()
 
@@ -28,95 +34,172 @@ async def start_booking(message: Message, state: FSMContext):
     await state.set_state(BookingState.service)
 
     await message.answer(
-        "Выберите услугу:\n"
-        "1. Массаж\n"
-        "2. SPA\n"
-        "3. Косметология",
-        reply_markup=cancel_menu
+        "Выберите услугу:",
+        reply_markup=get_services_keyboard()
     )
 
 
-# выбор услуги
-@router.message(StateFilter(BookingState.service))
-async def choose_service(message: Message, state: FSMContext):
+@router.callback_query(
+    StateFilter(BookingState.service),
+    F.data.startswith("service_")
+)
+async def choose_service(
+        callback: CallbackQuery,
+        state: FSMContext
+):
+    services = {
+        "service_massage": "Массаж",
+        "service_spa": "SPA",
+        "service_cosmetology": "Косметология"
+    }
 
-    forbidden = [
-        "📅 Записаться",
-        "👤 Профиль",
-        "📖 Мои записи",
-        "ℹ️ О компании",
-        "📞 Контакты"
-    ]
+    service_name = services[callback.data]
 
-    if message.text in forbidden:
-        await message.answer(
-            "⚠️ Сначала завершите запись или напишите 'отмена'"
-        )
-        return
-
-    await state.update_data(service=message.text)
-
-    await state.set_state(BookingState.date)
-
-    await message.answer(
-        "Введите дату (например 20.06)"
+    await state.update_data(
+        service=service_name
     )
 
+    await state.set_state(
+        BookingState.date
+    )
+    await callback.message.edit_text(
+        "📅 Выберите дату:",
+        reply_markup=get_dates_keyboard()
+    )
+
+    await callback.answer()
+
 
 # выбор даты
-@router.message(StateFilter(BookingState.date))
-async def choose_date(message: Message, state: FSMContext):
+@router.callback_query(
+    StateFilter(BookingState.date),
+    F.data.startswith("date_")
+)
+async def choose_date(
+        callback: CallbackQuery,
+        state: FSMContext
+):
+    selected_date = callback.data.replace(
+        "date_",
+        ""
+    )
 
-    forbidden = [
-        "📅 Записаться",
-        "👤 Профиль",
-        "📖 Мои записи",
-        "ℹ️ О компании",
-        "📞 Контакты"
-    ]
+    await state.update_data(
+        date=selected_date
+    )
 
-    if message.text in forbidden:
-        await message.answer(
-            "⚠️ Сначала завершите запись или напишите 'отмена'"
-        )
-        return
+    await state.set_state(
+        BookingState.time
+    )
 
-    await state.update_data(date=message.text)
+    await callback.message.edit_text(
+        "🕒 Выберите время:",
+        reply_markup=get_time_keyboard()
+    )
+
+    await callback.answer()
+
+
+@router.callback_query(
+    StateFilter(BookingState.time),
+    F.data.startswith("time_")
+)
+async def choose_time(
+        callback: CallbackQuery,
+        state: FSMContext
+):
+    selected_time = callback.data.replace(
+        "time_",
+        ""
+    )
+
+    await state.update_data(
+        time=selected_time
+    )
 
     data = await state.get_data()
 
-    await state.set_state(BookingState.confirm)
-
-    await message.answer(
-        f"Услуга: {data['service']}\n"
-        f"Дата: {data['date']}\n\n"
-        f"Напишите 'да' для подтверждения"
+    await state.set_state(
+        BookingState.confirm
     )
 
+    await callback.message.edit_text(
+        f"📋 Проверьте запись:\n\n"
+        f"💆 Услуга: {data['service']}\n"
+        f"📅 Дата: {data['date']}\n"
+        f"🕒 Время: {selected_time}",
+        reply_markup=get_confirm_booking_keyboard()
+    )
+
+    await callback.answer()
+
 
 # подтверждение
-@router.message(StateFilter(BookingState.confirm))
-async def confirm_booking(message: Message, state: FSMContext):
-
-    if message.text.lower() != "да":
-        await state.clear()
-
-        await message.answer(
-            "❌ Запись отменена",
-            reply_markup=menu
-        )
-
+@router.callback_query(
+    StateFilter(BookingState.confirm),
+    F.data == "confirm_booking"
+)
+async def confirm_booking_callback(
+        callback: CallbackQuery,
+        state: FSMContext
+):
     data = await state.get_data()
 
     create_booking(
-        user_id=message.from_user.id,
+        user_id=callback.from_user.id,
         service=data["service"],
-        date=data["date"]
+        date=data["date"],
+        time=data["time"]
     )
 
     await state.clear()
 
-    await message.answer(
-        "✅ Вы успешно записаны!",
-        reply_markup=menu
-    )
+    await callback.message.edit_text(
+        "✅ Запись успешно создана"
+    )
+    await callback.answer()
+
+
+@router.callback_query(
+    StateFilter(BookingState.confirm),
+    F.data == "cancel_booking"
+)
+async def cancel_booking_callback(
+        callback: CallbackQuery,
+        state: FSMContext
+):
+    await state.clear()
+
+    await callback.message.edit_text(
+        "❌ Запись отменена"
+    )
+
+    await callback.answer()
+
+
+@router.callback_query(
+    StateFilter(BookingState.confirm),
+    F.data == "edit_booking"
+)
+async def edit_booking_callback(
+        callback: CallbackQuery,
+        state: FSMContext
+):
+    old_data = await state.get_data()
+
+    await state.clear()
+
+    await state.update_data(
+        service=old_data.get("service")
+    )
+
+    await state.set_state(
+        BookingState.service
+    )
+
+    from app.keyboards.services import get_services_keyboard
+
+    await callback.message.edit_text(
+        "Выберите услугу:",
+        reply_markup=get_services_keyboard()
+    )

app/handlers/mybookings.py

@@ -23,6 +23,10 @@ async def my_bookings(message: Message, state: FSMContext):
     text = "📖 Ваши записи:\n\n"
 
     for b in user_bookings:
-        text += f"💆 {b['service']} — 📅 {b['date']}\n"
+        text += (
+            f"💆 {b['service']}\n"
+            f"📅 {b['date']}\n"
+            f"🕒 {b['time']}\n\n"
+        )
 
     await message.answer(text)