You've already forked Travel-Agent
feat: Added ability to change travel
This commit is contained in:
+171
-2
@@ -3,20 +3,54 @@ __all__ = ("router",)
|
||||
from aiogram import F, Router
|
||||
from aiogram.exceptions import TelegramBadRequest
|
||||
from aiogram.filters import StateFilter
|
||||
from aiogram.fsm.context import FSMContext
|
||||
from aiogram.types import CallbackQuery, Message
|
||||
|
||||
from app import messages
|
||||
from app import messages, session
|
||||
from app.config import Config
|
||||
from app.filters.user import RegisteredCallback
|
||||
from app.filters.user import Registered, RegisteredCallback
|
||||
from app.keyboards.builders import travels_keyboard
|
||||
from app.keyboards.travel import get
|
||||
from app.models.travel import Travel
|
||||
from app.models.user import User
|
||||
from app.states.travel import TravelAlteringState
|
||||
from app.utils.states import delete_message_from_state, handle_validation_error
|
||||
|
||||
|
||||
router = Router(name="menu_callback")
|
||||
|
||||
|
||||
@router.callback_query(
|
||||
F.data == "travels",
|
||||
RegisteredCallback(),
|
||||
StateFilter(None),
|
||||
)
|
||||
async def travels_index_callback(callback: CallbackQuery) -> None:
|
||||
page = 0
|
||||
|
||||
if callback.from_user is None or not isinstance(callback.message, Message):
|
||||
return
|
||||
|
||||
user = User().get_user_by_telegram_id(callback.from_user.id)
|
||||
|
||||
travels = user.get_user_travels()
|
||||
|
||||
if not travels or travels == []:
|
||||
await callback.message.edit_text(messages.NO_TRAVELS)
|
||||
else:
|
||||
pages = (len(travels) + Config.PAGE_SIZE - 1) // Config.PAGE_SIZE
|
||||
|
||||
await callback.message.edit_text(
|
||||
messages.TRAVELS,
|
||||
reply_markup=travels_keyboard(
|
||||
travels,
|
||||
page,
|
||||
pages,
|
||||
user.telegram_id,
|
||||
),
|
||||
)
|
||||
|
||||
|
||||
@router.callback_query(
|
||||
F.data.startswith("travels_page"),
|
||||
RegisteredCallback(),
|
||||
@@ -71,3 +105,138 @@ async def travel_detail_callback(callback: CallbackQuery) -> None:
|
||||
travel.get_travel_text(),
|
||||
reply_markup=get(travel_id),
|
||||
)
|
||||
|
||||
|
||||
@router.callback_query(
|
||||
F.data.startswith("travel_change"),
|
||||
RegisteredCallback(),
|
||||
StateFilter(None),
|
||||
)
|
||||
async def travel_change_callback(
|
||||
callback: CallbackQuery,
|
||||
state: FSMContext,
|
||||
) -> None:
|
||||
if (
|
||||
callback.data is None
|
||||
or callback.message is None
|
||||
or not isinstance(callback.message, Message)
|
||||
):
|
||||
return
|
||||
|
||||
travel_id, column = callback.data.replace("travel_change_", "").split("_")
|
||||
|
||||
if column == "title":
|
||||
message = await callback.message.answer(
|
||||
f"{messages.INPUT_TRAVEL_TITLE}\n{messages.CANCEL_CHANGE}",
|
||||
)
|
||||
elif column == "description":
|
||||
message = await callback.message.answer(
|
||||
f"{messages.EDIT_TRAVEL_DESCRIPTION}\n{messages.CANCEL_CHANGE}",
|
||||
)
|
||||
|
||||
await state.update_data(
|
||||
column=column,
|
||||
travel_message_id=callback.message.message_id,
|
||||
input_message_id=message.message_id,
|
||||
travel_id=travel_id,
|
||||
)
|
||||
await state.set_state(TravelAlteringState.value)
|
||||
|
||||
await callback.answer()
|
||||
|
||||
|
||||
@router.message(TravelAlteringState.value, F.text, Registered())
|
||||
async def travel_change_entered(message: Message, state: FSMContext) -> None:
|
||||
if (
|
||||
message.text is None
|
||||
or message.from_user is None
|
||||
or message.bot is None
|
||||
):
|
||||
return
|
||||
|
||||
data = await state.get_data()
|
||||
|
||||
column = data["column"]
|
||||
travel_id = data["travel_id"]
|
||||
value = message.text.strip()
|
||||
|
||||
if value == "/cancel":
|
||||
await message.answer(
|
||||
messages.CHANGE_CANCELED,
|
||||
)
|
||||
|
||||
await state.update_data(successfully=True)
|
||||
await message.delete()
|
||||
await delete_message_from_state(
|
||||
state,
|
||||
message.chat.id,
|
||||
message.bot,
|
||||
)
|
||||
await state.clear()
|
||||
|
||||
return
|
||||
|
||||
if column == "title":
|
||||
try:
|
||||
validated_title = Travel().validate_title(
|
||||
key="title",
|
||||
value=value,
|
||||
)
|
||||
except AssertionError as e:
|
||||
await handle_validation_error(message, state, e)
|
||||
|
||||
return
|
||||
|
||||
await state.update_data(value=validated_title, successfully=True)
|
||||
elif column == "description":
|
||||
if value == "/skip":
|
||||
await state.update_data(value=None, successfully=True)
|
||||
await delete_message_from_state(
|
||||
state,
|
||||
message.chat.id,
|
||||
message.bot,
|
||||
)
|
||||
else:
|
||||
try:
|
||||
validated_description = Travel().validate_description(
|
||||
key="description", value=value,
|
||||
)
|
||||
except AssertionError as e:
|
||||
await handle_validation_error(message, state, e)
|
||||
|
||||
return
|
||||
|
||||
await state.update_data(
|
||||
value=validated_description, successfully=True,
|
||||
)
|
||||
|
||||
await message.delete()
|
||||
await delete_message_from_state(state, message.chat.id, message.bot)
|
||||
|
||||
state_data = await state.get_data()
|
||||
|
||||
travel = Travel().get_travel_queryset_by_id(travel_id)
|
||||
|
||||
data = {state_data["column"]: state_data["value"]}
|
||||
travel.update(data)
|
||||
|
||||
session.commit()
|
||||
|
||||
travel = travel.first()
|
||||
session.refresh(travel)
|
||||
|
||||
try:
|
||||
await message.bot.edit_message_text(
|
||||
travel.get_travel_text(),
|
||||
message.chat.id,
|
||||
state_data["travel_message_id"],
|
||||
reply_markup=get(travel_id),
|
||||
)
|
||||
except TelegramBadRequest:
|
||||
pass
|
||||
|
||||
await message.answer(
|
||||
messages.TRAVEL_UPDATED,
|
||||
)
|
||||
|
||||
await state.clear()
|
||||
|
||||
Reference in New Issue
Block a user