ref(Emoji): rename char to str_

Author: emptybutton

src/ttt/entities/text/emoji.py

@@ -3,4 +3,4 @@
 
 @dataclass(frozen=True)
 class Emoji:
-    char: str
+    str_: str

src/ttt/infrastructure/alembic/versions/022844f6b4d2_deffer_players_current_game_id_fkey.py

@@ -21,7 +21,9 @@
 def upgrade() -> None:
     # ### commands auto generated by Alembic - please adjust! ###
     op.drop_constraint(
-        op.f("players_current_game_id_fkey"), "players", type_="foreignkey",
+        op.f("players_current_game_id_fkey"),
+        "players",
+        type_="foreignkey",
     )
     op.create_foreign_key(
         None,
@@ -38,7 +40,9 @@ def upgrade() -> None:
 def downgrade() -> None:
     # ### commands auto generated by Alembic - please adjust! ###
     op.drop_constraint(
-        "players_current_game_id_fkey", "players", type_="foreignkey",
+        "players_current_game_id_fkey",
+        "players",
+        type_="foreignkey",
     )
     op.create_foreign_key(
         op.f("players_current_game_id_fkey"),

src/ttt/infrastructure/alembic/versions/62217b947df9_rename_game_emoji_columns.py

@@ -0,0 +1,45 @@
+"""
+rename game emoji columns.
+
+Revision ID: 62217b947df9
+Revises: 1106a6a301dc
+Create Date: 2025-06-22 15:11:35.209641
+
+"""
+
+from collections.abc import Sequence
+
+import sqlalchemy as sa
+from alembic import op
+
+
+revision: str = "62217b947df9"
+down_revision: str | None = "1106a6a301dc"
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def upgrade() -> None:
+    op.alter_column(
+        "games",
+        "player1_emoji_char",
+        new_column_name="player1_emoji_str",
+    )
+    op.alter_column(
+        "games",
+        "player2_emoji_char",
+        new_column_name="player2_emoji_str",
+    )
+
+
+def downgrade() -> None:
+    op.alter_column(
+        "games",
+        "player1_emoji_str",
+        new_column_name="player1_emoji_char",
+    )
+    op.alter_column(
+        "games",
+        "player2_emoji_str",
+        new_column_name="player2_emoji_char",
+    )

src/ttt/infrastructure/sqlalchemy/tables.py

@@ -182,12 +182,12 @@ class TableGame(Base):
         lazy="joined",
         foreign_keys=[player1_id],
     )
-    player1_emoji_char: Mapped[str] = mapped_column(server_default="❌")
+    player1_emoji_str: Mapped[str] = mapped_column(server_default="❌")
     player2: Mapped["TablePlayer"] = relationship(
         lazy="joined",
         foreign_keys=[player2_id],
     )
-    player2_emoji_char: Mapped[str] = mapped_column(server_default="⭕️")
+    player2_emoji_str: Mapped[str] = mapped_column(server_default="⭕️")
     cells: Mapped[list["TableCell"]] = relationship(lazy="selectin")
 
     def entity(self) -> Game:
@@ -198,9 +198,9 @@ def entity(self) -> Game:
         return Game(
             self.id,
             player1,
-            Emoji(self.player1_emoji_char),
+            Emoji(self.player1_emoji_str),
             player2,
-            Emoji(self.player2_emoji_char),
+            Emoji(self.player2_emoji_str),
             board,
             number_of_unfilled_cells(board),
             None if self.result is None else self.result.entity(),
@@ -212,9 +212,9 @@ def of(cls, it: Game) -> "TableGame":
         return TableGame(
             id=it.id,
             player1_id=it.player1.id,
-            player1_emoji_char=it.player1_emoji.char,
+            player1_emoji_char=it.player1_emoji.str_,
             player2_id=it.player2.id,
-            player2_emoji_char=it.player2_emoji.char,
+            player2_emoji_char=it.player2_emoji.str_,
             state=TableGameState.of(it.state),
         )
 

src/ttt/presentation/aiogram/game/keyboards.py

@@ -22,9 +22,9 @@ def _game_keyboard_button(
 ) -> KeyboardButton:
     match cell.filler_id:
         case game.player1.id:
-            return KeyboardButton(text=game.player1_emoji.char)
+            return KeyboardButton(text=game.player1_emoji.str_)
         case game.player2.id:
-            return KeyboardButton(text=game.player2_emoji.char)
+            return KeyboardButton(text=game.player2_emoji.str_)
         case None:
             return KeyboardButton(text=(
                 f"{cell.board_position[0] + 1} {cell.board_position[1] + 1}"

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

@@ -17,12 +17,12 @@ async def started_game_message(
 ) -> None:
     if player_id == game.player1.id:
         about_players = (
-            f"Вы — {game.player1_emoji.char}, враг — {game.player2_emoji.char}"
+            f"Вы — {game.player1_emoji.str_}, враг — {game.player2_emoji.str_}"
         )
         about_move = "Ходите"
     else:
         about_players = (
-            f"Враг — {game.player1_emoji.char}, вы — {game.player2_emoji.char}"
+            f"Враг — {game.player1_emoji.str_}, вы — {game.player2_emoji.str_}"
         )
         about_move = "Ждите хода врага"
 

src/ttt/presentation/aiogram/game/texts.py

@@ -10,9 +10,9 @@ def game_cell(
 ) -> str:
     match cell.filler_id:
         case game.player1.id:
-            return game.player1_emoji.char
+            return game.player1_emoji.str_
         case game.player2.id:
-            return game.player2_emoji.char
+            return game.player2_emoji.str_
         case None:
             return default
         case _:
@@ -24,9 +24,9 @@ def winner_emoji(game: Game) -> str:
 
     match result.winner_id:
         case game.player1.id:
-            return game.player1_emoji.char
+            return game.player1_emoji.str_
         case game.player2.id:
-            return game.player2_emoji.char
+            return game.player2_emoji.str_
         case None:
             return "�"
         case _: