cody/wrestlingdev.com
1
0
Fork 0
mirror of https://github.com/jcwimer/wrestlingApp synced 2026-04-06 06:28:33 +00:00
Code Issues Releases Wiki Activity

Added tests for modified double elimination, added a 1-8 place modified double elimination, and renamed regular double elimination

Browse Source
This commit is contained in:
Jacob Cody Wimer
2021-02-20 01:33:31 +00:00
parent 89a695388a
commit 537eccf04d
17 changed files with 591 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/models/tournament.rb
View File

@@ -29,7 +29,15 @@ class Tournament < ActiveRecord::Base
end end
def tournament_types def tournament_types
["Pool to bracket","Modified 16 Man Double Elimination","Double Elimination 1-6"] ["Pool to bracket","Modified 16 Man Double Elimination 1-6","Modified 16 Man Double Elimination 1-8","Regular Double Elimination 1-6"]
end
def number_of_placers
if self.tournament_type.include? "1-8"
return 8
elsif self.tournament_type.include? "1-6"
return 6
end
end end
def create_pre_defined_weights(weight_classes) def create_pre_defined_weights(weight_classes)
@@ -112,7 +120,7 @@ class Tournament < ActiveRecord::Base
def modified_sixteen_man_number_of_wrestlers def modified_sixteen_man_number_of_wrestlers
error_string = "" error_string = ""
if self.tournament_type == "Modified 16 Man Double Elimination" if self.tournament_type.include? "Modified 16 Man Double Elimination"
weights_with_too_many_wrestlers = weights.select{|w| w.wrestlers.size > 16} weights_with_too_many_wrestlers = weights.select{|w| w.wrestlers.size > 16}
weight_with_too_few_wrestlers = weights.select{|w| w.wrestlers.size < 12} weight_with_too_few_wrestlers = weights.select{|w| w.wrestlers.size < 12}
weights_with_too_many_wrestlers.each do |weight| weights_with_too_many_wrestlers.each do |weight|

4
app/services/bracket_advancement/advance_wrestler.rb
View File

@@ -15,8 +15,8 @@ class AdvanceWrestler
def advance_raw def advance_raw
pool_to_bracket_advancement if @tournament.tournament_type == "Pool to bracket" pool_to_bracket_advancement if @tournament.tournament_type == "Pool to bracket"
DoubleEliminationAdvance.new(@wrestler, @last_match).bracket_advancement if @tournament.tournament_type == "Modified 16 Man Double Elimination" or DoubleEliminationAdvance.new(@wrestler, @last_match).bracket_advancement if @tournament.tournament_type.include? "Modified 16 Man Double Elimination" or
@tournament.tournament_type == "Double Elimination 1-6" @tournament.tournament_type.include? "Regular Double Elimination"
end end
def pool_to_bracket_advancement def pool_to_bracket_advancement

8
app/services/tournament_services/generate_tournament_matches.rb
View File

@@ -33,12 +33,12 @@ class GenerateTournamentMatches
def generate_raw def generate_raw
standardStartingActions standardStartingActions
PoolToBracketMatchGeneration.new(@tournament).generatePoolToBracketMatches if @tournament.tournament_type == "Pool to bracket" PoolToBracketMatchGeneration.new(@tournament).generatePoolToBracketMatches if @tournament.tournament_type == "Pool to bracket"
ModifiedSixteenManMatchGeneration.new(@tournament).generate_matches if @tournament.tournament_type == "Modified 16 Man Double Elimination" ModifiedSixteenManMatchGeneration.new(@tournament).generate_matches if @tournament.tournament_type.include? "Modified 16 Man Double Elimination"
DoubleEliminationMatchGeneration.new(@tournament).generate_matches if @tournament.tournament_type == "Double Elimination 1-6" DoubleEliminationMatchGeneration.new(@tournament).generate_matches if @tournament.tournament_type.include? "Regular Double Elimination"
postMatchCreationActions postMatchCreationActions
PoolToBracketMatchGeneration.new(@tournament).assignLoserNames if @tournament.tournament_type == "Pool to bracket" PoolToBracketMatchGeneration.new(@tournament).assignLoserNames if @tournament.tournament_type == "Pool to bracket"
ModifiedSixteenManGenerateLoserNames.new(@tournament).assign_loser_names if @tournament.tournament_type == "Modified 16 Man Double Elimination" ModifiedSixteenManGenerateLoserNames.new(@tournament).assign_loser_names if @tournament.tournament_type.include? "Modified 16 Man Double Elimination"
DoubleEliminationGenerateLoserNames.new(@tournament).assign_loser_names if @tournament.tournament_type == "Double Elimination 1-6" DoubleEliminationGenerateLoserNames.new(@tournament).assign_loser_names if @tournament.tournament_type.include? "Regular Double Elimination"
end end
def standardStartingActions def standardStartingActions

9
app/services/tournament_services/modified_sixteen_man_generate_loser_names.rb
View File

@@ -10,6 +10,7 @@ class ModifiedSixteenManGenerateLoserNames
conso_round_2(matches_by_weight) conso_round_2(matches_by_weight)
conso_round_3(matches_by_weight) conso_round_3(matches_by_weight)
third_fourth(matches_by_weight) third_fourth(matches_by_weight)
seventh_eighth(matches_by_weight)
save_matches(matches_by_weight) save_matches(matches_by_weight)
matches_by_weight = @tournament.matches.where(weight_id: w.id).reload matches_by_weight = @tournament.matches.where(weight_id: w.id).reload
advance_bye_matches_championship(matches_by_weight) advance_bye_matches_championship(matches_by_weight)
@@ -56,10 +57,16 @@ class ModifiedSixteenManGenerateLoserNames
end end
end end
def seventh_eighth(matches)
matches.select{|m| m.bracket_position == "7/8"}.sort_by{|m| m.bracket_position_number}.each do |match|
match.loser1_name = "Loser of #{matches.select{|m| m.bracket_position == "Conso Semis"}.first.bout_number}"
match.loser2_name = "Loser of #{matches.select{|m| m.bracket_position == "Conso Semis"}.second.bout_number}"
end
end
def advance_bye_matches_championship(matches) def advance_bye_matches_championship(matches)
matches.select{|m| m.round == 1 and m.bracket_position == "Bracket"}.sort_by{|m| m.bracket_position_number}.each do |match| matches.select{|m| m.round == 1 and m.bracket_position == "Bracket"}.sort_by{|m| m.bracket_position_number}.each do |match|
if match.w1 == nil or match.w2 == nil if match.w1 == nil or match.w2 == nil
puts match.bout_number
match.finished = 1 match.finished = 1
match.win_type = "BYE" match.win_type = "BYE"
if match.w1 != nil if match.w1 != nil

4
app/services/tournament_services/modified_sixteen_man_match_generation.rb
View File

@@ -1,6 +1,7 @@
class ModifiedSixteenManMatchGeneration class ModifiedSixteenManMatchGeneration
def initialize( tournament ) def initialize( tournament )
@tournament = tournament @tournament = tournament
@number_of_placers = @tournament.number_of_placers
end end
def generate_matches def generate_matches
@@ -57,6 +58,9 @@ class ModifiedSixteenManMatchGeneration
create_matchup(nil,nil,"1/2",1,5,weight) create_matchup(nil,nil,"1/2",1,5,weight)
create_matchup(nil,nil,"3/4",1,5,weight) create_matchup(nil,nil,"3/4",1,5,weight)
create_matchup(nil,nil,"5/6",1,5,weight) create_matchup(nil,nil,"5/6",1,5,weight)
if @number_of_placers >= 8
create_matchup(nil,nil,"7/8",1,5,weight)
end
end end
def wrestler_with_seed(seed,weight) def wrestler_with_seed(seed,weight)

1
app/services/tournament_services/sixteen_man_double_elimination_match_generation.rb
View File

@@ -1,6 +1,7 @@
class SixteenManDoubleEliminationMatchGeneration class SixteenManDoubleEliminationMatchGeneration
def initialize( weight ) def initialize( weight )
@weight = weight @weight = weight
@number_of_placers = @weight.tournament.number_of_placers
end end
def generate_matches_for_weight def generate_matches_for_weight

4
app/services/wrestler_services/calculate_wrestler_team_score.rb
View File

@@ -26,8 +26,8 @@ class CalculateWrestlerTeamScore
def placement_points def placement_points
return PoolBracketPlacementPoints.new(@wrestler).calcPoints if @tournament.tournament_type == "Pool to bracket" return PoolBracketPlacementPoints.new(@wrestler).calcPoints if @tournament.tournament_type == "Pool to bracket"
return ModifiedSixteenManPlacementPoints.new(@wrestler).calc_points if @tournament.tournament_type == "Modified 16 Man Double Elimination" return ModifiedSixteenManPlacementPoints.new(@wrestler).calc_points if @tournament.tournament_type.include? "Modified 16 Man Double Elimination"
return DoubleEliminationPlacementPoints.new(@wrestler).calc_points if @tournament.tournament_type == "Double Elimination 1-6" return DoubleEliminationPlacementPoints.new(@wrestler).calc_points if @tournament.tournament_type.include? "Regular Double Elimination"
return 0 return 0
end end

4
app/services/wrestler_services/double_elimination_placement_points.rb
View File

@@ -1,9 +1,7 @@
class DoubleEliminationPlacementPoints class DoubleEliminationPlacementPoints
def initialize(wrestler) def initialize(wrestler)
@wrestler = wrestler @wrestler = wrestler
if wrestler.tournament.tournament_type == "Double Elimination 1-6" @number_of_placers = @wrestler.tournament.number_of_placers
@number_of_placers = 6
end
end end
def calc_points def calc_points

7
app/services/wrestler_services/modified_sixteen_man_placement_points.rb
View File

@@ -1,7 +1,8 @@
class ModifiedSixteenManPlacementPoints class ModifiedSixteenManPlacementPoints
def initialize(wrestler) def initialize(wrestler)
@wrestler = wrestler @wrestler = wrestler
@number_of_placers = 6 @wrestler = wrestler
@number_of_placers = @wrestler.tournament.number_of_placers
end end
def calc_points def calc_points
@@ -17,6 +18,10 @@ class ModifiedSixteenManPlacementPoints
return PlacementPoints.new(@number_of_placers).fifthPlace return PlacementPoints.new(@number_of_placers).fifthPlace
elsif bracket_position_size("5/6") > 0 elsif bracket_position_size("5/6") > 0
return PlacementPoints.new(@number_of_placers).sixthPlace return PlacementPoints.new(@number_of_placers).sixthPlace
elsif won_bracket_position_size("7/8") > 0
return PlacementPoints.new(@number_of_placers).seventhPlace
elsif bracket_position_size("Conso Semis") > 0 and @number_of_placers >= 8
return PlacementPoints.new(@number_of_placers).eighthPlace
else else
return 0 return 0
end end

2
app/views/tournaments/_bracket_partial.html.erb
View File

@@ -106,7 +106,7 @@ table.smallText tr td { font-size: 10px; }
<%= render 'fourPoolSemiBracket' %> <%= render 'fourPoolSemiBracket' %>
<% end %> <% end %>
</td> </td>
<% elsif @tournament.tournament_type == "Modified 16 Man Double Elimination" %> <% elsif @tournament.tournament_type.include? "Modified 16 Man Double Elimination" %>
<td valign="top" style="padding: 10px;"> <td valign="top" style="padding: 10px;">
<%= render 'modified_sixteen_man_double_elimination_bracket' %> <%= render 'modified_sixteen_man_double_elimination_bracket' %>
</td> </td>

173
app/views/tournaments/_modified_sixteen_man_double_elimination_bracket.html.erb
View File

@@ -1,131 +1,48 @@
<h4>Championship Bracket</h4> <h4>Championship Bracket</h4>
<main id="bracket"> <div class="bracket">
<ul class="round round-1"> <!--Round 1-->
<% @matches.select{|m|m.bracket_position == "Bracket" and m.round == 1}.sort_by{|m| m.bracket_position_number}.each do |match| %> <% @round_matches = @matches.select{|m|m.bracket_position == "Bracket" and m.round == 1} %>
<li>&nbsp;</li> <%= render 'bracket_round' %>
<li class="game game-top "><%= match.w1_bracket_name_round_one %> <span></span></li> <!--Round 2-->
<li class="bout-number"><%= match.bout_number %> <%= match.bracket_score_string %>&nbsp;</li> <% @round_matches = @matches.select{|m|m.bracket_position == "Quarter"} %>
<li class="game game-bottom "><%= match.w2_bracket_name_round_one %><span></span></li> <%= render 'bracket_round' %>
<li>&nbsp;</li> <!--Round 3-->
<% @round_matches = @matches.select{|m|m.bracket_position == "Semis"} %>
<% end %> <%= render 'bracket_round' %>
</ul> <!--Round 4-->
<ul class="round round-2"> <% @final_match = @matches.select{|m|m.bracket_position == "1/2"} %>
<% @matches.select{|m|m.bracket_position == "Quarter"}.sort_by{|m| m.bracket_position_number}.each do |match| %> <% @winner_place = "1st" %>
<li></li> <%= render 'bracket_final' %>
<li class="game game-top "><%= match.w1_bracket_name %> <span></span></li> </div>
<li class="bout-number"><%= match.bout_number %> <%= match.bracket_score_string %>&nbsp;</li>
<li class="game game-bottom "><%= match.w2_bracket_name %><span></span></li>
<li></li>
<% end %>
</ul>
<ul class="round round-3">
<% @matches.select{|m|m.bracket_position == "Semis"}.sort_by{|m| m.bracket_position_number}.each do |match| %>
<li></li>
<li class="game game-top "><%= match.w1_bracket_name %> <span></span></li>
<li class="bout-number"><%= match.bout_number %> <%= match.bracket_score_string %>&nbsp;</li>
<li class="game game-bottom "><%= match.w2_bracket_name %><span></span></li>
<li></li>
<% end %>
</ul>
<ul class="round round-4">
<% @matches.select{|m|m.bracket_position == "1/2"}.each do |match| %>
<li></li>
<li class="game game-top "><%= match.w1_bracket_name %> <span></span></li>
<li class="bout-number"><%= match.bout_number %> <%= match.bracket_score_string %>&nbsp;</li>
<li class="game game-bottom "><%= match.w2_bracket_name %><span></span></li>
<li></li>
</ul>
<ul class="round round-5">
<li></li>
<li class="bracket-winner"> <%= match.bracket_winner_name %> <span></span></li>
1st
<li></li>
</ul>
<% end %>
</main>
<h4>3/4 place match</h4> <h4>3/4 place match</h4>
<main id="bracket"> <div class="bracket">
<ul class="round round-3"> <!--Round 1-->
<% @matches.select{|m|m.bracket_position == "3/4"}.each do |match| %> <% @final_match = @matches.select{|m|m.bracket_position == "3/4"} %>
<li>&nbsp;</li> <% @winner_place = "3rd" %>
<%= render 'bracket_final' %>
<li class="game game-top "><%= match.w1_bracket_name %> <span></span></li> </div>
<li class="bout-number"><%= match.bout_number %> <%= match.bracket_score_string %>&nbsp;</li>
<li class="game game-bottom "><%= match.w2_bracket_name %><span></span></li>
<li>&nbsp;</li>
</ul>
<ul class="round round-4">
<li>&nbsp;</li>
<li class="bracket-winner"> <%= match.bracket_winner_name %> <span></span></li>
3rd
<li>&nbsp;</li>
</ul>
<% end %>
</main>
<h4>Consolation Bracket</h4> <h4>Consolation Bracket</h4>
<main id="bracket"> <div class="bracket">
<ul class="round round-1"> <!--Round 1-->
<% @matches.select{|m|m.bracket_position == "Conso" and m.round == 2}.sort_by{|m| m.bracket_position_number}.each do |match| %> <% @round_matches = @matches.select{|m|m.bracket_position == "Conso" and m.round == 2} %>
<li>&nbsp;</li> <%= render 'bracket_round' %>
<li>&nbsp;</li> <!--Round 2-->
<% @round_matches = @matches.select{|m|m.bracket_position == "Conso Quarter"} %>
<%= render 'bracket_round' %>
<li class="game game-top "><%= match.w1_bracket_name %> <span></span></li> <!--Round 3-->
<li class="bout-number"><%= match.bout_number %> <%= match.bracket_score_string %>&nbsp;</li> <% @round_matches = @matches.select{|m|m.bracket_position == "Conso Semis"} %>
<li class="game game-bottom "><%= match.w2_bracket_name %><span></span></li> <%= render 'bracket_round' %>
<!--Round 4-->
<% end %> <% @final_match = @matches.select{|m|m.bracket_position == "5/6"} %>
</ul> <% @winner_place = "5th" %>
<ul class="round round-2"> <%= render 'bracket_final' %>
<% @matches.select{|m|m.bracket_position == "Conso Quarter"}.sort_by{|m| m.bracket_position_number}.each do |match| %> </div>
<li>&nbsp;</li> <% if @tournament.number_of_placers >= 8 %>
<h4>7/8 place match</h4>
<li class="game game-top "><%= match.w1_bracket_name %> <span></span></li> <div class="bracket">
<li class="bout-number"><%= match.bout_number %> <%= match.bracket_score_string %>&nbsp;</li> <!--Round 1-->
<li class="game game-bottom "><%= match.w2_bracket_name %><span></span></li> <% @final_match = @matches.select{|m|m.bracket_position == "7/8"} %>
<% @winner_place = "7th" %>
<li>&nbsp;</li> <%= render 'bracket_final' %>
</div>
<% end %> <% end %>
</ul>
<ul class="round round-3">
<% @matches.select{|m|m.bracket_position == "Conso Semis"}.sort_by{|m| m.bracket_position_number}.each do |match| %>
<li>&nbsp;</li>
<li class="game game-top "><%= match.w1_bracket_name %> <span></span></li>
<li class="bout-number"><%= match.bout_number %> <%= match.bracket_score_string %>&nbsp;</li>
<li class="game game-bottom "><%= match.w2_bracket_name %><span></span></li>
<li>&nbsp;</li>
<% end %>
</ul>
<ul class="round round-4">
<% @matches.select{|m|m.bracket_position == "5/6"}.each do |match| %>
<li>&nbsp;</li>
<li class="game game-top "><%= match.w1_bracket_name %> <span></span></li>
<li class="bout-number"><%= match.bout_number %> <%= match.bracket_score_string %>&nbsp;</li>
<li class="game game-bottom "><%= match.w2_bracket_name %><span></span></li>
<li>&nbsp;</li>
</ul>
<ul class="round round-5">
<li>&nbsp;</li>
<li class="bracket-winner"> <%= match.bracket_winner_name %> <span></span></li>
5th
<li>&nbsp;</li>
</ul>
<% end %>
</main>

2
app/views/tournaments/bracket.html.erb
View File

@@ -3,6 +3,6 @@
<% end %> <% end %>
<% if @tournament.tournament_type == "Pool to bracket" %> <% if @tournament.tournament_type == "Pool to bracket" %>
<%= render 'pool_bracket_director_actions' %> <%= render 'pool_bracket_director_actions' %>
<% elsif @tournament.tournament_type == "Modified 16 Man Double Elimination" or @tournament.tournament_type == "Double Elimination 1-6" %> <% elsif @tournament.tournament_type.include? "Modified 16 Man Double Elimination" or @tournament.tournament_type.include? "Regular Double Elimination" %>
<%= render 'bracket_director_actions' %> <%= render 'bracket_director_actions' %>
<% end %> <% end %>

129
test/integration/modified_double_elimination_1_6_match_generation_test.rb Normal file
View File

@@ -0,0 +1,129 @@
require 'test_helper'
class ModifiedDoubleEliminationSixPlacesManMatchGeneration < ActionDispatch::IntegrationTest
def setup
create_double_elim_tournament_single_weight(14, "Modified 16 Man Double Elimination 1-6")
end
test "Match generation works" do
assert @tournament.matches.count == 27
assert @tournament.matches.select{|m| m.bracket_position == "1/2"}.count == 1
assert @tournament.matches.select{|m| m.bracket_position == "3/4"}.count == 1
assert @tournament.matches.select{|m| m.bracket_position == "5/6"}.count == 1
assert @tournament.matches.select{|m| m.bracket_position == "Bracket" and m.round == 1}.count == 8
assert @tournament.matches.select{|m| m.bracket_position == "Conso" and m.round == 2}.count == 4
assert @tournament.matches.select{|m| m.bracket_position == "Quarter"}.count == 4
assert @tournament.matches.select{|m| m.bracket_position == "Semis"}.count == 2
assert @tournament.matches.select{|m| m.bracket_position == "Conso Quarter"}.count == 4
assert @tournament.matches.select{|m| m.bracket_position == "Conso Semis"}.count == 2
end
test "Seeded wrestlers have correct first line" do
@tournament.matches.reload
match1 = @tournament.matches.select{|match| match.round == 1 and match.bracket_position_number == 1}.first
match2 = @tournament.matches.select{|match| match.round == 1 and match.bracket_position_number == 2}.first
match3 = @tournament.matches.select{|match| match.round == 1 and match.bracket_position_number == 3}.first
match4 = @tournament.matches.select{|match| match.round == 1 and match.bracket_position_number == 4}.first
match5 = @tournament.matches.select{|match| match.round == 1 and match.bracket_position_number == 5}.first
match6 = @tournament.matches.select{|match| match.round == 1 and match.bracket_position_number == 6}.first
match7 = @tournament.matches.select{|match| match.round == 1 and match.bracket_position_number == 7}.first
match8 = @tournament.matches.select{|match| match.round == 1 and match.bracket_position_number == 8}.first
assert match1.wrestler1.bracket_line == 1
assert match1.loser2_name == "BYE"
assert match2.wrestler1.bracket_line == 8
assert match2.wrestler2.bracket_line == 9
assert match3.wrestler1.bracket_line == 5
assert match3.wrestler2.bracket_line == 12
assert match4.wrestler1.bracket_line == 4
assert match4.wrestler2.bracket_line == 14
assert match5.wrestler1.bracket_line == 3
assert match5.wrestler2.bracket_line == 13
assert match6.wrestler1.bracket_line == 6
assert match6.wrestler2.bracket_line == 11
assert match7.wrestler1.bracket_line == 7
assert match7.wrestler2.bracket_line == 10
assert match8.wrestler1.bracket_line == 2
assert match8.loser2_name == "BYE"
end
test "Byes are advanced correctly" do
@tournament.matches.reload
match1 = @tournament.matches.select{|match| match.round == 2 and match.bracket_position == "Quarter" and match.bracket_position_number == 1}.first
match2 = @tournament.matches.select{|match| match.round == 2 and match.bracket_position == "Quarter" and match.bracket_position_number == 4}.first
assert match1.wrestler1.name == "Test1"
assert match2.wrestler2.name == "Test2"
end
test "Loser names set up correctly" do
@tournament.matches.reload
match1 = @tournament.matches.select{|match| match.round == 1 and match.bracket_position_number == 1}.first
match2 = @tournament.matches.select{|match| match.round == 1 and match.bracket_position_number == 2}.first
match3 = @tournament.matches.select{|match| match.round == 1 and match.bracket_position_number == 3}.first
match4 = @tournament.matches.select{|match| match.round == 1 and match.bracket_position_number == 4}.first
match5 = @tournament.matches.select{|match| match.round == 1 and match.bracket_position_number == 5}.first
match6 = @tournament.matches.select{|match| match.round == 1 and match.bracket_position_number == 6}.first
match7 = @tournament.matches.select{|match| match.round == 1 and match.bracket_position_number == 7}.first
match8 = @tournament.matches.select{|match| match.round == 1 and match.bracket_position_number == 8}.first
assert @tournament.matches.select{|m| m.bracket_position == "Conso" and m.round == 2 && m.bracket_position_number == 1}.first.loser1_name == "BYE"
assert @tournament.matches.select{|m| m.bracket_position == "Conso" and m.round == 2 && m.bracket_position_number == 1}.first.loser2_name == "Loser of #{match2.bout_number}"
assert @tournament.matches.select{|m| m.bracket_position == "Conso" and m.round == 2 && m.bracket_position_number == 2}.first.loser1_name == "Loser of #{match3.bout_number}"
assert @tournament.matches.select{|m| m.bracket_position == "Conso" and m.round == 2 && m.bracket_position_number == 2}.first.loser2_name == "Loser of #{match4.bout_number}"
assert @tournament.matches.select{|m| m.bracket_position == "Conso" and m.round == 2 && m.bracket_position_number == 3}.first.loser1_name == "Loser of #{match5.bout_number}"
assert @tournament.matches.select{|m| m.bracket_position == "Conso" and m.round == 2 && m.bracket_position_number == 3}.first.loser2_name == "Loser of #{match6.bout_number}"
assert @tournament.matches.select{|m| m.bracket_position == "Conso" and m.round == 2 && m.bracket_position_number == 4}.first.loser1_name == "Loser of #{match7.bout_number}"
assert @tournament.matches.select{|m| m.bracket_position == "Conso" and m.round == 2 && m.bracket_position_number == 4}.first.loser2_name == "BYE"
quarter1 = @tournament.matches.select{|match| match.bracket_position == "Quarter" and match.bracket_position_number == 1}.first
quarter2 = @tournament.matches.select{|match| match.bracket_position == "Quarter" and match.bracket_position_number == 2}.first
quarter3 = @tournament.matches.select{|match| match.bracket_position == "Quarter" and match.bracket_position_number == 3}.first
quarter4 = @tournament.matches.select{|match| match.bracket_position == "Quarter" and match.bracket_position_number == 4}.first
consoround2match1 = @tournament.matches.select{|match| match.bracket_position == "Conso Quarter" and match.round == 3 && match.bracket_position_number == 1}.first
consoround2match2 = @tournament.matches.select{|match| match.bracket_position == "Conso Quarter" and match.round == 3 && match.bracket_position_number == 2}.first
consoround2match3 = @tournament.matches.select{|match| match.bracket_position == "Conso Quarter" and match.round == 3 && match.bracket_position_number == 3}.first
consoround2match4 = @tournament.matches.select{|match| match.bracket_position == "Conso Quarter" and match.round == 3 && match.bracket_position_number == 4}.first
assert consoround2match1.loser1_name == "Loser of #{quarter4.bout_number}"
assert consoround2match2.loser1_name == "Loser of #{quarter3.bout_number}"
assert consoround2match3.loser1_name == "Loser of #{quarter2.bout_number}"
assert consoround2match4.loser1_name == "Loser of #{quarter1.bout_number}"
semis1 = @tournament.matches.select{|match| match.bracket_position == "Semis" and match.bracket_position_number == 1}.first
semis2 = @tournament.matches.select{|match| match.bracket_position == "Semis" and match.bracket_position_number == 2}.first
assert @tournament.matches.select{|m| m.bracket_position == "3/4" && m.bracket_position_number == 1}.first.loser1_name == "Loser of #{semis1.bout_number}"
assert @tournament.matches.select{|m| m.bracket_position == "3/4" && m.bracket_position_number == 1}.first.loser2_name == "Loser of #{semis2.bout_number}"
end
test "Placement points are given when moving through bracket" do
match = @tournament.matches.select{|m| m.bracket_position == "Semis"}.first
wrestler = get_wrestler_by_name("Test1")
match.w1 = wrestler.id
match.save
assert wrestler.reload.placement_points == 7
end
test "Run through all matches works" do
@tournament.matches.sort_by{ |match| match.bout_number }.each do |match|
match.reload
if match.finished != 1 and match.w1 and match.w2
match.winner_id = match.w1
match.win_type = "Decision"
match.score = "0-0"
match.finished = 1
match.save
end
end
assert @tournament.matches.reload.select{|m| m.finished == 0}.count == 0
end
end

104
test/integration/modified_double_elimination_1_6_run_through_test.rb Normal file
View File

@@ -0,0 +1,104 @@
require 'test_helper'
class ModifiedDoubleEliminationSixPlacesRunThrough < ActionDispatch::IntegrationTest
def setup
end
def winner_by_name(winner_name,match)
wrestler = @tournament.weights.first.wrestlers.select{|w| w.name == winner_name}.first
match.winner_id = wrestler.id
match.finished = 1
match.win_type = "Decision"
match.score = "0-0"
match.save
end
test "16 man modified double elimination placing 1-6" do
@tournament = create_double_elim_tournament_single_weight(14, "Modified 16 Man Double Elimination 1-6")
matches = @tournament.matches.reload
round1 = matches.select{|m| m.round == 1}
winner_by_name("Test9", round1.select{|m| m.bracket_position_number == 2}.first)
winner_by_name("Test5", round1.select{|m| m.bracket_position_number == 3}.first)
winner_by_name("Test4", round1.select{|m| m.bracket_position_number == 4}.first)
winner_by_name("Test13", round1.select{|m| m.bracket_position_number == 5}.first)
winner_by_name("Test6", round1.select{|m| m.bracket_position_number == 6}.first)
winner_by_name("Test10", round1.select{|m| m.bracket_position_number == 7}.first)
quarter = matches.select{|m| m.bracket_position == "Quarter"}.sort_by{|m| m.bracket_position_number}
assert quarter.first.reload.wrestler1.name == "Test1"
assert quarter.first.reload.wrestler2.name == "Test9"
assert quarter.second.reload.wrestler1.name == "Test5"
assert quarter.second.reload.wrestler2.name == "Test4"
assert quarter.third.reload.wrestler1.name == "Test13"
assert quarter.third.reload.wrestler2.name == "Test6"
assert quarter.fourth.reload.wrestler1.name == "Test10"
assert quarter.fourth.reload.wrestler2.name == "Test2"
conso_round2 = matches.select{|m| m.bracket_position == "Conso" and m.round == 2}.sort_by{|m| m.bracket_position_number}
assert conso_round2.first.reload.wrestler2.name == "Test8"
assert conso_round2.second.reload.wrestler1.name == "Test12"
assert conso_round2.second.reload.wrestler2.name == "Test14"
assert conso_round2.third.reload.wrestler1.name == "Test3"
assert conso_round2.third.reload.wrestler2.name == "Test11"
assert conso_round2.fourth.reload.wrestler1.name == "Test7"
winner_by_name("Test1", quarter.first)
winner_by_name("Test5", quarter.second)
winner_by_name("Test13", quarter.third)
winner_by_name("Test10", quarter.fourth)
winner_by_name("Test12", conso_round2.second)
winner_by_name("Test3", conso_round2.third)
semis = matches.select{|m| m.bracket_position == "Semis"}.sort_by{|m| m.bracket_position_number}
assert semis.first.reload.wrestler1.name == "Test1"
assert semis.first.reload.wrestler2.name == "Test5"
assert semis.second.reload.wrestler1.name == "Test13"
assert semis.second.reload.wrestler2.name == "Test10"
conso_quarter = matches.select{|m| m.bracket_position == "Conso Quarter"}.sort_by{|m| m.bracket_position_number}
assert conso_quarter.first.reload.wrestler1.name == "Test2"
assert conso_quarter.first.reload.wrestler2.name == "Test8"
assert conso_quarter.second.reload.wrestler1.name == "Test6"
assert conso_quarter.second.reload.wrestler2.name == "Test12"
assert conso_quarter.third.reload.wrestler1.name == "Test4"
assert conso_quarter.third.reload.wrestler2.name == "Test3"
assert conso_quarter.fourth.reload.wrestler1.name == "Test9"
assert conso_quarter.fourth.reload.wrestler2.name == "Test7"
winner_by_name("Test5",semis.first)
winner_by_name("Test10",semis.second)
winner_by_name("Test2", conso_quarter.first)
winner_by_name("Test12", conso_quarter.second)
winner_by_name("Test4", conso_quarter.third)
winner_by_name("Test7", conso_quarter.fourth)
conso_semis = matches.select{|m| m.bracket_position == "Conso Semis"}.sort_by{|m| m.bracket_position_number}
assert conso_semis.first.reload.wrestler1.name == "Test2"
assert conso_semis.first.reload.wrestler2.name == "Test12"
assert conso_semis.second.reload.wrestler1.name == "Test4"
assert conso_semis.second.reload.wrestler2.name == "Test7"
winner_by_name("Test2",conso_semis.first)
winner_by_name("Test4",conso_semis.second)
first_finals = matches.select{|m| m.bracket_position == "1/2"}.first
third_finals = matches.select{|m| m.bracket_position == "3/4"}.first
fifth_finals = matches.select{|m| m.bracket_position == "5/6"}.first
assert first_finals.reload.wrestler1.name == "Test5"
assert first_finals.reload.wrestler2.name == "Test10"
assert third_finals.reload.wrestler1.name == "Test1"
assert third_finals.reload.wrestler2.name == "Test13"
assert fifth_finals.reload.wrestler1.name == "Test2"
assert fifth_finals.reload.wrestler2.name == "Test4"
# DEBUG
# matches.sort_by{|m| m.bout_number}.each do |match|
# match.reload
# puts "Round #{match.round} #{match.w1_bracket_name} vs #{match.w2_bracket_name}"
# end
end
end

142
test/integration/modified_double_elimination_1_8_match_generation_test.rb Normal file
View File

@@ -0,0 +1,142 @@
require 'test_helper'
class ModifiedDoubleEliminationEightPlacesManMatchGeneration < ActionDispatch::IntegrationTest
def setup
create_double_elim_tournament_single_weight(14, "Modified 16 Man Double Elimination 1-8")
end
test "Match generation works" do
assert @tournament.matches.count == 28
assert @tournament.matches.select{|m| m.bracket_position == "1/2"}.count == 1
assert @tournament.matches.select{|m| m.bracket_position == "3/4"}.count == 1
assert @tournament.matches.select{|m| m.bracket_position == "5/6"}.count == 1
assert @tournament.matches.select{|m| m.bracket_position == "7/8"}.count == 1
assert @tournament.matches.select{|m| m.bracket_position == "Bracket" and m.round == 1}.count == 8
assert @tournament.matches.select{|m| m.bracket_position == "Quarter"}.count == 4
assert @tournament.matches.select{|m| m.bracket_position == "Semis"}.count == 2
assert @tournament.matches.select{|m| m.bracket_position == "Conso" and m.round == 2}.count == 4
assert @tournament.matches.select{|m| m.bracket_position == "Conso Quarter"}.count == 4
assert @tournament.matches.select{|m| m.bracket_position == "Conso Semis"}.count == 2
end
test "Seeded wrestlers have correct first line" do
@tournament.matches.reload
match1 = @tournament.matches.select{|match| match.round == 1 and match.bracket_position_number == 1}.first
match2 = @tournament.matches.select{|match| match.round == 1 and match.bracket_position_number == 2}.first
match3 = @tournament.matches.select{|match| match.round == 1 and match.bracket_position_number == 3}.first
match4 = @tournament.matches.select{|match| match.round == 1 and match.bracket_position_number == 4}.first
match5 = @tournament.matches.select{|match| match.round == 1 and match.bracket_position_number == 5}.first
match6 = @tournament.matches.select{|match| match.round == 1 and match.bracket_position_number == 6}.first
match7 = @tournament.matches.select{|match| match.round == 1 and match.bracket_position_number == 7}.first
match8 = @tournament.matches.select{|match| match.round == 1 and match.bracket_position_number == 8}.first
assert match1.wrestler1.bracket_line == 1
assert match1.loser2_name == "BYE"
assert match2.wrestler1.bracket_line == 8
assert match2.wrestler2.bracket_line == 9
assert match3.wrestler1.bracket_line == 5
assert match3.wrestler2.bracket_line == 12
assert match4.wrestler1.bracket_line == 4
assert match4.wrestler2.bracket_line == 14
assert match5.wrestler1.bracket_line == 3
assert match5.wrestler2.bracket_line == 13
assert match6.wrestler1.bracket_line == 6
assert match6.wrestler2.bracket_line == 11
assert match7.wrestler1.bracket_line == 7
assert match7.wrestler2.bracket_line == 10
assert match8.wrestler1.bracket_line == 2
assert match8.loser2_name == "BYE"
end
test "Byes are advanced correctly" do
@tournament.matches.reload
match1 = @tournament.matches.select{|match| match.round == 2 and match.bracket_position == "Quarter" and match.bracket_position_number == 1}.first
match2 = @tournament.matches.select{|match| match.round == 2 and match.bracket_position == "Quarter" and match.bracket_position_number == 4}.first
assert match1.wrestler1.name == "Test1"
assert match2.wrestler2.name == "Test2"
end
test "Loser names set up correctly" do
@tournament.matches.reload
match1 = @tournament.matches.select{|match| match.round == 1 and match.bracket_position_number == 1}.first
match2 = @tournament.matches.select{|match| match.round == 1 and match.bracket_position_number == 2}.first
match3 = @tournament.matches.select{|match| match.round == 1 and match.bracket_position_number == 3}.first
match4 = @tournament.matches.select{|match| match.round == 1 and match.bracket_position_number == 4}.first
match5 = @tournament.matches.select{|match| match.round == 1 and match.bracket_position_number == 5}.first
match6 = @tournament.matches.select{|match| match.round == 1 and match.bracket_position_number == 6}.first
match7 = @tournament.matches.select{|match| match.round == 1 and match.bracket_position_number == 7}.first
match8 = @tournament.matches.select{|match| match.round == 1 and match.bracket_position_number == 8}.first
assert @tournament.matches.select{|m| m.bracket_position == "Conso" and m.round == 2 && m.bracket_position_number == 1}.first.loser1_name == "BYE"
assert @tournament.matches.select{|m| m.bracket_position == "Conso" and m.round == 2 && m.bracket_position_number == 1}.first.loser2_name == "Loser of #{match2.bout_number}"
assert @tournament.matches.select{|m| m.bracket_position == "Conso" and m.round == 2 && m.bracket_position_number == 2}.first.loser1_name == "Loser of #{match3.bout_number}"
assert @tournament.matches.select{|m| m.bracket_position == "Conso" and m.round == 2 && m.bracket_position_number == 2}.first.loser2_name == "Loser of #{match4.bout_number}"
assert @tournament.matches.select{|m| m.bracket_position == "Conso" and m.round == 2 && m.bracket_position_number == 3}.first.loser1_name == "Loser of #{match5.bout_number}"
assert @tournament.matches.select{|m| m.bracket_position == "Conso" and m.round == 2 && m.bracket_position_number == 3}.first.loser2_name == "Loser of #{match6.bout_number}"
assert @tournament.matches.select{|m| m.bracket_position == "Conso" and m.round == 2 && m.bracket_position_number == 4}.first.loser1_name == "Loser of #{match7.bout_number}"
assert @tournament.matches.select{|m| m.bracket_position == "Conso" and m.round == 2 && m.bracket_position_number == 4}.first.loser2_name == "BYE"
quarter1 = @tournament.matches.select{|match| match.bracket_position == "Quarter" and match.bracket_position_number == 1}.first
quarter2 = @tournament.matches.select{|match| match.bracket_position == "Quarter" and match.bracket_position_number == 2}.first
quarter3 = @tournament.matches.select{|match| match.bracket_position == "Quarter" and match.bracket_position_number == 3}.first
quarter4 = @tournament.matches.select{|match| match.bracket_position == "Quarter" and match.bracket_position_number == 4}.first
consoround2match1 = @tournament.matches.select{|match| match.bracket_position == "Conso Quarter" and match.round == 3 && match.bracket_position_number == 1}.first
consoround2match2 = @tournament.matches.select{|match| match.bracket_position == "Conso Quarter" and match.round == 3 && match.bracket_position_number == 2}.first
consoround2match3 = @tournament.matches.select{|match| match.bracket_position == "Conso Quarter" and match.round == 3 && match.bracket_position_number == 3}.first
consoround2match4 = @tournament.matches.select{|match| match.bracket_position == "Conso Quarter" and match.round == 3 && match.bracket_position_number == 4}.first
assert consoround2match1.loser1_name == "Loser of #{quarter4.bout_number}"
assert consoround2match2.loser1_name == "Loser of #{quarter3.bout_number}"
assert consoround2match3.loser1_name == "Loser of #{quarter2.bout_number}"
assert consoround2match4.loser1_name == "Loser of #{quarter1.bout_number}"
semis1 = @tournament.matches.select{|match| match.bracket_position == "Semis" and match.bracket_position_number == 1}.first
semis2 = @tournament.matches.select{|match| match.bracket_position == "Semis" and match.bracket_position_number == 2}.first
assert @tournament.matches.select{|m| m.bracket_position == "3/4" && m.bracket_position_number == 1}.first.loser1_name == "Loser of #{semis1.bout_number}"
assert @tournament.matches.select{|m| m.bracket_position == "3/4" && m.bracket_position_number == 1}.first.loser2_name == "Loser of #{semis2.bout_number}"
consosemis1 = @tournament.matches.select{|match| match.bracket_position == "Conso Semis" and match.bracket_position_number == 1}.first
consosemis2 = @tournament.matches.select{|match| match.bracket_position == "Conso Semis" and match.bracket_position_number == 2}.first
assert @tournament.matches.select{|m| m.bracket_position == "7/8" && m.bracket_position_number == 1}.first.loser1_name == "Loser of #{consosemis1.bout_number}"
assert @tournament.matches.select{|m| m.bracket_position == "7/8" && m.bracket_position_number == 1}.first.loser2_name == "Loser of #{consosemis2.bout_number}"
end
test "Placement points are given when moving through bracket" do
match = @tournament.matches.select{|m| m.bracket_position == "Semis"}.first
wrestler = get_wrestler_by_name("Test1")
match.w1 = wrestler.id
match.save
match2 = @tournament.matches.select{|m| m.bracket_position == "Conso Semis"}.first
wrestler2 = get_wrestler_by_name("Test2")
match2.w1 = wrestler2.id
match2.save
assert wrestler.reload.placement_points == 7
assert wrestler2.reload.placement_points == 1
end
test "Run through all matches works" do
@tournament.matches.sort_by{ |match| match.bout_number }.each do |match|
match.reload
if match.finished != 1 and match.w1 and match.w2
match.winner_id = match.w1
match.win_type = "Decision"
match.score = "0-0"
match.finished = 1
match.save
end
end
assert @tournament.matches.reload.select{|m| m.finished == 0}.count == 0
end
end

108
test/integration/modified_double_elimination_1_8_run_through_test.rb Normal file
View File

@@ -0,0 +1,108 @@
require 'test_helper'
class ModifiedDoubleEliminationEightPlacesRunThrough < ActionDispatch::IntegrationTest
def setup
end
def winner_by_name(winner_name,match)
wrestler = @tournament.weights.first.wrestlers.select{|w| w.name == winner_name}.first
match.winner_id = wrestler.id
match.finished = 1
match.win_type = "Decision"
match.score = "0-0"
match.save
end
test "16 man modified double elimination placing 1-8" do
@tournament = create_double_elim_tournament_single_weight(14, "Modified 16 Man Double Elimination 1-8")
matches = @tournament.matches.reload
round1 = matches.select{|m| m.round == 1}
winner_by_name("Test9", round1.select{|m| m.bracket_position_number == 2}.first)
winner_by_name("Test5", round1.select{|m| m.bracket_position_number == 3}.first)
winner_by_name("Test4", round1.select{|m| m.bracket_position_number == 4}.first)
winner_by_name("Test13", round1.select{|m| m.bracket_position_number == 5}.first)
winner_by_name("Test6", round1.select{|m| m.bracket_position_number == 6}.first)
winner_by_name("Test10", round1.select{|m| m.bracket_position_number == 7}.first)
quarter = matches.select{|m| m.bracket_position == "Quarter"}.sort_by{|m| m.bracket_position_number}
assert quarter.first.reload.wrestler1.name == "Test1"
assert quarter.first.reload.wrestler2.name == "Test9"
assert quarter.second.reload.wrestler1.name == "Test5"
assert quarter.second.reload.wrestler2.name == "Test4"
assert quarter.third.reload.wrestler1.name == "Test13"
assert quarter.third.reload.wrestler2.name == "Test6"
assert quarter.fourth.reload.wrestler1.name == "Test10"
assert quarter.fourth.reload.wrestler2.name == "Test2"
conso_round2 = matches.select{|m| m.bracket_position == "Conso" and m.round == 2}.sort_by{|m| m.bracket_position_number}
assert conso_round2.first.reload.wrestler2.name == "Test8"
assert conso_round2.second.reload.wrestler1.name == "Test12"
assert conso_round2.second.reload.wrestler2.name == "Test14"
assert conso_round2.third.reload.wrestler1.name == "Test3"
assert conso_round2.third.reload.wrestler2.name == "Test11"
assert conso_round2.fourth.reload.wrestler1.name == "Test7"
winner_by_name("Test1", quarter.first)
winner_by_name("Test5", quarter.second)
winner_by_name("Test13", quarter.third)
winner_by_name("Test10", quarter.fourth)
winner_by_name("Test12", conso_round2.second)
winner_by_name("Test3", conso_round2.third)
semis = matches.select{|m| m.bracket_position == "Semis"}.sort_by{|m| m.bracket_position_number}
assert semis.first.reload.wrestler1.name == "Test1"
assert semis.first.reload.wrestler2.name == "Test5"
assert semis.second.reload.wrestler1.name == "Test13"
assert semis.second.reload.wrestler2.name == "Test10"
conso_quarter = matches.select{|m| m.bracket_position == "Conso Quarter"}.sort_by{|m| m.bracket_position_number}
assert conso_quarter.first.reload.wrestler1.name == "Test2"
assert conso_quarter.first.reload.wrestler2.name == "Test8"
assert conso_quarter.second.reload.wrestler1.name == "Test6"
assert conso_quarter.second.reload.wrestler2.name == "Test12"
assert conso_quarter.third.reload.wrestler1.name == "Test4"
assert conso_quarter.third.reload.wrestler2.name == "Test3"
assert conso_quarter.fourth.reload.wrestler1.name == "Test9"
assert conso_quarter.fourth.reload.wrestler2.name == "Test7"
winner_by_name("Test5",semis.first)
winner_by_name("Test10",semis.second)
winner_by_name("Test2", conso_quarter.first)
winner_by_name("Test12", conso_quarter.second)
winner_by_name("Test4", conso_quarter.third)
winner_by_name("Test7", conso_quarter.fourth)
conso_semis = matches.select{|m| m.bracket_position == "Conso Semis"}.sort_by{|m| m.bracket_position_number}
assert conso_semis.first.reload.wrestler1.name == "Test2"
assert conso_semis.first.reload.wrestler2.name == "Test12"
assert conso_semis.second.reload.wrestler1.name == "Test4"
assert conso_semis.second.reload.wrestler2.name == "Test7"
winner_by_name("Test2",conso_semis.first)
winner_by_name("Test4",conso_semis.second)
first_finals = matches.select{|m| m.bracket_position == "1/2"}.first
third_finals = matches.select{|m| m.bracket_position == "3/4"}.first
fifth_finals = matches.select{|m| m.bracket_position == "5/6"}.first
seventh_finals = matches.select{|m| m.bracket_position == "7/8"}.first
assert first_finals.reload.wrestler1.name == "Test5"
assert first_finals.reload.wrestler2.name == "Test10"
assert third_finals.reload.wrestler1.name == "Test1"
assert third_finals.reload.wrestler2.name == "Test13"
assert fifth_finals.reload.wrestler1.name == "Test2"
assert fifth_finals.reload.wrestler2.name == "Test4"
assert seventh_finals.reload.wrestler1.name == "Test12"
assert seventh_finals.reload.wrestler2.name == "Test7"
# DEBUG
# matches.sort_by{|m| m.bout_number}.each do |match|
# match.reload
# puts "Round #{match.round} #{match.w1_bracket_name} vs #{match.w2_bracket_name}"
# end
end
end

24
test/test_helper.rb
View File

@@ -41,7 +41,29 @@ class ActiveSupport::TestCase
@tournament.address = "some place" @tournament.address = "some place"
@tournament.director = "some guy" @tournament.director = "some guy"
@tournament.director_email= "test@test.com" @tournament.director_email= "test@test.com"
@tournament.tournament_type = "Double Elimination 1-6" @tournament.tournament_type = "Regular Double Elimination 1-6"
@tournament.date = "2015-12-30"
@tournament.save
@school = School.new
@school.name = "Test"
@school.tournament_id = @tournament.id
@school.save
@weight = Weight.new
@weight.max = 106
@weight.tournament_id = @tournament.id
@weight.save
create_wrestlers_for_weight_for_double_elim(@weight, @school, number_of_wrestlers, 1)
GenerateTournamentMatches.new(@tournament).generate
return @tournament
end
def create_double_elim_tournament_single_weight(number_of_wrestlers, tournament_type)
@tournament = Tournament.new
@tournament.name = "Test Tournament"
@tournament.address = "some place"
@tournament.director = "some guy"
@tournament.director_email= "test@test.com"
@tournament.tournament_type = tournament_type
@tournament.date = "2015-12-30" @tournament.date = "2015-12-30"
@tournament.save @tournament.save
@school = School.new @school = School.new