Add Programmes::BaseController

This adds a controller which can be shared across all the programme
controllers to contain common logic.

Author: thomasleese

app/controllers/programmes/base_controller.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class Programmes::BaseController < ApplicationController
+  before_action :set_programme
+
+  layout "full"
+
+  private
+
+  def set_programme
+    @programme = policy_scope(Programme).find_by!(type: params[:programme_type])
+  end
+end

app/controllers/programmes/cohorts_controller.rb

@@ -1,12 +1,8 @@
 # frozen_string_literal: true
 
-class Programmes::CohortsController < ApplicationController
+class Programmes::CohortsController < Programmes::BaseController
   include Pagy::Backend
 
-  before_action :set_programme
-
-  layout "full"
-
   def index
     birth_academic_years = @programme.birth_academic_years
 
@@ -35,10 +31,6 @@ def show
 
   private
 
-  def set_programme
-    @programme = policy_scope(Programme).find_by!(type: params[:programme_type])
-  end
-
   def patients_in_organisation
     current_user.selected_organisation.patients
   end

app/controllers/programmes/overview_controller.rb

@@ -1,20 +1,10 @@
 # frozen_string_literal: true
 
-class Programmes::OverviewController < ApplicationController
-  before_action :set_programme
-
-  layout "full"
-
+class Programmes::OverviewController < Programmes::BaseController
   def show
     patients = policy_scope(Patient).in_programmes([@programme])
 
     @consents =
       policy_scope(Consent).where(patient: patients, programme: @programme)
   end
-
-  private
-
-  def set_programme
-    @programme = policy_scope(Programme).find_by!(type: params[:programme_type])
-  end
 end

app/controllers/programmes/patients_controller.rb

@@ -1,14 +1,11 @@
 # frozen_string_literal: true
 
-class Programmes::PatientsController < ApplicationController
+class Programmes::PatientsController < Programmes::BaseController
   include Pagy::Backend
   include SearchFormConcern
 
-  before_action :set_programme
   before_action :set_search_form
 
-  layout "full"
-
   def index
     scope =
       policy_scope(Patient).includes(:vaccination_statuses).in_programmes(
@@ -20,10 +17,4 @@ def index
     patients = @form.apply(scope)
     @pagy, @patients = pagy(patients)
   end
-
-  private
-
-  def set_programme
-    @programme = policy_scope(Programme).find_by!(type: params[:programme_type])
-  end
 end

app/controllers/programmes/reports_controller.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-class Programmes::ReportsController < ApplicationController
-  before_action :set_programme
-
+class Programmes::ReportsController < Programmes::BaseController
   def create
     vaccination_report =
       VaccinationReport.new(request_session: session, current_user:)
@@ -12,10 +10,4 @@ def create
 
     redirect_to vaccination_report_path(Wicked::FIRST_STEP)
   end
-
-  private
-
-  def set_programme
-    @programme = policy_scope(Programme).find_by!(type: params[:programme_type])
-  end
 end

app/controllers/programmes/sessions_controller.rb

@@ -1,10 +1,6 @@
 # frozen_string_literal: true
 
-class Programmes::SessionsController < ApplicationController
-  before_action :set_programme
-
-  layout "full"
-
+class Programmes::SessionsController < Programmes::BaseController
   def index
     @sessions =
       policy_scope(Session)
@@ -13,10 +9,4 @@ def index
         .includes(:location, :session_dates)
         .order("locations.name")
   end
-
-  private
-
-  def set_programme
-    @programme = policy_scope(Programme).find_by!(type: params[:programme_type])
-  end
 end

app/controllers/programmes/vaccinations_controller.rb

@@ -1,12 +1,8 @@
 # frozen_string_literal: true
 
-class Programmes::VaccinationsController < ApplicationController
+class Programmes::VaccinationsController < Programmes::BaseController
   include Pagy::Backend
 
-  before_action :set_programme
-
-  layout "full"
-
   def index
     scope =
       policy_scope(VaccinationRecord)
@@ -16,10 +12,4 @@ def index
 
     @pagy, @vaccination_records = pagy(scope)
   end
-
-  private
-
-  def set_programme
-    @programme = policy_scope(Programme).find_by!(type: params[:programme_type])
-  end
 end

config/routes.rb

@@ -166,7 +166,7 @@
   end
 
   resources :programmes, only: :index, param: :type do
-    get "consent-form", on: :member
+    get "consent-form", on: :member, action: :consent_form
 
     scope module: :programmes do
       resource :overview, path: "", only: :show, controller: :overview