Skip to content

Commit 2dad0c2

Browse files
committed
Refactor: events#latest の条件分岐処理をシンプルにまとめた
1 parent 47806eb commit 2dad0c2

File tree

2 files changed

+21
-27
lines changed

2 files changed

+21
-27
lines changed

app/controllers/events_controller.rb

Lines changed: 20 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -15,35 +15,29 @@ def index
1515
end
1616

1717
def latest
18-
@url = request.url
18+
# 現在はノートで細かな確認ができるため不要? (念のため残しています)
19+
# @active_dojos_verified = [
20+
# '和歌山', '市川真間', '泉', '石垣', '南紀田辺', '三好', '市川', 'ひばりヶ丘', '伊勢',
21+
# '徳島', '柏', '富山', 'ももち', '木曽', '熊本'
22+
# ]
1923
@latest_event_by_dojos = []
20-
@active_dojos_verified = [
21-
'和歌山', '市川真間', '泉', '石垣', '南紀田辺', '三好', '市川', 'ひばりヶ丘', '伊勢',
22-
'徳島', '柏', '富山', 'ももち', '木曽', '熊本'
23-
]
2424
Dojo.active.each do |dojo|
2525
latest_event = dojo.event_histories.newest.first
26-
if @active_dojos_verified.include?(dojo.name) or latest_event.nil?
27-
@latest_event_by_dojos << {
28-
id: dojo.id,
29-
name: dojo.name,
30-
note: dojo.note,
31-
url: dojo.url,
32-
event_at: dojo.created_at.strftime("%Y-%m-%d"),
33-
event_url: nil,
34-
}
35-
else
36-
@latest_event_by_dojos << {
37-
id: dojo.id,
38-
name: dojo.name,
39-
note: dojo.note,
40-
url: dojo.url,
41-
event_at: latest_event.evented_at.strftime("%Y-%m-%d"),
42-
event_url: latest_event.event_url.include?('dummy.url') ?
43-
"https://www.facebook.com/#{latest_event.service_group_id}/events" :
44-
latest_event.event_url
45-
}
46-
end
26+
27+
@latest_event_by_dojos << {
28+
id: dojo.id,
29+
name: dojo.name,
30+
note: dojo.note,
31+
url: dojo.url,
32+
33+
# 過去のイベント開催データが無ければ、大体として掲載日を入力
34+
event_at: latest_event.nil? ?
35+
dojo.created_at.strftime("%Y-%m-%d") :
36+
latest_event.evented_at.strftime("%Y-%m-%d"),
37+
event_url: latest_event.nil? ?
38+
nil :
39+
latest_event.event_url
40+
}
4741
end
4842

4943
# Sort by older events first && older Dojo ID first if same event date.

app/views/events/latest.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<% provide(:title, '道場情報 - 直近の開催日まとめ') %>
22
<% provide(:desc, '道場別の直近開催日をまとめたページです。') %>
3-
<% provide(:url, @url) %>
3+
<% provide(:url, events_latest_url) %>
44
<% provide(:meta_image, '/img/ogp-events.jpeg') %>
55

66
<section class="cover">

0 commit comments

Comments
 (0)