Skip to content

Commit 3335339

Browse files
committed
Namespace "Ticket"
TODO: see whether we should keep this at all
1 parent 24259dc commit 3335339

File tree

2 files changed

+21
-18
lines changed

2 files changed

+21
-18
lines changed

app/controllers/events_controller.rb

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,17 @@ def index
1313
events << Event.past.includes(:venue, :sponsors).limit(RECENT_EVENTS_DISPLAY_LIMIT)
1414
events = events.compact.flatten.sort_by(&:date_and_time).reverse.first(RECENT_EVENTS_DISPLAY_LIMIT)
1515
events_hash_grouped_by_date = events.group_by(&:date)
16-
@past_events = events_hash_grouped_by_date.map.inject({}) do |hash, (key, value)|
16+
@past_events = events_hash_grouped_by_date.map.each_with_object({}) do |(key, value), hash|
1717
hash[key] = EventPresenter.decorate_collection(value)
18-
hash
1918
end
2019

2120
events = [Workshop.includes(:chapter).upcoming.joins(:chapter).merge(Chapter.active)]
2221
events << Meeting.upcoming.all
2322
events << Event.upcoming.includes(:venue, :sponsors).all
2423
events = events.compact.flatten.sort_by(&:date_and_time).group_by(&:date)
25-
@events = events.map.inject({}) { |hash, (key, value)| hash[key] = EventPresenter.decorate_collection(value); hash }
24+
@events = events.map.each_with_object({}) do |(key, value), hash|
25+
hash[key] = EventPresenter.decorate_collection(value)
26+
end
2627
end
2728

2829
def show
@@ -34,7 +35,7 @@ def show
3435
return unless logged_in?
3536

3637
invitation = Invitation.find_by(member: current_user, event: event, attending: true)
37-
return redirect_to event_invitation_path(@event, invitation) if invitation
38+
redirect_to event_invitation_path(@event, invitation) if invitation
3839
end
3940

4041
def student
@@ -47,7 +48,7 @@ def coach
4748

4849
def rsvp
4950
set_event
50-
ticket = Ticket.new(request, params)
51+
ticket = Services::Ticket.new(request, params)
5152
member = Member.find_by(email: ticket.email)
5253
invitation = member.invitations.where(event: @event, role: 'Student').try(:first)
5354
invitation ||= Invitation.create(event: @event, member: member, role: 'Student')

lib/services/ticket.rb

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
1-
class Ticket
2-
def initialize(request, params)
3-
authorise(request)
4-
@params = params
5-
end
1+
module Services
2+
class Ticket
3+
def initialize(request, params)
4+
authorise(request)
5+
@params = params
6+
end
67

7-
def email
8-
@email ||= params[:email]
9-
end
8+
def email
9+
@email ||= params[:email]
10+
end
1011

11-
private
12+
private
1213

13-
attr_reader :params
14+
attr_reader :params
1415

15-
def authorise(request)
16-
# TODO
17-
# verify referer
16+
def authorise(request)
17+
# TODO
18+
# verify referer
19+
end
1820
end
1921
end

0 commit comments

Comments
 (0)