feat(aiogram): decorate

Author: emptybutton

src/ttt/presentation/adapters/player_views.py

@@ -6,7 +6,7 @@
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from ttt.application.player.ports.player_views import PlayerViews
-from ttt.infrastructure.sqlalchemy.tables import PlayerTableModel
+from ttt.infrastructure.sqlalchemy.tables import TablePlayer
 from ttt.presentation.aiogram.messages.command import need_to_start_message
 from ttt.presentation.aiogram.messages.player import player_info_message
 
@@ -20,12 +20,12 @@ async def view_of_player_with_id(
         self, player_id: int, /,
     ) -> SendMessage:
         stmt = select(
-            PlayerTableModel.number_of_wins,
-            PlayerTableModel.number_of_draws,
-            PlayerTableModel.number_of_defeats,
-            PlayerTableModel.game_location_game_id.is_not(None).label("is_in_game"),
+            TablePlayer.number_of_wins,
+            TablePlayer.number_of_draws,
+            TablePlayer.number_of_defeats,
+            TablePlayer.game_location_game_id.is_not(None).label("is_in_game"),
         ).where(
-            PlayerTableModel.id == player_id,
+            TablePlayer.id == player_id,
         ).limit(1)
 
         result = await self._session.execute(stmt)

src/ttt/presentation/aiogram/messages/command.py

@@ -1,7 +1,10 @@
+from aiogram import md
+from aiogram.enums import ParseMode
 from aiogram.methods import SendMessage
 from aiogram.types.message import Message
 from aiogram.utils.formatting import (
     Bold,
+    Text,
     as_list,
     as_marked_section,
 )
@@ -12,17 +15,18 @@ def need_to_start_message(message: Message) -> SendMessage:
 
 
 def help_message(message: Message) -> SendMessage:
+    description = Text(
+        Bold("ttt!"),
+        " — многопользовательские онлайн-крестики-нолики в Telegram.",
+    )
+
     content = as_list(
-         as_marked_section(
-            f"{Bold("ttt!"):}",
-            "Многопользовательские онлайн-крестики-нолики в Telegram.",
-            marker="  ",
-        ),
+        description,
         as_marked_section(
             "Комманды:",
-            "/game - чтобы начать игру",
-            "/info - чтобы посмотреть информацию о себе",
-            "/help - чтобы вывести это сообщение",
+            Text(Bold("/game"), " — начать игру"),
+            Text(Bold("/info"), " — посмотреть информацию о себе"),
+            Text(Bold("/help"), " — вывести это сообщение"),
             marker="  ",
         ),
         sep="\n\n",

src/ttt/presentation/aiogram/messages/player.py

@@ -1,11 +1,6 @@
 from aiogram.methods import SendMessage
 from aiogram.types.message import Message
-from aiogram.utils.formatting import (
-    Bold,
-    as_key_value,
-    as_list,
-    as_marked_section,
-)
+from aiogram.utils.formatting import as_key_value, as_list
 
 
 def player_info_message(
@@ -16,18 +11,23 @@ def player_info_message(
     is_in_game: bool,  # noqa: FBT001
 ) -> SendMessage:
     total = number_of_wins + number_of_defeats + number_of_draws
-    winning_percentage = number_of_wins / total * 100
+
+    if total > 0:
+        winning_percentage = number_of_wins / total * 100
+        winning_percentage_text = f"{winning_percentage:.2f}"
+    else:
+        winning_percentage_text = None
 
     content = as_list(
-        as_marked_section(
-            f"{Bold("Статистика"):}",
-            as_key_value("Побед", number_of_wins),
-            as_key_value("Поражений", number_of_defeats),
-            as_key_value("Ничьих", number_of_draws),
-            as_key_value("Процент побед", f"{winning_percentage:.2f}"),
-            marker="  ",
+        f"⭐ Побед: {number_of_wins}",
+        f"💀 Поражений: {number_of_defeats}",
+        f"🕊️ Ничьих: {number_of_draws}",
+        *(
+            []
+            if winning_percentage_text is None
+            else as_key_value("📊 Процент побед", winning_percentage_text)
         ),
-        *(["Сейчас в партии."] if is_in_game else []),
-        sep="\n\n",
+        "",
+        "⚔️ Сейчас в матче." if is_in_game else "💤 Сейчас не в матче",
     )
     return message.answer(**content.as_kwargs())

src/ttt/presentation/aiogram/routes/all.py

@@ -1,6 +1,8 @@
+from ttt.presentation.aiogram.routes.other.all import other_routers
 from ttt.presentation.aiogram.routes.player.all import player_routers
 
 
 all_routers = (
     *player_routers,
+    *other_routers,
 )

src/ttt/presentation/aiogram/routes/other/__init__.py

@@ -0,0 +1,6 @@
+from ttt.presentation.aiogram.routes.other.help import help_router
+
+
+other_routers = (
+    help_router,
+)

src/ttt/presentation/aiogram/routes/other/all.py

@@ -0,0 +1,16 @@
+from aiogram import Router
+from aiogram.filters import Command
+from aiogram.types import Message
+from dishka.integrations.aiogram import FromDishka, inject
+
+from ttt.application.player.register_player import RegisterPlayer
+from ttt.presentation.aiogram.messages.command import help_message
+from ttt.presentation.aiogram.messages.common import anons_are_rohibited_message
+
+
+help_router = Router(name=__name__)
+
+
+@help_router.message(Command("help"))
+async def help(message: Message) -> None:
+    await help_message(message)

src/ttt/presentation/aiogram/routes/other/help.py

@@ -11,7 +11,7 @@
 view_player_router = Router(name=__name__)
 
 
-@view_player_router.message(Command("start"))
+@view_player_router.message(Command("info"))
 @inject
 async def _(
     message: Message, view_player: FromDishka[ViewPlayer[SendMessage]],