Remember migrations are annoying

SecondRobotics · Sep 13, 2024 · 21a25ac · 21a25ac
1 parent 205688b
commit 21a25ac
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/ranked/models.py b/ranked/models.py
@@ -31,8 +31,6 @@ class Match(models.Model):
     red_starting_elo = models.FloatField()
     blue_starting_elo = models.FloatField()
 
-    winner = models.CharField(max_length=10, choices=[('red', 'Red'), ('blue', 'Blue'), ('draw', 'Draw')])
-
     def get_red_players(self):
         return self.red_alliance.all()
 

diff --git a/ranked/views.py b/ranked/views.py
@@ -130,8 +130,8 @@ def player_info(request, name, player_id):
         )
         total_matches = matches_together.count()
         wins = matches_together.filter(
-            (Q(red_alliance=player.player) & Q(red_alliance=played_with) & Q(winner='red')) |
-            (Q(blue_alliance=player.player) & Q(blue_alliance=played_with) & Q(winner='blue'))
+            (Q(red_alliance=player.player) & Q(red_alliance=played_with) & Q(red_score__gt=F('blue_score'))) |
+            (Q(blue_alliance=player.player) & Q(blue_alliance=played_with) & Q(blue_score__gt=F('red_score')))
         ).count()
         win_rate = (wins / total_matches * 100) if total_matches > 0 else 0
         players_with_stats.append({
@@ -156,8 +156,8 @@ def player_info(request, name, player_id):
         )
         total_matches = matches_against.count()
         wins = matches_against.filter(
-            (Q(red_alliance=player.player) & Q(winner='red')) |
-            (Q(blue_alliance=player.player) & Q(winner='blue'))
+            (Q(red_alliance=player.player) & Q(red_score__gt=F('blue_score'))) |
+            (Q(blue_alliance=player.player) & Q(blue_score__gt=F('red_score')))
         ).count()
         win_rate = (wins / total_matches * 100) if total_matches > 0 else 0
         players_against_stats.append({