Merge pull request #5204 from nhsuk/sessions-base-controller

Add `Sessions::BaseController`

Author: thomasleese

app/controllers/sessions/base_controller.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class Sessions::BaseController < ApplicationController
+  before_action :set_session
+
+  private
+
+  def set_session
+    @session =
+      policy_scope(Session).includes(
+        :location_programme_year_groups,
+        programmes: :vaccines
+      ).find_by!(slug: params[:session_slug])
+  end
+end

app/controllers/sessions/consent_controller.rb

@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-class Sessions::ConsentController < ApplicationController
+class Sessions::ConsentController < Sessions::BaseController
   include PatientSearchFormConcern
 
-  before_action :set_session
   before_action :set_statuses
   before_action :set_patient_search_form
 

app/controllers/sessions/invite_to_clinic_controller.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-class Sessions::InviteToClinicController < ApplicationController
-  before_action :set_session
+class Sessions::InviteToClinicController < Sessions::BaseController
+  before_action :check_can_send_clinic_invitations
   before_action :set_generic_clinic_session
   before_action :set_patients_to_invite
   before_action :set_invitations_to_send
@@ -31,12 +31,7 @@ def update
 
   private
 
-  def set_session
-    @session =
-      authorize Session.includes(:programmes).find_by!(
-                  slug: params[:session_slug]
-                )
-
+  def check_can_send_clinic_invitations
     render status: :not_found unless @session.can_send_clinic_invitations?
   end
 

app/controllers/sessions/manage_consent_reminders_controller.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-class Sessions::ManageConsentRemindersController < ApplicationController
-  before_action :set_session
-
+class Sessions::ManageConsentRemindersController < Sessions::BaseController
   def show
   end
 
@@ -14,10 +12,4 @@ def create
                   success: "Manual consent reminders sent"
                 }
   end
-
-  private
-
-  def set_session
-    @session = policy_scope(Session).find_by!(slug: params[:session_slug])
-  end
 end

app/controllers/sessions/patient_specific_directions_controller.rb

@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-class Sessions::PatientSpecificDirectionsController < ApplicationController
+class Sessions::PatientSpecificDirectionsController < Sessions::BaseController
   include PatientSearchFormConcern
 
-  before_action :set_session
   before_action :set_programme
   before_action :set_vaccine
   before_action :set_patient_search_form
@@ -38,10 +37,6 @@ def create
 
   private
 
-  def set_session
-    @session = policy_scope(Session).find_by!(slug: params[:session_slug])
-  end
-
   def set_programme
     # TODO: Handle PSDs in sessions with multiple programmes.
     @programme = @session.programmes.supports_delegation.first

app/controllers/sessions/patients_controller.rb

@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-class Sessions::PatientsController < ApplicationController
+class Sessions::PatientsController < Sessions::BaseController
   include PatientSearchFormConcern
 
-  before_action :set_session
   before_action :set_patient_search_form
 
   layout "full"
@@ -18,13 +17,4 @@ def show
     @pagy, @patients =
       patients.is_a?(Array) ? pagy_array(patients) : pagy(patients)
   end
-
-  private
-
-  def set_session
-    @session =
-      policy_scope(Session).includes(:location_programme_year_groups).find_by!(
-        slug: params[:session_slug]
-      )
-  end
 end

app/controllers/sessions/record_controller.rb

@@ -1,10 +1,9 @@
 # frozen_string_literal: true
 
-class Sessions::RecordController < ApplicationController
+class Sessions::RecordController < Sessions::BaseController
   include PatientSearchFormConcern
   include TodaysBatchConcern
 
-  before_action :set_session
   before_action :set_patient_search_form
 
   before_action :set_programme, except: :show
@@ -68,13 +67,6 @@ def update_batch
 
   private
 
-  def set_session
-    @session =
-      policy_scope(Session).includes(programmes: :vaccines).find_by!(
-        slug: params[:session_slug]
-      )
-  end
-
   def set_programme
     @programme = policy_scope(Programme).find_by!(type: params[:programme_type])
   end

app/controllers/sessions/register_controller.rb

@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-class Sessions::RegisterController < ApplicationController
+class Sessions::RegisterController < Sessions::BaseController
   include PatientSearchFormConcern
 
-  before_action :set_session
   before_action :set_patient_search_form, only: :show
   before_action :set_session_date, only: :create
   before_action :set_patient, only: :create
@@ -52,13 +51,6 @@ def create
 
   private
 
-  def set_session
-    @session =
-      policy_scope(Session).includes(programmes: :vaccines).find_by!(
-        slug: params[:session_slug]
-      )
-  end
-
   def set_session_date
     @session_date = @session.session_dates.find_by!(value: Date.current)
   end

app/controllers/sessions/triage_controller.rb

@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-class Sessions::TriageController < ApplicationController
+class Sessions::TriageController < Sessions::BaseController
   include PatientSearchFormConcern
 
-  before_action :set_session
   before_action :set_statuses
   before_action :set_patient_search_form
 
@@ -29,13 +28,6 @@ def show
 
   private
 
-  def set_session
-    @session =
-      policy_scope(Session).includes(programmes: :vaccines).find_by!(
-        slug: params[:session_slug]
-      )
-  end
-
   def set_statuses
     programmes = @session.programmes