Skip to content

Add all_events parameter for Event API #1552

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion app/controllers/events_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@ def index
@url = request.url
@upcoming_events = UpcomingEvent.group_by_prefecture
@pokemon_events = UpcomingEvent.group_by_keyword('ポケモン')
all_events = params[:all_events] == 'true'

respond_to do |format|
format.html
format.json {
# DojoMap: https://map.coderdojo.jp
render json: UpcomingEvent.for_dojo_map
render json: UpcomingEvent.for_dojo_map(all_events)
}
end
end
Expand Down
53 changes: 33 additions & 20 deletions app/models/upcoming_event.rb
Original file line number Diff line number Diff line change
Expand Up @@ -35,35 +35,48 @@ def group_by_keyword(keyword)
where('event_title like(?)', "%#{keyword}%")
end

def for_dojo_map
def for_dojo_map(all_events = false)
result = []
list_of_dojo_and_events = eager_load(dojo_event_service: :dojo)
.since(Time.zone.today)
.merge(Dojo.default_order)
.group_by { |event| event.dojo_event_service.dojo }

list_of_dojo_and_events.each do |dojo, events|
event = events.sort_by(&:event_at).first
result << {
id: dojo.id,
name: dojo.name,
url: dojo.url,
event_id: event[:id],
event_title: event[:event_title],
event_date: event[:event_at],
event_end_at: event[:event_end_at],
event_url: event[:event_url],
prefecture: dojo.prefecture.name,
participants: event[:participants],
event_update_at: event[:event_update_at],
address: event[:address],
place: event[:place],
limit: event[:limit]
}
sorted_events = events.sort_by(&:event_at)
if all_events
sorted_events.each do |event|
result << build_event_hash(dojo, event)
end
else
event = sorted_events.first
result << build_event_hash(dojo, event)
end
end

result
end

private

def build_event_hash(dojo, event)
{
id: dojo.id,
name: dojo.name,
url: dojo.url,
event_id: event[:id],
event_title: event[:event_title],
event_date: event[:event_at],
event_end_at: event[:event_end_at],
event_url: event[:event_url],
prefecture: dojo.prefecture.name,
participants: event[:participants],
event_update_at: event[:event_update_at],
address: event[:address],
place: event[:place],
limit: event[:limit]
}
end
end

def catalog
Expand Down