dojo数の集計とラベル生成処理をヘルパーに移動し、ビューをシンプルに整理

Author: nacchan99

app/controllers/home_controller.rb

@@ -1,13 +1,7 @@
 class HomeController < ApplicationController
   def show
-    @dojo_count        = Dojo.active_dojos_count
+    @dojo_count = Dojo.active_dojos_count
     @regions_and_dojos = Dojo.group_by_region_on_active
-    @prefectures_and_dojos = Dojo.group_by_prefecture_on_active.transform_values do |dojos|
-      count = dojos.pluck(:counter).sum
-      {
-        dojos: dojos,
-        label: "#{count} Dojo#{'s' if count != 1}"
-      }
-    end
+    @prefectures_and_dojos = Dojo.group_by_prefecture_on_active
   end
 end

app/helpers/dojo_helper.rb

@@ -0,0 +1,13 @@
+module DojoHelper
+  def dojo_count_label(count)
+    if count == 1
+      "#{count} Dojo"
+    else
+      "#{count} Dojos"
+    end
+  end
+
+  def total_dojos_count(dojos)
+    dojos.sum(&:counter)
+  end
+end

app/views/shared/_dojos.html+smartphone.erb

@@ -1,19 +1,20 @@
 <div id="accordion" class="panel-group" aria-multiselectable="true" role="tablist">
   <% if @prefectures_and_dojos.present? %>
-    <% @prefectures_and_dojos.each_with_index do |(prefecture, data), index| %>
+    <% @prefectures_and_dojos.each_with_index do |(prefecture, dojos), index| %>
+      <% dojo_count = total_dojos_count(dojos) %>
 
       <div class="panel panel-default">
         <div class="panel-heading" id="heading<%= index %>" role="tab">
           <h4 class="panel-title">
             <a data-toggle="collapse" href="#collapse<%= index %>" role="button">
               <i class="fa fa-chevron-right" aria-hidden="true"></i>
-              <%= prefecture %> - <%= data[:label] %>
+              <%= prefecture %> - <%= dojo_count_label(dojo_count) %>
             </a>
           </h4>
         </div>
         <div class="panel-collapse collapse" id="collapse<%= index %>" role="tabpanel">
           <div class="panel-body grayscale-bg dojo-flex">
-            <%= render partial: 'shared/dojo', collection: data[:dojos] %>
+            <%= render partial: 'shared/dojo', collection: dojos %>
           </div>
         </div>
       </div>