change tounament: viewset, serializer, models

simply the code and use django feat

README.md

@@ -25,6 +25,7 @@ pip install -r requirements.txt
 python manage.py makemigrations games
 python manage.py makemigrations profiles
 python manage.py makemigrations chat
+python manage.py makemigrations tournament
 python manage.py migrate
 ```
 - Start the developpement server

frontend/static/js/api/account.js

@@ -33,7 +33,7 @@ class Account
 
 		if (JSON.stringify(response_data) == JSON.stringify({'detail': 'Authentication credentials were not provided.'}))
 		{
-			this.client._logged = false;
+			this.client._update_logged(false);
 			return null;			
 		}
 		if (response_data == "user deleted")

frontend/static/js/api/matchmaking.js

@@ -8,7 +8,7 @@ class MatchMaking
 	constructor(client)
 	{
 		/**
-		 * @type {client}
+		 * @type {Client}
 		 */
 		this.client = client
 	}

frontend/static/js/api/tournament/tournament.js

@@ -0,0 +1,19 @@
+import { Client } from "./client.js";
+
+class Tourmanent
+{
+	/**
+	 * @param  {Client} client
+	 */
+	constructor(client)
+	{
+		/**
+		 * @type {Client}
+		 */
+		this.client = client
+	}
+
+	
+}
+
+export { Tourmanent }

frontend/static/js/api/tournament/tournaments.js

@@ -0,0 +1,33 @@
+import { Client } from "./client.js";
+
+class Tourmanents
+{
+	/**
+	 * @param  {Client} client
+	 */
+	constructor(client)
+	{
+		/**
+		 * @type {Client}
+		 */
+		this.client = client
+	}
+
+	async createTournament(nb_players, online)
+	{
+		if (online)
+			return "offline";
+		let response = await this.client._post("/api/tournaments/", {numbers_of_players: nb_players});
+		let response_data = await response.json();
+
+		if (JSON.stringify(response_data) === JSON.stringify({'detail': 'Authentication credentials were not provided.'}))
+		{
+			this.client._update_logged(false);
+			return null;			
+		}
+		return response_data.tournament_id;
+	}
+	
+}
+
+export { Tourmanents }

games/models.py

@@ -2,12 +2,19 @@ from django.db import models
 
 # Create your models here.
 class GameModel(models.Model):
+
+	finished = models.BooleanField(default=False)
+	started = models.BooleanField(default=False)
+	winner_id = models.IntegerField(null=True, blank=True)
 	
 	def create(self, users_id: [int]):
 		self.save()
 		for user_id in users_id:
-			GameMembersModel(game_id=self.pk, member_id=user_id)
+			GameMembersModel(game_id=self.pk, member_id=user_id).save()
 		return self.pk
+	
+	def get_users(self):
+		return list(GameMembersModel.objects.filter(self.pk))
 
 class GameMembersModel(models.Model):
 	game_id = models.IntegerField()

profiles/viewsets.py

@@ -31,9 +31,6 @@ class ProfileViewSet(viewsets.ModelViewSet):
             profile["avatar_url"] = profile["avatar_url"][profile["avatar_url"].find("static") - 1:]
         return Response(serializer.data)
 
-    def perform_create(self, serializer):
-        serializer.save(user=self.request.user)
-
 class MyProfileViewSet(viewsets.ModelViewSet):
 
     permission_classes = (permissions.IsAuthenticated,)

tournament/admin.py

@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.

tournament/apps.py

@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class TournamentConfig(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'tournament'

tournament/models.py

@@ -0,0 +1,36 @@
+from django.db import models
+
+from games.models import GameModel
+
+# Create your models here.tu
+class TournamentModel(models.Model):
+
+	name = models.CharField(max_length=100)
+	nb_players = models.IntegerField()
+	nb_players_by_game = models.IntegerField()
+	level = models.IntegerField()
+	started = models.BooleanField(default=False)
+	finished = models.BooleanField(default=False)
+
+	def create_game(self, users_id):
+		game_id = GameModel.create(users_id=users_id)
+		TournamentGamesModel(game_id=game_id, tournament_id=self.pk).save()
+		return game_id
+	
+	def get_games_id_by_level(self, level):
+		return list(TournamentGamesModel.objects.filter(tournament_id=self.pk, tournament_level=level))
+
+	def get_games_id(self):
+		return list(TournamentGamesModel.objects.filter(tournament_id=self.pk))
+	
+	def get_players_id(self):
+		lst: [int] = []
+		for game_id in self.get_games_id():
+			lst.append(GameMembersModel.objects.filter(game_id=game_id))
+		return lst
+
+class TournamentGamesModel(models.Model):
+
+	tournament_id = models.IntegerField()
+	tournament_level = models.IntegerField()
+	game_id = models.IntegerField()

tournament/serializers.py

@@ -0,0 +1,22 @@
+from rest_framework import serializers
+from .models import TournamentModel
+
+class TournamentSerializer(serializers.ModelSerializer):
+
+	levels = serializers.SerializerMethodField(read_only=True, required=False)
+	level = serializers.ReadOnlyField()
+	started = serializers.ReadOnlyField()
+	finished = serializers.ReadOnlyField()
+
+	class Meta:
+		model = TournamentModel
+		fields = ["name", "nb_players", "nb_players_by_game", "level", "started", "finished", "levels", "id"]
+
+	def get_levels(self, instance):
+		levels: [[int]] = []
+		for i in range(instance.level):
+			level: [int] = instance.get_games_id_by_level(i)
+			if (level == []):
+				break
+			levels.append(level)
+		return levels

tournament/tests.py

@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.

tournament/urls.py

@@ -0,0 +1,10 @@
+from django.urls import path, re_path
+from django.conf import settings
+from django.conf.urls.static import static
+
+from .viewset import TournamentViewSet
+
+urlpatterns = [
+    path("<int:pk>", TournamentViewSet.as_view({"get": "retrieve"}), name="tournament_page"),
+    re_path(r"search/(?P<state>\w*)", TournamentViewSet.as_view({"get": "list", "post": "create"}), name="tournaments"),
+]

tournament/viewset.py

@@ -0,0 +1,57 @@
+from rest_framework import viewsets
+from rest_framework.response import Response
+from rest_framework import permissions, status
+from rest_framework.authentication import SessionAuthentication
+
+from django.http import HttpRequest
+from django.contrib.auth import login
+from django.db.models import QuerySet
+
+from matchmaking.models import in_matchmaking
+from .models import TournamentModel
+from .serializers import TournamentSerializer
+
+# Create your views here.
+class TournamentViewSet(viewsets.ModelViewSet):
+    
+	queryset = TournamentModel.objects.all
+	serializer_class = TournamentSerializer
+	permission_classes = (permissions.IsAuthenticated,)
+	authentication_classes = (SessionAuthentication,)
+
+	def perform_create(self, serializer: TournamentSerializer):
+
+		nb_players = serializer.validated_data["nb_players"]
+		nb_players_by_game = serializer.validated_data["nb_players_by_game"]
+		level = 1
+		number: int = nb_players
+		while (number != nb_players_by_game):
+			number = number // 2 + (number % 2)
+			level += 1
+
+		tournament = serializer.save(level = level)
+		
+		return Response(self.serializer_class(tournament).data, status=status.HTTP_201_CREATED)
+	
+	def list(self, request: HttpRequest, state: str = ""):
+		query: QuerySet
+		match state:
+			case "started":
+				query = TournamentModel.objects.filter(started=True, finished=False)
+			case "finished":
+				query = TournamentModel.objects.filter(finished=True)
+			case "waiting":
+				query = TournamentModel.objects.filter(started=False, finished=False)
+			case _:
+				query = TournamentModel.objects.all()
+		serializer = TournamentSerializer(query, many=True)	
+		return Response(serializer.data)
+
+	def retrieve(self, request: HttpRequest, pk):
+
+		if (not TournamentModel.objects.filter(pk=pk).exists()):
+			return Response({"detail": "Tournament not found."}, status=status.HTTP_404_NOT_FOUND)
+		
+		tournament = TournamentModel.objects.get(pk=pk)
+
+		return Response(self.serializer_class(tournament).data, status=status.HTTP_200_OK)

trancendence/settings.py

@@ -43,6 +43,7 @@ INSTALLED_APPS = [
 	'channels',
 	'daphne',
 
+    'tournament.apps.TournamentConfig',
     'matchmaking.apps.MatchmakingConfig',
     'games.apps.GamesConfig',
     'accounts.apps.AccountsConfig',

trancendence/urls.py

@@ -22,5 +22,6 @@ urlpatterns = [
     path('api/profiles/', include('profiles.urls')),
     path('api/accounts/', include('accounts.urls')),
     path('api/chat/', include('chat.urls')),
+    path('api/tournaments/', include('tournament.urls')),
     path('', include('frontend.urls')),
 ]