都道府県別表示に変更

Author: chicaco

app/controllers/events_controller.rb

@@ -1,6 +1,6 @@
 class EventsController < ApplicationController
   def show
     @url             = request.url
-    @upcoming_events = UpcomingEvent.group_by_region_and_date
+    @upcoming_events = UpcomingEvent.group_by_prefecture_and_date
   end
 end

app/models/upcoming_event.rb

@@ -12,16 +12,16 @@ class UpcomingEvent < ApplicationRecord
   scope :until, ->(date) { where('event_at < ?', date.beginning_of_day) }
 
   class << self
-    def group_by_region_and_date
-      events_by_region = eager_load(dojo_event_service: { dojo: :prefecture }).since(Time.zone.today).
+    def group_by_prefecture_and_date
+      events_by_prefecture = eager_load(dojo_event_service: :dojo).since(Time.zone.today).
         merge(Dojo.default_order).
-        group_by { |event| event.dojo_event_service.dojo.prefecture.region }
+        group_by { |event| event.dojo_event_service.dojo.prefecture_id }
 
-      regions = Prefecture.pluck(:region).uniq
       result = {}
-      regions.each do |region|
-        events = events_by_region[region]
-        result[region] = events ? events.sort_by(&:event_at).map(&:catalog).group_by { |d| d[:event_date] } : {}
+      Prefecture.all.each do |prefecture|
+        events = events_by_prefecture[prefecture.id]
+        next if events.blank?
+        result[prefecture] = events.sort_by(&:event_at).map(&:catalog).group_by { |d| d[:event_date] }
       end
       result
     end

app/views/shared/_upcoming_events.html.haml renamed to app/views/events/_upcoming_events.html.haml

@@ -1,6 +1,6 @@
 %div#event-list
-  - upcoming_events.each do |region, events_by_date|
-    %p.event-region= region
+  - upcoming_events.each do |prefecture, events_by_date|
+    %p.event-region= prefecture.name
     - events_by_date.each do |date, events|
       %p.event-date= "#{date.strftime('%Y/%m/%d')}"
       %ul
@@ -10,4 +10,4 @@
               %span.event-at= "#{event[:event_at].strftime('%k:%M')}〜"
               %a.event-url{ href: "#{event[:event_url]}" }
                 %span= event[:event_title]
-              %span= "#{event[:dojo_name]} (#{event[:dojo_prefecture_name]})"
+              %span= "(#{event[:dojo_name]})"

app/views/events/show.html.haml

@@ -11,8 +11,8 @@
   %h1 もうすぐ開催のイベント
   %br
   %p{:style => "margin: 0 30px 40px 30px;"}
-    開催予定のイベントをチェックしましょう！
-  = render partial: 'shared/upcoming_events', locals: { upcoming_events: @upcoming_events }
+    💻 開催予定のイベントをチェックしましょう！
+  = render partial: 'upcoming_events', locals: { upcoming_events: @upcoming_events }
 
 %br
 %br