Merge pull request #460 from coderdojo-japan/view_upcoming_events

直近の CoderDojo 開催情報を表示する

Author: chicaco

app/assets/stylesheets/custom.scss

@@ -561,6 +561,33 @@ a {
     text-decoration: none
 }
 
+.event-region {
+    font-weight: bold;
+}
+
+#event-list {
+    width: 80%;
+    margin: 0 auto;
+}
+
+#event-list .event-date {
+    text-align: left;
+    margin: .5em 0;
+}
+
+#event-list ul {
+    list-style: none;
+    padding-left: 20px;
+}
+
+#event-list ul li {
+    text-align: left;
+}
+
+#event-list .event-at {
+    display: inline-block;
+    width: 80px;
+}
 
 @media only screen and (min-width:560px) {
     .dojo {

app/controllers/events_controller.rb

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

app/models/upcoming_event.rb

@@ -8,5 +8,33 @@ class UpcomingEvent < ApplicationRecord
   validates :participants, presence: true
 
   scope :for, ->(service) { where(dojo_event_service: DojoEventService.for(service)) }
+  scope :since, ->(date) { where('event_at >= ?', date.beginning_of_day) }
   scope :until, ->(date) { where('event_at < ?', date.beginning_of_day) }
+
+  class << self
+    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_id }
+
+      result = {}
+      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
+  end
+
+  def catalog
+    {
+      dojo_name:            dojo_event_service.dojo.name,
+      dojo_prefecture_name: dojo_event_service.dojo.prefecture.name,
+      event_title:          event_title,
+      event_url:            event_url,
+      event_at:             event_at,
+      event_date:           event_at.to_date
+    }
+  end
 end

app/views/events/_upcoming_events.html.haml

@@ -0,0 +1,13 @@
+%div#event-list
+  - 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
+        - events.each do |event|
+          %li
+            %p
+              %span.event-at= "#{event[:event_at].strftime('%k:%M')}〜"
+              %a.event-url{ href: "#{event[:event_url]}" }
+                %span= event[:event_title]
+              %span= "(#{event[:dojo_name]})"

app/views/events/show.html.haml

@@ -0,0 +1,18 @@
+- provide(:title, 'イベント')
+- provide(:desc,  'もうすぐ開催のイベント情報をまとめています。')
+- provide(:url,   @url)
+
+/
+  %section.cover{style: 'padding-top:40px; background-color: white;'}
+    = image_tag "stats_cover.png"
+
+%section#events.text-center
+  %br
+  %h1 もうすぐ開催のイベント
+  %br
+  %p{:style => "margin: 0 30px 40px 30px;"}
+    💻 開催予定のイベントをチェックしましょう！
+  = render partial: 'upcoming_events', locals: { upcoming_events: @upcoming_events }
+
+%br
+%br

config/routes.rb

@@ -25,6 +25,8 @@
   #       Hotfix with the code above that works correctly.
   #resources :stats,  only: %i(show)
 
+  get "/events"  => "events#show"
+
   # Redirects
   get "/releases/2016/12/12/new-backend", to: redirect('/news/2016/12/12/new-backend')
   get "/blogs/2016/12/12/new-backend",    to: redirect('/news/2016/12/12/new-backend')

db/migrate/20190602092528_add_event_title_to_upcoming_event.rb

@@ -0,0 +1,5 @@
+class AddEventTitleToUpcomingEvent < ActiveRecord::Migration[5.1]
+  def change
+    add_column :upcoming_events, :event_title, :string, null: false
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20190526151359) do
+ActiveRecord::Schema.define(version: 20190602092528) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -86,6 +86,7 @@
     t.datetime "event_at", null: false
     t.string "service_name", null: false
     t.integer "participants", null: false
+    t.string "event_title", null: false
     t.index ["dojo_event_service_id"], name: "index_upcoming_events_on_dojo_event_service_id"
     t.index ["service_name", "event_id"], name: "index_upcoming_events_on_service_name_and_event_id", unique: true
   end

lib/upcoming_events/tasks/connpass.rb

@@ -15,6 +15,7 @@ def run
 
               record = dojo_event_service.upcoming_events.find_or_initialize_by(event_id: e['event_id'])
               record.update!(service_name: dojo_event_service.name,
+                             event_title:  e['title'],
                              event_url:    e['event_url'],
                              event_at:     Time.zone.parse(e['started_at']),
                              participants: e['accepted'])

lib/upcoming_events/tasks/doorkeeper.rb

@@ -15,6 +15,7 @@ def run
 
               record = dojo_event_service.upcoming_events.find_or_initialize_by(event_id: e['id'])
               record.update!(service_name: dojo_event_service.name,
+                             event_title: e['title'],
                              event_url: e['public_url'],
                              participants: e['participants'],
                              event_at: Time.zone.parse(e['starts_at']))

spec/factories/upcoming_events.rb

@@ -4,6 +4,7 @@
   factory :upcoming_event do
     service_name { :connpass }
     event_id     { '1234' }
+    event_title  { 'event title' }
     event_url    { 'http:/www.aaa.com/events/1224' }
     event_at     { '2019-05-01 10:00'.in_time_zone }
     participants { 1 }

spec/lib/upcoming_events/aggregation_spec.rb

@@ -26,11 +26,11 @@
     end
 
     it '昨日分までは削除' do
-      create(:upcoming_event, dojo_event_service_id: @es1.id, service_name: 'connpass', event_id: '1111', event_at: "#{Time.zone.today - 3.days} 13:00:00".in_time_zone)
-      create(:upcoming_event, dojo_event_service_id: @es1.id, service_name: 'connpass', event_id: '2222', event_at: "#{Time.zone.today - 2.days} 14:00:00".in_time_zone)
-      create(:upcoming_event, dojo_event_service_id: @es1.id, service_name: 'connpass', event_id: '3333', event_at: "#{Time.zone.today - 1.days} 15:00:00".in_time_zone)
-      create(:upcoming_event, dojo_event_service_id: @es2.id, service_name: 'doorkeeper', event_id: '4444', event_at: "#{Time.zone.today - 2.days} 10:00:00".in_time_zone)
-      create(:upcoming_event, dojo_event_service_id: @es2.id, service_name: 'doorkeeper', event_id: '5555', event_at: "#{Time.zone.today - 1.days} 11:00:00".in_time_zone)
+      create(:upcoming_event, dojo_event_service_id: @es1.id, service_name: 'connpass', event_id: '1111', event_title: 'title 1111', event_at: "#{Time.zone.today - 3.days} 13:00:00".in_time_zone)
+      create(:upcoming_event, dojo_event_service_id: @es1.id, service_name: 'connpass', event_id: '2222', event_title: 'title 2222', event_at: "#{Time.zone.today - 2.days} 14:00:00".in_time_zone)
+      create(:upcoming_event, dojo_event_service_id: @es1.id, service_name: 'connpass', event_id: '3333', event_title: 'title 3333', event_at: "#{Time.zone.today - 1.days} 15:00:00".in_time_zone)
+      create(:upcoming_event, dojo_event_service_id: @es2.id, service_name: 'doorkeeper', event_id: '4444', event_title: 'title 4444', event_at: "#{Time.zone.today - 2.days} 10:00:00".in_time_zone)
+      create(:upcoming_event, dojo_event_service_id: @es2.id, service_name: 'doorkeeper', event_id: '5555', event_title: 'title 5555', event_at: "#{Time.zone.today - 1.days} 11:00:00".in_time_zone)
 
       expect{ UpcomingEvents::Aggregation.new({}).run }.to change{ UpcomingEvent.count }.from(5).to(3)
     end