refactored project loading

sashazykov · sashazykov · commit 0c912186d084 · 2020-11-29T16:25:49.000+01:00
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2020-11-28 07:55:00 UTC using RuboCop version 1.3.1.
+# on 2020-11-29 15:24:20 UTC using RuboCop version 1.3.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -11,7 +11,7 @@ Lint/MissingSuper:
   Exclude:
     - 'lib/bitcoin_rpc.rb'
 
-# Offense count: 17
+# Offense count: 18
 # Configuration parameters: IgnoredMethods.
 Metrics/AbcSize:
   Max: 51
@@ -25,14 +25,14 @@ Metrics/BlockLength:
 # Offense count: 2
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
-  Max: 184
+  Max: 187
 
-# Offense count: 6
+# Offense count: 5
 # Configuration parameters: IgnoredMethods.
 Metrics/CyclomaticComplexity:
   Max: 29
 
-# Offense count: 21
+# Offense count: 20
 # Configuration parameters: CountComments, CountAsOne, ExcludedMethods.
 Metrics/MethodLength:
   Max: 57
@@ -42,10 +42,10 @@ Metrics/MethodLength:
 Metrics/ModuleLength:
   Max: 163
 
-# Offense count: 6
+# Offense count: 5
 # Configuration parameters: IgnoredMethods.
 Metrics/PerceivedComplexity:
-  Max: 20
+  Max: 18
 
 # Offense count: 1
 # Configuration parameters: NamePrefix, ForbiddenPrefixes, AllowedMethods, MethodDefinitionMacros.
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -31,33 +31,13 @@ def locale_from_http_accept_language
     http_accept_language.compatible_language_from(::Rails.application.config.available_locales)&.to_sym
   end
 
-  def load_project(params)
-    return unless (is_via_project = is_a? ProjectsController) ||
-                  (is_via_tips     = is_a? TipsController) ||
-                  (is_via_deposits = is_a? DepositsController)
-
-    is_standard_path    = params[:id].present? && is_via_project
-    is_association_path = params[:project_id].present?
-    is_pretty_path      = params[:service].present? && params[:repo].present?
-    return unless is_standard_path || is_association_path || is_pretty_path
-
-    if (is_standard_path || is_association_path) &&
-       (project_id = is_via_project ? params[:id] : params[:project_id]) &&
-       (@project   = (Project.where id: project_id).first)
-      if    is_via_tips
-        redirect_to project_tips_pretty_path     @project.host, @project.full_name
-      elsif is_via_deposits
-        redirect_to project_deposits_pretty_path @project.host, @project.full_name
-      end
-    elsif is_pretty_path
-      @project = Project.where(host: params[:service])
-                        .where('lower(`full_name`) = ?', params[:repo].downcase).first
-    end
-
-    return if @project.present?
+  def pretty_project_path?
+    params[:service].present? && params[:repo].present?
+  end
 
+  def project_not_found
     flash[:error] = I18n.t('errors.project_not_found')
-    redirect_to projects_path
+    redirect_to(projects_path)
   end
 
   def load_user(params)
diff --git a/app/controllers/deposits_controller.rb b/app/controllers/deposits_controller.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class DepositsController < ApplicationController
-  before_action { load_project params }
+  before_action { load_project }
 
   def index
     @deposits = if @project.present?
@@ -17,4 +17,19 @@ def index
       format.csv { render csv: @deposits, except: %i[updated_at confirmations fee_size], add_methods: %i[project_name fee confirmed?] }
     end
   end
+
+  private
+
+  def load_project
+    return unless pretty_project_path? || params[:project_id].present?
+
+    if pretty_project_path?
+      @project = Project.first_by_service_and_repo(params[:service], params[:repo])
+    elsif params[:project_id].present?
+      @project = Project.where(id: params[:project_id]).first
+      redirect_to project_deposits_pretty_path(@project.host, @project.full_name) if @project
+    end
+
+    project_not_found unless @project
+  end
 end
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
@@ -72,7 +72,13 @@ def decide_tip_amounts
   private
 
   def load_project
-    super params
+    @project = if pretty_project_path?
+                 Project.first_by_service_and_repo(params[:service], params[:repo])
+               else
+                 Project.where(id: params[:id]).first
+               end
+
+    project_not_found unless @project
   end
 
   def project_params
diff --git a/app/controllers/tips_controller.rb b/app/controllers/tips_controller.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class TipsController < ApplicationController
-  before_action { load_project params }
+  before_action { load_project }
   before_action { load_user    params }
 
   def index
@@ -25,4 +25,19 @@ def index
       format.csv { render csv: @tips, except: %i[updated_at commit commit_message refunded_at decided_at], add_methods: %i[user_name project_name decided? claimed? paid? refunded? txid] }
     end
   end
+
+  private
+
+  def load_project
+    return unless pretty_project_path? || params[:project_id].present?
+
+    if pretty_project_path?
+      @project = Project.first_by_service_and_repo(params[:service], params[:repo])
+    elsif params[:project_id].present?
+      @project = Project.where(id: params[:project_id]).first
+      redirect_to project_tips_pretty_path(@project.host, @project.full_name) if @project
+    end
+
+    project_not_found unless @project
+  end
 end
diff --git a/app/models/project.rb b/app/models/project.rb
@@ -238,5 +238,9 @@ class << self
     def export_labels
       Hash[pluck(:bitcoin_address, :full_name)].to_json
     end
+
+    def first_by_service_and_repo(service, repo)
+      where(host: service).where('lower(`full_name`) = ?', repo.downcase).first
+    end
   end
 end
