New bracket positions for double elim brackets. Each bracket position will now wrestle during the same round. Made a rake task to migrate previous matches to the new bracket positions.

app/services/bracket_advancement/double_elimination_advance.rb

@@ -21,50 +21,33 @@ class DoubleEliminationAdvance
   if (@last_match.loser1_name == "BYE" or @last_match.loser2_name == "BYE") and @last_match.is_championship_match
     update_consolation_bye
   end
-  if @last_match.bracket_position == "Quarter"
-     new_match = Match.where("bracket_position = ? AND bracket_position_number = ? AND weight_id = ?","Semis",@next_match_position_number.ceil,@wrestler.weight_id).first
-     update_new_match(new_match, get_wrestler_number)
-  elsif @last_match.bracket_position == "Semis"
-     new_match = Match.where("bracket_position = ? AND bracket_position_number = ? AND weight_id = ?","1/2",@next_match_position_number.ceil,@wrestler.weight_id).first
-     update_new_match(new_match, get_wrestler_number)
-  elsif @last_match.bracket_position == "Conso Semis"
-     # if its a regular double elim
-     if @wrestler.tournament.tournament_type.include? "Regular Double Elimination"
-      new_match = Match.where("bracket_position = ? AND bracket_position_number = ? AND weight_id = ?","3/4",@next_match_position_number.ceil,@wrestler.weight_id).first
-      update_new_match(new_match, get_wrestler_number)
-     # if it's a special bracket where consolations wrestler for 5th
-     elsif @wrestler.tournament.tournament_type.include? "Modified 16 Man Double Elimination"
-       new_match = Match.where("bracket_position = ? AND bracket_position_number = ? AND weight_id = ?","5/6",@next_match_position_number.ceil,@wrestler.weight_id).first
-       update_new_match(new_match, get_wrestler_number)
-     end
-  elsif @last_match.bracket_position == "Conso Quarter"
-     next_round_matches = Match.where("weight_id = ? and bracket_position = ?", @wrestler.weight_id, "Conso Semis").sort_by{|m| m.round}
-     this_round_matches = Match.where("weight_id = ? and round = ? and bracket_position = ?", @wrestler.weight_id, @last_match.round, "Conso Quarter")
-     # bracket position is different depending on if a semi loser is dropping or if there are 4 conso quarter matches
-     if next_round_matches.size == this_round_matches.size
-       # if a semi loser is dropping down
-       new_match = Match.where("bracket_position = ? AND bracket_position_number = ? AND weight_id = ?","Conso Semis",@last_match.bracket_position_number,@wrestler.weight_id).first
-       update_new_match(new_match,2)
-     else
-       # if it's a special bracket where a semi loser is not dropping down
-       new_match = Match.where("bracket_position = ? AND bracket_position_number = ? AND weight_id = ?","Conso Semis",@next_match_position_number.ceil,@wrestler.weight_id).first
-       update_new_match(new_match, get_wrestler_number)
-     end
-  elsif @last_match.bracket_position == "Bracket"
-     new_match = Match.where("bracket_position_number = ? and weight_id = ? and round > ? and (bracket_position = ? or bracket_position = ?)", @next_match_position_number.ceil,@wrestler.weight_id, @last_match.round , "Bracket", "Quarter").sort_by{|m| m.round}.first
-     update_new_match(new_match, get_wrestler_number)
-  elsif @last_match.bracket_position == "Conso"
-     next_round = next_round_matches = Match.where("weight_id = ? and round > ? and (bracket_position = ? or bracket_position = ?)", @wrestler.weight_id, @last_match.round, "Conso", "Conso Quarter").sort_by{|m| m.round}.first.round
-     next_round_matches = Match.where("weight_id = ? and round = ? and (bracket_position = ? or bracket_position = ?)", @wrestler.weight_id, next_round, "Conso", "Conso Quarter")
-     this_round_matches = Match.where("weight_id = ? and round = ? and (bracket_position = ? or bracket_position = ?)", @wrestler.weight_id, @last_match.round, "Conso", "Conso Quarter")
-     # if a loser is dropping down
-     if next_round_matches.size == this_round_matches.size
-       new_match = Match.where("bracket_position_number = ? and weight_id = ? and round > ? and (bracket_position = ? or bracket_position = ?)", @last_match.bracket_position_number,@wrestler.weight_id, @last_match.round, "Conso", "Conso Quarter").sort_by{|m| m.round}.first
-       update_new_match(new_match, 2)
-     else
-       new_match = Match.where("bracket_position_number = ? and weight_id = ? and round > ? and (bracket_position = ? or bracket_position = ?)", @next_match_position_number.ceil,@wrestler.weight_id, @last_match.round, "Conso", "Conso Quarter").sort_by{|m| m.round}.first
-       update_new_match(new_match, get_wrestler_number)
-     end
+
+  future_round_matches = @last_match.weight.matches.select{|m| m.round > @last_match.round}
+  next_match = nil
+  next_match_bracket_position = nil
+  next_match_position_number = @next_match_position_number.ceil
+
+  if @last_match.is_championship_match and future_round_matches.size > 0
+    next_match_round = future_round_matches.select{|m| m.is_championship_match}.sort_by{|m| m.round}.first.round
+    next_match_bracket_position = future_round_matches.select{|m| m.is_championship_match}.sort_by{|m| m.round}.first.bracket_position
+  end
+
+  if @last_match.is_consolation_match and future_round_matches.size > 0
+    next_match_round = future_round_matches.select{|m| m.is_consolation_match}.sort_by{|m| m.round}.first.round
+    next_match_bracket_position = future_round_matches.select{|m| m.is_consolation_match}.sort_by{|m| m.round}.first.bracket_position
+    next_match_loser1_name = future_round_matches.select{|m| m.is_consolation_match}.sort_by{|m| m.round}.first.loser1_name
+    # If someone is falling down to them in this round, then their bracket_position_number stays the same
+    if next_match_loser1_name
+      next_match_position_number = @last_match.bracket_position_number
+    end
+  end
+
+  if next_match_bracket_position
+    next_match = Match.where("bracket_position = ? AND bracket_position_number = ? AND weight_id = ?",next_match_bracket_position,next_match_position_number.ceil,@wrestler.weight_id).first
+  end
+
+  if next_match
+    update_new_match(next_match, get_wrestler_number)
   end
  end