Split VaccinationReportsController

This splits the controller in to two separate controllers that serve
different needs. Programmes::ReportsController will exist to first
create a vaccination report for a particular programme and the
existing controller will continue to serve the wizard and pages related
to the vaccination report model.

Author: thomasleese

app/controllers/programmes/reports_controller.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class Programmes::ReportsController < ApplicationController
+  before_action :set_programme
+
+  def create
+    vaccination_report =
+      VaccinationReport.new(request_session: session, current_user:)
+
+    vaccination_report.reset!
+    vaccination_report.update!(programme: @programme)
+
+    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/vaccination_reports_controller.rb

@@ -2,19 +2,20 @@
 
 class VaccinationReportsController < ApplicationController
   before_action :set_vaccination_report
-  before_action :set_programme, only: %i[show update]
+  before_action :set_programme
 
   include WizardControllerConcern
 
-  skip_after_action :verify_policy_scoped, only: %i[show update download]
+  skip_after_action :verify_policy_scoped
 
-  def create
-    @programme = policy_scope(Programme).find_by(type: params[:programme_type])
+  def show
+    render_wizard
+  end
 
-    @vaccination_report.reset!
-    @vaccination_report.update!(programme: @programme)
+  def update
+    @vaccination_report.assign_attributes(update_params)
 
-    redirect_to vaccination_report_path(Wicked::FIRST_STEP)
+    render_wizard @vaccination_report
   end
 
   def download
@@ -28,16 +29,6 @@ def download
     end
   end
 
-  def show
-    render_wizard
-  end
-
-  def update
-    @vaccination_report.assign_attributes(update_params)
-
-    render_wizard @vaccination_report
-  end
-
   private
 
   def set_vaccination_report

app/views/programmes/show.html.erb

@@ -11,7 +11,7 @@
 
 <%= render AppProgrammeNavigationComponent.new(@programme, active: :overview) %>
 
-<%= govuk_button_to "Download vaccination report", programme_vaccination_reports_path(@programme), secondary: true, class: "nhsuk-u-margin-bottom-5" %>
+<%= govuk_button_to "Download vaccination report", programme_reports_path(@programme), secondary: true, class: "nhsuk-u-margin-bottom-5" %>
 
 <%= render AppProgrammeStatsComponent.new(programme: @programme) %>
 

config/routes.rb

@@ -124,12 +124,6 @@
            only: %i[show update],
            path: "draft-vaccination-record/:id"
 
-  resource :vaccination_report,
-           only: %i[show update],
-           path: "draft-vaccination-report/:id" do
-    get "download", on: :member
-  end
-
   resources :immunisation_imports,
             path: "immunisation-imports",
             except: %i[index destroy]
@@ -180,11 +174,8 @@
     end
 
     resources :cohorts, only: %i[index show], controller: "programmes/cohorts"
+    resources :reports, only: :create, controller: "programmes/reports"
     resources :vaccinations, only: :index, controller: "programmes/vaccinations"
-
-    resources :vaccination_reports,
-              path: "vaccination-reports",
-              only: %i[create]
   end
 
   resources :school_moves, path: "school-moves", only: %i[index show update]
@@ -299,6 +290,12 @@
     get "destroy", action: :confirm_destroy, on: :member, as: "destroy"
   end
 
+  resource :vaccination_report,
+           only: %i[show update],
+           path: "vaccination-report/:id" do
+    get "download", on: :member
+  end
+
   resources :vaccines, only: %i[index show] do
     resources :batches, only: %i[create edit new update] do
       member do