mirror of
https://github.com/jcwimer/wrestlingApp
synced 2026-03-25 01:14:43 +00:00
Fixed the query for unassigned matches on the up_matches page and also only allow mats to get a new match assigned if they have less than 4 unfinished matches. Added mats to the finish_tournament_204 rake task.
This commit is contained in:
@@ -191,9 +191,12 @@ class TournamentsController < ApplicationController
|
|||||||
|
|
||||||
|
|
||||||
def up_matches
|
def up_matches
|
||||||
|
# .where.not(loser1_name: 'BYE') won't return matches with NULL loser1_name
|
||||||
|
# so I was only getting back matches with Loser of BOUT_NUMBER
|
||||||
@matches = @tournament.matches
|
@matches = @tournament.matches
|
||||||
.where("mat_id is NULL and (finished <> ? or finished is NULL)",1)
|
.where("mat_id is NULL and (finished != 1 or finished is NULL)")
|
||||||
.where.not(loser1_name: "BYE").where.not(loser2_name: "BYE")
|
.where("loser1_name != ? OR loser1_name IS NULL", "BYE")
|
||||||
|
.where("loser2_name != ? OR loser2_name IS NULL", "BYE")
|
||||||
.order('bout_number ASC')
|
.order('bout_number ASC')
|
||||||
.limit(10).includes(:wrestlers)
|
.limit(10).includes(:wrestlers)
|
||||||
@mats = @tournament.mats.includes(:matches)
|
@mats = @tournament.mats.includes(:matches)
|
||||||
|
|||||||
@@ -23,7 +23,8 @@ class Mat < ApplicationRecord
|
|||||||
|
|
||||||
def assign_next_match
|
def assign_next_match
|
||||||
match = next_eligible_match
|
match = next_eligible_match
|
||||||
if match
|
self.matches.reload
|
||||||
|
if match and self.unfinished_matches.size < 4
|
||||||
match.mat_id = self.id
|
match.mat_id = self.id
|
||||||
if match.save
|
if match.save
|
||||||
# Invalidate any wrestler caches
|
# Invalidate any wrestler caches
|
||||||
|
|||||||
@@ -5,6 +5,27 @@ namespace :tournament do
|
|||||||
|
|
||||||
@tournament = Tournament.find(204)
|
@tournament = Tournament.find(204)
|
||||||
|
|
||||||
|
Mat.create(
|
||||||
|
name: "1",
|
||||||
|
tournament_id: @tournament.id
|
||||||
|
)
|
||||||
|
Mat.create(
|
||||||
|
name: "2",
|
||||||
|
tournament_id: @tournament.id
|
||||||
|
)
|
||||||
|
Mat.create(
|
||||||
|
name: "3",
|
||||||
|
tournament_id: @tournament.id
|
||||||
|
)
|
||||||
|
Mat.create(
|
||||||
|
name: "4",
|
||||||
|
tournament_id: @tournament.id
|
||||||
|
)
|
||||||
|
Mat.create(
|
||||||
|
name: "5",
|
||||||
|
tournament_id: @tournament.id
|
||||||
|
)
|
||||||
|
|
||||||
GenerateTournamentMatches.new(@tournament).generate
|
GenerateTournamentMatches.new(@tournament).generate
|
||||||
sleep(180)
|
sleep(180)
|
||||||
|
|
||||||
@@ -45,7 +66,7 @@ namespace :tournament do
|
|||||||
match.save
|
match.save
|
||||||
|
|
||||||
# Pause to simulate processing delay
|
# Pause to simulate processing delay
|
||||||
sleep(30)
|
sleep(10)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
Reference in New Issue
Block a user