refactoring

Gemfile

@@ -21,12 +21,6 @@ gem 'turbolinks', '~> 5'
 gem 'jbuilder', '~> 2.7'
 # Use Redis adapter to run Action Cable in production
 gem 'redis', '~> 4.0'
-# Use Active Model has_secure_password
-# gem 'bcrypt', '~> 3.1.7'
-
-# Use Active Storage variant
-# gem 'image_processing', '~> 1.2'
-gem 'letter_opener', group: :development
 
 # Reduces boot times through caching; required in config/boot.rb
 gem 'bootsnap', '>= 1.4.4', require: false
@@ -39,6 +33,8 @@ end
 
 group :development do
   gem 'bullet', '~> 7.0'
+  gem 'delayed_job_web', '~> 1.4.4', require: 'delayed_job_active_record'
+  gem 'letter_opener'
 
   # Access an interactive console on exception pages or by calling 'console' anywhere in the code.
   gem 'web-console', '>= 4.1.0'
@@ -70,9 +66,6 @@ gem 'tailwindcss-rails', '~> 2.0'
 
 gem 'devise-two-factor', '~> 4.0'
 
-gem 'dotenv-rails'
-gem 'rqrcode', '~> 2.1'
-
 gem 'stimulus-rails'
 
 gem 'hotwire-rails', '~> 0.1.3'
@@ -88,7 +81,6 @@ gem 'attr_encrypted', '~> 3.1'
 
 gem 'daemons'
 gem 'delayed_job_active_record'
-gem 'delayed_job_web', '~> 1.4.4', require: 'delayed_job_active_record'
 
 gem 'twilio-ruby', '~> 5.77'
 

app/channels/match_channel.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+# channel for timer and selection
+class MatchChannel < ApplicationCable::Channel
+  def subscribed
+    stream_from "match_channel_#{params[:match_id]}"
+  end
+end

app/controllers/application_controller.rb

@@ -5,6 +5,7 @@ class ApplicationController < ActionController::Base
   before_action :configure_permitted_parameters, if: :devise_controller?
   rescue_from ActiveRecord::RecordNotFound, with: :record_not_found
   rescue_from CanCan::AccessDenied, with: :access_denied
+  rescue_from ActionController::RoutingError, with: :render_not_found
 
   def access_denied
     render file: "#{Rails.root}/public/403.html", formats: [:html], status: 403, layout: false
@@ -14,10 +15,19 @@ def record_not_found
     render file: "#{Rails.root}/public/404.html", formats: [:html], status: 404, layout: false
   end
 
+  def render_not_found
+    redirect_to root_path, alert: 'The page you requested was not found.'
+  end
+
   def devise_controller?
     is_a?(Devise::SessionsController)
   end
 
+  def handle_not_found
+    # Handle the request and display an error message
+    render file: "#{Rails.root}/public/404.html", formats: [:html], status: 404, layout: false
+  end
+
   protected
 
   def after_resetting_password_path_for(user)
@@ -26,7 +36,7 @@ def after_resetting_password_path_for(user)
 
   def configure_permitted_parameters
     devise_parameter_sanitizer.permit(:sign_up, keys: %i[name email password phone_number])
-    devise_parameter_sanitizer.permit(:account_update, keys: %i[name email password phone_number avatar])
+    devise_parameter_sanitizer.permit(:account_update, keys: %i[name email password phone_number image])
     devise_parameter_sanitizer.permit(:sign_in, keys: [:otp_attempt])
   end
 end

app/controllers/matches_controller.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-# Matches_Controller
 class MatchesController < ApplicationController
   load_and_authorize_resource :tournament
   load_and_authorize_resource through: :tournament
@@ -16,31 +15,19 @@ def all
 
   def show; end
 
-  def new
-    @match = Match.new
-  end
-
   def playmatch
-    @match = Match.includes([:users]).find(params[:match_id])
-    redirect_to result_tournament_match_path(match_id: @match) unless @match.match_winner_id.nil?
-    @players = @match.users
-    @remaining_tries = @match.remaining_tries(@players.first.id)
-    @done_tries = @match.selections.by_user(@players.first.id).size
-    @is_player = @match.users.include?(current_user)
     @messages = @match.messages.includes([:user]).all.reverse
-  end
+    return if @match.done?
 
-  def result
-    @is_player = @match.users.include?(current_user)
-    @players = @match.users
-    @players_selections = @match.selections.order(:try_num).group_by(&:user_id)
-    @players_scores = @match.selections.group(:user_id).winner.count
-    @result_message = @match.result_message(current_user.id)
+    @players_data = @match.users.pluck(:id, :name).to_h
   end
 
-  private
+  def result
+    return if @match.undone?
 
-  def match_params
-    params.require(:match).permit(:match_winner_id, :winner_score, :match_time, :tournament_id)
+    @players_data = @match.users.pluck(:id, :name).to_h
+    @players_selections = @match.selections.includes(:user).order(:try_num).group_by(&:user_id)
+    @players_scores = @match.selections.winner.group(:user_id).count
+    @result_message = @match.result_message(current_user.id)
   end
 end

app/controllers/messages_controller.rb

@@ -2,26 +2,20 @@
 
 class MessagesController < ApplicationController
   load_and_authorize_resource
-  def index; end
-
-  def new
-    @message = Message.new
-  end
 
   def create
     @message = Message.new(message_params)
-    respond_to do |format|
-      if @message.save
-        format.json { render json: { data: 'Saved' }, status: :ok }
-      else
-        format.json { render json: { errors: @message.errors.full_messages }, status: :unprocessable_entity }
-      end
+    @message.user_id = current_user.id
+    if @message.save
+      flash[:notice] = 'Message Sent'
+    else
+      flash[:error] = @message.errors.full_messages.join(', ')
     end
   end
 
   private
 
   def message_params
-    params.permit(:user_id, :match_id, :message)
+    params.permit(:match_id, :content)
   end
 end

app/controllers/selection_controller.rb

@@ -1,26 +1,21 @@
 # frozen_string_literal: true
 
 class SelectionController < ApplicationController
+  load_and_authorize_resource
   before_action :authenticate_user!
+
   def create
     @selection = Selection.new(selection_params)
-    @selection.add_try_num
-    respond_to do |format|
-      if @selection.save
-        format.json { render json: { data: 'Saved' }, status: :ok }
-      else
-        format.json { render json: { errors: @selection.errors.full_messages }, status: :unprocessable_entity }
-      end
+    if @selection.save
+      flash[:notice] = 'Choice Saved'
+    else
+      flash[:error] = @selection.errors.full_messages.join(', ')
     end
   end
 
-  def new
-    @selection = Selection.new
-  end
-
   private
 
   def selection_params
-    params.require(:selection).permit(:match_id, :user_id, :selection)
+    params.require(:selection).permit(:match_id, :user_id, :choice)
   end
 end

app/controllers/tournaments_controller.rb

@@ -1,72 +1,67 @@
-# Tournamnets Controller
+# frozen_string_literal: true
+
 class TournamentsController < ApplicationController
   load_and_authorize_resource
   before_action :authenticate_user!, except: [:index]
 
   def index
-    @tournaments = Tournament.includes(:users).all
+    @tournaments = Tournament.includes(%i[users winner]).all
     @tournaments = @tournaments.order(:registration_deadline).page(params[:page])
   end
 
   def show; end
 
-  def new
-    @tournament = Tournament.new
-  end
+  def new; end
 
   def edit; end
 
   def register
     @tournaments_user = TournamentsUser.new(user: current_user, tournament: @tournament)
     if @tournaments_user.save
-      redirect_to tournament_url(@tournament), notice: 'You have registered for the tournament!'
+      flash[:notice] = 'You have registered for the tournament!.'
     else
-      redirect_to tournament_url(@tournament), notice: 'Already Registered'
+      flash[:errors] = @tournament.errors.full_messages.join(', ')
     end
+    redirect_to tournament_url(@tournament)
   end
 
   def create_matches
-    registered_users = @tournament.users
-    length = registered_users.length
-    return unless (length - 8) != 0
-
     begin
-      MatchCreator.new(@tournament, registered_users).create_match
-      redirect_to tournament_path(@tournament), notice: 'Matches Generated'
+      TournamentMatchesCreator.new(@tournament, @tournament.users).call
+      flash[:notice] = 'Matches Generated.'
     rescue StandardError => e
-      redirect_to tournament_path(@tournament), alert: "Error generating matches: #{e.message}"
+      flash[:alert] = "Error generating matches: #{e.message}"
     end
+    redirect_to tournament_path(@tournament)
   end
 
   def create
-    @tournament = Tournament.new(tournament_params)
-
-    respond_to do |format|
-      if @tournament.save
-        format.html { redirect_to tournament_url(@tournament), notice: 'Tournament was successfully created.' }
-      else
-        format.html { render :new, status: :unprocessable_entity }
-      end
+    if @tournament.save
+      flash[:notice] = 'Tournament was successfully created.'
+      redirect_to tournament_url(@tournament)
+    else
+      flash[:errors] = @tournament.errors.full_messages.join(', ')
+      render :new
     end
   end
 
   def update
-    respond_to do |format|
-      if @tournament.update(tournament_params)
-        format.html { redirect_to tournament_url(@tournament), notice: 'Tournament was successfully updated.' }
-      else
-        format.html { render :edit, status: :unprocessable_entity }
-      end
+    if @tournament.update(tournament_params)
+      flash[:notice] = 'Tournament was successfully updated.'
+      redirect_to tournament_url(@tournament)
+    else
+      flash[:errors] = @tournament.errors.full_messages.join(', ')
+      render :edit
     end
   end
 
   def destroy
-    respond_to do |format|
-      if @tournament.destroy
-        format.html { redirect_to tournaments_url, notice: 'Tournament was successfully deleted.' }
-      else
-        format.html { render :edit, status: :unprocessable_entity }
-      end
+    if @tournament.destroy
+      flash[:notice] = 'Tournament was successfully deleted.'
+      redirect_to tournaments_url
+    else
+      flash[:errors] = @tournament.errors.full_messages.join(', ')
+      render :index
     end
   end
 
@@ -77,7 +72,7 @@ def tournament_params
                                        :description,
                                        :start_date,
                                        :end_date,
-                                       :tournament_winner_id,
+                                       :winner_id,
                                        :image,
                                        :registration_deadline)
   end

app/controllers/users/confirmations_controller.rb

@@ -15,7 +15,8 @@ def show
       end
     end
 
-    # protected
+    protected
+
     def after_confirmation_path_for(_resource_name, resource)
       sign_in(resource)
       root_path

app/controllers/users/registrations_controller.rb

@@ -29,7 +29,7 @@ def after_sign_up_path_for(_resource)
   end
 
   def configure_permitted_parameters
-    devise_parameter_sanitizer.permit(:sign_up, keys: %i[avatar name phone_number])
-    devise_parameter_sanitizer.permit(:account_update, keys: %i[avatar name phone_number])
+    devise_parameter_sanitizer.permit(:sign_up, keys: %i[image name phone_number])
+    devise_parameter_sanitizer.permit(:account_update, keys: %i[image name phone_number])
   end
 end