From ce0a9891058e87e436b9017ca2966f158b2e1e95 Mon Sep 17 00:00:00 2001 From: Raz Date: Tue, 13 May 2025 15:49:17 +0200 Subject: [PATCH] add unique_random_index in team --- tournaments/models/tournament.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tournaments/models/tournament.py b/tournaments/models/tournament.py index 09326f1..27f030b 100644 --- a/tournaments/models/tournament.py +++ b/tournaments/models/tournament.py @@ -432,14 +432,14 @@ class Tournament(BaseModel): t.registration_date is None, t.registration_date or datetime.min, t.initial_weight, - t.unique_random_index, + t.team_registration.unique_random_index, t.team_registration.id )) waiting_teams.sort(key=lambda t: ( t.registration_date is None, t.registration_date or datetime.min, t.initial_weight, - t.unique_random_index, + t.team_registration.unique_random_index, t.team_registration.id )) else: @@ -456,8 +456,8 @@ class Tournament(BaseModel): qualified_teams = complete_teams[:computed_team_count] excess_teams = complete_teams[computed_team_count:] - qualified_teams.sort(key=lambda t: (t.initial_weight, t.unique_random_index, t.team_registration.id)) - excess_teams.sort(key=lambda t: (t.initial_weight, t.unique_random_index, t.team_registration.id)) + qualified_teams.sort(key=lambda t: (t.initial_weight, t.team_registration.unique_random_index, t.team_registration.id)) + excess_teams.sort(key=lambda t: (t.initial_weight, t.team_registration.unique_random_index, t.team_registration.id)) # Combine all waiting list teams waiting_list = excess_teams + waiting_teams @@ -466,17 +466,17 @@ class Tournament(BaseModel): t.registration_date is None, t.registration_date or datetime.min, t.initial_weight, - t.unique_random_index, + t.team_registration.unique_random_index, t.team_registration.id )) else: - waiting_list.sort(key=lambda t: (t.initial_weight, t.unique_random_index, t.team_registration.id)) + waiting_list.sort(key=lambda t: (t.initial_weight, t.team_registration.unique_random_index, t.team_registration.id)) # Return final sorted list bracket_teams = qualified_teams[:bracket_seeds] + wildcard_bracket gs_teams = qualified_teams[bracket_seeds:(bracket_seeds+group_stage_team_count)] + wildcard_group_stage - bracket_teams.sort(key=lambda t: (t.initial_weight, t.unique_random_index, t.team_registration.id)) - gs_teams.sort(key=lambda t: (t.initial_weight, t.unique_random_index, t.team_registration.id)) + bracket_teams.sort(key=lambda t: (t.initial_weight, t.team_registration.unique_random_index, t.team_registration.id)) + gs_teams.sort(key=lambda t: (t.initial_weight, t.team_registration.unique_random_index, t.team_registration.id)) all_teams = bracket_teams + gs_teams for team in bracket_teams: team.set_stage("Tableau")