From fa0a2a43a271bb0794380684bf74f0627472e65a Mon Sep 17 00:00:00 2001
From: user12986714 <65436504+user12986714@users.noreply.github.com>
Date: Mon, 25 Jan 2021 22:02:52 +0000
Subject: [PATCH 1/9] Eliminate unnecessary SQL queries in search

---
 app/controllers/search_controller.rb | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index e2452dea8..79d382a74 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -64,7 +64,6 @@ def index
     end
 
     @results = @results.where(search_string.join(params[:or_search].present? ? ' OR ' : ' AND '), **search_params)
-                       .paginate(page: params[:page], per_page: per_page)
                        .order(Arel.sql('`posts`.`created_at` DESC'))
 
     @results = @results.includes(:reasons).includes(:feedbacks) if params[:option].nil?
@@ -127,14 +126,24 @@ def index
         @counts_by_feedback = %i[is_tp is_fp is_naa].each_with_index.map do |symbol, i|
           [symbol, @counts_by_accuracy_group.select { |k, _v| k[i] }.values.sum]
         end.to_h
+        @total_count = @counts_by_accuracy_group.values.sum
 
         case params[:feedback_filter]
         when 'tp'
           @results = @results.where(is_tp: true)
+                             .paginate(page: params[:page], per_page: per_page,
+                                       total_entries: @counts_by_feedback[:is_tp])
         when 'fp'
           @results = @results.where(is_fp: true)
+                             .paginate(page: params[:page], per_page: per_page,
+                                       total_entries: @counts_by_feedback[:is_fp])
         when 'naa'
           @results = @results.where(is_naa: true)
+                             .paginate(page: params[:page], per_page: per_page,
+                                       total_entries: @counts_by_feedback[:is_naa])
+        else
+          @results = @results.paginate(page: params[:page], per_page: per_page,
+                                       total_entries: @total_count)
         end
 
         @sites = Site.where(id: @results.map(&:site_id)).to_a unless params[:option] == 'graphs'

From 282cedb3e10fb227af1490c396852a1e2091c49f Mon Sep 17 00:00:00 2001
From: user12986714 <65436504+user12986714@users.noreply.github.com>
Date: Mon, 25 Jan 2021 22:04:49 +0000
Subject: [PATCH 2/9] Move total result count logic to the controller

---
 app/views/search/search.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/search/search.html.erb b/app/views/search/search.html.erb
index 17517be50..9d84276dc 100644
--- a/app/views/search/search.html.erb
+++ b/app/views/search/search.html.erb
@@ -98,7 +98,7 @@
 <% if @results.present? %>
   <ul class="nav nav-tabs">
     <li role="presentation" class="<%= "active" if params[:option].nil? and (params[:feedback_filter].nil? or params[:feedback_filter] == 'all') %>">
-      <%= link_to "Results (#{@counts_by_accuracy_group.values.sum})", search_path(request.query_parameters.merge!({option: nil, feedback_filter: nil})) %>
+      <%= link_to "Results (#{@total_count})", search_path(request.query_parameters.merge!({option: nil, feedback_filter: nil})) %>
     </li>
     <li class="<%= 'active' if params[:feedback_filter] == 'tp' %>">
       <%= link_to "True positives (#{@counts_by_feedback[:is_tp]})", search_path(request.query_parameters.to_h.merge!({option: nil, feedback_filter: "tp"})) %>

From 289d2bde858f260f05aa9d16393525515312ad1c Mon Sep 17 00:00:00 2001
From: user12986714 <65436504+user12986714@users.noreply.github.com>
Date: Mon, 25 Jan 2021 22:06:50 +0000
Subject: [PATCH 3/9] Eliminate N+1 queries in post rendering

---
 app/views/posts/_post.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/posts/_post.html.erb b/app/views/posts/_post.html.erb
index 19049d130..cf562c1a2 100644
--- a/app/views/posts/_post.html.erb
+++ b/app/views/posts/_post.html.erb
@@ -38,8 +38,8 @@
     <% end %>
 
     <% if post.comments.any? && !hide_feedbacks %>
-      <span class="comment-hint text-muted" title="<%= pluralize(post.comments.count, 'comment') %>">
-        <span class="glyphicon glyphicon-comment"></span> &times;<%= post.comments.count %>
+      <span class="comment-hint text-muted" title="<%= pluralize(post.comments.size, 'comment') %>">
+        <span class="glyphicon glyphicon-comment"></span> &times;<%= post.comments.size %>
       </span>
     <% end %>
 

From 7a0d40babe78c637369388599fa5bb4f2a1f6083 Mon Sep 17 00:00:00 2001
From: user12986714 <65436504+user12986714@users.noreply.github.com>
Date: Mon, 25 Jan 2021 22:11:04 +0000
Subject: [PATCH 4/9] Use collection rendering in search results

---
 app/views/search/search.html.erb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/views/search/search.html.erb b/app/views/search/search.html.erb
index 9d84276dc..617bbd7f6 100644
--- a/app/views/search/search.html.erb
+++ b/app/views/search/search.html.erb
@@ -116,9 +116,7 @@
 
   <% if params[:option].nil? %>
     <table class="table">
-      <% @results.each do |post| %>
-        <%= render "posts/post", post: post %>
-      <% end %>
+      <%= render @results, collection: :post %>
     </table>
     <div class="text-center">
       <%= will_paginate @results, renderer: BootstrapPagination::Rails %>

From 3c50921c83e8f0210e3246c03d82f0da8f0dca2b Mon Sep 17 00:00:00 2001
From: user12986714 <65436504+user12986714@users.noreply.github.com>
Date: Mon, 25 Jan 2021 22:35:56 +0000
Subject: [PATCH 5/9] Make MySQL strict mode happy

---
 app/controllers/search_controller.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 79d382a74..f02a2ac37 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -64,8 +64,6 @@ def index
     end
 
     @results = @results.where(search_string.join(params[:or_search].present? ? ' OR ' : ' AND '), **search_params)
-                       .order(Arel.sql('`posts`.`created_at` DESC'))
-
     @results = @results.includes(:reasons).includes(:feedbacks) if params[:option].nil?
 
     if params[:has_no_feedback] == '1'
@@ -145,6 +143,7 @@ def index
           @results = @results.paginate(page: params[:page], per_page: per_page,
                                        total_entries: @total_count)
         end
+        @results = @results.order(Arel.sql('`posts`.`created_at` DESC'))
 
         @sites = Site.where(id: @results.map(&:site_id)).to_a unless params[:option] == 'graphs'
         render :search

From 5950315cc0fd8c72b9c55498bb86817b75279e50 Mon Sep 17 00:00:00 2001
From: user12986714 <65436504+user12986714@users.noreply.github.com>
Date: Mon, 25 Jan 2021 22:48:49 +0000
Subject: [PATCH 6/9] Suppress rubocop errors

---
 app/controllers/search_controller.rb | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index f02a2ac37..78c754eac 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -126,25 +126,25 @@ def index
         end.to_h
         @total_count = @counts_by_accuracy_group.values.sum
 
-        case params[:feedback_filter]
-        when 'tp'
-          @results = @results.where(is_tp: true)
+        # rubocop:disable Metrics/BlockLength
+        @results = case params[:feedback_filter]
+                   when 'tp'
+                     @results.where(is_tp: true)
                              .paginate(page: params[:page], per_page: per_page,
                                        total_entries: @counts_by_feedback[:is_tp])
-        when 'fp'
-          @results = @results.where(is_fp: true)
+                   when 'fp'
+                     @results.where(is_fp: true)
                              .paginate(page: params[:page], per_page: per_page,
                                        total_entries: @counts_by_feedback[:is_fp])
-        when 'naa'
-          @results = @results.where(is_naa: true)
+                   when 'naa'
+                     @results.where(is_naa: true)
                              .paginate(page: params[:page], per_page: per_page,
                                        total_entries: @counts_by_feedback[:is_naa])
-        else
-          @results = @results.paginate(page: params[:page], per_page: per_page,
+                   else
+                     @results.paginate(page: params[:page], per_page: per_page,
                                        total_entries: @total_count)
-        end
-        @results = @results.order(Arel.sql('`posts`.`created_at` DESC'))
-
+                   end.order(Arel.sql('`posts`.`created_at` DESC'))
+        # rubocop:enable Metrics/BlockLength
         @sites = Site.where(id: @results.map(&:site_id)).to_a unless params[:option] == 'graphs'
         render :search
       end

From 9bf4dde23d79925571cb500abdbfd4fb8d12f9f8 Mon Sep 17 00:00:00 2001
From: user12986714 <65436504+user12986714@users.noreply.github.com>
Date: Mon, 25 Jan 2021 22:52:31 +0000
Subject: [PATCH 7/9] Remove unused (and expensive) @sites variable

---
 app/controllers/search_controller.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 78c754eac..f93a8da66 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -145,7 +145,6 @@ def index
                                        total_entries: @total_count)
                    end.order(Arel.sql('`posts`.`created_at` DESC'))
         # rubocop:enable Metrics/BlockLength
-        @sites = Site.where(id: @results.map(&:site_id)).to_a unless params[:option] == 'graphs'
         render :search
       end
       format.json do

From 1b0ed7aa66fd984ee6bdba3941a4b6bd6ab1835f Mon Sep 17 00:00:00 2001
From: user12986714 <65436504+user12986714@users.noreply.github.com>
Date: Mon, 25 Jan 2021 22:55:53 +0000
Subject: [PATCH 8/9] Disable rubocop checks at correct places

---
 app/controllers/search_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index f93a8da66..9e2092df9 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -118,6 +118,7 @@ def index
                   end
     end
 
+    # rubocop:disable Metrics/BlockLength
     respond_to do |format|
       format.html do
         @counts_by_accuracy_group = @results.group(:is_tp, :is_fp, :is_naa).count
@@ -126,7 +127,6 @@ def index
         end.to_h
         @total_count = @counts_by_accuracy_group.values.sum
 
-        # rubocop:disable Metrics/BlockLength
         @results = case params[:feedback_filter]
                    when 'tp'
                      @results.where(is_tp: true)
@@ -144,7 +144,7 @@ def index
                      @results.paginate(page: params[:page], per_page: per_page,
                                        total_entries: @total_count)
                    end.order(Arel.sql('`posts`.`created_at` DESC'))
-        # rubocop:enable Metrics/BlockLength
+
         render :search
       end
       format.json do

From 1ae4bd0889ddd269075505e8721398946744ff4f Mon Sep 17 00:00:00 2001
From: user12986714 <65436504+user12986714@users.noreply.github.com>
Date: Wed, 27 Jan 2021 00:42:06 +0000
Subject: [PATCH 9/9] Make rubocop happy

---
 app/controllers/search_controller.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 9e2092df9..14c643c12 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -118,7 +118,6 @@ def index
                   end
     end
 
-    # rubocop:disable Metrics/BlockLength
     respond_to do |format|
       format.html do
         @counts_by_accuracy_group = @results.group(:is_tp, :is_fp, :is_naa).count