core: fix: matchmaking and game

games/objects/AGame.py

@@ -6,6 +6,8 @@ from .ASpectator import ASpectator
 
 from ..models import GameModel
 
+from django.contrib.auth.models import User
+
 class AGame(AbstractRoom):
     
     def __init__(self, game_type: str, game_id: int, game_manager):
@@ -16,23 +18,23 @@ class AGame(AbstractRoom):
         
         self.model: GameModel = GameModel.objects.get(pk = game_id, game_type = game_type)
         
-        players_id: list[int] = self.model.get_players_id()
+        players: list[User] = self.model.get_players()
 
-        self.players: list[APlayer] = [APlayer(player_id, None, self) for player_id in players_id]
+        self.players: list[APlayer] = [APlayer(player.pk, None, self) for player in players]
         
         self.spectators: list[ASpectator] = []
 
         self.game_id: int = game_id
     
     def get_players_id(self) -> list[int]:
-        return [player.user_id for player in self.players]
+        return [player.pk for player in self.players]
     
     def get_players_connected(self) -> list[APlayer]:
         return [player for player in self.players if player.is_connected()]
     
     def get_player_by_user_id(self, user_id: int) -> APlayer:
         for player in self.players:
-            if (player.user_id == user_id):
+            if (player.user.pk == user_id):
                 return player
         return None
     

games/objects/APlayer.py

@@ -10,9 +10,6 @@ if TYPE_CHECKING:
 
 class APlayer(ASpectator):
     
-    def __init__(self, user_id: int, socket: WebsocketConsumer, game: AGame):
-        super().__init__(user_id, socket, game)
-        
     def is_connected(self) -> bool:
         return self.socket != None
     

games/objects/ASpectator.py

@@ -3,6 +3,8 @@ from channels.generic.websocket import WebsocketConsumer
 
 from transcendence.abstract.AbstractRoomMember import AbstractRoomMember
 
+from django.contrib.auth.models import User
+
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
@@ -10,8 +12,8 @@ if TYPE_CHECKING:
 
 class ASpectator(AbstractRoomMember):
 
-    def __init__(self, user_id: int, socket: WebsocketConsumer, game):
+    def __init__(self, user: User, socket: WebsocketConsumer, game):
         
-        super().__init__(user_id, socket)
+        super().__init__(user, socket)
         
         self.game: AGame = game

games/objects/pong/PongGame.py

@@ -22,7 +22,7 @@ import threading
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
-    pass
+    from profiles.models import ProfileModel
 
 class PongGame(AGame):
 
@@ -36,7 +36,7 @@ class PongGame(AGame):
         
         radius: float = min(config.MAP_SIZE_X, config.MAP_SIZE_Y) / 2 - 10 
 
-        players_id: list[int] = self.model.get_players_id()
+        players: list[ProfileModel] = self.model.get_players()
 
         nb_sides = 4
         
@@ -58,16 +58,16 @@ class PongGame(AGame):
         self.walls: list[Wall]
         self.players: list[PongPlayer]
         
-        nb_players: int = len(players_id)
+        nb_players: int = len(players)
         if (nb_players == 2):
-            self.players = [PongPlayer(self, players_id[0], None, segments[0]), PongPlayer(self, players_id[1], None, segments[2])]
+            self.players = [PongPlayer(self, players[0], None, segments[0]), PongPlayer(self, players[1], None, segments[2])]
             self.walls = [Wall(segments[1].start, segments[1].stop), Wall(segments[3].start, segments[3].stop)]
         else:
             self.players = []
             self.walls = []
             for i in range(4):
                 if (i < nb_players):
-                    self.players.append(PongPlayer(self, players_id[i], None, segments[i]))
+                    self.players.append(PongPlayer(self, players[i], None, segments[i]))
                 else:
                     self.walls.append(Wall(segments[i]))
     

games/objects/pong/PongPlayer.py

@@ -17,9 +17,9 @@ if TYPE_CHECKING:
 
 class PongPlayer(APlayer):
     
-    def __init__(self, game: PongGame, user_id: int, socket: WebsocketConsumer, rail: Segment) -> None:
+    def __init__(self, game: PongGame, user: User, socket: WebsocketConsumer, rail: Segment) -> None:
         
-        super().__init__(user_id, socket, game)
+        super().__init__(user, socket, game)
         
         self.position: Position = Position(0.5, 0)
         
@@ -29,8 +29,6 @@ class PongPlayer(APlayer):
 
         self.game: PongGame
         
-        self.username: str = User.objects.get(pk = self.user_id).username
-        
     def eliminate(self):
         
         self.disconnect(1000)
@@ -43,7 +41,7 @@ class PongPlayer(APlayer):
 
         if (detail is None):
             return
-    
+        
         if (detail == "update_my_paddle_pos"):
             self.update_position(data)
     
@@ -119,8 +117,8 @@ class PongPlayer(APlayer):
     def to_dict(self) -> dict:
         
         data = {
-            "username": self.username,
-            "id": self.user_id,
+            "username": self.user.username,
+            "id": self.user.pk,
             "position": self.position.to_dict(),
             "score": self.score,