Fixed query for upcoming matches on the bout board and trying to fix why currently generating matches is not nil when

generating a single weight class.

app/controllers/tournaments_controller.rb

@@ -182,7 +182,7 @@ class TournamentsController < ApplicationController
 
 
   def up_matches
-    @matches = @tournament.matches.where(mat_id: nil).order('bout_number ASC').limit(10).includes(:wrestlers)
+    @matches = @tournament.matches.where("mat_id is NULL and (finished <> ? or finished is NULL)",1).order('bout_number ASC').limit(10).includes(:wrestlers)
     @mats = @tournament.mats.includes(:matches)
   end
 

app/services/tournament_services/generate_tournament_matches.rb

@@ -39,7 +39,7 @@ class GenerateTournamentMatches
         assignBouts
         assignFirstMatchesToMats
         @tournament.curently_generating_matches = nil
-        @tournament.save
+        @tournament.save!
     end
 
     def assignBouts