PROD.2024/Travel-Agent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: Changed states class names and formatted migrations

Browse Source
This commit is contained in:
ITQ
2024-03-22 11:13:40 +03:00
parent 2a60eb75f9
commit 4cf40a465f
4 changed files with 33 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/callbacks/profile.py
+3 -3
View File
@@ -12,7 +12,7 @@ from app.filters.user import Registered, RegisteredCallback
from app.keyboards.builders import sex_keyboard from app.keyboards.builders import sex_keyboard
from app.keyboards.profile import get from app.keyboards.profile import get
from app.models.user import User from app.models.user import User
from app.states.user import UserAltering from app.states.user import UserAlteringState
from app.utils.states import ( from app.utils.states import (
delete_message_from_state, delete_message_from_state,
handle_validation_error, handle_validation_error,
@@ -63,12 +63,12 @@ async def profile_change_callback(
profile_message_id=callback.message.message_id, profile_message_id=callback.message.message_id,
input_message_id=message.message_id, input_message_id=message.message_id,
) )
await state.set_state(UserAltering.value) await state.set_state(UserAlteringState.value)
await callback.answer() await callback.answer()
@router.message(UserAltering.value, F.text, Registered()) @router.message(UserAlteringState.value, F.text, Registered())
async def profile_change_entered(message: Message, state: FSMContext) -> None: async def profile_change_entered(message: Message, state: FSMContext) -> None:
column = (await state.get_data()).get("column") column = (await state.get_data()).get("column")
value = message.text.strip() value = message.text.strip()
app/handlers/start_command.py
+12 -12
View File
@@ -8,7 +8,7 @@ from aiogram.types import Message, ReplyKeyboardRemove
from app import messages, session from app import messages, session
from app.keyboards.builders import sex_keyboard from app.keyboards.builders import sex_keyboard
from app.models.user import User from app.models.user import User
from app.states.user import UserRegistration from app.states.user import UserRegistrationState
from app.utils.states import ( from app.utils.states import (
delete_message_from_state, delete_message_from_state,
handle_validation_error, handle_validation_error,
@@ -38,11 +38,11 @@ async def command_start_handler(message: Message, state: FSMContext) -> None:
), ),
) )
await state.set_state(UserRegistration.username) await state.set_state(UserRegistrationState.username)
await message.answer(messages.INPUT_USERNAME) await message.answer(messages.INPUT_USERNAME)
@router.message(UserRegistration.username, F.text) @router.message(UserRegistrationState.username, F.text)
async def username_handler(message: Message, state: FSMContext) -> None: async def username_handler(message: Message, state: FSMContext) -> None:
if message.text is None: if message.text is None:
return return
@@ -62,7 +62,7 @@ async def username_handler(message: Message, state: FSMContext) -> None:
await delete_message_from_state(state, message.chat.id, message.bot) await delete_message_from_state(state, message.chat.id, message.bot)
await state.update_data(username=validated_username) await state.update_data(username=validated_username)
await state.set_state(UserRegistration.age) await state.set_state(UserRegistrationState.age)
await message.answer( await message.answer(
messages.INPUT_CALLBACK.format( messages.INPUT_CALLBACK.format(
@@ -73,7 +73,7 @@ async def username_handler(message: Message, state: FSMContext) -> None:
await message.answer(messages.INPUT_AGE) await message.answer(messages.INPUT_AGE)
@router.message(UserRegistration.age, F.text) @router.message(UserRegistrationState.age, F.text)
async def age_handler(message: Message, state: FSMContext) -> None: async def age_handler(message: Message, state: FSMContext) -> None:
if message.text is None: if message.text is None:
return return
@@ -90,7 +90,7 @@ async def age_handler(message: Message, state: FSMContext) -> None:
await delete_message_from_state(state, message.chat.id, message.bot) await delete_message_from_state(state, message.chat.id, message.bot)
await state.update_data(age=validated_age) await state.update_data(age=validated_age)
await state.set_state(UserRegistration.sex) await state.set_state(UserRegistrationState.sex)
await message.answer( await message.answer(
messages.INPUT_CALLBACK.format(key="age", value=validated_age), messages.INPUT_CALLBACK.format(key="age", value=validated_age),
@@ -101,7 +101,7 @@ async def age_handler(message: Message, state: FSMContext) -> None:
) )
@router.message(UserRegistration.sex, F.text) @router.message(UserRegistrationState.sex, F.text)
async def sex_handler(message: Message, state: FSMContext) -> None: async def sex_handler(message: Message, state: FSMContext) -> None:
if message.text is None: if message.text is None:
return return
@@ -118,7 +118,7 @@ async def sex_handler(message: Message, state: FSMContext) -> None:
await delete_message_from_state(state, message.chat.id, message.bot) await delete_message_from_state(state, message.chat.id, message.bot)
await state.update_data(sex=validated_sex) await state.update_data(sex=validated_sex)
await state.set_state(UserRegistration.bio) await state.set_state(UserRegistrationState.bio)
await message.answer( await message.answer(
messages.INPUT_CALLBACK.format(key="sex", value=sex), messages.INPUT_CALLBACK.format(key="sex", value=sex),
@@ -127,7 +127,7 @@ async def sex_handler(message: Message, state: FSMContext) -> None:
await message.answer(messages.INPUT_BIO) await message.answer(messages.INPUT_BIO)
@router.message(UserRegistration.bio, F.text) @router.message(UserRegistrationState.bio, F.text)
async def bio_handler(message: Message, state: FSMContext) -> None: async def bio_handler(message: Message, state: FSMContext) -> None:
if message.text is None: if message.text is None:
return return
@@ -136,7 +136,7 @@ async def bio_handler(message: Message, state: FSMContext) -> None:
if bio == "/skip": if bio == "/skip":
await state.update_data(bio=None) await state.update_data(bio=None)
await state.set_state(UserRegistration.location) await state.set_state(UserRegistrationState.location)
await delete_message_from_state(state, message.chat.id, message.bot) await delete_message_from_state(state, message.chat.id, message.bot)
@@ -153,7 +153,7 @@ async def bio_handler(message: Message, state: FSMContext) -> None:
await delete_message_from_state(state, message.chat.id, message.bot) await delete_message_from_state(state, message.chat.id, message.bot)
await state.update_data(bio=validated_bio) await state.update_data(bio=validated_bio)
await state.set_state(UserRegistration.location) await state.set_state(UserRegistrationState.location)
await message.answer( await message.answer(
messages.INPUT_CALLBACK.format(key="bio", value=validated_bio), messages.INPUT_CALLBACK.format(key="bio", value=validated_bio),
@@ -161,7 +161,7 @@ async def bio_handler(message: Message, state: FSMContext) -> None:
await message.answer(messages.INPUT_LOCATION) await message.answer(messages.INPUT_LOCATION)
@router.message(UserRegistration.location, F.text) @router.message(UserRegistrationState.location, F.text)
async def location_handler(message: Message, state: FSMContext) -> None: async def location_handler(message: Message, state: FSMContext) -> None:
if message.text is None or message.from_user is None: if message.text is None or message.from_user is None:
return return
app/migrations/versions/1ea8d34d6232_added_user_model.py
+15 -11
View File
@@ -5,6 +5,7 @@ Revises:
Create Date: 2024-03-22 00:57:44.526995 Create Date: 2024-03-22 00:57:44.526995
""" """
from typing import Sequence, Union from typing import Sequence, Union
from alembic import op from alembic import op
@@ -20,18 +21,21 @@ depends_on: Union[str, Sequence[str], None] = None
def upgrade() -> None: def upgrade() -> None:
# ### commands auto generated by Alembic - please adjust! ### # ### commands auto generated by Alembic - please adjust! ###
op.create_table('users', op.create_table(
sa.Column('telegram_id', sa.BigInteger(), nullable=False), 'users',
sa.Column('username', sa.String(length=32), nullable=False), sa.Column('telegram_id', sa.BigInteger(), nullable=False),
sa.Column('age', sa.SmallInteger(), nullable=False), sa.Column('username', sa.String(length=32), nullable=False),
sa.Column('bio', sa.String(length=100), nullable=True), sa.Column('age', sa.SmallInteger(), nullable=False),
sa.Column('sex', sa.String(length=6), nullable=True), sa.Column('bio', sa.String(length=100), nullable=True),
sa.Column('country', sa.Text(), nullable=False), sa.Column('sex', sa.String(length=6), nullable=True),
sa.Column('city', sa.Text(), nullable=False), sa.Column('country', sa.Text(), nullable=False),
sa.PrimaryKeyConstraint('telegram_id'), sa.Column('city', sa.Text(), nullable=False),
sa.UniqueConstraint('username') sa.PrimaryKeyConstraint('telegram_id'),
sa.UniqueConstraint('username'),
)
op.create_index(
op.f('ix_users_telegram_id'), 'users', ['telegram_id'], unique=True
) )
op.create_index(op.f('ix_users_telegram_id'), 'users', ['telegram_id'], unique=True)
# ### end Alembic commands ### # ### end Alembic commands ###
app/states/user.py
+3 -3
View File
@@ -1,9 +1,9 @@
__all__ = ("UserRegistration", "UserAltering") __all__ = ("UserRegistrationState", "UserAlteringState")
from aiogram.fsm.state import State, StatesGroup from aiogram.fsm.state import State, StatesGroup
class UserRegistration(StatesGroup): class UserRegistrationState(StatesGroup):
error_message_id = State() error_message_id = State()
username = State() username = State()
age = State() age = State()
@@ -12,7 +12,7 @@ class UserRegistration(StatesGroup):
location = State() location = State()
class UserAltering(StatesGroup): class UserAlteringState(StatesGroup):
profile_message_id = State() profile_message_id = State()
input_message_id = State() input_message_id = State()
error_message_id = State() error_message_id = State()