Merge pull request #47 from emptybutton/dev

Pull 0.4.0

Author: emptybutton

deploy/dev/docker-compose.yaml

@@ -35,9 +35,6 @@ services:
       TTT_NATS_URL: nats://nats:4222
 
       TTT_GEMINI_URL: https://my-openai-gemini-sigma-sandy.vercel.app
-
-      TTT_GAME_WAITING_QUEUE_PULLING_TIMEOUT_MIN_MS: 100
-      TTT_GAME_WAITING_QUEUE_PULLING_TIMEOUT_SALT_MS: 100
     secrets:
       - secrets
     command: ttt-dev

deploy/prod/docker-compose.yaml

@@ -35,9 +35,6 @@ services:
       TTT_NATS_URL: nats://${NATS_TOKEN}@nats:4222
 
       TTT_GEMINI_URL: ${GEMINI_URL}
-
-      TTT_GAME_WAITING_QUEUE_PULLING_TIMEOUT_MIN_MS: 100
-      TTT_GAME_WAITING_QUEUE_PULLING_TIMEOUT_SALT_MS: 200
     secrets:
       - secrets
     networks:

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ttt"
-version = "0.3.0"
+version = "0.4.0"
 description = "Tic-Tac-Toe Telegram Bot"
 authors = [
     {name = "Alexander Smolin", email = "[email protected]"}
@@ -75,6 +75,9 @@ indent-width = 4
 [tool.ruff.lint.isort]
 lines-after-imports = 2
 
+[tool.ruff.lint.pylint]
+allow-dunder-method-names = ["__entity__"]
+
 [tool.ruff.lint]
 select = ["ALL"]
 ignore = [

src/ttt/application/common/ports/map.py

@@ -7,6 +7,9 @@
 class NotUniqueUserIdError(Exception): ...
 
 
+class NotUniqueActiveInvitationToGameUserIdsError(Exception): ...
+
+
 type MappableTracking = Tracking[Atomic]
 
 
@@ -19,4 +22,5 @@ async def __call__(
     ) -> None:
         """
         :raises ttt.application.common.ports.map.NotUniqueUserIdError:
-        """
+        :raises ttt.application.common.ports.map.NotUniqueActiveInvitationToGameUserIdsError:
+        """  # noqa: E501

src/ttt/application/game/game/ports/game_log.py

@@ -1,26 +1,11 @@
 from abc import ABC, abstractmethod
-from collections.abc import Sequence
 
 from ttt.entities.core.game.game import Game
 from ttt.entities.core.game.move import AiMove, UserMove
 from ttt.entities.core.user.user import User
 
 
 class GameLog(ABC):
-    @abstractmethod
-    async def waiting_for_game_start(
-        self,
-        user_id: int,
-        /,
-    ) -> None: ...
-
-    @abstractmethod
-    async def double_waiting_for_game_start(
-        self,
-        user_id: int,
-        /,
-    ) -> None: ...
-
     @abstractmethod
     async def game_against_user_started(
         self,
@@ -70,7 +55,9 @@ async def game_completed(
     ) -> None: ...
 
     @abstractmethod
-    async def user_already_in_game_to_start_game(self, user: User, /) -> None:
+    async def user_already_in_game_to_start_game_against_ai(
+        self, user: User, /,
+    ) -> None:
         ...
 
     @abstractmethod
@@ -116,17 +103,3 @@ async def already_completed_game_to_cancel(
         user_id: int,
         /,
     ) -> None: ...
-
-    @abstractmethod
-    async def users_already_in_game_to_start_game_via_game_starting_queue(
-        self,
-        user_ids: Sequence[int],
-        /,
-    ) -> None: ...
-
-    @abstractmethod
-    async def bad_attempt_to_start_game_via_game_starting_queue(
-        self,
-        user_ids: Sequence[int],
-        /,
-    ) -> None: ...

src/ttt/application/game/game/ports/game_starting_queue.py

@@ -6,9 +6,6 @@
 
 
 class GameViews(ABC):
-    @abstractmethod
-    async def waiting_for_game_view(self, user_id: int, /) -> None: ...
-
     @abstractmethod
     async def current_game_view_with_user_id(self, user_id: int, /) -> None: ...
 
@@ -68,8 +65,4 @@ async def already_filled_cell_error(
     ) -> None: ...
 
     @abstractmethod
-    async def users_already_in_game_views(
-        self,
-        user_ids: Sequence[int],
-        /,
-    ) -> None: ...
+    async def user_already_in_game_view(self, user_id: int, /) -> None: ...

src/ttt/application/game/game/ports/game_views.py

@@ -8,9 +8,6 @@
 from ttt.application.common.ports.uuids import UUIDs
 from ttt.application.game.game.ports.game_ai_gateway import GameAiGateway
 from ttt.application.game.game.ports.game_log import GameLog
-from ttt.application.game.game.ports.game_starting_queue import (
-    GameStartingQueue,
-)
 from ttt.application.game.game.ports.game_views import GameViews
 from ttt.application.game.game.ports.games import Games
 from ttt.application.user.common.ports.user_views import CommonUserViews
@@ -32,7 +29,6 @@ class StartGameWithAi:
     user_views: CommonUserViews
     games: Games
     game_views: GameViews
-    game_starting_queue: GameStartingQueue
     transaction: Transaction
     ai_gateway: GameAiGateway
     log: GameLog
@@ -66,8 +62,10 @@ async def __call__(self, user_id: int, ai_type: AiType) -> None:
                     tracking,
                 )
             except UserAlreadyInGameError:
-                await self.log.user_already_in_game_to_start_game(user)
-                await self.game_views.users_already_in_game_views([user_id])
+                await self.log.user_already_in_game_to_start_game_against_ai(
+                    user,
+                )
+                await self.game_views.user_already_in_game_view(user_id)
             else:
                 await self.log.game_against_ai_started(started_game.game)