ref(User): remove aggregation data (#59)

Author: emptybutton

src/ttt/entities/core/user/user.py

@@ -83,10 +83,6 @@ class User:
     selected_emoji_id: UUID | None
     rating: EloRating
     admin_right: AdminRight | None
-
-    number_of_wins: int
-    number_of_draws: int
-    number_of_defeats: int
     game_location: UserGameLocation | None
 
     emoji_cost: ClassVar[Stars] = 1000
@@ -253,7 +249,6 @@ def lose_to_user(
 
         self.leave_game(tracking)
 
-        self.number_of_defeats += 1
         new_rating = new_elo_rating(
             self.rating,
             enemy_rating,
@@ -272,8 +267,6 @@ def lose_to_ai(self, tracking: Tracking) -> UserLoss:
         """
 
         self.leave_game(tracking)
-
-        self.number_of_defeats += 1
         tracking.register_mutated(self)
 
         return UserLoss(user_id=self.id, rating_vector=None)
@@ -290,9 +283,6 @@ def win_against_user(
         """
 
         self.leave_game(tracking)
-
-        self.number_of_wins += 1
-
         new_rating = new_elo_rating(
             self.rating,
             enemy_rating,
@@ -327,9 +317,6 @@ def be_draw_against_user(
         """
 
         self.leave_game(tracking)
-
-        self.number_of_draws += 1
-
         new_rating = new_elo_rating(
             self.rating,
             enemy_rating,
@@ -348,8 +335,6 @@ def be_draw_against_ai(self, tracking: Tracking) -> UserDraw:
         """
 
         self.leave_game(tracking)
-
-        self.number_of_draws += 1
         tracking.register_mutated(self)
 
         return UserDraw(self.id, rating_vector=None)
@@ -443,9 +428,6 @@ def register_user(user_id: int, tracking: Tracking) -> User:
         emojis=[],
         selected_emoji_id=None,
         rating=initial_elo_rating,
-        number_of_wins=0,
-        number_of_draws=0,
-        number_of_defeats=0,
         game_location=None,
         admin_right=None,
     )

src/ttt/infrastructure/alembic/versions/679c935495d1_remove_aggregation_data_from_users.py

@@ -0,0 +1,59 @@
+"""
+remove aggregation data from `users`.
+
+Revision ID: 679c935495d1
+Revises: dc59db88676c
+Create Date: 2025-09-16 04:42:25.995128
+
+"""
+
+from collections.abc import Sequence
+
+import sqlalchemy as sa
+from alembic import op
+
+
+revision: str = "679c935495d1"
+down_revision: str | None = "dc59db88676c"
+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.drop_column("users", "number_of_draws")
+    op.drop_column("users", "number_of_wins")
+    op.drop_column("users", "number_of_defeats")
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column(
+        "users",
+        sa.Column(
+            "number_of_defeats",
+            sa.INTEGER(),
+            autoincrement=False,
+            nullable=False,
+        ),
+    )
+    op.add_column(
+        "users",
+        sa.Column(
+            "number_of_wins",
+            sa.INTEGER(),
+            autoincrement=False,
+            nullable=False,
+        ),
+    )
+    op.add_column(
+        "users",
+        sa.Column(
+            "number_of_draws",
+            sa.INTEGER(),
+            autoincrement=False,
+            nullable=False,
+        ),
+    )
+    # ### end Alembic commands ###

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

@@ -82,9 +82,6 @@ class TableUser(Base[User]):
         index=True,
     )
     rating: Mapped[float]
-    number_of_wins: Mapped[int]
-    number_of_draws: Mapped[int]
-    number_of_defeats: Mapped[int]
     game_location_game_id: Mapped[UUID | None] = mapped_column(
         ForeignKey("games.id", deferrable=True, initially="DEFERRED"),
         index=True,
@@ -134,9 +131,6 @@ def __entity__(self) -> User:
             emojis=[it.entity() for it in self.emojis],
             selected_emoji_id=self.selected_emoji_id,
             rating=self.rating,
-            number_of_wins=self.number_of_wins,
-            number_of_draws=self.number_of_draws,
-            number_of_defeats=self.number_of_defeats,
             game_location=location,
             admin_right=admin_right,
         )
@@ -164,9 +158,6 @@ def of(cls, it: User) -> "TableUser":
             account_stars=it.account.stars,
             selected_emoji_id=it.selected_emoji_id,
             rating=it.rating,
-            number_of_wins=it.number_of_wins,
-            number_of_draws=it.number_of_draws,
-            number_of_defeats=it.number_of_defeats,
             game_location_game_id=game_location_game_id,
             admin_right=admin_right,
             admin_right_via_other_admin_admin_id=(

src/ttt/presentation/adapters/user_views.py

@@ -20,10 +20,12 @@
 from ttt.entities.core.stars import Stars
 from ttt.entities.core.user.location import UserGameLocation
 from ttt.entities.core.user.user import User, is_user_in_game, user_stars
+from ttt.entities.tools.assertion import not_none
 from ttt.infrastructure.sqlalchemy.stmts import (
     selected_user_emoji_str_from_postgres,
     user_emojis_from_postgres,
 )
+from ttt.infrastructure.sqlalchemy.tables.game import TableGame
 from ttt.infrastructure.sqlalchemy.tables.invitation_to_game import (
     TableInvitationToGame,
     TableInvitationToGameState,
@@ -80,13 +82,7 @@ async def view_of_user_with_id(
         /,
     ) -> None:
         user_stmt = (
-            select(
-                TableUser.number_of_wins,
-                TableUser.number_of_draws,
-                TableUser.number_of_defeats,
-                TableUser.account_stars,
-                TableUser.rating,
-            )
+            select(TableUser.account_stars, TableUser.rating)
             .where(TableUser.id == user_id)
         )
         result = await self._session.execute(user_stmt)
@@ -96,10 +92,31 @@ async def view_of_user_with_id(
             await need_to_start_message(self._bot, user_id)
             return
 
+        wins_stmt = (
+            select(func.count(1))
+            .where(TableGame.result_decided_game_user_win_user_id == user_id)
+        )
+        wins = not_none(await self._session.scalar(wins_stmt))
+
+        draws_stmt = (
+            select(func.count(1))
+            .where(
+                (TableGame.result_draw_game_user_draw1_user_id == user_id)
+                | (TableGame.result_draw_game_user_draw2_user_id == user_id),
+            )
+        )
+        draws = not_none(await self._session.scalar(draws_stmt))
+
+        defeats_stmt = (
+            select(func.count(1))
+            .where(TableGame.result_decided_game_user_loss_user_id == user_id)
+        )
+        defeats = not_none(await self._session.scalar(defeats_stmt))
+
         view = UserProfileView.of(
-            user_row.number_of_wins,
-            user_row.number_of_draws,
-            user_row.number_of_defeats,
+            wins,
+            draws,
+            defeats,
             user_row.account_stars,
             user_row.rating,
         )
@@ -326,9 +343,6 @@ async def user_is_not_admin_view(self, user: User, /) -> None:
     async def other_user_view(self, user: User, other_user_id: int, /) -> None:
         stmt = (
             select(
-                TableUser.number_of_wins,
-                TableUser.number_of_draws,
-                TableUser.number_of_defeats,
                 TableUser.account_stars,
                 TableUser.rating,
                 TableUser.admin_right,
@@ -349,6 +363,22 @@ async def other_user_view(self, user: User, other_user_id: int, /) -> None:
             )
             return
 
+        wins_stmt = select(func.count(1)).where(
+            TableGame.result_decided_game_user_win_user_id == other_user_id,
+        )
+        wins = not_none(await self._session.scalar(wins_stmt))
+
+        draws_stmt = select(func.count(1)).where(
+            (TableGame.result_draw_game_user_draw1_user_id == other_user_id)
+            | (TableGame.result_draw_game_user_draw2_user_id == other_user_id),
+        )
+        draws = not_none(await self._session.scalar(draws_stmt))
+
+        defeats_stmt = select(func.count(1)).where(
+            TableGame.result_decided_game_user_loss_user_id == other_user_id,
+        )
+        defeats = not_none(await self._session.scalar(defeats_stmt))
+
         if row.admin_right is None:
             admin_right = None
         else:
@@ -359,9 +389,9 @@ async def other_user_view(self, user: User, other_user_id: int, /) -> None:
         view = OtherUserProfileView.of(
             other_user_id,
             admin_right,
-            row.number_of_wins,
-            row.number_of_draws,
-            row.number_of_defeats,
+            wins,
+            draws,
+            defeats,
             row.account_stars,
             row.rating,
         )

tests/test_ttt/test_entities/test_core/conftest.py

@@ -28,9 +28,6 @@ def user1() -> User:
         emojis=[],
         selected_emoji_id=None,
         rating=1000.,
-        number_of_wins=0,
-        number_of_draws=0,
-        number_of_defeats=0,
         game_location=UserGameLocation(1, UUID(int=0)),
         admin_right=None,
     )
@@ -44,9 +41,6 @@ def user2() -> User:
         emojis=[],
         rating=1000.,
         selected_emoji_id=None,
-        number_of_wins=0,
-        number_of_draws=0,
-        number_of_defeats=0,
         game_location=UserGameLocation(2, UUID(int=0)),
         admin_right=None,
     )

tests/test_ttt/test_entities/test_core/test_game.py

@@ -428,9 +428,6 @@ def test_winning_game(  # noqa: PLR0913, PLR0917
             emojis=[],
             rating=1020.0,
             selected_emoji_id=None,
-            number_of_wins=1,
-            number_of_draws=0,
-            number_of_defeats=0,
             game_location=None,
             admin_right=None,
         )
@@ -442,9 +439,6 @@ def test_winning_game(  # noqa: PLR0913, PLR0917
             emojis=[],
             rating=981.1500225556907,
             selected_emoji_id=None,
-            number_of_wins=0,
-            number_of_draws=0,
-            number_of_defeats=1,
             game_location=None,
             admin_right=None,
         )
@@ -521,9 +515,6 @@ def test_drawn_game(  # noqa: PLR0913, PLR0917
             emojis=[],
             rating=1020.0,
             selected_emoji_id=None,
-            number_of_wins=0,
-            number_of_draws=1,
-            number_of_defeats=0,
             game_location=None,
             admin_right=None,
         )
@@ -535,9 +526,6 @@ def test_drawn_game(  # noqa: PLR0913, PLR0917
             emojis=[],
             rating=1020.0,
             selected_emoji_id=None,
-            number_of_wins=0,
-            number_of_draws=1,
-            number_of_defeats=0,
             game_location=None,
             admin_right=None,
         )
@@ -614,9 +602,6 @@ def test_winning_game_with_filled_board(  # noqa: PLR0913, PLR0917
             emojis=[],
             rating=1020.0,
             selected_emoji_id=None,
-            number_of_wins=1,
-            number_of_draws=0,
-            number_of_defeats=0,
             game_location=None,
             admin_right=None,
         )
@@ -628,9 +613,6 @@ def test_winning_game_with_filled_board(  # noqa: PLR0913, PLR0917
             emojis=[],
             rating=981.1500225556907,
             selected_emoji_id=None,
-            number_of_wins=0,
-            number_of_draws=0,
-            number_of_defeats=1,
             game_location=None,
             admin_right=None,
         )

tests/test_ttt/test_entities/test_core/test_user.py

@@ -16,9 +16,6 @@ def test_create_user(tracking: Tracking, object_: str) -> None:
             emojis=[],
             rating=1000.,
             selected_emoji_id=None,
-            number_of_wins=0,
-            number_of_draws=0,
-            number_of_defeats=0,
             game_location=None,
             admin_right=None,
         )

tests/test_ttt/test_infrastructure/test_adapters/test_game_dao.py

@@ -31,9 +31,6 @@ def player1() -> User:
         emojis=[],
         selected_emoji_id=None,
         rating=1000.,
-        number_of_wins=0,
-        number_of_draws=0,
-        number_of_defeats=0,
         game_location=UserGameLocation(1, UUID(int=0)),
         admin_right=None,
     )
@@ -97,13 +94,7 @@ async def test_games_played_by_player_id(
 ) -> None:
     async with session.begin():
         await session.execute(
-            insert(TableUser).values({
-                "id": 1,
-                "rating": 1000,
-                "number_of_wins": 0,
-                "number_of_draws": 0,
-                "number_of_defeats": 0,
-            }),
+            insert(TableUser).values({"id": 1, "rating": 1000}),
         )
         if games:
             await session.execute(