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

2026-07-31 13:07:25 +04:00
parent f289631645
commit d757352b8a
19 changed files with 108 additions and 337 deletions
@@ -12,7 +12,7 @@ async def about(message: Message, state: FSMContext):
    await state.clear()
    logger.info("User {uid} opened About", uid=message.from_user.id)
    text = (
-        "\u262f\ufe0f SPA-\u0441\u0430\u043b\u043e\u043d Demo\n\n"
+        "\u262f\ufe0f **SPA-\u0441\u0430\u043b\u043e\u043d Demo**\n\n"
        "\u041c\u044b - \u0443\u044e\u0442\u043d\u044b\u0439 SPA-\u0441\u0430\u043b\u043e\u043d \u0432 \u0446\u0435\u043d\u0442\u0440\u0435 \u0433\u043e\u0440\u043e\u0434\u0430.\n\n"
        "\U0001f4aa \u041f\u0440\u043e\u0444\u0435\u0441\u0441\u0438\u043e\u043d\u0430\u043b\u044c\u043d\u044b\u0435 \u043c\u0430\u0441\u0442\u0435\u0440\u0430\n"
        "\U0001f9ec \u041d\u0430\u0442\u0443\u0440\u0430\u043b\u044c\u043d\u0430\u044f \u043a\u043e\u0441\u043c\u0435\u0442\u0438\u043a\u0430\n"
@@ -1,14 +1,12 @@
-"""Booking handler - full FSM flow for service reservation."""
 import re

 from aiogram import Router, F
 from aiogram.fsm.context import FSMContext
 from aiogram.filters import StateFilter
-from aiogram.types import Message, CallbackQuery, FSInputFile, InlineKeyboardMarkup, InlineKeyboardButton
+from aiogram.types import Message, CallbackQuery
 from app.keyboards.services import get_services_keyboard, get_extra_services_keyboard
 from app.keyboards.masters import get_masters_keyboard
 from app.states.booking import BookingState
-from app.config import SERVICES as ALL_SERVICES, ADMIN_CHAT_ID
 from app.services.booking_service import (
    create_booking,
    update_booking,
@@ -34,17 +32,6 @@ def _services_to_str(data):
    return main


-def _make_service_card(key):
-    """Recreate the service card text for 'back' navigation from a photo card."""
-    svc = ALL_SERVICES[key]
-    return (
-        svc["emoji"] + " " + svc["name"] + "\n\n"
-        + svc["desc"] + "\n\n"
-        + "\u23f1 Продолжительность: " + str(svc["duration"]) + " мин\n"
-        + "\U0001f4b0 Цена: " + str(svc["price"]) + "\u20bd"
-    )
-
-
 # отмена записи на любом шаге
@router.message(F.text.lower() == "отмена")
 async def cancel(message: Message, state: FSMContext):
@@ -66,14 +53,15 @@ async def start_booking(message: Message, state: FSMContext):
    )


-# выбор первой услуги (через кнопку "📅 Записаться")
+# выбор первой услуги
@router.callback_query(
    StateFilter(BookingState.service),
    F.data.startswith("service_")
 )
 async def choose_service(callback: CallbackQuery, state: FSMContext):
-    svc_data = ALL_SERVICES[callback.data]
-    service_name = svc_data["name"] if isinstance(svc_data, dict) else svc_data
+    from app.config import SERVICES
+
+    service_name = SERVICES[callback.data]
    logger.debug("User {uid} selected first service: {srv}", uid=callback.from_user.id, srv=service_name)

    await state.update_data(service=service_name, extra_services=[])
@@ -94,7 +82,10 @@ async def choose_service(callback: CallbackQuery, state: FSMContext):
    F.data.startswith("extra_")
 )
 async def choose_extra_service(callback: CallbackQuery, state: FSMContext):
+    from app.config import SERVICES
+
    if callback.data == "extra_done":
+        # Go to master selection
        await state.set_state(BookingState.master)
        await callback.message.edit_text(
            "👤 Выберите специалиста:",
@@ -103,12 +94,12 @@ async def choose_extra_service(callback: CallbackQuery, state: FSMContext):
        await callback.answer()
        return

+    # Toggle extra service
    actual_key = callback.data.replace("extra_", "", 1)
-    svc_data = ALL_SERVICES.get(actual_key)
-    if not svc_data:
+    service_name = SERVICES.get(actual_key)
+    if not service_name:
        await callback.answer("Услуга не найдена")
        return
-    service_name = svc_data["name"] if isinstance(svc_data, dict) else svc_data

    data = await state.get_data()
    extra = data.get("extra_services", [])
@@ -142,8 +133,7 @@ async def choose_extra_service(callback: CallbackQuery, state: FSMContext):
 async def choose_master(callback: CallbackQuery, state: FSMContext):
    from app.config import MASTERS

-    master_data = MASTERS[callback.data]
-    master_name = master_data["name"] if isinstance(master_data, dict) else master_data
+    master_name = MASTERS[callback.data]
    logger.debug("User {uid} selected master: {m}", uid=callback.from_user.id, m=master_name)

    await state.update_data(master=master_name)
@@ -232,14 +222,6 @@ async def confirm_booking_callback(callback: CallbackQuery, state: FSMContext):
        date = data.get("date", "?")
        time = data.get("time", "?")

-        from app.db.postgres import PostgresDB as _PG
-        from app.config import USE_POSTGRES as _UPG
-        if _UPG:
-            _u = await _PG.get_user(callback.from_user.id)
-            if not _u:
-                _n = callback.from_user.full_name or callback.from_user.username or str(callback.from_user.id)
-                await _PG.set_user(callback.from_user.id, _n)
-
        if await is_slot_busy(master, date, time):
            logger.warning("Slot already busy: {mst} {dt} {tm}", mst=master, dt=date, tm=time)
            await callback.message.edit_text("❌ Это время уже занято. Пожалуйста, выберите другое время.")
@@ -258,26 +240,6 @@ async def confirm_booking_callback(callback: CallbackQuery, state: FSMContext):
        cleanup_cancelled()
        result_text = "✅ Запись успешно создана"

-        # Notify admin about new booking
-        try:
-            if ADMIN_CHAT_ID:
-                from aiogram import Bot
-                from app.config import BOT_TOKEN
-                admin_bot = Bot(token=BOT_TOKEN)
-                user_str = callback.from_user.full_name or callback.from_user.username or str(callback.from_user.id)
-                await admin_bot.send_message(
-                    ADMIN_CHAT_ID,
-                    "🆕 Новая запись!\n\n"
-                    f"👤 Клиент: {user_str} (id={callback.from_user.id})\n"
-                    f"💆 Услуги: {services_str}\n"
-                    f"👤 Мастер: {master}\n"
-                    f"📅 Дата: {date}\n"
-                    f"🕒 Время: {time}"
-                )
-                await admin_bot.session.close()
-        except Exception as e:
-            logger.warning("Failed to notify admin: {error}", error=e)
-
    await state.clear()
    await callback.message.edit_text(result_text)
    await callback.answer()
@@ -309,80 +271,24 @@ async def edit_booking_callback(callback: CallbackQuery, state: FSMContext):
    )


-# прямая запись с карточки услуги (без предварительного выбора)
-@router.callback_query(F.data.startswith("service_"))
-async def quick_book_service(callback: CallbackQuery, state: FSMContext):
-    svc_data = ALL_SERVICES[callback.data]
-    service_name = svc_data["name"] if isinstance(svc_data, dict) else svc_data
-    svc_key = callback.data
-    logger.info("User {uid} quick book from card: {srv}", uid=callback.from_user.id, srv=service_name)
-
-    await state.clear()
-    await state.update_data(
-        service=service_name,
-        extra_services=[],
-        _from_card=True,
-        _card_key=svc_key
-    )
-    await state.set_state(BookingState.extra_services)
-
-    text = (
-        "✅ Выбрано: " + service_name + "\n\n"
-        "Хотите добавить ещё услугу?\n"
-        "Нажмите нужную или «Готово»:"
-    )
-
-    # Карточка с фото — удаляем и отправляем новое сообщение
-    try:
-        await callback.message.delete()
-        await callback.message.answer(text, reply_markup=get_extra_services_keyboard([]))
-    except Exception:
-        await callback.message.edit_text(text, reply_markup=get_extra_services_keyboard([]))
-
-    await callback.answer()
-
-
@router.callback_query(F.data == "go_back")
 async def go_back_handler(callback: CallbackQuery, state: FSMContext):
    current_state = await state.get_state()

    if current_state == BookingState.extra_services:
-        # Назад к списку услуг — проверяем, с карточки пришёл или из меню
+        # Back to first service
        await state.set_state(BookingState.service)
        data = await state.get_data()
        data.pop("extra_services", None)
        data.pop("service", None)
-        from_card = data.pop("_from_card", False)
-        card_key = data.pop("_card_key", None)
        await state.set_data(data)
-
-        if from_card and card_key and card_key in ALL_SERVICES:
-            # Возвращаем карточку с фото
-            svc = ALL_SERVICES[card_key]
-            card_text = _make_service_card(card_key)
-            book_btn = InlineKeyboardMarkup(inline_keyboard=[[
-                InlineKeyboardButton(text="\U0001f4c5 Записаться", callback_data=card_key)
-            ]])
-            try:
-                img = FSInputFile(svc["image"])
-                await callback.message.answer_photo(photo=img, caption=card_text, reply_markup=book_btn)
-                try:
-                    await callback.message.delete()
-                except Exception:
-                    pass
-            except Exception:
-                await callback.message.edit_text(
-                    "Выберите услугу:",
-                    reply_markup=get_services_keyboard()
-                )
-        else:
-            await callback.message.edit_text(
-                "Выберите услугу:",
-                reply_markup=get_services_keyboard()
-            )
+        await callback.message.edit_text(
+            "Выберите услугу:",
+            reply_markup=get_services_keyboard()
+        )

    elif current_state == BookingState.master:
-        # Назад к доп. услугам
+        # Back to extra services
        await state.set_state(BookingState.extra_services)
        data = await state.get_data()
        extra = data.get("extra_services", [])
@@ -12,7 +12,7 @@ async def contacts(message: Message, state: FSMContext):
    await state.clear()
    logger.info("User {uid} requested contacts", uid=message.from_user.id)
    text = (
-        "\U0001f4de \u041a\u043e\u043d\u0442\u0430\u043a\u0442\u044b\n\n"
+        "\U0001f4de **\u041a\u043e\u043d\u0442\u0430\u043a\u0442\u044b**\n\n"
        "\U0001f4cd \u0433. \u041c\u043e\u0441\u043a\u0432\u0430, \u0443\u043b. \u0426\u0432\u0435\u0442\u043e\u0447\u043d\u0430\u044f, 15\n\n"
        "\U0001f4de +7 (999) 123-45-67\n\n"
        "\U0001f4e7 info@spa-demo.ru\n\n"
@@ -21,36 +21,24 @@ async def my_bookings(message: Message):
        logger.debug("Found {n} bookings", n=len(bookings))

        if not bookings:
-            await message.answer("У вас нет активных записей")
+            await message.answer("\u0423 \u0432\u0430\u0441 \u043d\u0435\u0442 \u0430\u043a\u0442\u0438\u0432\u043d\u044b\u0445 \u0437\u0430\u043f\u0438\u0441\u0435\u0439")
            return

-        # 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}"
+        for booking in bookings:
+            svc = booking["service"]
+            mst = booking["master"]
+            dat = booking["date"]
+            tim = booking["time"]
+            text = (
+                "\U0001f486 " + svc + "\n"
+                "\U0001f464 " + mst + "\n"
+                "\U0001f4c5 " + dat + "\n"
+                "\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"])
-            )
-
+            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("Произошла ошибка. Попробуйте позже.")
+        await message.answer("\u041f\u0440\u043e\u0438\u0437\u043e\u0448\u043b\u0430 \u043e\u0448\u0438\u0431\u043a\u0430. \u041f\u043e\u043f\u0440\u043e\u0431\u0443\u0439\u0442\u0435 \u043f\u043e\u0437\u0436\u0435.")


@router.callback_query(F.data.startswith("cancel_booking_"))
@@ -58,7 +46,7 @@ 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)
    await cancel_booking(booking_id)
-    await callback.message.edit_text("\u2705 Запись отменена")
+    await callback.message.edit_text("\u2705 \u0417\u0430\u043f\u0438\u0441\u044c \u043e\u0442\u043c\u0435\u043d\u0435\u043d\u0430")
    await callback.answer()


@@ -75,7 +63,7 @@ async def edit_booking_handler(callback: CallbackQuery, state: FSMContext):
        booking = next((b for b in bookings if b["id"] == booking_id), None)

    if not booking:
-        await callback.message.edit_text("Запись не найдена")
+        await callback.message.edit_text("\u0417\u0430\u043f\u0438\u0441\u044c \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u0430")
        await callback.answer()
        return

@@ -89,7 +77,7 @@ async def edit_booking_handler(callback: CallbackQuery, state: FSMContext):

    await state.set_state(BookingState.service)
    await callback.message.edit_text(
-        "\u270f\ufe0f Редактирование записи #" + str(booking_id) + "\n\nВыберите новую услугу:",
+        "\u270f\ufe0f \u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435 \u0437\u0430\u043f\u0438\u0441\u0438 #" + str(booking_id) + "\n\n\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u043d\u043e\u0432\u0443\u044e \u0443\u0441\u043b\u0443\u0433\u0443:",
        reply_markup=get_services_keyboard()
    )
    await callback.answer()
@@ -1,4 +1,4 @@
-"""User profile handler - auto-registers if missing."""
+"""User profile handler."""
 from aiogram import Router, F
 from aiogram.types import Message
 from aiogram.fsm.context import FSMContext
@@ -10,25 +10,16 @@ from app.logger import logger
 router = Router()


-@router.message(F.text == "\U0001f464 \u041f\u0440\u043e\u0444\u0438\u043b\u044c")
+@router.message(F.text == "👤 Профиль")
 async def profile(message: Message, state: FSMContext):
    await state.clear()
-    user_id = message.from_user.id
-    name = message.from_user.full_name or "\u0413\u043e\u0441\u0442\u044c"
-    
    if USE_POSTGRES:
-        user = await PostgresDB.get_user(user_id)
-        if not user:
-            logger.info("Auto-registering user {uid} in PG", uid=user_id)
-            await PostgresDB.set_user(user_id, name)
-            user = await PostgresDB.get_user(user_id)
-        user_name = user.get("name") or user.get("full_name", "\u0413\u043e\u0441\u0442\u044c")
+        user = await PostgresDB.get_user(message.from_user.id)
    else:
-        from app.db.memory import get_user, set_user
-        user = get_user(user_id)
-        if not user:
-            set_user(user_id, {"name": name})
-            user = get_user(user_id)
-        user_name = user.get("name", "\u0413\u043e\u0441\u0442\u044c")
-    
-    await message.answer(f"\U0001f464 \u041f\u0440\u043e\u0444\u0438\u043b\u044c\n\n\U0001f464 \u0418\u043c\u044f: {user_name}")
+        from app.db.memory import get_user
+        user = get_user(message.from_user.id)
+    if not user:
+        await message.answer("Профиль не найден")
+        return
+    name = user.get("name") or user.get("full_name", "?")
+    await message.answer(f"👤 Имя: {name}")
@@ -1,10 +1,11 @@
 """Services handler - show rich service cards with images."""
 from aiogram import Router, F
-from aiogram.types import Message, FSInputFile, InlineKeyboardMarkup, InlineKeyboardButton, CallbackQuery
+from aiogram.types import Message, FSInputFile
 from aiogram.fsm.context import FSMContext
 from aiogram import Bot

 from app.config import SERVICES, BOT_TOKEN
+from app.keyboards.services import get_services_keyboard
 from app.logger import logger

 router = Router()
@@ -24,18 +25,21 @@ async def show_services(message: Message, state: FSMContext):
    await state.clear()
    logger.info("User {uid} requested services list", uid=message.from_user.id)

+    await message.answer(
+        "\U0001f4cb **\u041d\u0430\u0448\u0438 \u0443\u0441\u043b\u0443\u0433\u0438**\n\n"
+        "\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0438\u043d\u0442\u0435\u0440\u0435\u0441\u0443\u044e\u0449\u0443\u044e \u0443\u0441\u043b\u0443\u0433\u0443:",
+        reply_markup=get_services_keyboard()
+    )
+
    for key, svc in SERVICES.items():
        try:
            card = (
-                svc["emoji"] + " " + svc["name"] + "\n\n"
+                svc["emoji"] + " **" + svc["name"] + "**\n\n"
                + svc["desc"] + "\n\n"
                + "\u23f1 \u0414\u043b\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0441\u0442\u044c: " + str(svc["duration"]) + " \u043c\u0438\u043d\n"
                + "\U0001f4b0 \u0426\u0435\u043d\u0430: " + str(svc["price"]) + "\u20bd"
            )
-            book_btn = InlineKeyboardMarkup(inline_keyboard=[[
-                InlineKeyboardButton(text="\U0001f4c5 \u0417\u0430\u043f\u0438\u0441\u0430\u0442\u044c\u0441\u044f", callback_data=key)
-            ]])
            img = FSInputFile(svc["image"])
-            await bot().send_photo(message.chat.id, photo=img, caption=card, reply_markup=book_btn)
+            await bot().send_photo(message.chat.id, photo=img, caption=card)
        except Exception as e:
            logger.warning("Error sending service card for {key}: {err}", key=key, err=e)
@@ -1,7 +1,7 @@
 """Start handler with welcome greeting and prices."""
 from aiogram import Router
 from aiogram.filters import CommandStart
-from aiogram.types import Message, FSInputFile
+from aiogram.types import Message

 from app.keyboards.menu import menu
 from app.db.postgres import PostgresDB
@@ -25,14 +25,10 @@ async def start(message: Message):

    greet = (
        "\U0001f44b \u0414\u043e\u0431\u0440\u043e \u043f\u043e\u0436\u0430\u043b\u043e\u0432\u0430\u0442\u044c, " + name + "!\n\n"
-        "\u262f\ufe0f SPA-\u0441\u0430\u043b\u043e\u043d Demo - \u0432\u0430\u0448 \u043e\u0441\u0442\u0440\u043e\u0432\u043e\u043a \u0440\u0435\u043b\u0430\u043a\u0441\u0430\u0446\u0438\u0438\n\n"
+        "\u262f\ufe0f **SPA-\u0441\u0430\u043b\u043e\u043d Demo** - \u0432\u0430\u0448 \u043e\u0441\u0442\u0440\u043e\u0432\u043e\u043a \u0440\u0435\u043b\u0430\u043a\u0441\u0430\u0446\u0438\u0438\n\n"
        "\U0001f4aa \u041c\u0430\u0441\u0441\u0430\u0436 - \u043e\u0442 " + str(SERVICES["service_massage"]["price"]) + "\u20bd\n"
        "\U0001f388 SPA-\u043a\u043e\u043c\u043f\u043b\u0435\u043a\u0441 - \u043e\u0442 " + str(SERVICES["service_spa"]["price"]) + "\u20bd\n"
        "\U0001f484 \u041a\u043e\u0441\u043c\u0435\u0442\u043e\u043b\u043e\u0433\u0438\u044f - \u043e\u0442 " + str(SERVICES["service_cosmetology"]["price"]) + "\u20bd\n\n"
        "\U0001f447 \u041d\u0430\u0436\u043c\u0438\u0442\u0435 \u00ab\u0417\u0430\u043f\u0438\u0441\u0430\u0442\u044c\u0441\u00bb \u0447\u0442\u043e\u0431\u044b \u043d\u0430\u0447\u0430\u0442\u044c"
    )
-    try:
-        img = FSInputFile("assets/welcome.png")
-        await message.answer_photo(photo=img, caption=greet, reply_markup=menu)
-    except Exception:
-        await message.answer(greet, reply_markup=menu)
+    await message.answer(greet, reply_markup=menu)