Move methods to AttendanceConcerns and refactor

Signed-off-by: jonathan.kerr <3410350+jonodrew@users.noreply.github.com>

Author: jonodrew

app/controllers/chapter_controller.rb

@@ -1,4 +1,5 @@
 class ChapterController < ApplicationController
+  include AttendanceConcerns
   def show
     @chapter = ChapterPresenter.new(Chapter.active.find_by!(slug: slug))
 
@@ -10,7 +11,7 @@ def show
     @latest_workshops = event_presenters_by_date(past_events)
 
     @recent_sponsors = Sponsor.recent_for_chapter(@chapter)
-    @attending_ids = MemberPresenter.new(current_user).attending_workshops
+    @attending_ids = attending_workshops
   end
 
   private

app/controllers/concerns/attendance_concerns.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module AttendanceConcerns
+  extend ActiveSupport::Concern
+
+  def attending_workshops
+    current_user.nil? ? Set.new : current_user.workshop_invitations.accepted.pluck(:id).to_set
+  end
+
+  def attending_events
+    current_user.nil? ? Set.new : current_user.invitations.accepted.pluck(:id).to_set
+  end
+end

app/controllers/dashboard_controller.rb

@@ -1,4 +1,5 @@
 class DashboardController < ApplicationController
+  include AttendanceConcerns
   before_action :is_logged_in?, only: %i[dashboard]
   skip_before_action :accept_terms, except: %i[dashboard show]
 
@@ -8,12 +9,12 @@ class DashboardController < ApplicationController
 
   def show
     @chapters = Chapter.active.all.order(:created_at)
-    @user = MemberPresenter.new(current_user)
+    @user = current_user ? MemberPresenter.new(current_user) : nil
     @upcoming_workshops = upcoming_events.map.inject({}) do |hash, (key, value)|
       hash[key] = EventPresenter.decorate_collection(value)
       hash
     end
-    @attending_ids = @user.attending_workshops
+    @attending_ids = attending_workshops
     @testimonials = Testimonial.order(Arel.sql('RANDOM()')).limit(5).includes(:member)
   end
 
@@ -24,7 +25,7 @@ def dashboard
       hash
     end
     @announcements = current_user.announcements.active
-    @attending_ids = MemberPresenter.new(current_user).attending_workshops
+    @attending_ids = attending_workshops
   end
 
   def code; end

app/controllers/events_controller.rb

@@ -1,6 +1,7 @@
 require 'services/ticket'
 
 class EventsController < ApplicationController
+  include AttendanceConcerns
   before_action :is_logged_in?, only: %i[student coach]
 
   RECENT_EVENTS_DISPLAY_LIMIT = 40
@@ -23,7 +24,7 @@ def index
     events << Event.upcoming.includes(:venue, :sponsors).all
     events = events.compact.flatten.sort_by(&:date_and_time).group_by(&:date)
     @events = events.map.inject({}) { |hash, (key, value)| hash[key] = EventPresenter.decorate_collection(value); hash }
-    @attending_ids = MemberPresenter.new(current_user).attending_events
+    @attending_ids = attending_events
   end
 
   def show

app/presenters/member_presenter.rb

@@ -1,9 +1,5 @@
 class MemberPresenter < BasePresenter
 
-  def initialize(current_user)
-    @member = current_user
-    super
-  end
   def organiser?
     has_role? :organiser, :any
   end
@@ -28,13 +24,7 @@ def pairing_details_array(role, tutorial, note)
     role.eql?('Coach') ? coach_pairing_details(note) : student_pairing_details(tutorial, note)
   end
 
-  def attending_workshops
-    @member.nil? ? Set.new : workshop_invitations.accepted.pluck(:id).to_set
-  end
 
-  def attending_events
-    @member.nil? ? Set.new : invitations.accepted.pluck(:id).to_set
-  end
 
   private