Merge pull request #5807 from nhsuk/add-location-to-programme-status

thomasleese · web-flow · commit 30c7085ac12c · 2026-01-20T08:22:48.000Z
Track location on programme status
diff --git a/app/lib/status_generator/programme.rb b/app/lib/status_generator/programme.rb
@@ -116,6 +116,10 @@ def date
       vaccination_generator.latest_date
   end
 
+  def location_id
+    vaccination_generator.latest_location_id
+  end
+
   private
 
   attr_reader :programme,
diff --git a/app/lib/status_updater.rb b/app/lib/status_updater.rb
@@ -73,11 +73,12 @@ def update_programme_statuses!
             conflict_target: [:id],
             columns: %i[
               date
+              disease_types
               dose_sequence
+              location_id
               status
               vaccine_methods
               without_gelatine
-              disease_types
             ]
           }
         )
diff --git a/app/models/patient/programme_status.rb b/app/models/patient/programme_status.rb
@@ -13,12 +13,14 @@
 #  status           :integer          default("not_eligible"), not null
 #  vaccine_methods  :integer          is an Array
 #  without_gelatine :boolean
+#  location_id      :bigint
 #  patient_id       :bigint           not null
 #
 # Indexes
 #
 #  idx_on_academic_year_patient_id_3d5bf8d2c8                 (academic_year,patient_id)
 #  idx_on_patient_id_academic_year_programme_type_75e0e0c471  (patient_id,academic_year,programme_type) UNIQUE
+#  index_patient_programme_statuses_on_location_id            (location_id)
 #  index_patient_programme_statuses_on_patient_id             (patient_id)
 #  index_patient_programme_statuses_on_status                 (status)
 #
@@ -31,6 +33,7 @@ class Patient::ProgrammeStatus < ApplicationRecord
   include HasVaccineMethods
 
   belongs_to :patient
+  belongs_to :location, optional: true
 
   has_many :patient_locations,
            -> { includes(location: :location_programme_year_groups) },
@@ -134,11 +137,12 @@ def group = GROUPS.find { status.starts_with?(it) }
 
   def assign
     self.date = generator.date
+    self.disease_types = generator.disease_types
     self.dose_sequence = generator.dose_sequence
+    self.location_id = generator.location_id
     self.status = generator.status
     self.vaccine_methods = generator.vaccine_methods
     self.without_gelatine = generator.without_gelatine
-    self.disease_types = generator.disease_types
   end
 
   def vaccine_criteria = VaccineCriteria.from_programme_status(self)
diff --git a/db/migrate/20260119161311_add_location_to_patient_programme_statuses.rb b/db/migrate/20260119161311_add_location_to_patient_programme_statuses.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddLocationToPatientProgrammeStatuses < ActiveRecord::Migration[8.1]
+  def change
+    add_reference :patient_programme_statuses, :location
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[8.1].define(version: 2026_01_15_090835) do
+ActiveRecord::Schema[8.1].define(version: 2026_01_19_161311) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_catalog.plpgsql"
   enable_extension "pg_trgm"
@@ -621,12 +621,14 @@
     t.date "date"
     t.enum "disease_types", array: true, enum_type: "disease_type"
     t.integer "dose_sequence"
+    t.bigint "location_id"
     t.bigint "patient_id", null: false
     t.enum "programme_type", null: false, enum_type: "programme_type"
     t.integer "status", default: 0, null: false
     t.integer "vaccine_methods", array: true
     t.boolean "without_gelatine"
     t.index ["academic_year", "patient_id"], name: "idx_on_academic_year_patient_id_3d5bf8d2c8"
+    t.index ["location_id"], name: "index_patient_programme_statuses_on_location_id"
     t.index ["patient_id", "academic_year", "programme_type"], name: "idx_on_patient_id_academic_year_programme_type_75e0e0c471", unique: true
     t.index ["patient_id"], name: "index_patient_programme_statuses_on_patient_id"
     t.index ["status"], name: "index_patient_programme_statuses_on_status"
diff --git a/spec/factories/patient_programme_statuses.rb b/spec/factories/patient_programme_statuses.rb
@@ -13,12 +13,14 @@
 #  status           :integer          default("not_eligible"), not null
 #  vaccine_methods  :integer          is an Array
 #  without_gelatine :boolean
+#  location_id      :bigint
 #  patient_id       :bigint           not null
 #
 # Indexes
 #
 #  idx_on_academic_year_patient_id_3d5bf8d2c8                 (academic_year,patient_id)
 #  idx_on_patient_id_academic_year_programme_type_75e0e0c471  (patient_id,academic_year,programme_type) UNIQUE
+#  index_patient_programme_statuses_on_location_id            (location_id)
 #  index_patient_programme_statuses_on_patient_id             (patient_id)
 #  index_patient_programme_statuses_on_status                 (status)
 #
diff --git a/spec/lib/status_generator/programme_spec.rb b/spec/lib/status_generator/programme_spec.rb
@@ -21,18 +21,20 @@
   let(:programme) { Programme.sample }
   let(:session) { create(:session, programmes: [programme]) }
   let(:patient) { create(:patient, session:) }
+  let(:location) { create(:school) }
 
   context "when already vaccinated" do
     let(:programme) { Programme.hpv }
 
     let!(:vaccination_record) do
-      create(:vaccination_record, :already_had, patient:, programme:)
+      create(:vaccination_record, :already_had, patient:, programme:, location:)
     end
 
-    its(:status) { should be(:vaccinated_already) }
     its(:date) { should eq(vaccination_record.performed_at.to_date) }
     its(:disease_types) { should eq(%w[human_papillomavirus]) }
     its(:dose_sequence) { should be_nil }
+    its(:location_id) { should eq(location.id) }
+    its(:status) { should be(:vaccinated_already) }
     its(:vaccine_methods) { should be_empty }
     its(:without_gelatine) { should be_nil }
   end
@@ -41,13 +43,14 @@
     let(:programme) { Programme.hpv }
 
     let!(:vaccination_record) do
-      create(:vaccination_record, patient:, programme:)
+      create(:vaccination_record, patient:, programme:, location:)
     end
 
-    its(:status) { should be(:vaccinated_fully) }
     its(:date) { should eq(vaccination_record.performed_at.to_date) }
     its(:disease_types) { should eq(%w[human_papillomavirus]) }
     its(:dose_sequence) { should be_nil }
+    its(:location_id) { should eq(location.id) }
+    its(:status) { should be(:vaccinated_fully) }
     its(:vaccine_methods) { should be_empty }
     its(:without_gelatine) { should be_nil }
   end
@@ -56,13 +59,14 @@
     let(:programme) { Programme.mmr }
 
     let!(:vaccination_record) do
-      create(:vaccination_record, patient:, programme:)
+      create(:vaccination_record, patient:, programme:, location:)
     end
 
-    its(:status) { should be(:needs_consent_no_response) }
     its(:date) { should eq(vaccination_record.performed_at.to_date) }
     its(:disease_types) { should be_nil }
     its(:dose_sequence) { should be_nil }
+    its(:location_id) { should be_nil }
+    its(:status) { should be(:needs_consent_no_response) }
     its(:vaccine_methods) { should be_nil }
     its(:without_gelatine) { should be_nil }
 
@@ -81,35 +85,45 @@
     before { create(:consent, :given, patient:, programme:) }
 
     let!(:vaccination_record) do
-      create(:vaccination_record, :unwell, patient:, programme:)
+      create(:vaccination_record, :unwell, patient:, programme:, location:)
     end
 
-    its(:status) { should be(:cannot_vaccinate_unwell) }
     its(:date) { should eq(vaccination_record.performed_at.to_date) }
     its(:disease_types) { should eq(programme.disease_types) }
+    its(:location_id) { should be_nil }
+    its(:status) { should be(:cannot_vaccinate_unwell) }
     its(:vaccine_methods) { should contain_exactly("injection") }
     its(:without_gelatine) { should be(false) }
 
     context "on a different day" do
       let!(:vaccination_record) do
-        create(:vaccination_record, :unwell, :yesterday, patient:, programme:)
+        create(
+          :vaccination_record,
+          :unwell,
+          :yesterday,
+          patient:,
+          programme:,
+          location:
+        )
       end
 
-      its(:status) { should be(:due) }
       its(:date) { should eq(vaccination_record.performed_at.to_date) }
+      its(:location_id) { should be_nil }
+      its(:status) { should be(:due) }
     end
   end
 
   context "when the child refused" do
     before { create(:consent, :given, patient:, programme:) }
 
     let!(:vaccination_record) do
-      create(:vaccination_record, :refused, patient:, programme:)
+      create(:vaccination_record, :refused, patient:, programme:, location:)
     end
 
-    its(:status) { should be(:cannot_vaccinate_refused) }
     its(:date) { should eq(vaccination_record.performed_at.to_date) }
     its(:disease_types) { should eq(programme.disease_types) }
+    its(:location_id) { should be_nil }
+    its(:status) { should be(:cannot_vaccinate_refused) }
     its(:vaccine_methods) { should contain_exactly("injection") }
     its(:without_gelatine) { should be(false) }
 
@@ -118,21 +132,29 @@
         create(:vaccination_record, :unwell, :yesterday, patient:, programme:)
       end
 
-      its(:status) { should be(:due) }
       its(:date) { should eq(vaccination_record.performed_at.to_date) }
+      its(:location_id) { should be_nil }
+      its(:status) { should be(:due) }
     end
   end
 
   context "when contraindicated" do
     before { create(:consent, :given, patient:, programme:) }
 
     let!(:vaccination_record) do
-      create(:vaccination_record, :contraindicated, patient:, programme:)
+      create(
+        :vaccination_record,
+        :contraindicated,
+        patient:,
+        programme:,
+        location:
+      )
     end
 
-    its(:status) { should be(:cannot_vaccinate_contraindicated) }
     its(:date) { should eq(vaccination_record.performed_at.to_date) }
     its(:disease_types) { should eq(programme.disease_types) }
+    its(:location_id) { should be_nil }
+    its(:status) { should be(:cannot_vaccinate_contraindicated) }
     its(:vaccine_methods) { should contain_exactly("injection") }
     its(:without_gelatine) { should be(false) }
 
@@ -141,8 +163,9 @@
         create(:vaccination_record, :unwell, :yesterday, patient:, programme:)
       end
 
-      its(:status) { should be(:due) }
       its(:date) { should eq(vaccination_record.performed_at.to_date) }
+      its(:location_id) { should be_nil }
+      its(:status) { should be(:due) }
     end
   end
 
@@ -153,9 +176,10 @@
       create(:attendance_record, :absent, patient:, session:)
     end
 
-    its(:status) { should be(:cannot_vaccinate_absent) }
     its(:date) { should eq(attendance_record.date) }
     its(:disease_types) { should eq(programme.disease_types) }
+    its(:location_id) { should be_nil }
+    its(:status) { should be(:cannot_vaccinate_absent) }
     its(:vaccine_methods) { should contain_exactly("injection") }
     its(:without_gelatine) { should be(false) }
 
@@ -181,10 +205,11 @@
       )
     end
 
-    its(:status) { should be(:cannot_vaccinate_delay_vaccination) }
     its(:date) { should eq(Date.tomorrow) }
     its(:disease_types) { should eq(programme.disease_types) }
     its(:dose_sequence) { should be_nil }
+    its(:location_id) { should be_nil }
+    its(:status) { should be(:cannot_vaccinate_delay_vaccination) }
     its(:vaccine_methods) { should contain_exactly("injection") }
     its(:without_gelatine) { should be(false) }
   end
@@ -195,10 +220,11 @@
       create(:triage, :invite_to_clinic, patient:, programme:)
     end
 
-    its(:status) { should be(:needs_triage) }
     its(:date) { should be_nil }
     its(:disease_types) { should eq(programme.disease_types) }
     its(:dose_sequence) { should be_nil }
+    its(:location_id) { should be_nil }
+    its(:status) { should be(:needs_triage) }
     its(:vaccine_methods) { should be_nil }
     its(:without_gelatine) { should be_nil }
   end
@@ -209,32 +235,35 @@
       create(:triage, :do_not_vaccinate, patient:, programme:)
     end
 
-    its(:status) { should be(:cannot_vaccinate_do_not_vaccinate) }
     its(:date) { should be_nil }
     its(:disease_types) { should eq(programme.disease_types) }
     its(:dose_sequence) { should be_nil }
+    its(:location_id) { should be_nil }
+    its(:status) { should be(:cannot_vaccinate_do_not_vaccinate) }
     its(:vaccine_methods) { should be_nil }
     its(:without_gelatine) { should be_nil }
   end
 
   context "when needs triage" do
     before { create(:consent, :given, :needing_triage, patient:, programme:) }
 
-    its(:status) { should be(:needs_triage) }
     its(:date) { should be_nil }
     its(:disease_types) { should eq(programme.disease_types) }
     its(:dose_sequence) { should be_nil }
+    its(:location_id) { should be_nil }
+    its(:status) { should be(:needs_triage) }
     its(:vaccine_methods) { should be_nil }
     its(:without_gelatine) { should be_nil }
   end
 
   context "when consent is refused" do
     before { create(:consent, :refused, patient:, programme:) }
 
-    its(:status) { should be(:has_refusal_consent_refused) }
     its(:date) { should be_nil }
     its(:disease_types) { should be_empty }
     its(:dose_sequence) { should be_nil }
+    its(:location_id) { should be_nil }
+    its(:status) { should be(:has_refusal_consent_refused) }
     its(:vaccine_methods) { should be_nil }
     its(:without_gelatine) { should be_nil }
   end
@@ -245,30 +274,33 @@
       create(:consent, :given, patient:, programme:, parent: create(:parent))
     end
 
-    its(:status) { should be(:has_refusal_consent_conflicts) }
     its(:date) { should be_nil }
     its(:disease_types) { should be_empty }
     its(:dose_sequence) { should be_nil }
+    its(:location_id) { should be_nil }
+    its(:status) { should be(:has_refusal_consent_conflicts) }
     its(:vaccine_methods) { should be_nil }
     its(:without_gelatine) { should be_nil }
   end
 
   context "when consent is needed" do
-    its(:status) { should be(:needs_consent_no_response) }
     its(:date) { should be_nil }
     its(:disease_types) { should be_nil }
     its(:dose_sequence) { should be_nil }
+    its(:location_id) { should be_nil }
+    its(:status) { should be(:needs_consent_no_response) }
     its(:vaccine_methods) { should be_nil }
     its(:without_gelatine) { should be_nil }
   end
 
   context "when not eligible" do
     let(:patient) { create(:patient, year_group: 20) }
 
-    its(:status) { should be(:not_eligible) }
     its(:date) { should be_nil }
     its(:disease_types) { should be_nil }
     its(:dose_sequence) { should be_nil }
+    its(:location_id) { should be_nil }
+    its(:status) { should be(:not_eligible) }
     its(:vaccine_methods) { should be_nil }
     its(:without_gelatine) { should be_nil }
   end
diff --git a/spec/models/patient/programme_status_spec.rb b/spec/models/patient/programme_status_spec.rb

Original file line number	Diff line number	Diff line change
`@@ -73,11 +73,12 @@ def update_programme_statuses!`
`73`	`73`	`conflict_target: [:id],`
`74`	`74`	`columns: %i[`
`75`	`75`	`date`
	`76`	`+ disease_types`
`76`	`77`	`dose_sequence`
	`78`	`+ location_id`
`77`	`79`	`status`
`78`	`80`	`vaccine_methods`
`79`	`81`	`without_gelatine`
`80`		`- disease_types`
`81`	`82`	`]`
`82`	`83`	`}`
`83`	`84`	`)`
Original file line number	Diff line number	Diff line change
`@@ -13,12 +13,14 @@`
`13`	`13`	`# status :integer default("not_eligible"), not null`
`14`	`14`	`# vaccine_methods :integer is an Array`
`15`	`15`	`# without_gelatine :boolean`
	`16`	`+# location_id :bigint`
`16`	`17`	`# patient_id :bigint not null`
`17`	`18`	`#`
`18`	`19`	`# Indexes`
`19`	`20`	`#`
`20`	`21`	`# idx_on_academic_year_patient_id_3d5bf8d2c8 (academic_year,patient_id)`
`21`	`22`	`# idx_on_patient_id_academic_year_programme_type_75e0e0c471 (patient_id,academic_year,programme_type) UNIQUE`
	`23`	`+# index_patient_programme_statuses_on_location_id (location_id)`
`22`	`24`	`# index_patient_programme_statuses_on_patient_id (patient_id)`
`23`	`25`	`# index_patient_programme_statuses_on_status (status)`
`24`	`26`	`#`