Split VaccinationRecordsController

This splits the controller in to two separate controllers that serve
different needs. Programmes::VaccinationsController will exist to render
the vaccinations tab in the programme page, and the existing controller
will render pages related to viewing and editing vaccination records.

Author: thomasleese

app/components/app_patient_vaccination_table_component.html.erb

@@ -17,7 +17,7 @@
           <% row.with_cell do %>
             <span class="nhsuk-table-responsive__heading">Vaccination date</span>
             <%= link_to vaccination_record.performed_at.to_date.to_fs(:long),
-                        programme_vaccination_record_path(vaccination_record.programme, vaccination_record) %>
+                        vaccination_record_path(vaccination_record) %>
           <% end %>
 
           <% row.with_cell do %>

app/components/app_programme_navigation_component.rb

@@ -35,9 +35,9 @@ def call
       )
 
       nav.with_item(
-        href: programme_vaccination_records_path(programme),
-        text: I18n.t("vaccination_records.index.title"),
-        selected: active == :vaccination_records
+        href: programme_vaccinations_path(programme),
+        text: I18n.t("programmes.vaccinations.index.title"),
+        selected: active == :vaccinations
       )
     end
   end

app/components/app_programme_stats_component.html.erb

@@ -7,7 +7,7 @@
   </div>
 
   <div class="nhsuk-grid-column-one-third nhsuk-card-group__item">
-    <%= render AppCardComponent.new(link_to: programme_vaccination_records_path(@programme), colour: "reversed", data: true) do |card| %>
+    <%= render AppCardComponent.new(link_to: programme_vaccinations_path(@programme), colour: "reversed", data: true) do |card| %>
       <% card.with_heading { "Vaccinations" } %>
       <% card.with_description { vaccinations_count.to_s } %>
     <% end %>
@@ -19,4 +19,4 @@
       <% card.with_description { consent_notifications_count.to_s } %>
     <% end %>
   </div>
-</div>
+</div>

app/components/app_vaccination_record_table_component.html.erb

@@ -18,8 +18,7 @@
             <span class="nhsuk-table-responsive__heading">Full name</span>
 
             <% if can_link_to?(vaccination_record) %>
-              <%= link_to vaccination_record.patient.full_name,
-                          programme_vaccination_record_path(vaccination_record.programme, vaccination_record) %>
+              <%= link_to vaccination_record.patient.full_name, vaccination_record_path(vaccination_record) %>
             <% else %>
               <%= vaccination_record.patient.full_name %>
             <% end %>

app/controllers/draft_vaccination_records_controller.rb

@@ -143,7 +143,7 @@ def finish_wizard_path
         return_to: "record"
       )
     else
-      programme_vaccination_record_path(@programme, @vaccination_record)
+      vaccination_record_path(@vaccination_record)
     end
   end
 
@@ -231,7 +231,7 @@ def set_back_link_path
     @back_link_path =
       if @draft_vaccination_record.editing?
         if current_step == :confirm
-          programme_vaccination_record_path(@programme, @vaccination_record)
+          vaccination_record_path(@vaccination_record)
         else
           wizard_path("confirm")
         end

app/controllers/programmes/vaccinations_controller.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+class Programmes::VaccinationsController < ApplicationController
+  include Pagy::Backend
+
+  before_action :set_programme
+
+  layout "full"
+
+  def index
+    scope =
+      policy_scope(VaccinationRecord)
+        .where(programme: @programme)
+        .includes(:patient, :programme)
+        .order(:performed_at)
+
+    @pagy, @vaccination_records = pagy(scope)
+  end
+
+  private
+
+  def set_programme
+    @programme = policy_scope(Programme).find_by!(type: params[:programme_type])
+  end
+end

app/controllers/vaccination_records_controller.rb

@@ -1,18 +1,11 @@
 # frozen_string_literal: true
 
 class VaccinationRecordsController < ApplicationController
-  include Pagy::Backend
   include VaccinationMailerConcern
 
-  before_action :set_vaccination_record, except: :index
+  before_action :set_vaccination_record
   before_action :set_return_to, only: %i[confirm_destroy destroy]
 
-  def index
-    @pagy, @vaccination_records = pagy(vaccination_records)
-
-    render layout: "full"
-  end
-
   def show
   end
 
@@ -48,31 +41,21 @@ def destroy
 
   private
 
-  def programme
-    @programme ||=
-      policy_scope(Programme).find_by!(type: params[:programme_type])
-  end
-
-  def vaccination_records
-    @vaccination_records ||=
-      policy_scope(VaccinationRecord)
-        .includes(
-          :batch,
-          :immunisation_imports,
-          :location,
-          :performed_by_user,
-          :programme,
-          patient: [:gp_practice, :school, { parent_relationships: :parent }],
-          session: %i[session_dates],
-          vaccine: :programme
-        )
-        .where(programme:)
-        .order(:performed_at)
-  end
-
   def set_vaccination_record
-    @vaccination_record = vaccination_records.find(params[:id])
+    @vaccination_record =
+      policy_scope(VaccinationRecord).includes(
+        :batch,
+        :immunisation_imports,
+        :location,
+        :performed_by_user,
+        :programme,
+        patient: [:gp_practice, :school, { parent_relationships: :parent }],
+        session: %i[session_dates],
+        vaccine: :programme
+      ).find(params[:id])
+
     @patient = @vaccination_record.patient
+    @programme = @vaccination_record.programme
     @session = @vaccination_record.session
   end
 

…views/vaccination_records/index.html.erb …s/programmes/vaccinations/index.html.erbapp/views/vaccination_records/index.html.erb renamed to app/views/programmes/vaccinations/index.html.erb app/views/vaccination_records/index.html.erb renamed to app/views/programmes/vaccinations/index.html.erb

@@ -1,4 +1,4 @@
-<% content_for :page_title, "#{@programme.name} – #{t("vaccination_records.index.title")}" %>
+<% content_for :page_title, "#{@programme.name} – #{t(".title")}" %>
 
 <% content_for :before_main do %>
   <%= render AppBreadcrumbComponent.new(items: [
@@ -10,11 +10,10 @@
 
 <h1 class="nhsuk-heading-l"><%= @programme.name %></h1>
 
-<%= render AppProgrammeNavigationComponent.new(@programme, active: :vaccination_records) %>
+<%= render AppProgrammeNavigationComponent.new(@programme, active: :vaccinations) %>
 
 <%= govuk_button_link_to "Import vaccination records", new_immunisation_import_path, secondary: true, class: "nhsuk-u-margin-bottom-0" %>
 
 <%= render AppVaccinationRecordTableComponent.new(@vaccination_records, current_user:, count: @pagy.count) %>
 
 <%= govuk_pagination(pagy: @pagy) %>
-

app/views/vaccination_records/destroy.html.erb

@@ -11,7 +11,7 @@
   <%= page_title %>
 <% end %>
 
-<%= form_with url: programme_vaccination_record_path, method: :delete do |f| %>
+<%= form_with url: vaccination_record_path, method: :delete do |f| %>
   <%= f.hidden_field :return_to, value: @return_to %>
   <div class="app-button-group">
     <%= f.govuk_submit "Yes, delete this vaccination record", warning: true %>

app/views/vaccination_records/show.html.erb

@@ -2,8 +2,8 @@
   <%= render AppBreadcrumbComponent.new(items: [
                                           { text: t("dashboard.index.title"), href: dashboard_path },
                                           { text: t("programmes.index.title"), href: programmes_path },
-                                          { text: @programme.name, href: programme_vaccination_records_path(@programme) },
-                                          { text: t("vaccination_records.index.title"), href: programme_vaccination_records_path(@programme) },
+                                          { text: @programme.name, href: programme_path(@programme) },
+                                          { text: t("programmes.vaccinations.index.title"), href: programme_vaccinations_path(@programme) },
                                         ]) %>
 <% end %>
 
@@ -18,13 +18,13 @@
   <div class="app-button-group">
     <% if policy(@vaccination_record).edit? %>
       <%= govuk_button_to "Edit vaccination record",
-                          programme_vaccination_record_path(@programme, @vaccination_record),
+                          vaccination_record_path(@vaccination_record),
                           method: :put, secondary: true %>
     <% end %>
 
     <% if policy(@vaccination_record).destroy? %>
       <%= govuk_link_to "Delete vaccination record",
-                        destroy_programme_vaccination_record_path(@programme, @vaccination_record) %>
+                        destroy_vaccination_record_path(@vaccination_record) %>
     <% end %>
   </div>
 <% end %>