Enhance RSVP functionality and optimize event loading

- Ensure user is logged in before managing RSVPs
- Optimize event attendance queries to reduce N+1 issues
- Preload necessary associations for event and calendar displays

Author: rsmithlal

app/controllers/better_together/events_controller.rb

@@ -46,7 +46,15 @@ def rsvp_going
     def rsvp_cancel
       @event = set_resource_instance
       authorize @event, :show?
-      attendance = BetterTogether::EventAttendance.find_by(event: @event, person: helpers.current_person)
+      
+      # Ensure current_person exists
+      current_person = helpers.current_person
+      unless current_person
+        redirect_to @event, alert: t('better_together.events.login_required', default: 'Please log in to manage RSVPs.')
+        return
+      end
+      
+      attendance = BetterTogether::EventAttendance.find_by(event: @event, person: current_person)
       attendance&.destroy
       redirect_to @event, notice: t('better_together.events.rsvp_cancelled', default: 'RSVP cancelled')
     end
@@ -95,8 +103,14 @@ def rsvp_update(status) # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
         return
       end
 
-      attendance = BetterTogether::EventAttendance.find_or_initialize_by(event: @event,
-                                                                         person: helpers.current_person)
+      # Ensure current_person exists before creating attendance
+      current_person = helpers.current_person
+      unless current_person
+        redirect_to @event, alert: t('better_together.events.login_required', default: 'Please log in to RSVP.')
+        return
+      end
+
+      attendance = BetterTogether::EventAttendance.find_or_initialize_by(event: @event, person: current_person)
       attendance.status = status
       authorize attendance
       if attendance.save
@@ -106,5 +120,47 @@ def rsvp_update(status) # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
       end
     end
     # rubocop:enable Metrics/MethodLength
+
+    # Override base controller method to add performance optimizations
+    def set_resource_instance
+      super
+      
+      # Preload associations needed for event show page to avoid N+1 queries
+      preload_event_associations! unless json_request?
+    end
+
+    def json_request?
+      request.format.json?
+    end
+
+    def preload_event_associations!
+      return unless @event
+
+      # Preload categories and their translations to avoid N+1 queries
+      @event.categories.includes(:string_translations).load
+      
+      # Preload event hosts and their associated models
+      @event.event_hosts.includes(:host).load
+      
+      # Preload event attendances to avoid count queries in view
+      @event.event_attendances.includes(:person).load
+      
+      # Preload current person's attendance for RSVP buttons
+      if current_person
+        @current_attendance = @event.event_attendances.find { |a| a.person_id == current_person.id }
+      end
+      
+      # Preload translations for the event itself
+      @event.string_translations.load
+      @event.text_translations.load
+      
+      # Preload cover image attachment to avoid attachment queries
+      @event.cover_image_attachment&.blob&.load if @event.cover_image.attached?
+      
+      # Preload location if present
+      @event.location&.reload if @event.location
+      
+      self
+    end
   end
 end

app/controllers/better_together/people_controller.rb

@@ -17,6 +17,9 @@ def show
                           :string_translations,
                           blocks: { background_image_file_attachment: :blob }
                         )
+      
+      # Preload calendar associations to avoid N+1 queries
+      @person.preload_calendar_associations!
     end
 
     # GET /people/new

app/models/better_together/person.rb

@@ -166,36 +166,67 @@ def after_record_created
     # Combines events they're going to, created, and interested in
     def all_calendar_events
       @all_calendar_events ||= begin
-        # Events from primary calendar (going)
-        calendar_events = primary_calendar.events.includes(:string_translations)
+        # Build a single query to get all relevant events with proper includes
+        event_ids = Set.new
 
-        # Events they created 
-        created_events = Event.includes(:string_translations).where(creator_id: id)
+        # Get event IDs from calendar entries (going events)
+        calendar_event_ids = primary_calendar.calendar_entries.pluck(:event_id)
+        event_ids.merge(calendar_event_ids)
 
-        # Events they're interested in (but not going)
-        interested_event_ids = event_attendances.where(status: 'interested').pluck(:event_id)
-        interested_events = Event.includes(:string_translations).where(id: interested_event_ids)
+        # Get event IDs from attendances (interested events)
+        attendance_event_ids = event_attendances.pluck(:event_id)
+        event_ids.merge(attendance_event_ids)
 
-        # Combine all events, removing duplicates by ID
-        all_events = (calendar_events.to_a + created_events.to_a + interested_events.to_a)
-        all_events.uniq(&:id)
+        # Get event IDs from created events
+        created_event_ids = Event.where(creator_id: id).pluck(:id)
+        event_ids.merge(created_event_ids)
+        
+        # Single query to fetch all events with necessary includes
+        if event_ids.any?
+          Event.includes(:string_translations, :text_translations)
+               .where(id: event_ids.to_a)
+               .to_a
+        else
+          []
+        end
       end
     end
 
     # Determines the relationship type for an event
     # Returns: :going, :created, :interested, or :calendar
     def event_relationship_for(event)
+      # Check if they created it first (highest priority)
       return :created if event.creator_id == id
 
-      attendance = event_attendances.find_by(event: event)
+      # Use memoized attendances to avoid N+1 queries
+      @_event_attendances_by_event_id ||= event_attendances.index_by(&:event_id)
+      attendance = @_event_attendances_by_event_id[event.id]
+      
       return attendance.status.to_sym if attendance
 
-      # Check if it's in their calendar (fallback)
-      return :going if primary_calendar.events.include?(event)
+      # Check if it's in their calendar (for events added directly to calendar)
+      @_calendar_event_ids ||= Set.new(primary_calendar.calendar_entries.pluck(:event_id))
+      return :going if @_calendar_event_ids.include?(event.id)
 
       :calendar # Default for calendar events
     end
 
+    # Preloads associations needed for calendar display to avoid N+1 queries
+    def preload_calendar_associations!
+      # Preload event attendances
+      event_attendances.includes(:event).load
+      
+      # Preload calendar entries
+      primary_calendar.calendar_entries.includes(:event).load
+      
+      # Reset memoized variables
+      @all_calendar_events = nil
+      @_event_attendances_by_event_id = nil
+      @_calendar_event_ids = nil
+      
+      self
+    end
+
     include ::BetterTogether::RemoveableAttachment
   end
 end

app/views/better_together/events/show.html.erb

@@ -51,7 +51,7 @@
 
     <!-- RSVP Actions -->
     <% if current_person && @event.scheduled? %>
-      <% attendance = BetterTogether::EventAttendance.find_by(event: @event, person: current_person) %>
+      <% attendance = @current_attendance %>
       <div class="container my-3">
         <div class="d-flex gap-2">
           <%= button_to rsvp_interested_event_path(@event), method: :post, class: "btn btn-outline-danger #{'active' if attendance&.status == 'interested'}", style: "#{attendance&.status == 'interested' ? '--bs-btn-active-bg: #e91e63; --bs-btn-active-border-color: #e91e63;' : '--bs-btn-color: #e91e63; --bs-btn-border-color: #e91e63; --bs-btn-hover-bg: #e91e63; --bs-btn-hover-border-color: #e91e63;'}" do %>
@@ -67,8 +67,9 @@
           <% end %>
         </div>
         <div class="text-muted mt-2">
-          <% going_count = BetterTogether::EventAttendance.where(event: @event, status: 'going').count %>
-          <% interested_count = BetterTogether::EventAttendance.where(event: @event, status: 'interested').count %>
+          <% attendance_counts = @event.event_attendances.group(:status).count %>
+          <% going_count = attendance_counts['going'] || 0 %>
+          <% interested_count = attendance_counts['interested'] || 0 %>
           <small>
             <%= t('better_together.events.rsvp_counts', default: 'Going: %{going} · Interested: %{interested}', going: going_count, interested: interested_count) %>
           </small>
@@ -93,7 +94,7 @@
           <%# Show the Attendees tab only to organizers (reuse invitation policy check) %>
           <% invitation = BetterTogether::EventInvitation.new(invitable: @event, inviter: current_person) %>
           <% if policy(invitation).create? %>
-            <% attendees_count = BetterTogether::EventAttendance.where(event: @event).count %>
+            <% attendees_count = @event.event_attendances.count %>
             <%= link_to "#{t('globals.tabs.attendees', default: 'Attendees')} (#{attendees_count})", '#attendees', class: 'nav-link', id: 'attendees-tab', data: { bs_toggle: 'tab', bs_target: '#attendees', turbo: false, 'better_together--tabs-target': 'tab' }, role: 'tab', aria: { controls: 'attendees', selected: 'false' }, tabindex: '0' %>
           <% end %>
         <% end %>
@@ -150,7 +151,7 @@
                   <%# Render the existing invitations panel inside this attendees pane %>
                   <%= render 'better_together/events/invitations_panel' %>
 
-                  <% attendances = BetterTogether::EventAttendance.includes(:person).where(event: @event) %>
+                  <% attendances = @event.event_attendances %>
                   <% if attendances.any? %>
                     <hr/>
                     <h6 class="mb-2"><%= t('better_together.events.attendees', default: 'Attendees') %></h6>

app/views/better_together/people/_calendar_section.html.erb

@@ -4,10 +4,11 @@
     <%= t('better_together.people.calendar.title', default: 'Personal Calendar') %>
   </h6>
 
-  <% if person.primary_calendar.calendar_entries.any? || person.event_attendances.any? || person.created_resources.where(type: 'BetterTogether::Event').any? %>
+  <% all_events = person.all_calendar_events %>
+  <% if all_events.any? %>
     <!-- Simple Calendar View -->
     <div class="calendar-container">
-      <%= month_calendar(events: person.all_calendar_events) do |date, events| %>
+      <%= month_calendar(events: all_events) do |date, events| %>
         <% events.each do |event| %>
           <% event_url = better_together.event_path(event) %>
           <% icon_data = event_relationship_icon(person, event) %>
@@ -38,7 +39,7 @@
         <%= t('better_together.people.calendar.upcoming_events', default: 'Upcoming Events') %>
       </h6>
 
-      <% upcoming_events = person.all_calendar_events.select { |e| e.starts_at && e.starts_at >= Time.current }.sort_by(&:starts_at).first(5) %>
+      <% upcoming_events = all_events.select { |e| e.starts_at && e.starts_at >= Time.current }.sort_by(&:starts_at).first(5) %>
       <% if upcoming_events.any? %>
         <div class="list-group">
           <% upcoming_events.each do |event| %>
@@ -85,7 +86,7 @@
         <%= t('better_together.people.calendar.recent_past_events', default: 'Recent Past Events') %>
       </h6>
 
-      <% past_events = person.all_calendar_events.select { |e| e.starts_at && e.starts_at < Time.current }.sort_by(&:starts_at).reverse.first(3) %>
+      <% past_events = all_events.select { |e| e.starts_at && e.starts_at < Time.current }.sort_by(&:starts_at).reverse.first(3) %>
       <% if past_events.any? %>
         <div class="list-group">
           <% past_events.each do |event| %>