@@ -13,16 +13,17 @@ def index
13
13
events << Event . past . includes ( :venue , :sponsors ) . limit ( RECENT_EVENTS_DISPLAY_LIMIT )
14
14
events = events . compact . flatten . sort_by ( &:date_and_time ) . reverse . first ( RECENT_EVENTS_DISPLAY_LIMIT )
15
15
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 |
17
17
hash [ key ] = EventPresenter . decorate_collection ( value )
18
- hash
19
18
end
20
19
21
20
events = [ Workshop . includes ( :chapter ) . upcoming . joins ( :chapter ) . merge ( Chapter . active ) ]
22
21
events << Meeting . upcoming . all
23
22
events << Event . upcoming . includes ( :venue , :sponsors ) . all
24
23
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
26
27
end
27
28
28
29
def show
@@ -34,7 +35,7 @@ def show
34
35
return unless logged_in?
35
36
36
37
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
38
39
end
39
40
40
41
def student
@@ -47,7 +48,7 @@ def coach
47
48
48
49
def rsvp
49
50
set_event
50
- ticket = Ticket . new ( request , params )
51
+ ticket = Services :: Ticket . new ( request , params )
51
52
member = Member . find_by ( email : ticket . email )
52
53
invitation = member . invitations . where ( event : @event , role : 'Student' ) . try ( :first )
53
54
invitation ||= Invitation . create ( event : @event , member : member , role : 'Student' )
0 commit comments