aiogram FSM: ko'p bosqichli dialog-formalarni to'g'ri qurish

[boshlang'ich] --/login--> [telefon kutilmoqda] --raqam keldi--> [kod kutilmoqda]
                                                                      |
                                    [kabinetda] <--kod to'g'ri keldi--+

bot/
├── states/
│   └── login.py         ← holatlar deklaratsiyasi
├── handlers/
│   ├── login.py         ← dialog qadamlari
│   └── nav_reset.py     ← "qotgan"larni qutqarish (oxirida)
├── validators.py        ← sof tekshiruv funksiyalari (testlanadi)
└── app.py               ← dispatcher + storage

# bot/states/login.py
from aiogram.fsm.state import State, StatesGroup


class Login(StatesGroup):
    # har State — dialogning bitta "to'xtash bekati"
    waiting_phone = State()
    waiting_code = State()

# bot/app.py
from aiogram import Bot, Dispatcher
from aiogram.fsm.storage.redis import RedisStorage

# Holatlar Redis'da: bot qayta ishga tushsa ham dialog joyidan davom etadi.
# MemoryStorage faqat o'yin uchun — pastdagi ogohlantirishga qarang
storage = RedisStorage.from_url("redis://127.0.0.1:6379/1")
dp = Dispatcher(storage=storage)

# bot/validators.py
import re

PHONE_RE = re.compile(r"^\+?998\d{9}$")


def normalize_phone(raw: str) -> str | None:
    """'+998 90 123-45-67' -> '+998901234567'; yaroqsiz bo'lsa None."""
    digits = re.sub(r"[^\d+]", "", raw)
    if not digits.startswith("+"):
        digits = "+" + digits
    return digits if PHONE_RE.match(digits) else None


def is_sms_code(raw: str) -> bool:
    return raw.strip().isdigit() and len(raw.strip()) == 6

# bot/handlers/login.py
from aiogram import F, Router, types
from aiogram.filters import Command
from aiogram.fsm.context import FSMContext

from bot.api import auth_api  # kompaniya API'si (SMS yuboradi/tekshiradi)
from bot.states.login import Login
from bot.validators import is_sms_code, normalize_phone

router = Router()


@router.message(Command("login"))
async def login_start(message: types.Message, state: FSMContext):
    await state.set_state(Login.waiting_phone)  # bekatga keldik
    await message.answer("Telefon raqamingizni yuboring: +998XXXXXXXXX")


@router.message(Login.waiting_phone, F.text)
async def got_phone(message: types.Message, state: FSMContext):
    phone = normalize_phone(message.text)
    if phone is None:
        # holatni O'ZGARTIRMAYMIZ — foydalanuvchi shu bekatda qoladi
        # va qayta urinadi. Xato = dialogning oxiri emas
        await message.answer("Raqam formati noto'g'ri. Namuna: +998901234567")
        return
    await auth_api.send_sms(phone)
    # keyingi qadamga KERAK bo'ladigan ma'lumotni holat datasiga yozamiz
    await state.update_data(phone=phone)
    await state.set_state(Login.waiting_code)
    await message.answer("SMS'dagi 6 xonali kodni kiriting.")


@router.message(Login.waiting_code, F.text)
async def got_code(message: types.Message, state: FSMContext):
    if not is_sms_code(message.text):
        await message.answer("Kod 6 ta raqamdan iborat bo'ladi. Qayta kiriting.")
        return
    data = await state.get_data()  # avvalgi qadamda yozilgan phone
    token = await auth_api.verify(data["phone"], message.text.strip())
    if token is None:
        await message.answer("Kod noto'g'ri yoki eskirgan. Qayta kiriting yoki /login.")
        return
    await state.clear()  # dialog tugadi — holat tozalanadi
    await message.answer("Xush kelibsiz! Kabinet: /menu")

# bot/handlers/nav_reset.py
from aiogram import Router, types
from aiogram.filters import Command
from aiogram.fsm.context import FSMContext

router = Router()

# Bu router dispatcher'ga BIRINCHI ulanadi — FSM handler'lardan oldin ishlaydi
NAV_COMMANDS = ["start", "menu", "help", "cancel"]


@router.message(Command(*NAV_COMMANDS))
async def nav_reset(message: types.Message, state: FSMContext):
    """Global navigatsiya-reset: foydalanuvchini FSM holatidan chiqaradi."""
    if await state.get_state() is not None:
        await state.clear()
    # shu yerdan odatiy menyu/started oqimiga o'tib ketiladi
    await message.answer("Bosh menyu: /calc — hisoblash, /login — kabinet")

# bot/app.py (davomi)
from bot.handlers import login, nav_reset

dp.include_router(nav_reset.router)  # 1) avval qutqaruvchi
dp.include_router(login.router)  # 2) keyin dialoglar

# tests/test_validators.py
from bot.validators import is_sms_code, normalize_phone


def test_phone_normalization():
    assert normalize_phone("+998 90 123-45-67") == "+998901234567"
    assert normalize_phone("998901234567") == "+998901234567"
    assert normalize_phone("90 123 45 67") is None  # kod yo'q
    assert normalize_phone("+7 900 000 00 00") is None  # boshqa davlat


def test_sms_code_shape():
    assert is_sms_code(" 123456 ")
    assert not is_sms_code("12345")
    assert not is_sms_code("kod123")