feat(invitation_to_game): use usernames (#53)

Author: emptybutton

src/ttt/application/invitation_to_game/game/invite_to_game.py

@@ -34,7 +34,13 @@ class InviteToGame:
     views: InvitationToGameViews
     log: InvitationToGameLog
 
-    async def __call__(self, user_id: int, invited_user_id: int) -> None:
+    async def __call__(
+        self,
+        user_id: int,
+        user_username: str | None,
+        invited_user_id: int,
+        invited_user_username: str | None,
+    ) -> None:
         """
         :raises ttt.application.common.errors.serialization_error.SerializationError:
         """  # noqa: E501
@@ -61,8 +67,10 @@ async def __call__(self, user_id: int, invited_user_id: int) -> None:
                 tracking = Tracking()
                 invitation_to_game = invite_to_game(
                     user,
+                    user_username,
                     invited_user,
                     invited_user_id,
+                    invited_user_username,
                     invitation_to_game_id,
                     current_datetime,
                     tracking,

src/ttt/entities/core/invitation_to_game/invitation_to_game.py

@@ -41,7 +41,9 @@ class InvitationToGame:
 
     id_: UUID
     inviting_user: User
+    inviting_user_username: str | None
     invited_user: User
+    invited_user_username: str | None
     invitation_datetime: datetime
     state: InvitationToGameState
 
@@ -155,8 +157,10 @@ def invitation_to_game_datetime(expiration_datetime: datetime) -> datetime:
 
 def invite_to_game(  # noqa: PLR0913, PLR0917
     user: User,
+    user_username: str | None,
     invited_user: User | None,
     invited_user_id: int,
+    invited_user_username: str | None,
     invitation_to_game_id: UUID,
     current_datetime: datetime,
     tracking: Tracking,
@@ -170,7 +174,9 @@ def invite_to_game(  # noqa: PLR0913, PLR0917
 
     invitation_to_game = InvitationToGame(
         id_=invitation_to_game_id,
+        inviting_user_username=user_username,
         inviting_user=user,
+        invited_user_username=invited_user_username,
         invited_user=invited_user,
         invitation_datetime=current_datetime,
         state=InvitationToGameState.active,

src/ttt/infrastructure/alembic/versions/dc1b9f720a1d_add_username_columns_to_invitations_to_.py

@@ -0,0 +1,39 @@
+"""
+add `username` columns to `invitations_to_game`.
+
+Revision ID: dc1b9f720a1d
+Revises: 2dcb2be9e277
+Create Date: 2025-10-05 09:44:49.062023
+
+"""
+
+from collections.abc import Sequence
+
+import sqlalchemy as sa
+from alembic import op
+
+
+revision: str = "dc1b9f720a1d"
+down_revision: str | None = "2dcb2be9e277"
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column(
+        "invitations_to_game",
+        sa.Column("inviting_user_username", sa.String(), nullable=True),
+    )
+    op.add_column(
+        "invitations_to_game",
+        sa.Column("invited_user_username", sa.String(), nullable=True),
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column("invitations_to_game", "invited_user_username")
+    op.drop_column("invitations_to_game", "inviting_user_username")
+    # ### end Alembic commands ###

src/ttt/infrastructure/sqlalchemy/tables/invitation_to_game.py

@@ -75,6 +75,7 @@ class TableInvitationToGame(Base[InvitationToGame]):
         ),
         index=True,
     )
+    inviting_user_username: Mapped[str | None]
     invited_user_id: Mapped[int] = mapped_column(
         ForeignKey(
             "users.id",
@@ -83,6 +84,7 @@ class TableInvitationToGame(Base[InvitationToGame]):
         ),
         index=True,
     )
+    invited_user_username: Mapped[str | None]
     invitation_datetime: Mapped[datetime] = mapped_column()
     state: Mapped[TableInvitationToGameState] = mapped_column(
         invitation_to_game_state,
@@ -117,6 +119,8 @@ def __entity__(self) -> InvitationToGame:
             invited_user=self.invited_user.entity(),
             invitation_datetime=self.invitation_datetime,
             state=self.state.entity(),
+            inviting_user_username=self.inviting_user_username,
+            invited_user_username=self.invited_user_username,
         )
 
     @classmethod
@@ -127,6 +131,8 @@ def of(cls, it: InvitationToGame) -> "TableInvitationToGame":
             invited_user_id=it.invited_user.id,
             invitation_datetime=it.invitation_datetime,
             state=TableInvitationToGameState.of(it.state),
+            inviting_user_username=it.inviting_user_username,
+            invited_user_username=it.invited_user_username,
         )
 
 

src/ttt/presentation/adapters/invitation_to_game_views.py

@@ -61,6 +61,7 @@ async def incoming_user_invitations_to_game_view(
             select(
                 TableInvitationToGame.id,
                 TableInvitationToGame.inviting_user_id,
+                TableInvitationToGame.inviting_user_username,
             )
             .where(
                 (TableInvitationToGame.invited_user_id == user_id)
@@ -74,7 +75,11 @@ async def incoming_user_invitations_to_game_view(
         rows = result.all()
 
         invitations = [
-            IncomingInvitationToGameData(row.id, row.inviting_user_id)
+            IncomingInvitationToGameData(
+                row.id,
+                row.inviting_user_id,
+                row.inviting_user_username,
+            )
             for row in rows
         ]
         self._result_buffer.result = IncomingInvitationsToGameView.of(
@@ -90,6 +95,7 @@ async def outcoming_user_invitations_to_game_view(
             select(
                 TableInvitationToGame.id,
                 TableInvitationToGame.invited_user_id,
+                TableInvitationToGame.invited_user_username,
             )
             .where(
                 (TableInvitationToGame.inviting_user_id == user_id)
@@ -103,7 +109,11 @@ async def outcoming_user_invitations_to_game_view(
         rows = result.all()
 
         invitations = [
-            OutcomingInvitationToGameData(row.id.hex, row.invited_user_id)
+            OutcomingInvitationToGameData(
+                row.id.hex,
+                row.invited_user_id,
+                row.invited_user_username,
+            )
             for row in rows
         ]
         self._result_buffer.result = OutcomingInvitationsToGameView.of(
@@ -117,6 +127,7 @@ async def one_incoming_invitation_to_game_view(
             select(
                 TableInvitationToGame.id,
                 TableInvitationToGame.inviting_user_id,
+                TableInvitationToGame.inviting_user_username,
             )
             .where(
                 (TableInvitationToGame.invited_user_id == user_id)
@@ -137,13 +148,17 @@ async def one_incoming_invitation_to_game_view(
         self._result_buffer.result = IncomingInvitationToGameView(
             id_hex=row.id.hex,
             inviting_user_id=row.inviting_user_id,
+            inviting_user_username=row.inviting_user_username,
         )
 
     async def incoming_invitation_to_game_view(
         self, user_id: int, invitation_to_game_id: UUID, /,
     ) -> None:
         stmt = (
-            select(TableInvitationToGame.inviting_user_id)
+            select(
+                TableInvitationToGame.inviting_user_id,
+                TableInvitationToGame.inviting_user_username,
+            )
             .where(
                 (TableInvitationToGame.id == invitation_to_game_id)
                 & (
@@ -152,15 +167,17 @@ async def incoming_invitation_to_game_view(
                 ),
             )
         )
-        inviting_user_id = await self._session.scalar(stmt)
+        result = await self._session.execute(stmt)
+        row = result.first()
 
-        if inviting_user_id is None:
+        if row is None:
             self._result_buffer.result = None
             return
 
         self._result_buffer.result = IncomingInvitationToGameView(
             id_hex=invitation_to_game_id.hex,
-            inviting_user_id=inviting_user_id,
+            inviting_user_id=row.inviting_user_id,
+            inviting_user_username=row.inviting_user_username,
         )
 
     async def invitation_to_game_view(
@@ -195,6 +212,7 @@ async def _invited_user_to_game_view(
         view = IncomingInvitationToGameView(
             id_hex=invitation_to_game.id_.hex,
             inviting_user_id=invitation_to_game.inviting_user.id,
+            inviting_user_username=invitation_to_game.inviting_user_username,
         )
         start_data = view.window_data()
         await manager.start(
@@ -230,17 +248,20 @@ async def rejected_invitation_to_game_view(
             invitation_to_game.inviting_user.id,
         )
 
-        inviting_user_hint = Text(
-            "👤 Пользователь ",
-            Code(invitation_to_game.invited_user.id),
-            " отклонил ваше приглашение к игре",
-        ).as_html()
+        if invitation_to_game.invited_user_username is None:
+            public_user_id = Code(invitation_to_game.invited_user.id).as_html()
+        else:
+            public_user_id = f"@{invitation_to_game.invited_user_username}"
+
+        hint = (
+            f"👤 Пользователь {public_user_id} отклонил ваше приглашение к игре"
+        )
 
         await gather(
             invited_user_manager.done(),
             inviting_user_manager.start(
                 MainDialogState.notification,
-                {"hint": inviting_user_hint},
+                {"hint": hint},
             ),
         )
 

src/ttt/presentation/aiogram_dialog/common/wigets/users_request.py

@@ -0,0 +1,61 @@
+from collections.abc import Awaitable, Callable
+from typing import Any, Optional, Union
+
+from aiogram.types import (
+    CallbackQuery,
+    InlineKeyboardButton,
+    KeyboardButton,
+    KeyboardButtonRequestUsers,
+    LoginUrl,
+    SwitchInlineQueryChosenChat,
+    WebAppInfo,
+)
+from aiogram_dialog.api.internal import RawKeyboard
+from aiogram_dialog.api.protocols import DialogManager, DialogProtocol
+from aiogram_dialog.widgets.common import WhenCondition
+from aiogram_dialog.widgets.kbd import Keyboard
+from aiogram_dialog.widgets.kbd.button import OnClick
+from aiogram_dialog.widgets.text import Text
+from aiogram_dialog.widgets.widget_event import (
+    WidgetEventProcessor,
+)
+
+
+UsersRequestOnClick = Callable[
+    [CallbackQuery, "UsersRequest", DialogManager], Awaitable[Any],
+]
+
+
+class UsersRequest(Keyboard):
+    def __init__(
+        self,
+        text: Text,
+        id: str,  # noqa: A002
+        criteria: KeyboardButtonRequestUsers,
+        when: WhenCondition = None,
+    ) -> None:
+        super().__init__(id=id, when=when)
+        self.text = text
+        self.criteria = criteria
+
+    async def _process_own_callback(
+            self,
+            callback: CallbackQuery,
+            dialog: DialogProtocol,  # noqa: ARG002
+            manager: DialogManager,
+    ) -> bool:
+        return True
+
+    async def _render_keyboard(
+            self,
+            data: dict[Any, Any],
+            manager: DialogManager,
+    ) -> RawKeyboard:
+        return [
+            [
+                KeyboardButton(
+                    text=await self.text.render_text(data, manager),
+                    request_users=self.criteria,
+                ),
+            ],
+        ]

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

@@ -36,6 +36,7 @@
 class IncomingInvitationToGameView(EncodableToWindowData):
     id_hex: str
     inviting_user_id: int
+    inviting_user_username: str | None
 
 
 @inject
@@ -80,10 +81,14 @@ async def incoming_invitation_to_game_html(  # noqa: RUF029
         raise TypeError
 
     invitation = manager.start_data["main"]
-    text = Text(
-        "👤 Приглашение к игре от ", Code(invitation["inviting_user_id"]),
-    )
-    return text.as_html()
+
+    if invitation.get("inviting_user_username") is None:
+        text = Text(
+            "👤 Приглашение к игре от ", Code(invitation["inviting_user_id"]),
+        )
+        return text.as_html()
+
+    return f"👤 Приглашение к игре от @{invitation["inviting_user_username"]}"
 
 
 incoming_invitation_to_game_window = Window(