ref(presentation): extract aiogram_dialog from dialogs (#28)

Author: emptybutton

pyproject.toml

@@ -49,8 +49,8 @@ build-backend = "hatchling.build"
 packages = ["src/ttt"]
 
 [project.scripts]
-ttt = "ttt.main.aiogram_prod.__main__:main"
-ttt-dev = "ttt.main.aiogram_dev.__main__:main"
+ttt = "ttt.main.tg_bot_prod.__main__:main"
+ttt-dev = "ttt.main.tg_bot_dev.__main__:main"
 
 [tool.uv]
 add-bounds = "exact"

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

@@ -15,10 +15,3 @@ async def emoji_not_purchased_to_select_view(
         user_id: int,
         /,
     ) -> None: ...
-
-    @abstractmethod
-    async def emoji_selected_view(
-        self,
-        user_id: int,
-        /,
-    ) -> None: ...

src/ttt/main/aiogram/__init__.py renamed to src/ttt/main/tg_bot/__init__.py

@@ -79,9 +79,9 @@
     AiogramMessagesFromPostgresAsEmojiSelectionUserViews,
 )
 from ttt.presentation.aiogram.common.bots import ttt_bot
-from ttt.presentation.aiogram.common.dialogs import dialog
 from ttt.presentation.aiogram.common.routes.all import common_routers
 from ttt.presentation.aiogram.user.routes.all import user_routers
+from ttt.presentation.aiogram_dialog.main_dialog import main_dialog
 from ttt.presentation.result_buffer import ResultBuffer
 from ttt.presentation.unkillable_tasks import UnkillableTasks
 
@@ -181,7 +181,7 @@ def provide_dp(self, storage: BaseStorage) -> Dispatcher:
             *user_routers,
         )
 
-        dp.include_routers(dialog)
+        dp.include_routers(main_dialog)
         setup_dialogs(dp)
 
         return dp

src/ttt/main/aiogram/di.py renamed to src/ttt/main/tg_bot/di.py

@@ -7,12 +7,12 @@
     DevLoggerFactory,
     LoggerFactory,
 )
-from ttt.main.aiogram.di import (
+from ttt.main.common.di import InfrastructureProvider
+from ttt.main.tg_bot.di import (
     ApplicationProvider,
     PresentationProvider,
 )
-from ttt.main.aiogram.start_aiogram import start_aiogram
-from ttt.main.common.di import InfrastructureProvider
+from ttt.main.tg_bot.start_aiogram import start_aiogram
 
 
 async def amain() -> None:

src/ttt/main/aiogram/start_aiogram.py renamed to src/ttt/main/tg_bot/start_aiogram.py

@@ -4,12 +4,12 @@
 from dishka.integrations.aiogram import AiogramProvider
 
 from ttt.infrastructure.structlog.logger import LoggerFactory, ProdLoggerFactory
-from ttt.main.aiogram.di import (
+from ttt.main.common.di import InfrastructureProvider
+from ttt.main.tg_bot.di import (
     ApplicationProvider,
     PresentationProvider,
 )
-from ttt.main.aiogram.start_aiogram import start_aiogram
-from ttt.main.common.di import InfrastructureProvider
+from ttt.main.tg_bot.start_aiogram import start_aiogram
 
 
 async def amain() -> None:

src/ttt/main/aiogram_dev/__init__.py renamed to src/ttt/main/tg_bot_dev/__init__.py

@@ -15,12 +15,12 @@
 from ttt.infrastructure.background_tasks import BackgroundTasks
 from ttt.infrastructure.sqlalchemy.tables.game import TableGame
 from ttt.infrastructure.sqlalchemy.tables.user import TableUser
-from ttt.presentation.aiogram.common.dialogs import (
+from ttt.presentation.aiogram.game.messages import completed_game_sticker
+from ttt.presentation.aiogram_dialog.main_dialog.common import MainDialogState
+from ttt.presentation.aiogram_dialog.main_dialog.game_window import (
     ActiveGameView,
     CompletedGameView,
-    DialogState,
 )
-from ttt.presentation.aiogram.game.messages import completed_game_sticker
 from ttt.presentation.result_buffer import ResultBuffer
 
 
@@ -37,7 +37,7 @@ async def waiting_for_game_view(self, user_id: int, /) -> None:
             self._bot, user_id, user_id,
         )
         await dialog_manager.start(
-            DialogState.game_mode_to_start_game,
+            MainDialogState.game_mode_to_start_game,
             {"hint": "⚔️ Поиск игры начат"},
             StartMode.RESET_STACK,
         )
@@ -85,7 +85,7 @@ async def started_game_view_with_locations(
                 self._bot, location.user_id, location.user_id,
             )
             await dialog_manager.start(
-                DialogState.game,
+                MainDialogState.game,
                 ActiveGameView.of(game, location.user_id).window_data(),
                 StartMode.RESET_STACK,
             )
@@ -97,7 +97,7 @@ async def no_game_view(self, user_id: int, /) -> None:
             self._bot, user_id, user_id,
         )
         await dialog_manager.start(
-            DialogState.main, data, StartMode.RESET_STACK,
+            MainDialogState.main, data, StartMode.RESET_STACK,
         )
 
     async def game_already_complteted_view(
@@ -111,7 +111,7 @@ async def game_already_complteted_view(
         )
         data = {"hint": "❌ Игра уже закончилась"}
         await dialog_manager.start(
-            DialogState.game, data, StartMode.RESET_STACK,
+            MainDialogState.game, data, StartMode.RESET_STACK,
         )
 
     async def not_current_user_view(
@@ -128,7 +128,7 @@ async def not_current_user_view(
             self._bot, user_id, user_id,
         )
         await dialog_manager.start(
-            DialogState.game, data, StartMode.RESET_STACK,
+            MainDialogState.game, data, StartMode.RESET_STACK,
         )
 
     async def no_cell_view(
@@ -159,7 +159,7 @@ async def already_filled_cell_error(
             self._bot, user_id, user_id,
         )
         await dialog_manager.start(
-            DialogState.game, data, StartMode.RESET_STACK,
+            MainDialogState.game, data, StartMode.RESET_STACK,
         )
 
     async def _active_game_view(
@@ -173,7 +173,7 @@ async def _active_game_view(
         data = view.window_data()
 
         await dialog_manager.start(
-            DialogState.game, data, StartMode.RESET_STACK,
+            MainDialogState.game, data, StartMode.RESET_STACK,
         )
 
     async def _completed_game_view(
@@ -193,7 +193,7 @@ async def _completed_game_view(
                 self._bot, location.user_id, game, location.user_id,
             ),
             dialog_manager.start(
-                DialogState.game,
+                MainDialogState.game,
                 data,
                 StartMode.RESET_STACK,
                 ShowMode.DELETE_AND_SEND,