Merge pull request #3984 from nhsuk/custom-year-group-eligibility-school

Allow custom programme year groups per school

Author: thomasleese

app/components/app_patient_session_search_result_card_component.rb

@@ -68,9 +68,11 @@ def initialize(patient_session, context:, programmes: [])
     @context = context
 
     @programmes =
-      programmes
-        .select { it.year_groups.include?(patient.year_group) }
-        .presence || patient_session.programmes
+      if programmes.present?
+        patient_session.programmes.select { it.in?(programmes) }
+      else
+        patient_session.programmes
+      end
   end
 
   private

app/controllers/programmes/cohorts_controller.rb

@@ -4,7 +4,11 @@ class Programmes::CohortsController < Programmes::BaseController
   include Pagy::Backend
 
   def index
-    birth_academic_years = @programme.birth_academic_years
+    birth_academic_years =
+      policy_scope(Location::ProgrammeYearGroup)
+        .where(programme: @programme)
+        .pluck_year_groups
+        .map(&:to_birth_academic_year)
 
     @patient_count_by_birth_academic_year =
       patients_in_organisation

app/controllers/programmes/patients_controller.rb

@@ -7,6 +7,11 @@ class Programmes::PatientsController < Programmes::BaseController
   before_action :set_search_form
 
   def index
+    @year_groups =
+      policy_scope(Location::ProgrammeYearGroup).where(
+        programme: @programme
+      ).pluck_year_groups
+
     scope =
       policy_scope(Patient).includes(:vaccination_statuses).in_programmes(
         [@programme]

app/lib/govuk_notify_personalisation.rb

@@ -93,21 +93,13 @@ def batch_name
   end
 
   def catch_up
-    return nil if patient.nil? || programmes.empty?
-    if patient.year_group == programmes.flat_map(&:year_groups).sort.uniq.first
-      "no"
-    else
-      "yes"
-    end
+    return nil if patient.nil? || administered_year_groups.empty?
+    patient.year_group == administered_year_groups.first ? "no" : "yes"
   end
 
   def not_catch_up
-    return nil if patient.nil? || programmes.empty?
-    if patient.year_group == programmes.flat_map(&:year_groups).sort.uniq.first
-      "yes"
-    else
-      "no"
-    end
+    return nil if patient.nil? || administered_year_groups.empty?
+    patient.year_group == administered_year_groups.first ? "yes" : "no"
   end
 
   def consent_deadline
@@ -400,6 +392,10 @@ def vaccine_side_effects
 
   private
 
+  def administered_year_groups
+    session&.year_groups || programmes.flat_map(&:default_year_groups).sort.uniq
+  end
+
   def programme_names
     @programme_names ||= programmes.map(&:name)
   end

app/lib/mavis_cli.rb

@@ -24,6 +24,8 @@ def self.progress_bar(total)
 require_relative "mavis_cli/gias/check_import"
 require_relative "mavis_cli/gias/download"
 require_relative "mavis_cli/gias/import"
+require_relative "mavis_cli/schools/add_programme_year_group"
 require_relative "mavis_cli/schools/add_to_organisation"
+require_relative "mavis_cli/schools/remove_programme_year_group"
 require_relative "mavis_cli/vaccination_records/generate_fhir"
 require_relative "mavis_cli/vaccination_records/sync"

app/lib/mavis_cli/schools/add_programme_year_group.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module MavisCLI
+  module Schools
+    class AddProgrammeYearGroup < Dry::CLI::Command
+      desc "Add programme year groups to a school"
+
+      argument :urn, required: true, desc: "The URN of the school"
+      argument :programme_type,
+               required: true,
+               desc: "The programme to add year groups to"
+      argument :year_groups,
+               type: :array,
+               required: true,
+               desc: "The year groups to add"
+
+      def call(urn:, programme_type:, year_groups:, **)
+        location = Location.school.find_by(urn:)
+
+        if location.nil?
+          warn "Could not find school."
+          return
+        end
+
+        programme = Programme.find_by(type: programme_type)
+
+        if programme.nil?
+          warn "Could not find programme."
+          return
+        end
+
+        ActiveRecord::Base.transaction do
+          year_groups.each do |year_group|
+            location.programme_year_groups.create!(programme:, year_group:)
+          end
+        end
+      end
+    end
+  end
+
+  register "schools" do |prefix|
+    prefix.register "add-programme-year-group", Schools::AddProgrammeYearGroup
+  end
+end

app/lib/mavis_cli/schools/add_to_organisation.rb

@@ -4,6 +4,7 @@ module MavisCLI
   module Schools
     class AddToOrganisation < Dry::CLI::Command
       desc "Add an existing school to an organisation"
+
       argument :ods_code,
                required: true,
                desc: "The ODS code of the organisation"
@@ -13,7 +14,7 @@ class AddToOrganisation < Dry::CLI::Command
                required: true,
                desc: "The URN of the school"
 
-      def call(ods_code:, team:, urns:)
+      def call(ods_code:, team:, urns:, **)
         organisation = Organisation.find_by(ods_code:)
 
         if organisation.nil?
@@ -28,19 +29,24 @@ def call(ods_code:, team:, urns:)
           return
         end
 
-        urns.each do |urn|
-          location = Location.school.find_by(urn:)
+        ActiveRecord::Base.transaction do
+          urns.each do |urn|
+            location = Location.school.find_by(urn:)
 
-          if location.nil?
-            warn "Could not find location: #{urn}"
-            next
-          end
+            if location.nil?
+              warn "Could not find location: #{urn}"
+              next
+            end
 
-          if !location.team_id.nil? && location.team_id != team.id
-            warn "#{urn} previously belonged to #{location.team.name}"
-          end
+            if !location.team_id.nil? && location.team_id != team.id
+              warn "#{urn} previously belonged to #{location.team.name}"
+            end
 
-          location.update!(team:)
+            location.update!(team:)
+            location.create_default_programme_year_groups!(
+              organisation.programmes
+            )
+          end
         end
 
         UnscheduledSessionsFactory.new.call

app/lib/mavis_cli/schools/remove_programme_year_group.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module MavisCLI
+  module Schools
+    class RemoveProgrammeYearGroup < Dry::CLI::Command
+      desc "Remove programme year groups from a school"
+
+      argument :urn, required: true, desc: "The URN of the school"
+      argument :programme_type,
+               required: true,
+               desc: "The programme to remove year groups from"
+      argument :year_groups,
+               type: :array,
+               required: true,
+               desc: "The year groups to remove"
+
+      def call(urn:, programme_type:, year_groups:, **)
+        location = Location.school.find_by(urn:)
+
+        if location.nil?
+          warn "Could not find school."
+          return
+        end
+
+        programme = Programme.find_by(type: programme_type)
+
+        if programme.nil?
+          warn "Could not find programme."
+          return
+        end
+
+        ActiveRecord::Base.transaction do
+          year_groups.each do |year_group|
+            location
+              .programme_year_groups
+              .find_by(programme:, year_group:)
+              &.destroy!
+          end
+        end
+      end
+    end
+  end
+
+  register "schools" do |prefix|
+    prefix.register "remove-programme-year-group",
+                    Schools::RemoveProgrammeYearGroup
+  end
+end

app/lib/reports/offline_session_exporter.rb

@@ -42,7 +42,7 @@ def add_vaccinations_sheet(package)
     cached_styles = CachedStyles.new(workbook)
 
     workbook.add_worksheet(name: "Vaccinations") do |sheet|
-      sheet.add_row(columns.map { _1.to_s.upcase })
+      sheet.add_row(columns.map { it.to_s.upcase })
 
       patient_sessions.find_each do |patient_session|
         rows(patient_session:).each { |row| row.add_to(sheet:, cached_styles:) }

app/lib/status_updater.rb

@@ -153,45 +153,50 @@ def patient_statuses_to_import
         .pluck(:patient_id, :"patients.birth_academic_year")
         .uniq
         .flat_map do |patient_id, birth_academic_year|
-          programme_ids_per_birth_academic_year
-            .fetch(birth_academic_year, [])
+          programme_ids_per_year_group
+            .fetch(birth_academic_year.to_year_group, [])
             .map { [patient_id, it] }
         end
   end
 
   def patient_session_statuses_to_import
     @patient_session_statuses_to_import ||=
       patient_sessions
-        .joins(:patient)
-        .pluck(:id, :"patients.birth_academic_year")
-        .flat_map do |patient_session_id, birth_academic_year|
-          programme_ids_per_birth_academic_year
-            .fetch(birth_academic_year, [])
+        .joins(:patient, :session)
+        .pluck(:id, :"session.location_id", :"patients.birth_academic_year")
+        .flat_map do |patient_session_id, location_id, birth_academic_year|
+          programme_ids_per_location_id_and_year_group
+            .fetch(location_id, {})
+            .fetch(birth_academic_year.to_year_group, [])
             .map { [patient_session_id, it] }
         end
   end
 
   def registration_statuses_to_import
     @registration_statuses_to_import ||=
-      patient_sessions
-        .joins(:patient)
-        .pluck(:id, :"patients.birth_academic_year")
-        .filter_map do |patient_session_id, birth_academic_year|
-          if programme_ids_per_birth_academic_year.key?(birth_academic_year)
-            [patient_session_id]
-          end
+      patient_session_statuses_to_import.map { [it.first] }.uniq
+  end
+
+  def programme_ids_per_year_group
+    @programme_ids_per_year_group ||=
+      Location::ProgrammeYearGroup
+        .distinct
+        .pluck(:programme_id, :year_group)
+        .each_with_object({}) do |(programme_id, year_group), hash|
+          hash[year_group] ||= []
+          hash[year_group] << programme_id
         end
   end
 
-  def programme_ids_per_birth_academic_year
-    @programme_ids_per_birth_academic_year ||=
-      Programme
-        .all
-        .each_with_object({}) do |programme, hash|
-          programme.birth_academic_years.each do |year_group|
-            hash[year_group] ||= []
-            hash[year_group] << programme.id
-          end
+  def programme_ids_per_location_id_and_year_group
+    @programme_ids_per_location_id_and_year_group ||=
+      Location::ProgrammeYearGroup
+        .distinct
+        .pluck(:location_id, :programme_id, :year_group)
+        .each_with_object({}) do |(location_id, programme_id, year_group), hash|
+          hash[location_id] ||= {}
+          hash[location_id][year_group] ||= []
+          hash[location_id][year_group] << programme_id
         end
   end
 end