From 0bd8f226d456449db154e223c63752ddb8b3b6c2 Mon Sep 17 00:00:00 2001 From: "Jesse C. Fisher" Date: Sat, 26 Oct 2019 00:41:32 -0700 Subject: [PATCH] Add user count validation to start game --- app/models/game.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/models/game.rb b/app/models/game.rb index 1db8f2bc..0e0613e4 100644 --- a/app/models/game.rb +++ b/app/models/game.rb @@ -49,8 +49,9 @@ class Game < ActiveRecord::Base def validate_startable @player_count = players.count - errors[:players] = 'Must be at least 2 players.' if @player_count < 2 - errors[:players] = 'Must be less than 5 players.' if @player_count > 4 + @user_count = players.where.not(soft_token: nil).count + errors[:players] = 'Must be at least 2 players.' if @user_count < 2 + errors[:players] = 'Must be less than 5 players.' if @user_count > 4 errors[:status] = 'Game already started...' if self.status.nil? == false errors[:player_cards] = 'Cards already dealt...' unless player_cards.empty? fail StandardError, errors if errors.count > 0