merge with chaku and adrien v1

pong/game/matchmaking.py

@@ -40,7 +40,7 @@ class MatchMaker:
                 await asyncio.sleep(1)
                 self.timer += 1
                 # Waiting for more than 30s -> BOT game
-                if self.timer >= 30 and self.waiting_players:
+                if self.timer >= 15 and self.waiting_players:
                     player1 = self.waiting_players.pop(0)
                     print(f"*** MATCH FOUND: {player1.user.username} vs BOT")
                     self.botgame = True

pong/game/templates/pong/match_list.html

@@ -1,51 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Matches List</title>
-</head>
-<body>
-    <h1>Matches List</h1>
-    <table border="1">
-        <thead>
-            <tr>
-                <th>ID</th>
-                <th>Player 1</th>
-                <th>Player 2</th>
-                <th>Score Player 1</th>
-                <th>Score Player 2</th>
-                <th>Winner</th>
-                <th>Ball Touches Player 1</th>
-                <th>Ball Touches Player 2</th>
-                <th>Duration</th>
-                <th>Date</th>
-                <th>Is Tournament</th>
-                <th>Tournament</th>
-            </tr>
-        </thead>
-        <tbody>
-            {% for match in matches %}
-            <tr>
-                <td>{{ match.id }}</td>
-                <td>{{ match.player1.name }}</td>
-                <td>{{ match.player2.name }}</td>
-                <td>{{ match.score_player1 }}</td>
-                <td>{{ match.score_player2 }}</td>
-                <td>{{ match.winner.name }}</td>
-                <td>{{ match.nbr_ball_touch_p1 }}</td>
-                <td>{{ match.nbr_ball_touch_p2 }}</td>
-                <td>{{ match.duration }}</td>
-                <td>{{ match.date }}</td>
-                <td>{{ match.is_tournoi }}</td>
-                <td>{{ match.tournoi.name }}</td>
-            </tr>
-            {% empty %}
-            <tr>
-                <td colspan="12">No matches found.</td>
-            </tr>
-            {% endfor %}
-        </tbody>
-    </table>
-</body>
-</html>

pong/game/templates/pong/player_list.html

@@ -1,53 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Players List</title>
-</head>
-<body>
-    <h1>Players List</h1>
-    <table border="1">
-        <thead>
-            <tr>
-                <th>ID</th>
-                <th>Name</th>
-                <th>Total Matches</th>
-                <th>Total Wins</th>
-                <th>Win Percentage</th>
-                <th>Average Match Score</th>
-                <th>Average Opponent Score</th>
-                <th>Best Score</th>
-                <th>Average Ball Touches</th>
-                <th>Total Duration</th>
-                <th>Average Duration</th>
-                <th>Participated Tournaments</th>
-                <th>Won Tournaments</th>
-            </tr>
-        </thead>
-        <tbody>
-            {% for player in players %}
-            <tr>
-                <td>{{ player.id }}</td>
-                <td>{{ player.name }}</td>
-                <td>{{ player.total_match }}</td>
-                <td>{{ player.total_win }}</td>
-                <td>{{ player.p_win }}</td>
-                <td>{{ player.m_score_match }}</td>
-                <td>{{ player.m_score_adv_match }}</td>
-                <td>{{ player.best_score }}</td>
-                <td>{{ player.m_nbr_ball_touch }}</td>
-                <td>{{ player.total_duration }}</td>
-                <td>{{ player.m_duration }}</td>
-                <td>{{ player.num_participated_tournaments }}</td>
-                <td>{{ player.num_won_tournaments }}</td>
-            </tr>
-            {% empty %}
-            <tr>
-                <td colspan="13">No players found.</td>
-            </tr>
-            {% endfor %}
-        </tbody>
-    </table>
-</body>
-</html>

pong/game/templates/pong/tournoi_list.html

@@ -1,37 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Tournaments List</title>
-</head>
-<body>
-    <h1>Tournaments List</h1>
-    <table border="1">
-        <thead>
-            <tr>
-                <th>ID</th>
-                <th>Name</th>
-                <th>Number of Players</th>
-                <th>Date</th>
-                <th>Winner</th>
-            </tr>
-        </thead>
-        <tbody>
-            {% for tournoi in tournois %}
-            <tr>
-                <td>{{ tournoi.id }}</td>
-                <td>{{ tournoi.name }}</td>
-                <td>{{ tournoi.nbr_player }}</td>
-                <td>{{ tournoi.date }}</td>
-                <td>{{ tournoi.winner.name }}</td>
-            </tr>
-            {% empty %}
-            <tr>
-                <td colspan="5">No tournaments found.</td>
-            </tr>
-            {% endfor %}
-        </tbody>
-    </table>
-</body>
-</html>

pong/game/urls.py

@@ -2,7 +2,6 @@
 
 from django.urls import path, include
 from . import views
-from .views import player_list, tournoi_list, match_list
 from rest_framework.routers import DefaultRouter
 from .views import match_list_json, player_list_json, tournoi_list_json
 
@@ -13,9 +12,6 @@ urlpatterns = [
     path('register_user/', views.register_user, name='register_user'),
     path('authenticate_user/', views.authenticate_user, name='authenticate_user'),
     path('web3/', views.read_data, name='read_data'),
-    path('players/', player_list, name='player_list'),
-    path('matches/', match_list, name='match_list'),
-    path('tournois/', tournoi_list, name='tournoi_list'),
     path('api/match_list/', match_list_json, name='match_list_json'),
     path('api/player_list/', player_list_json, name='player_list_json'),
     path('api/tournoi_list/', tournoi_list_json, name='tournoi_list_json')

pong/game/utils.py

@@ -4,35 +4,17 @@ from django.shortcuts import get_object_or_404
 from django.db.models import Max, Sum, F
 from datetime import timedelta
 from channels.db import database_sync_to_async
+#from asgiref.sync import database_sync_to_async
 
 async def endfortheouche(p1, p2, s_p1, s_p2, bt_p1, bt_2, dur, is_tournoi, name_tournament):
     try:
         print("here endfortheouche §!!!")
+        # Vérification de l'existence des joueurs et création si nécessaire
+        player_1 = await get_or_create_player(p1)
+        player_2 = await get_or_create_player(p2)
+
+        print("ok")
 
-        # Handle Player 1
-        exists = await database_sync_to_async(Player.objects.filter(name=p1).exists)()
-        if exists:
-            print(f"Player {p1} exists.")
-        else:
-            print(f"Player {p1} does not exist.")
-            
-        player_1 = await get_name(p1)
-        print(f"Player 1 retrieval result: {player_1}")
-        if player_1 is None:
-            print("############# CREATING PLAYER")
-            player_1 = await create_player(p1)
-        else:
-            print("############# PLAYER FOUND")
-        
-        # Handle Player 2
-        player_2 = await get_name(p2)
-        print(f"Player 2 retrieval result: {player_2}")
-        if player_2 is None:
-            print("############# CREATING PLAYER")
-            player_2 = await create_player(p2)
-        else:
-            print("############# PLAYER FOUND")
-        
         print("############# BEFORE MATCH")
         await create_match(player_1, player_2, s_p1, s_p2, bt_p1, bt_2, dur, is_tournoi, name_tournament)
         print("############# AFTER DONE")
@@ -45,13 +27,34 @@ async def endfortheouche(p1, p2, s_p1, s_p2, bt_p1, bt_2, dur, is_tournoi, name_
         print(f"Error in endfortheouche: {e}")
 
 @database_sync_to_async
-def get_name(p):
-    print(f"in get_name({p})..")
-    try:
-        return Player.objects.get(name=p)
-    except Player.DoesNotExist:
-        print("get_name() exception")
-        return None    
+def get_player_by_name(name):
+    print(f"Checking if player '{name}' exists")
+    exists = Player.objects.filter(name=name).exists()
+    print(f"Player exists: {exists}")
+    return exists
+
+
+@database_sync_to_async
+def get_player(name):
+    return Player.objects.get(name=name)
+
+
+async def get_or_create_player(name):
+    print("here !!")
+    print(f"Checking existence for player: {name}")
+    player_exists = await get_player_by_name(name)
+    print(f"END search in database!! (Player exists: {player_exists})")
+    if not player_exists:
+        print("Player does not exist, creating player...")
+        player = await create_player(name)
+        print(f"Player created: {player}")
+        return player
+    else:
+        print("Player exists, fetching player...")
+        player = await get_player(name)
+        print(f"Player fetched: {player}")
+        return player 
+
 
 @database_sync_to_async
 def create_player(
@@ -69,8 +72,6 @@ def create_player(
     num_won_tournaments=0
 ):
     print("create player !!!")
-    """ if database_sync_to_async(Player.objects.filter(name=name).exists)():
-        raise ValueError(f"A player with the name '{name}' already exists.") """
     
     player = Player(
         name=name,
@@ -150,9 +151,9 @@ def update_player_statistics(player_name):
         return
     
     won_matches = Match.objects.filter(winner=player)
-    """ part_tourn_as_p1 = Tournoi.objects.filter(matches__is_tournoi=True, matches__matches_as_player1=player)
-    part_tourn_as_p2 = Tournoi.objects.filter(matches__is_tournoi=True, matches__matches_as_player2=player)
-    won_tourn = Tournoi.objects.filter(winner=player) """
+    #part_tourn_as_p1 = Tournoi.objects.filter(matches__is_tournoi=True, matches__matches_as_player1=player)
+    #part_tourn_as_p2 = Tournoi.objects.filter(matches__is_tournoi=True, matches__matches_as_player2=player)
+    #won_tourn = Tournoi.objects.filter(winner=player) 
 
     total_score = matches_as_player1.aggregate(Sum('score_player1'))['score_player1__sum'] or 0
     total_score += matches_as_player2.aggregate(Sum('score_player2'))['score_player2__sum'] or 0
@@ -174,10 +175,10 @@ def update_player_statistics(player_name):
     total_duration += matches_as_player2.aggregate(Sum('duration'))['duration__sum'] or 0
     m_duration = total_duration / total_match
 
-    """ total_tourn_p = part_tourn_as_p1.count() + part_tourn_as_p2.count()
-    total_win_tourn = won_tourn.count()
-    p_win_tourn = (total_win_tourn / total_tourn_p) * 100 if total_tourn_p else 0
- """
+    #total_tourn_p = part_tourn_as_p1.count() + part_tourn_as_p2.count()
+    #total_win_tourn = won_tourn.count()
+    #p_win_tourn = (total_win_tourn / total_tourn_p) * 100 if total_tourn_p else 0
+ 
     best_score_as_player1 = matches_as_player1.aggregate(Max('score_player1'))['score_player1__max'] or 0
     best_score_as_player2 = matches_as_player2.aggregate(Max('score_player2'))['score_player2__max'] or 0
     best_score = max(best_score_as_player1, best_score_as_player2)
@@ -192,8 +193,8 @@ def update_player_statistics(player_name):
     player.m_nbr_ball_touch = m_nbr_ball_touch
     player.total_duration = total_duration
     player.m_duration = m_duration
-    """ player.num_participated_tournaments = total_tourn_p
-    player.num_won_tournaments = total_win_tourn """
+    # player.num_participated_tournaments = total_tourn_p
+    #player.num_won_tournaments = total_win_tourn 
 
     player.save()
     print("CHAKU IS THE BEST")
@@ -205,4 +206,100 @@ def get_player_p_win(player_name):
     return player.p_win
 
 
+
+
+
+
+
+######## try synchrone version ########
+
+""" def endfortheouche_sync(p1, p2, s_p1, s_p2, bt_p1, bt_2, dur, is_tournoi, name_tournament):
+    try:
+        print("here endfortheouche §!!!")
+        player_1 = get_or_create_player_sync(p1)
+        player_2 = get_or_create_player_sync(p2)
+
+        print("ok")
+
+        print("############# BEFORE MATCH")
+        create_match_sync(player_1, player_2, s_p1, s_p2, bt_p1, bt_2, dur, is_tournoi, name_tournament)
+        print("############# AFTER DONE")
+
+        #update_player_statistics_sync(p1)
+        print("############# END STAT P1")
+        #update_player_statistics_sync(p2)
+    except Exception as e:
+        print(f"Error in endfortheouche: {e}")
+
+def get_player_sync(name):
+    print(f"Getting player '{name}'")
+    return Player.objects.get(name=name)
+
+
+def get_or_create_player_sync(name):
+    print("here !!")
+    player_exists = Player.objects.filter(name=name).exists()
+    print("search in database!!")
+    if not player_exists:
+        print(f"Player '{name}' does not exist, creating new player.")
+        return create_player_sync(name)
+    else:
+        print(f"Player '{name}' exists.")
+        return get_player_sync(name)
+
+def create_player(
+    name, 
+    total_match=0, 
+    total_win=0, 
+    p_win= None, 
+    m_score_match= None, 
+    m_score_adv_match= None, 
+    best_score=0, 
+    m_nbr_ball_touch= None, 
+    total_duration= None, 
+    m_duration= None, 
+    num_participated_tournaments=0, 
+    num_won_tournaments=0
+):
+    print("create player !!!")
     
+    player = Player(
+        name=name,
+        total_match=total_match,
+        total_win=total_win,
+        p_win=p_win,
+        m_score_match=m_score_match,
+        m_score_adv_match=m_score_adv_match,
+        best_score=best_score,
+        m_nbr_ball_touch=m_nbr_ball_touch,
+        total_duration=total_duration,
+        m_duration=m_duration,
+        num_participated_tournaments=num_participated_tournaments,
+        num_won_tournaments=num_won_tournaments
+    )
+    player.save()
+    return player
+
+
+def create_match(player1, player2, score_player1, score_player2, nbr_ball_touch_p1, nbr_ball_touch_p2, duration, is_tournoi, tournoi):
+    match = Match(
+        player1=player1,
+        player2=player2,
+        score_player1=score_player1,
+        score_player2=score_player2,
+        nbr_ball_touch_p1=nbr_ball_touch_p1,
+        nbr_ball_touch_p2=nbr_ball_touch_p2,
+        duration=duration,
+        is_tournoi=is_tournoi,
+        tournoi=tournoi
+    )
+
+    if score_player1 > score_player2:
+        match.winner = match.player1
+    elif score_player2 > score_player1:
+        match.winner = match.player2
+    else:
+        match.winner = None
+    
+    match.save()
+    return match """

pong/game/views.py

@@ -72,18 +72,6 @@ def get_or_create_token(user):
 
 ####################### THEOUCHE PART ############################
 
-def player_list(request):
-    players = Player.objects.all()
-    return render(request, 'pong/player_list.html', {'players': players})
-
-def match_list(request):
-    matches = Match.objects.select_related('player1', 'player2', 'winner', 'tournoi').all()
-    return render(request, 'pong/match_list.html', {'matches': matches})
-
-def tournoi_list(request):
-    tournois = Tournoi.objects.select_related('winner').all()
-    return render(request, 'pong/tournoi_list.html', {'tournois': tournois})
-
 from django.http import JsonResponse
 
 def match_list_json(request):