fix tests

Author: istar410

insalan/tournament/models/manager.py

@@ -6,6 +6,7 @@
 from insalan.user.models import User
 
 from .payement_status import PaymentStatus
+from . import validators
 
 class Manager(models.Model):
     """
@@ -69,11 +70,11 @@ def clean(self):
         """
         user = self.user
         event = self.get_team().get_tournament().get_event()
-        if not unique_event_registration_validator(user,event, manager=self.id):
+        if not validators.unique_event_registration_validator(user,event, manager=self.id):
             raise ValidationError(
                 _("Utilisateur⋅rice déjà inscrit⋅e dans un tournoi de cet évènement")
             )
-        if not tournament_announced(self.team.get_tournament()):
+        if not validators.tournament_announced(self.team.get_tournament()):
             raise ValidationError(
                 _("Tournoi non annoncé")
             )

insalan/tournament/models/player.py

@@ -7,7 +7,7 @@
 from insalan.user.models import User
 
 from .payement_status import PaymentStatus
-from . import team
+from . import team, validators
 
 class Player(models.Model):
     """
@@ -78,15 +78,15 @@ def clean(self):
         """
         user = self.user
         event = self.team.get_tournament().get_event()
-        if not unique_event_registration_validator(user,event,player=self.id):
+        if not validators.unique_event_registration_validator(user,event,player=self.id):
             raise ValidationError(
                 _("Utilisateur⋅rice déjà inscrit⋅e dans un tournoi de cet évènement")
             )
-        if max_players_per_team_reached(self.team, exclude=self.id):
+        if validators.max_players_per_team_reached(self.team, exclude=self.id):
             raise ValidationError(
                 _("Équipe déjà remplie")
             )
-        if not tournament_announced(self.team.get_tournament()):
+        if not validators.tournament_announced(self.team.get_tournament()):
             raise ValidationError(
                 _("Tournoi non annoncé")
             )

insalan/tournament/models/substitute.py

@@ -8,6 +8,7 @@
 from insalan.user.models import User
 
 from .payement_status import PaymentStatus
+from . import validators
 
 class Substitute(models.Model):
     """
@@ -83,15 +84,15 @@ def clean(self):
         """
         user = self.user
         event = self.get_team().get_tournament().get_event()
-        if not unique_event_registration_validator(user,event, substitute=self.id):
+        if not validators.unique_event_registration_validator(user,event, substitute=self.id):
             raise ValidationError(
                 _("Utilisateur⋅rice déjà inscrit⋅e dans un tournoi de cet évènement")
             )
-        if max_substitue_per_team_reached(self.team, exclude=self.id):
+        if validators.max_substitue_per_team_reached(self.team, exclude=self.id):
             raise ValidationError(
                 _("Nombre maximum de remplaçants déjà atteint")
             )
-        if not tournament_announced(self.team.get_tournament()):
+        if not validators.tournament_announced(self.team.get_tournament()):
             raise ValidationError(
                 _("Tournoi non annoncé")
             )

insalan/tournament/models/validators.py

@@ -3,13 +3,13 @@
 from rest_framework.validators import ValidationError
 
 # from .event import Event
-from . import player
-from . import manager
-from . import substitute
+from . import player as play
+from . import manager as manage
+from . import substitute as sub
 
 def unique_event_registration_validator(user: User, event: "Event", player = None, manager = None, substitute = None):
     """Validate a unique registration per event"""
-    e_regs = player.Player.objects.filter(team__tournament__event=event,user=user).exclude(id=player).values("id").union(manager.Manager.objects.filter(team__tournament__event=event, user=user).exclude(id=manager).values("id")).union(substitute.Substitute.objects.filter(team__tournament__event=event, user=user).exclude(id=substitute).values("id"))
+    e_regs = play.Player.objects.filter(team__tournament__event=event,user=user).exclude(id=player).values("id").union(manage.Manager.objects.filter(team__tournament__event=event, user=user).exclude(id=manager).values("id")).union(sub.Substitute.objects.filter(team__tournament__event=event, user=user).exclude(id=substitute).values("id"))
     if len(e_regs) > 0:
         return False
     return True

insalan/tournament/tests.py

@@ -1171,6 +1171,7 @@ def test_example(self):
                 "short_name": "TFG",
                 "players_per_team": 1,
                 "substitute_players_per_team": 0,
+                "team_per_match": 2
             },
             "name": "Test Tournament",
             "rules": "have fun!",