feat: add matchmaking waiting cancellation (#45)

Author: emptybutton

src/ttt/application/user/game/dont_wait_for_matchmaking.py

@@ -0,0 +1,45 @@
+from dataclasses import dataclass
+
+from ttt.application.common.ports.map import Map
+from ttt.application.common.ports.transaction import Transaction
+from ttt.application.user.common.ports.user_views import CommonUserViews
+from ttt.application.user.common.ports.users import Users
+from ttt.application.user.game.ports.user_log import GameUserLog
+from ttt.application.user.game.ports.user_views import GameUserViews
+from ttt.entities.core.user.user import UserIsNotWaitingForMatchmakingError
+from ttt.entities.tools.tracking import Tracking
+
+
+@dataclass(frozen=True, unsafe_hash=False)
+class DontWaitForMatchmaking:
+    map_: Map
+    transaction: Transaction
+    users: Users
+    user_views: CommonUserViews
+    views: GameUserViews
+    log: GameUserLog
+
+    async def __call__(self, user_id: int) -> None:
+        async with self.transaction:
+            user = await self.users.user_with_id(user_id)
+
+            if user is None:
+                await self.user_views.user_is_not_registered_view(user_id)
+                return
+
+            try:
+                tracking = Tracking()
+                user.dont_wait_for_matchmaking(tracking)
+            except UserIsNotWaitingForMatchmakingError:
+                await self.log.user_is_not_waiting_for_matchmaking_to_dont_wait(
+                    user,
+                )
+                await (
+                    self.views
+                    .user_is_not_waiting_for_matchmaking_to_dont_wait_view(user)
+                )
+            else:
+                await self.log.user_is_not_waiting_for_matchmaking(user)
+                await self.map_(tracking)
+
+                await self.views.user_is_not_waiting_for_matchmaking_view(user)

src/ttt/application/user/game/ports/user_log.py

@@ -33,3 +33,8 @@ async def user_is_in_game_to_wait_for_matchmaking(
 
     @abstractmethod
     async def games_were_matched(self, games: list[Game], /) -> None: ...
+
+    @abstractmethod
+    async def user_is_not_waiting_for_matchmaking_to_dont_wait(
+        self, user: User, /,
+    ) -> None: ...

src/ttt/application/user/game/ports/user_views.py

@@ -26,3 +26,16 @@ async def user_is_in_game_to_wait_for_matchmaking_view(
 
     @abstractmethod
     async def matched_games_view(self, games: list[Game], /) -> None: ...
+
+    @abstractmethod
+    async def user_is_not_waiting_for_matchmaking_to_dont_wait_view(
+        self, user: User, /,
+    ) -> None: ...
+
+    @abstractmethod
+    async def user_is_not_waiting_for_matchmaking_view(
+        self, user: User, /,
+    ) -> None: ...
+
+    @abstractmethod
+    async def matchmaking_view(self, user_id: int, /) -> None: ...

src/ttt/application/user/game/view_matchmaking.py

@@ -0,0 +1,14 @@
+from dataclasses import dataclass
+
+from ttt.application.common.ports.transaction import Transaction
+from ttt.application.user.game.ports.user_views import GameUserViews
+
+
+@dataclass(frozen=True, unsafe_hash=False)
+class ViewMatchmaking:
+    transaction: Transaction
+    views: GameUserViews
+
+    async def __call__(self, user_id: int) -> None:
+        async with self.transaction:
+            await self.views.matchmaking_view(user_id)

src/ttt/infrastructure/adapters/user_log.py

@@ -394,3 +394,11 @@ async def _game_was_matched(self, game: Game) -> None:
             "game_was_matched",
             game_id=game.id.hex,
         )
+
+    async def user_is_not_waiting_for_matchmaking_to_dont_wait(
+        self, user: User, /,
+    ) -> None:
+        await self._logger.ainfo(
+            "user_is_not_waiting_for_matchmaking_to_dont_wait",
+            user_id=user.id,
+        )

src/ttt/main/tg_bot/di.py

@@ -105,8 +105,12 @@
     EmojiSelectionUserViews,
 )
 from ttt.application.user.emoji_selection.select_emoji import SelectEmoji
+from ttt.application.user.game.dont_wait_for_matchmaking import (
+    DontWaitForMatchmaking,
+)
 from ttt.application.user.game.matchmake import Matchmake
 from ttt.application.user.game.ports.user_views import GameUserViews
+from ttt.application.user.game.view_matchmaking import ViewMatchmaking
 from ttt.application.user.game.wait_for_matchmaking import WaitForMatchmaking
 from ttt.application.user.register_user import RegisterUser
 from ttt.application.user.relinquish_admin_right import RelinquishAdminRight
@@ -378,6 +382,10 @@ class ApplicationProvider(Provider):
     provide_wait_for_matchmaking = provide(
         WaitForMatchmaking, scope=Scope.REQUEST,
     )
+    provide_dont_wait_for_matchmaking = provide(
+        DontWaitForMatchmaking, scope=Scope.REQUEST,
+    )
+    provide_view_matchmaking = provide(ViewMatchmaking, scope=Scope.REQUEST)
 
     provide_start_stars_purchase = provide(
         StartStarsPurchase,

src/ttt/presentation/adapters/user_views.py

@@ -61,6 +61,9 @@
 from ttt.presentation.aiogram_dialog.main_dialog.emojis_window import (
     EmojiMenuView,
 )
+from ttt.presentation.aiogram_dialog.main_dialog.game_start_window import (
+    GameStartView,
+)
 from ttt.presentation.aiogram_dialog.main_dialog.game_window import (
     ActiveGameView,
 )
@@ -630,30 +633,21 @@ async def _account_view(
 class AiogramGameUserViews(GameUserViews):
     _dialog_manager_for_user: DialogManagerForUser
     _result_buffer: ResultBuffer
+    _session: AsyncSession
 
     async def user_is_waiting_for_matchmaking_view(
         self,
         user: User,
         /,
     ) -> None:
-        dialog_manager = self._dialog_manager_for_user(user.id)
-        await dialog_manager.start(
-            MainDialogState.game_mode_to_start_game,
-            {"hint": "⚔️ Подбор начат"},
-            StartMode.RESET_STACK,
-        )
+        ...
 
     async def user_is_already_waiting_for_matchmaking_view(
         self,
         user: User,
         /,
     ) -> None:
-        dialog_manager = self._dialog_manager_for_user(user.id)
-        await dialog_manager.start(
-            MainDialogState.game_mode_to_start_game,
-            {"hint": "⚔️ Подбор начат"},
-            StartMode.RESET_STACK,
-        )
+        ...
 
     async def user_is_in_game_to_wait_for_matchmaking_view(
         self, user: User, /,
@@ -683,3 +677,27 @@ async def _started_game_view_for_user(
             ActiveGameView.of(game, user_id).window_data(),
             StartMode.RESET_STACK,
         )
+
+    async def user_is_not_waiting_for_matchmaking_to_dont_wait_view(
+        self, user: User, /,
+    ) -> None:
+        ...
+
+    async def user_is_not_waiting_for_matchmaking_view(
+        self, user: User, /,
+    ) -> None:
+        ...
+
+    async def matchmaking_view(self, user_id: int, /) -> None:
+        stmt = (
+            select(TableUser.has_matchmaking_waiting)
+            .where(TableUser.id == user_id)
+        )
+        has_matchmaking_waiting = await self._session.scalar(stmt)
+
+        if has_matchmaking_waiting is None:
+            self._result_buffer.result = None
+        else:
+            self._result_buffer.result = GameStartView(
+                is_user_waiting_for_matchmaking=has_matchmaking_waiting,
+            )

src/ttt/presentation/aiogram_dialog/main_dialog/game_start_window.py

@@ -1,4 +1,8 @@
+from dataclasses import dataclass
+from typing import Any
+
 from aiogram.types import CallbackQuery
+from aiogram.types.user import User
 from aiogram_dialog import DialogManager, Window
 from aiogram_dialog.widgets.kbd import (
     Button,
@@ -10,16 +14,27 @@
 from dishka.integrations.aiogram_dialog import inject
 from magic_filter import F
 
+from ttt.application.user.game.dont_wait_for_matchmaking import (
+    DontWaitForMatchmaking,
+)
+from ttt.application.user.game.view_matchmaking import ViewMatchmaking
 from ttt.application.user.game.wait_for_matchmaking import WaitForMatchmaking
+from ttt.presentation.aiogram_dialog.common.data import EncodableToWindowData
 from ttt.presentation.aiogram_dialog.common.wigets.hint import hint
 from ttt.presentation.aiogram_dialog.common.wigets.one_time_key import (
     OneTimekey,
 )
 from ttt.presentation.aiogram_dialog.main_dialog.common import MainDialogState
+from ttt.presentation.result_buffer import ResultBuffer
+
+
+@dataclass(frozen=True)
+class GameStartView(EncodableToWindowData):
+    is_user_waiting_for_matchmaking: bool
 
 
 @inject
-async def on_matchmaking_clicked(
+async def on_wait_for_matchmaking_clicked(
     callback: CallbackQuery,
     _: Button,
     __: DialogManager,
@@ -28,14 +43,45 @@ async def on_matchmaking_clicked(
     await wait_for_matchmaking(callback.from_user.id)
 
 
+@inject
+async def on_dont_wait_for_matchmaking_clicked(
+    callback: CallbackQuery,
+    _: Button,
+    __: DialogManager,
+    dont_wait_for_matchmaking: FromDishka[DontWaitForMatchmaking],
+) -> None:
+    await dont_wait_for_matchmaking(callback.from_user.id)
+
+
+@inject
+async def getter(
+    *,
+    event_from_user: User,
+    view_matchmaking: FromDishka[ViewMatchmaking],
+    result_buffer: FromDishka[ResultBuffer],
+    **_: Any,  # noqa: ANN401
+) -> dict[str, Any]:
+    await view_matchmaking(event_from_user.id)
+    view = result_buffer(GameStartView)
+
+    return view.window_data()
+
+
 game_start_window = Window(
     Const("⚔️ Выберите режим", when=~F["start_data"]["hint"]),
     hint(key="hint"),
     Row(
         Button(
             Const("🗡 Подбор игр"),
-            id="matchmaking",
-            on_click=on_matchmaking_clicked,
+            id="wait_for_matchmaking",
+            on_click=on_wait_for_matchmaking_clicked,
+            when=~F["main"]["is_user_waiting_for_matchmaking"],
+        ),
+        Button(
+            Const("🗡❌ Отменить"),
+            id="dont_wait_for_matchmaking",
+            on_click=on_dont_wait_for_matchmaking_clicked,
+            when=F["main"]["is_user_waiting_for_matchmaking"],
         ),
         SwitchTo(
             Const("🤖 Играть с ИИ"),
@@ -54,4 +100,5 @@ async def on_matchmaking_clicked(
 
     OneTimekey("hint"),
     state=MainDialogState.game_mode_to_start_game,
+    getter=getter,
 )