nora/Birthday-Pool-Bot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Little fixes, add exception handler

Browse Source
This commit is contained in:
Oleg Yurchik
2026-01-24 21:55:27 +03:00
parent 7758a3cf62
commit 239dd05992
14 changed files with 244 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
birthday_pool_bot/telegram_bot/ui/handlers.py
View File

@@ -1,4 +1,6 @@
from aiogram import types
import asyncio
from aiogram import Bot, types
from aiogram.enums import MessageOriginType, ParseMode
from aiogram.fsm.context import FSMContext
@@ -14,7 +16,11 @@ from birthday_pool_bot.repositories.repositories import (
UsersRepository,
)
from . import constants, logic
from .callback_data import PoolCallbackData, SubscriptionCallbackData
from .callback_data import (
NotifyNewPoolCallbackData,
PoolCallbackData,
SubscriptionCallbackData,
)
from .exceptions import FlowInternalError
from .states import (
NewSubscriptionPoolState,
@@ -337,10 +343,11 @@ async def set_new_subscription_user_message_handler(
async with users_repository.transaction():
if message.contact is not None:
subscription_users = await users_repository.get_users_by_primary_keys(
subscription_users_generator = users_repository.get_users_by_primary_keys(
phone=message.contact.phone_number,
telegram_id=message.contact.user_id,
)
subscription_users = [user async for user in subscription_users_generator]
subscription_user = await users_repository.merge_users(*subscription_users)
user_name = get_telegram_user_full_name(message.contact)
user_phone = message.contact.phone_number
@@ -370,7 +377,7 @@ async def set_new_subscription_user_message_handler(
if user_phone is None:
await logic.ask_new_subscription_user(message=message)
await state.set_state(NewSubscriptionState.WAITING_FOR_PHONE)
return
return
subscription_user = await users_repository.get_user_by_phone(phone=user_phone)
if subscription_user is None:
@@ -401,7 +408,7 @@ async def set_new_subscription_user_message_handler(
return
await state.update_data(
subscription_user_id=subscription_user.id,
subscription_user_id=str(subscription_user.id),
)
if subscription_user.birthday is None:
@@ -577,7 +584,7 @@ async def ask_new_subscription_pool_decision_callback_handler(
subscription_user_id=subscription_user_id,
)
except FlowInternalError:
await message.reply(text=constants.ERROR_MESSAGE)
await callback_query.answer(text=constants.ERROR_MESSAGE)
await logic.ask_new_subscription_user(message=callback_query.message)
await state.set_state(NewSubscriptionState.WAITING_FOR_PHONE)
return
@@ -652,6 +659,8 @@ async def show_new_subscription_choosing_pools_callback_handler(
async def show_new_subscription_choosing_pool_callback_handler(
callback_query: types.CallbackQuery,
state: FSMContext,
user: User,
users_repository: UsersRepository,
pools_repository: PoolsRepository,
):
callback_data = PoolCallbackData.unpack(callback_query.data)
@@ -668,7 +677,7 @@ async def show_new_subscription_choosing_pool_callback_handler(
user=user,
users_repository=users_repository,
pools_repository=pools_repository,
subscription_user_id=subscription_user_id,
subscription_user_id=callback_data.user_id,
)
await state.set_state(NewSubscriptionState.WAITING_FOR_CHOOSE_POOL)
return
@@ -679,6 +688,7 @@ async def show_new_subscription_choosing_pool_callback_handler(
async def choose_new_subscription_pool_callback_handler(
callback_query: types.CallbackQuery,
state: FSMContext,
user: User,
users_repository: UsersRepository,
pools_repository: PoolsRepository,
):
@@ -686,8 +696,8 @@ async def choose_new_subscription_pool_callback_handler(
subscription_user_id = state_data.get("subscription_user_id")
subscription_name = state_data.get("subscription_name")
if not all((subscription_user_id, subscription_name)):
await message.reply(text=constants.ERROR_MESSAGE)
await logic.ask_new_subscription_user(message=message)
await callback_query.answer(text=constants.ERROR_MESSAGE)
await logic.ask_new_subscription_user(message=callback_query.message)
await state.set_state(NewSubscriptionState.WAITING_FOR_PHONE)
return
@@ -696,8 +706,8 @@ async def choose_new_subscription_pool_callback_handler(
user_id=subscription_user_id,
)
if subscription_user is None:
await message.reply(text=constants.ERROR_MESSAGE)
await logic.ask_new_subscription_user(message=message)
await callback_query.answer(text=constants.ERROR_MESSAGE)
await logic.ask_new_subscription_user(message=callback_query.message)
await state.set_state(NewSubscriptionState.WAITING_FOR_PHONE)
return
@@ -720,7 +730,7 @@ async def choose_new_subscription_pool_callback_handler(
return
await state.update_data(
subscription_pool_id=callback_data.id,
subscription_pool_id=str(callback_data.id),
)
try:
@@ -960,6 +970,7 @@ async def ask_new_subscription_confirmation_message_handler(
async def confirm_new_subscription_callback_handler(
callback_query: types.CallbackQuery,
state: FSMContext,
bot: Bot,
user: User,
pools_repository: PoolsRepository,
subscriptions_repository: SubscriptionsRepository,
@@ -1032,3 +1043,65 @@ async def confirm_new_subscription_callback_handler(
)
await state.clear()
await state.set_state(MenuState.SUBSCRIPTIONS)
subscriptions_generator = subscriptions_repository.get_to_users_subscriptions(
to_users_ids={subscription_user_id},
have_pool=False,
with_from_user=True,
with_pool=True,
with_pool_owner=True,
)
async with subscriptions_repository.transaction():
coroutines = [
logic.notify_user_about_new_subscription_pool(
subscription=subscription,
user=subscription.from_user,
pool=subscription.pool,
pool_owner=subscription.pool.owner,
bot=bot,
)
async for subscription in subscriptions_generator
]
await asyncio.gather(*coroutines, return_exceptions=True)
async def subscribe_to_new_pool_callback_handler(
callback_query: types.CallbackQuery,
user: User,
subscriptions_repository: SubscriptionsRepository,
pools_repository: PoolsRepository,
):
callback_data = NotifyNewPoolCallbackData.unpack(
callback_query.data,
)
async with subscriptions_repository.transaction():
subscription = await subscriptions_repository.get_subscription(
from_user_id=user.id,
to_user_id=callback_data.user_id,
)
async with pools_repository.transaction():
pool = await pools_repository.get_pool_by_id(
pool_id=callback_data.pool_id,
)
if not all((subscription, pool)):
await callback_query.answer(text=constants.ERROR_MESSAGE)
return
async with subscriptions_repository.transaction():
subscription = await subscriptions_repository.set_pool_for_subscription(
from_user_id=subscription.from_user_id,
to_user_id=subscription.to_user_id,
pool_id=pool.id,
)
if subscription is None:
await callback_query.answer(text=constants.ERROR_MESSAGE)
return
await callback_query.answer(text="Вы присоединились к сбору")
async def hide_new_pool_notification(
callback_query: types.CallbackQuery,
):
await callback_query.message.delete()