feat: use cell numbers for moves

Author: emptybutton

src/ttt/application/game/make_move_in_game.py

@@ -15,7 +15,6 @@
     NotCurrentPlayerError,
 )
 from ttt.entities.core.player.location import PlayerLocation
-from ttt.entities.math.vector import Vector
 from ttt.entities.tools.assertion import not_none
 from ttt.entities.tools.tracking import Tracking
 
@@ -33,7 +32,7 @@ class MakeMoveInGame:
     async def __call__(
         self,
         location: PlayerLocation,
-        cell_position: Vector,
+        cell_number_int: int,
     ) -> None:
         async with self.transaction:
             game = await self.games.game_with_game_location(location.player_id)
@@ -55,7 +54,7 @@ async def __call__(
                 tracking = Tracking()
                 game.make_move(
                     location.player_id,
-                    cell_position,
+                    cell_number_int,
                     game_result_id,
                     random,
                     tracking,

src/ttt/entities/core/game/cell.py

@@ -1,6 +1,7 @@
 from dataclasses import dataclass
 from uuid import UUID
 
+from ttt.entities.core.game.cell_number import CellNumber
 from ttt.entities.math.vector import Vector
 from ttt.entities.tools.assertion import assert_
 from ttt.entities.tools.tracking import Tracking
@@ -16,6 +17,9 @@ class Cell:
     board_position: Vector
     filler_id: int | None
 
+    def number(self) -> CellNumber:
+        return CellNumber.of_board_position(self.board_position)
+
     def is_filled(self) -> bool:
         return self.filler_id is not None
 

src/ttt/entities/core/game/cell_number.py

@@ -0,0 +1,50 @@
+from dataclasses import dataclass
+from typing import ClassVar, cast
+
+from ttt.entities.math.vector import Vector
+from ttt.entities.tools.assertion import assert_, not_none
+
+
+class InvalidCellNumberError(Exception): ...
+
+
+@dataclass(frozen=True)
+class CellNumber:
+    """
+    :raises ttt.entities.core.game.cell_number.InvalidCellNumberError:
+    """
+
+    _int: int
+
+    _board_position_by_int: ClassVar = {
+        1: (0, 0),
+        2: (1, 0),
+        3: (2, 0),
+        4: (0, 1),
+        5: (1, 1),
+        6: (2, 1),
+        7: (0, 2),
+        8: (1, 2),
+        9: (2, 2),
+    }
+    _int_by_board_position: ClassVar = dict(zip(
+        _board_position_by_int.values(),
+        _board_position_by_int.keys(),
+        strict=True,
+    ))
+
+    def __post_init__(self) -> None:
+        assert_(1 <= self._int <= 9, else_=InvalidCellNumberError)  # noqa: PLR2004
+
+    def __int__(self) -> int:
+        return self._int
+
+    @classmethod
+    def of_board_position(cls, board_position: Vector) -> "CellNumber":
+        int_ = CellNumber._int_by_board_position.get(board_position)
+        int_ = cast(int, not_none(int_, InvalidCellNumberError))
+
+        return CellNumber(int_)
+
+    def board_position(self) -> "Vector":
+        return cast(Vector, CellNumber._board_position_by_int[int(self)])

src/ttt/entities/core/game/game.py

@@ -2,15 +2,18 @@
 from dataclasses import dataclass
 from enum import Enum, auto
 from itertools import chain
-from typing import cast
 from uuid import UUID
 
 from ttt.entities.core.game.board import (
     Board,
     create_empty_board,
     is_board_standard,
 )
-from ttt.entities.core.game.cell import AlreadyFilledCellError, Cell
+from ttt.entities.core.game.cell import Cell
+from ttt.entities.core.game.cell_number import (
+    CellNumber,
+    InvalidCellNumberError,
+)
 from ttt.entities.core.player.player import (
     Player,
     PlayerAlreadyInGameError,
@@ -20,7 +23,7 @@
 from ttt.entities.math.random import Random
 from ttt.entities.math.vector import Vector
 from ttt.entities.text.emoji import Emoji
-from ttt.entities.tools.assertion import assert_, not_none
+from ttt.entities.tools.assertion import assert_, none, not_none
 from ttt.entities.tools.tracking import Tracking
 
 
@@ -78,9 +81,6 @@ def number_of_unfilled_cells(board: Matrix[Cell]) -> int:
     return sum(int(not cell.is_filled()) for cell in chain.from_iterable(board))
 
 
-type FilledCellPosition = None
-
-
 @dataclass
 class Game:
     """
@@ -127,9 +127,7 @@ def cancel(
         :raises ttt.entities.core.game.game.NotPlayerError:
         """
 
-        self.result = cast(
-            GameResult, not_none(self.result, AlreadyCompletedGameError),
-        )
+        none(self.result, else_=AlreadyCompletedGameError)
         canceler = not_none(self._player(player_id), else_=NotPlayerError)
 
         self.player1.leave_game(tracking)
@@ -145,7 +143,7 @@ def cancel(
     def make_move(
         self,
         player_id: int,
-        cell_position: Vector | FilledCellPosition,
+        cell_number_int: int,
         game_result_id: UUID,
         random: Random,
         tracking: Tracking,
@@ -167,8 +165,12 @@ def make_move(
         )
         assert_(current_player.id == player_id, else_=NotCurrentPlayerError())
 
-        if cell_position is None:
-            raise AlreadyFilledCellError
+        try:
+            cell_number = CellNumber(cell_number_int)
+        except InvalidCellNumberError as error:
+            raise NoCellError from error
+        else:
+            cell_position = cell_number.board_position()
 
         self._fill_cell(cell_position, player_id, tracking)
 

src/ttt/entities/tools/assertion.py

@@ -1,4 +1,4 @@
-from typing import Literal, NoReturn, overload
+from typing import Any, Literal, NoReturn, overload
 
 
 def not_none[ValueT](
@@ -11,6 +11,14 @@ def not_none[ValueT](
     raise else_
 
 
+def none(
+    value: Any,  # noqa: ANN401
+    else_: Exception | type[Exception] = ValueError,
+) -> None:
+    if value is not None:
+        raise else_
+
+
 @overload
 def assert_(
     assertion: Literal[False],

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

@@ -12,7 +12,7 @@ def game_keyboard(game: Game) -> ReplyKeyboardMarkup:
     return ReplyKeyboardMarkup(
         keyboard=kb,
         resize_keyboard=True,
-        input_field_placeholder="Введите позицию закрашиваемой ячейки",
+        input_field_placeholder="Введите номер закрашиваемой ячейки",
     )
 
 
@@ -26,8 +26,6 @@ def _game_keyboard_button(
         case game.player2.id:
             return KeyboardButton(text=game.player2_emoji.str_)
         case None:
-            return KeyboardButton(text=(
-                f"{cell.board_position[0] + 1} {cell.board_position[1] + 1}"
-            ))
+            return KeyboardButton(text=f"{int(cell.number())}")
         case _:
             raise ValueError((cell.filler_id, game.player1.id, game.player2.id))

src/ttt/presentation/aiogram/game/routes/make_move_in_game.py

@@ -13,7 +13,7 @@
 make_move_in_game_router = Router(name=__name__)
 
 
-@make_move_in_game_router.message(F.text.regexp(r"^-?\d+\s-?\d+$"))
+@make_move_in_game_router.message(F.text.regexp(r"^\d+$"))
 @inject
 async def _(
     message: Message,
@@ -23,10 +23,8 @@ async def _(
         await anons_are_rohibited_message(message)
         return
 
-    x, y = map(int, not_none(message.text).split()[:2])
-    x -= 1
-    y -= 1
+    cell_number_int = int(not_none(message.text))
 
     await make_move_in_game(
-        PlayerLocation(message.from_user.id, message.chat.id), (x, y),
+        PlayerLocation(message.from_user.id, message.chat.id), cell_number_int,
     )