Add academic year to programme controllers

This updates all the programme routes and controllers to include the
academic year allowing for the pages to be filtered according to the
academic year. This has no change to the current design as we will only
show the current academic year (as we do currently) but in the future it
allows us to show multiple academic years.

Author: thomasleese

app/components/app_programme_navigation_component.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
 class AppProgrammeNavigationComponent < ViewComponent::Base
-  def initialize(programme, active:)
+  def initialize(programme, academic_year, active:)
     super
 
     @programme = programme
+    @academic_year = academic_year
     @active = active
   end
 
@@ -14,7 +15,8 @@ def call
         action = section == :overview ? :show : :index
 
         nav.with_item(
-          href: public_send("programme_#{section}_path", programme),
+          href:
+            public_send("programme_#{section}_path", programme, academic_year),
           text: I18n.t("title", scope: [:programmes, section, action]),
           selected: active == section
         )
@@ -24,7 +26,7 @@ def call
 
   private
 
-  attr_reader :programme, :active
+  attr_reader :programme, :active, :academic_year
 
   SECTIONS = %i[overview cohorts sessions patients vaccinations].freeze
 end

app/components/app_programme_stats_component.html.erb

@@ -1,13 +1,13 @@
 <div class="nhsuk-grid-row nhsuk-card-group">
   <div class="nhsuk-grid-column-one-third nhsuk-card-group__item">
-    <%= render AppCardComponent.new(link_to: programme_cohorts_path(@programme), colour: "reversed", data: true) do |card| %>
+    <%= render AppCardComponent.new(link_to: programme_cohorts_path(programme, academic_year), colour: "reversed", data: true) do |card| %>
       <% card.with_heading { "Children" } %>
       <% card.with_description { patients_count.to_s } %>
     <% end %>
   </div>
 
   <div class="nhsuk-grid-column-one-third nhsuk-card-group__item">
-    <%= render AppCardComponent.new(link_to: programme_vaccinations_path(@programme), colour: "reversed", data: true) do |card| %>
+    <%= render AppCardComponent.new(link_to: programme_vaccinations_path(programme, academic_year), colour: "reversed", data: true) do |card| %>
       <% card.with_heading { "Vaccinations" } %>
       <% card.with_description { vaccinations_count.to_s } %>
     <% end %>

app/components/app_programme_stats_component.rb

@@ -1,20 +1,38 @@
 # frozen_string_literal: true
 
 class AppProgrammeStatsComponent < ViewComponent::Base
-  def initialize(programme:)
+  def initialize(programme, academic_year:)
     super
+
     @programme = programme
+    @academic_year = academic_year
   end
 
   def patients_count
-    helpers.policy_scope(Patient).in_programmes([@programme]).count
+    helpers
+      .policy_scope(Patient)
+      .in_programmes([@programme], academic_year:)
+      .count
   end
 
   def vaccinations_count
-    helpers.policy_scope(VaccinationRecord).where(programme: @programme).count
+    helpers
+      .policy_scope(VaccinationRecord)
+      .where(programme:, performed_at: academic_year_date_range)
+      .count
   end
 
   def consent_notifications_count
-    helpers.policy_scope(ConsentNotification).has_programme(@programme).count
+    helpers
+      .policy_scope(ConsentNotification)
+      .has_programme(programme)
+      .where(sent_at: academic_year_date_range)
+      .count
   end
+
+  private
+
+  attr_reader :programme, :academic_year
+
+  def academic_year_date_range = academic_year.to_academic_year_date_range
 end

app/controllers/programmes/base_controller.rb

@@ -2,6 +2,7 @@
 
 class Programmes::BaseController < ApplicationController
   before_action :set_programme
+  before_action :set_academic_year
 
   layout "full"
 
@@ -10,4 +11,12 @@ class Programmes::BaseController < ApplicationController
   def set_programme
     @programme = policy_scope(Programme).find_by!(type: params[:programme_type])
   end
+
+  def set_academic_year
+    @academic_year = params[:academic_year].to_i
+
+    if @academic_year.nil? || @academic_year < 2000 || @academic_year > 2100
+      raise ActiveRecord::RecordNotFound
+    end
+  end
 end

app/controllers/programmes/cohorts_controller.rb

@@ -8,7 +8,7 @@ def index
       policy_scope(Location::ProgrammeYearGroup)
         .where(programme: @programme)
         .pluck_year_groups
-        .map(&:to_birth_academic_year)
+        .map { it.to_birth_academic_year(academic_year: @academic_year) }
 
     @patient_count_by_birth_academic_year =
       patients_in_organisation

app/controllers/programmes/overview_controller.rb

@@ -2,9 +2,17 @@
 
 class Programmes::OverviewController < Programmes::BaseController
   def show
-    patients = policy_scope(Patient).in_programmes([@programme])
+    patients =
+      policy_scope(Patient).in_programmes(
+        [@programme],
+        academic_year: @academic_year
+      )
 
     @consents =
-      policy_scope(Consent).where(patient: patients, programme: @programme)
+      policy_scope(Consent).where(
+        patient: patients,
+        programme: @programme,
+        submitted_at: @academic_year.to_academic_year_date_range
+      )
   end
 end

app/controllers/programmes/patients_controller.rb

@@ -14,7 +14,8 @@ def index
 
     scope =
       policy_scope(Patient).includes(:vaccination_statuses).in_programmes(
-        [@programme]
+        [@programme],
+        academic_year: @academic_year
       )
 
     @form.programme_types = [@programme.type]

app/controllers/programmes/reports_controller.rb

@@ -6,7 +6,10 @@ def create
       VaccinationReport.new(request_session: session, current_user:)
 
     vaccination_report.reset!
-    vaccination_report.update!(programme: @programme)
+    vaccination_report.update!(
+      programme: @programme,
+      academic_year: @academic_year
+    )
 
     redirect_to vaccination_report_path(Wicked::FIRST_STEP)
   end

app/controllers/programmes/sessions_controller.rb

@@ -5,7 +5,7 @@ def index
     @sessions =
       policy_scope(Session)
         .has_programme(@programme)
-        .for_current_academic_year
+        .for_academic_year(@academic_year)
         .includes(:location, :session_dates)
         .order("locations.name")
   end

app/controllers/programmes/vaccinations_controller.rb

@@ -6,7 +6,10 @@ class Programmes::VaccinationsController < Programmes::BaseController
   def index
     scope =
       policy_scope(VaccinationRecord)
-        .where(programme: @programme)
+        .where(
+          programme: @programme,
+          performed_at: @academic_year.to_academic_year_date_range
+        )
         .includes(:patient, :programme)
         .order(:performed_at)