#100 cancel waivers

bomzheg · Jul 27, 2024 · db82926 · db82926
1 parent 272fe46
commit db82926
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 6 deletions.
diff --git a/shvatka/tgbot/handlers/waivers.py b/shvatka/tgbot/handlers/waivers.py
@@ -153,6 +153,23 @@ async def confirm_approve_waivers_handler(
     await total_remove_msg(bot, chat_id=c.message.chat.id, msg_id=c.message.message_id)
 
 
+async def cancel_waivers_handler(
+    c: CallbackQuery,
+    callback_data: kb.WaiverConfirmCD,
+    player: dto.Player,
+    game: dto.Game,
+    dao: HolderDao,
+    bot: Bot,
+):
+    check_same_game(callback_data, game, player)
+    team = await get_my_team(player, dao.team_player)
+    check_same_team(callback_data, player, team)
+    assert team
+    await c.answer("Сбор вейверов в вашей команде отменён!", show_alert=True)
+    assert c.message
+    await total_remove_msg(bot, chat_id=c.message.chat.id, msg_id=c.message.message_id)
+
+
 async def waiver_user_menu(
     c: CallbackQuery,
     callback_data: kb.WaiverManagePlayerCD,
@@ -319,6 +336,19 @@ def setup() -> Router:
         kb.WaiverConfirmCD.filter(),
     )
 
+    captain_router.callback_query.register(
+        cancel_waivers_handler,
+        kb.WaiverCancelCD.filter(),
+    )
+    player_router.callback_query.register(
+        player_is_not_captain,
+        kb.WaiverCancelCD.filter(),
+    )
+    fallback_router.callback_query.register(
+        player_is_not_captain,
+        kb.WaiverCancelCD.filter(),
+    )
+
     captain_router.callback_query.register(
         waiver_user_menu,
         kb.WaiverManagePlayerCD.filter(),

diff --git a/shvatka/tgbot/keyboards/__init__.py b/shvatka/tgbot/keyboards/__init__.py
@@ -31,6 +31,7 @@
     IWaiverCD,
     WaiverVoteCD,
     WaiverConfirmCD,
+    WaiverCancelCD,
     WaiverAddForceMenuCD,
     WaiverManagePlayerCD,
     WaiverMainCD,

diff --git a/shvatka/tgbot/keyboards/waiver.py b/shvatka/tgbot/keyboards/waiver.py
@@ -23,6 +23,11 @@ class WaiverConfirmCD(CallbackData, prefix="confirm_waivers"):
     team_id: int
 
 
+class WaiverCancelCD(CallbackData, prefix="cancel_waivers"):
+    game_id: int
+    team_id: int
+
+
 class WaiverManagePlayerCD(CallbackData, prefix="waiver_player"):
     game_id: int
     team_id: int
@@ -58,18 +63,22 @@ class WaiverAddPlayerForceCD(CallbackData, prefix="waiver_add_force"):
 
 def get_kb_waivers(team: dto.Team, game: dto.Game) -> InlineKeyboardMarkup:
     builder = InlineKeyboardBuilder()
-    builder.button(text="Играю", callback_data=WaiverVoteCD(vote=Played.yes, team_id=team.id))
-    builder.button(text="Не могу", callback_data=WaiverVoteCD(vote=Played.no, team_id=team.id))
-    builder.button(text="Думаю", callback_data=WaiverVoteCD(vote=Played.think, team_id=team.id))
+    builder.button(text="🙋Играю", callback_data=WaiverVoteCD(vote=Played.yes, team_id=team.id))
+    builder.button(text="🙅Не могу", callback_data=WaiverVoteCD(vote=Played.no, team_id=team.id))
+    builder.button(text="🤔Думаю", callback_data=WaiverVoteCD(vote=Played.think, team_id=team.id))
     builder.button(
-        text="Отредактировать список",
+        text="📝Отредактировать список",
         callback_data=WaiverToApproveCD(game_id=game.id, team_id=team.id),
     )
     builder.button(
-        text="Подтвердить",
+        text="✅Подтвердить",
         callback_data=WaiverConfirmCD(game_id=game.id, team_id=team.id),
     )
-    builder.adjust(3, 1, 1)
+    builder.button(
+        text="❌Отменить",
+        callback_data=WaiverCancelCD(game_id=game.id, team_id=team.id),
+    )
+    builder.adjust(3, 1, 1, 1)
     return builder.as_markup()