Merge pull request #3983 from nhsuk/refactor-programme-controllers

Refactor programme controllers

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

@@ -10,39 +10,21 @@ def initialize(programme, active:)
 
   def call
     render AppSecondaryNavigationComponent.new do |nav|
-      nav.with_item(
-        href: programme_path(programme),
-        text: "Overview",
-        selected: active == :overview
-      )
-
-      nav.with_item(
-        href: programme_cohorts_path(programme),
-        text: I18n.t("cohorts.index.title"),
-        selected: active == :cohorts
-      )
-
-      nav.with_item(
-        href: sessions_programme_path(programme),
-        text: I18n.t("sessions.index.title"),
-        selected: active == :sessions
-      )
-
-      nav.with_item(
-        href: patients_programme_path(programme),
-        text: I18n.t("patients.index.title"),
-        selected: active == :patients
-      )
-
-      nav.with_item(
-        href: programme_vaccination_records_path(programme),
-        text: I18n.t("vaccination_records.index.title"),
-        selected: active == :vaccination_records
-      )
+      SECTIONS.each do |section|
+        action = section == :overview ? :show : :index
+
+        nav.with_item(
+          href: public_send("programme_#{section}_path", programme),
+          text: I18n.t("title", scope: [:programmes, section, action]),
+          selected: active == section
+        )
+      end
     end
   end
 
   private
 
   attr_reader :programme, :active
+
+  SECTIONS = %i[overview cohorts sessions patients vaccinations].freeze
 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/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/cohorts_controller.rb …rollers/programmes/cohorts_controller.rbapp/controllers/cohorts_controller.rb renamed to app/controllers/programmes/cohorts_controller.rb app/controllers/cohorts_controller.rb renamed to app/controllers/programmes/cohorts_controller.rb

@@ -1,12 +1,8 @@
 # frozen_string_literal: true
 
-class 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

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class Programmes::OverviewController < Programmes::BaseController
+  def show
+    patients = policy_scope(Patient).in_programmes([@programme])
+
+    @consents =
+      policy_scope(Consent).where(patient: patients, programme: @programme)
+  end
+end

app/controllers/programmes/patients_controller.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class Programmes::PatientsController < Programmes::BaseController
+  include Pagy::Backend
+  include SearchFormConcern
+
+  before_action :set_search_form
+
+  def index
+    scope =
+      policy_scope(Patient).includes(:vaccination_statuses).in_programmes(
+        [@programme]
+      )
+
+    @form.programme_types = [@programme.type]
+
+    patients = @form.apply(scope)
+    @pagy, @patients = pagy(patients)
+  end
+end

app/controllers/programmes/reports_controller.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class Programmes::ReportsController < Programmes::BaseController
+  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
+end