refactoring

Gemfile

@@ -17,37 +17,27 @@ gem 'sass-rails', '>= 6'
 gem 'webpacker', '~> 5.0'
 # Turbolinks makes navigating your web appliletter_openercation faster. Read more: https://github.com/turbolinks/turbolinks
 gem 'turbolinks', '~> 5'
-# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
-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
+gem 'redis', '~> 4.0'
 
-gem 'bootstrap'
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
   gem 'byebug', platforms: %i[mri mingw x64_mingw]
 end
 
 group :development do
   gem 'bullet', '~> 7.0'
-
+  gem 'delayed_job_web', '~> 1.4.4', require: 'delayed_job_active_record'
+  gem 'erb_lint', '~> 0.4.0'
+  gem 'htmlbeautifier', '~> 1.4'
+  gem 'letter_opener'
   # Access an interactive console on exception pages or by calling 'console' anywhere in the code.
   gem 'web-console', '>= 4.1.0'
   # Display performance information such as SQL time and flame graphs for each request in your browser.
   # Can be configured to work on production as well see: https://github.com/MiniProfiler/rack-mini-profiler/blob/master/README.md
   gem 'listen', '~> 3.3'
   gem 'rack-mini-profiler', '~> 2.0'
-  # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
-  # gem 'spring'
 end
 
 group :test do
@@ -62,6 +52,7 @@ end
 gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby]
 
 gem 'activestorage', '~> 6.1'
+
 gem 'devise', '~> 4.9'
 
 gem 'tailwindcss', '~> 0.1.1'
@@ -70,28 +61,16 @@ 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'
 
-# gem "autoprefixer"
-
 gem 'kaminari'
-gem 'whenever', '~> 1.0'
 
 gem 'cancancan', '~> 3.5'
 
-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'
-
-gem 'erb_lint', '~> 0.4.0'
-
-gem 'htmlbeautifier', '~> 1.4'

Gemfile.lock

@@ -65,8 +65,6 @@ GEM
     ast (2.4.2)
     attr_encrypted (3.1.0)
       encryptor (~> 3.0.0)
-    autoprefixer-rails (10.4.13.0)
-      execjs (~> 2)
     bcrypt (3.1.18)
     better_html (2.0.1)
       actionview (>= 6.0)
@@ -78,10 +76,6 @@ GEM
     bindex (0.8.1)
     bootsnap (1.16.0)
       msgpack (~> 1.2)
-    bootstrap (5.2.3)
-      autoprefixer-rails (>= 9.1.0)
-      popper_js (>= 2.11.6, < 3)
-      sassc-rails (>= 2.0.0)
     builder (3.2.4)
     bullet (7.0.7)
       activesupport (>= 3.0.0)
@@ -97,8 +91,6 @@ GEM
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
-    chronic (0.10.2)
-    chunky_png (1.4.0)
     concurrent-ruby (1.2.2)
     crass (1.0.6)
     daemons (1.4.1)
@@ -125,10 +117,6 @@ GEM
       devise (~> 4.0)
       railties (< 7.1)
       rotp (~> 6.0)
-    dotenv (2.8.1)
-    dotenv-rails (2.8.1)
-      dotenv (= 2.8.1)
-      railties (>= 3.2)
     encryptor (3.0.0)
     erb_lint (0.4.0)
       activesupport
@@ -138,7 +126,6 @@ GEM
       rubocop
       smart_properties
     erubi (1.12.0)
-    execjs (2.8.1)
     faraday (2.7.5)
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
@@ -153,9 +140,6 @@ GEM
     htmlbeautifier (1.4.2)
     i18n (1.13.0)
       concurrent-ruby (~> 1.0)
-    jbuilder (2.11.5)
-      actionview (>= 5.0.0)
-      activesupport (>= 5.0.0)
     json (2.6.3)
     jwt (2.7.0)
     kaminari (1.2.2)
@@ -212,7 +196,6 @@ GEM
     parser (3.2.2.1)
       ast (~> 2.4.1)
     pg (1.5.3)
-    popper_js (2.11.7)
     public_suffix (5.0.1)
     puma (5.6.5)
       nio4r (~> 2.0)
@@ -264,10 +247,6 @@ GEM
       railties (>= 5.2)
     rexml (3.2.5)
     rotp (6.2.2)
-    rqrcode (2.2.0)
-      chunky_png (~> 1.0)
-      rqrcode_core (~> 1.0)
-    rqrcode_core (1.2.0)
     rubocop (1.51.0)
       json (~> 2.3)
       parallel (~> 1.10)
@@ -304,6 +283,7 @@ GEM
       rack-protection (= 3.0.6)
       tilt (~> 2.0)
     smart_properties (1.17.0)
+    spring (4.1.1)
     sprockets (4.2.0)
       concurrent-ruby (~> 1.0)
       rack (>= 2.2.4, < 4)
@@ -356,8 +336,6 @@ GEM
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    whenever (1.0.0)
-      chronic (>= 0.6.3)
     xpath (3.2.0)
       nokogiri (~> 1.8)
     zeitwerk (2.6.8)
@@ -368,9 +346,7 @@ PLATFORMS
 
 DEPENDENCIES
   activestorage (~> 6.1)
-  attr_encrypted (~> 3.1)
   bootsnap (>= 1.4.4)
-  bootstrap
   bullet (~> 7.0)
   byebug
   cancancan (~> 3.5)
@@ -380,11 +356,9 @@ DEPENDENCIES
   delayed_job_web (~> 1.4.4)
   devise (~> 4.9)
   devise-two-factor (~> 4.0)
-  dotenv-rails
   erb_lint (~> 0.4.0)
   hotwire-rails (~> 0.1.3)
   htmlbeautifier (~> 1.4)
-  jbuilder (~> 2.7)
   kaminari
   letter_opener
   listen (~> 3.3)
@@ -393,9 +367,9 @@ DEPENDENCIES
   rack-mini-profiler (~> 2.0)
   rails (~> 6.1.7, >= 6.1.7.2)
   redis (~> 4.0)
-  rqrcode (~> 2.1)
   sass-rails (>= 6)
   selenium-webdriver (>= 4.0.0.rc1)
+  spring
   stimulus-rails
   tailwindcss (~> 0.1.1)
   tailwindcss-rails (~> 2.0)
@@ -405,7 +379,6 @@ DEPENDENCIES
   web-console (>= 4.1.0)
   webdrivers
   webpacker (~> 5.0)
-  whenever (~> 1.0)
 
 RUBY VERSION
    ruby 3.1.3p185

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

@@ -3,14 +3,15 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery prepend: true
   before_action :configure_permitted_parameters, if: :devise_controller?
-  rescue_from ActiveRecord::RecordNotFound, with: :record_not_found
+  rescue_from ActiveRecord::RecordNotFound, with: :not_found
   rescue_from CanCan::AccessDenied, with: :access_denied
+  rescue_from ActionController::RoutingError, with: :not_found
 
   def access_denied
     render file: "#{Rails.root}/public/403.html", formats: [:html], status: 403, layout: false
   end
 
-  def record_not_found
+  def not_found
     render file: "#{Rails.root}/public/404.html", formats: [:html], status: 404, layout: false
   end
 
@@ -26,7 +27,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/leaderboard_controller.rb

@@ -1,6 +1,6 @@
 # LeaderBoard Controller
 class LeaderboardController < ApplicationController
   def index
-    @players = LeaderBoard.new.result
+    @players = LeaderBoardCreator.call
   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.players_data_by_current_user(current_user)
   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.players_data_by_current_user(current_user)
+    @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