Merge pull request #5698 from nhsuk/delay-triage-automated

thomasleese · web-flow · commit f7ce19b0c1ae · 2026-01-09T10:19:42.000Z
Create delay vaccination triage for historical MMR uploads
diff --git a/app/components/app_patient_session_triage_component.html.erb b/app/components/app_patient_session_triage_component.html.erb
@@ -29,16 +29,8 @@
       <p>A nurse needs to decide if <%= patient.full_name %> is safe to vaccinate.</p>
     <% end %>
   <% elsif latest_triage %>
-    <% if latest_triage.safe_to_vaccinate? %>
-      <% if latest_triage.vaccine_method.present? && programme.has_multiple_vaccine_methods? %>
-        <p><%= latest_triage.performed_by.full_name %> decided that <%= patient.full_name %> is safe to vaccinate using the <%= vaccination_method %> vaccine only.</p>
-      <% else %>
-        <p><%= latest_triage.performed_by.full_name %> decided that <%= patient.full_name %> is safe to vaccinate.</p>
-      <% end %>
-    <% elsif latest_triage.do_not_vaccinate? %>
-      <p><%= latest_triage.performed_by.full_name %> decided that <%= patient.full_name %> should not be vaccinated.</p>
-    <% elsif latest_triage.delay_vaccination? %>
-      <p><%= latest_triage.performed_by.full_name %> decided that <%= patient.full_name %>'s vaccination should be delayed.</p>
+    <% if (summary = triage_summary(latest_triage)) %>
+      <p><%= summary %></p>
     <% end %>
 
     <div class="nhsuk-button-group">
diff --git a/app/components/app_patient_session_triage_component.rb b/app/components/app_patient_session_triage_component.rb
@@ -19,7 +19,7 @@ def render? = consent_status.given? || !triage_status.not_required?
 
   attr_reader :current_user, :triage_form
 
-  delegate :govuk_button_link_to, to: :helpers
+  delegate :govuk_button_link_to, :triage_summary, to: :helpers
 
   def programme_type = programme.type
 
@@ -39,10 +39,6 @@ def consent_status
     patient.consent_status(programme:, academic_year:)
   end
 
-  def vaccination_method
-    Vaccine.human_enum_name(:method_prefix, triage_status.vaccine_method)
-  end
-
   def latest_triage
     @latest_triage ||=
       TriageFinder.call(
diff --git a/app/components/app_triage_table_component.html.erb b/app/components/app_triage_table_component.html.erb
@@ -14,10 +14,12 @@
       <% body.with_row do |row| %>
         <% row.with_cell do %>
           <%= triage.created_at.to_fs(:long) %>
-          <br />
-          <span class="nhsuk-u-secondary-text-colour nhsuk-u-font-size-16">
-            <%= triage.performed_by.full_name %>
-          </span>
+          <% if (performed_by = triage.performed_by) %>
+            <br />
+            <span class="nhsuk-u-secondary-text-colour nhsuk-u-font-size-16">
+              <%= performed_by.full_name %>
+            </span>
+          <% end %>
         <% end %>
 
         <% row.with_cell(text: triage.notes) %>
diff --git a/app/helpers/triages_helper.rb b/app/helpers/triages_helper.rb
@@ -48,4 +48,31 @@ def triage_status_tag(triage)
       govuk_tag(text:, classes: "nhsuk-tag--#{colour}")
     end
   end
+
+  def triage_summary(triage)
+    prefix =
+      if (performed_by = triage.performed_by)
+        "#{performed_by.full_name} decided that "
+      else
+        ""
+      end
+
+    suffix =
+      if triage.safe_to_vaccinate?
+        if triage.vaccine_method.present? &&
+             triage.programme.has_multiple_vaccine_methods?
+          vaccination_method =
+            Vaccine.human_enum_name(:method_prefix, triage.vaccine_method)
+          "is safe to vaccinate using the #{vaccination_method} vaccine only."
+        else
+          "is safe to vaccinate."
+        end
+      elsif triage.do_not_vaccinate?
+        "should not be vaccinated."
+      elsif triage.delay_vaccination?
+        "’s vaccination should be delayed."
+      end
+
+    "#{prefix}#{triage.patient.full_name} #{suffix}" if suffix
+  end
 end
diff --git a/app/lib/next_dose_triage_factory.rb b/app/lib/next_dose_triage_factory.rb
@@ -8,10 +8,6 @@ def initialize(vaccination_record:)
   def call
     return unless should_create?
 
-    # This factory should only be called for vaccination records performed in
-    #  the service, meaning there should always be a `performed_by` set.
-    raise UnknownPerformedBy if performed_by_user_id.nil?
-
     ActiveRecord::Base.transaction do
       Triage
         .create!(attributes:)
@@ -29,13 +25,12 @@ def self.call(...) = new(...).call
 
   attr_reader :vaccination_record
 
-  delegate :academic_year, :patient, :programme, :team, to: :vaccination_record
+  delegate :academic_year, :patient, :programme, to: :vaccination_record
 
   def should_create?
-    unless vaccination_record.sourced_from_service? &&
-             vaccination_record.administered? && programme.mmr?
-      return false
-    end
+    return false unless vaccination_record.administered? && programme.mmr?
+
+    return false if next_date.past?
 
     dose_sequence =
       patient.vaccination_status(programme:, academic_year:).dose_sequence
@@ -45,21 +40,14 @@ def should_create?
 
   def next_date = vaccination_record.performed_at + 28.days
 
-  def performed_by_user_id = vaccination_record.performed_by_user_id
-
   def attributes
     {
       patient:,
-      team:,
       programme:,
-      performed_by_user_id:,
       status: "delay_vaccination",
       academic_year:,
       notes: "Next dose #{next_date.to_fs(:long)}",
       delay_vaccination_until: next_date
     }
   end
-
-  class UnknownPerformedBy < StandardError
-  end
 end
diff --git a/app/models/triage.rb b/app/models/triage.rb
@@ -16,8 +16,8 @@
 #  created_at              :datetime         not null
 #  updated_at              :datetime         not null
 #  patient_id              :bigint           not null
-#  performed_by_user_id    :bigint           not null
-#  team_id                 :bigint           not null
+#  performed_by_user_id    :bigint
+#  team_id                 :bigint
 #
 # Indexes
 #
@@ -37,12 +37,15 @@ class Triage < ApplicationRecord
   include BelongsToProgramme
   include Invalidatable
   include Notable
-  include PerformableByUser
 
   audited associated_with: :patient
 
   belongs_to :patient
-  belongs_to :team
+  belongs_to :team, optional: true
+  belongs_to :performed_by,
+             class_name: "User",
+             foreign_key: :performed_by_user_id,
+             optional: true
 
   enum :status,
        {
diff --git a/app/policies/triage_policy.rb b/app/policies/triage_policy.rb
@@ -11,7 +11,7 @@ def update?
 
   class Scope < ApplicationPolicy::Scope
     def resolve
-      scope.where(team: user.selected_team)
+      scope.where(team: [nil, user.selected_team])
     end
   end
 end
diff --git a/db/migrate/20260108143705_make_triage_performed_by_null.rb b/db/migrate/20260108143705_make_triage_performed_by_null.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class MakeTriagePerformedByNull < ActiveRecord::Migration[8.1]
+  def change
+    change_column_null :triages, :performed_by_user_id, true
+  end
+end
diff --git a/db/migrate/20260108150039_make_triage_team_null.rb b/db/migrate/20260108150039_make_triage_team_null.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class MakeTriageTeamNull < ActiveRecord::Migration[8.1]
+  def change
+    change_column_null :triages, :team_id, true
+  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_07_194410) do
+ActiveRecord::Schema[8.1].define(version: 2026_01_08_150039) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_catalog.plpgsql"
   enable_extension "pg_trgm"
@@ -893,10 +893,10 @@
     t.datetime "invalidated_at"
     t.text "notes", default: "", null: false
     t.bigint "patient_id", null: false
-    t.bigint "performed_by_user_id", null: false
+    t.bigint "performed_by_user_id"
     t.enum "programme_type", null: false, enum_type: "programme_type"
     t.integer "status", null: false
-    t.bigint "team_id", null: false
+    t.bigint "team_id"
     t.datetime "updated_at", null: false
     t.integer "vaccine_method"
     t.boolean "without_gelatine"
diff --git a/spec/components/app_triage_table_component_spec.rb b/spec/components/app_triage_table_component_spec.rb
@@ -25,21 +25,27 @@
     subject { render_inline(component) }
 
     context "triaged as safe to vaccinate" do
-      let!(:triage) do
-        create(:triage, :safe_to_vaccinate, patient:, programme:)
-      end
+      before { create(:triage, :safe_to_vaccinate, patient:, programme:) }
 
       it { should have_css("caption", text: "Triage notes") }
       it { should have_content("Safe to vaccinate") }
-      it { should have_content(triage.performed_by.full_name) }
     end
 
     context "triaged as unsafe to vaccinate" do
-      let!(:triage) { create(:triage, :do_not_vaccinate, patient:, programme:) }
+      before { create(:triage, :do_not_vaccinate, patient:, programme:) }
 
       it { should have_css("caption", text: "Triage notes") }
       it { should have_content("Do not vaccinate") }
-      it { should have_content(triage.performed_by.full_name) }
+    end
+
+    context "with a performed by user" do
+      before do
+        create(:triage, :safe_to_vaccinate, patient:, programme:, performed_by:)
+      end
+
+      let(:performed_by) { create(:nurse) }
+
+      it { should have_content(performed_by.full_name) }
     end
   end
 end
diff --git a/spec/factories/triages.rb b/spec/factories/triages.rb
@@ -16,8 +16,8 @@
 #  created_at              :datetime         not null
 #  updated_at              :datetime         not null
 #  patient_id              :bigint           not null
-#  performed_by_user_id    :bigint           not null
-#  team_id                 :bigint           not null
+#  performed_by_user_id    :bigint
+#  team_id                 :bigint
 #
 # Indexes
 #
@@ -38,9 +38,6 @@
     patient
     programme { Programme.sample }
 
-    performed_by
-    team { performed_by.teams.first }
-
     notes { "" }
 
     academic_year { created_at&.to_date&.academic_year || AcademicYear.current }
diff --git a/spec/lib/next_dose_triage_factory_spec.rb b/spec/lib/next_dose_triage_factory_spec.rb
@@ -3,9 +3,7 @@
 describe NextDoseTriageFactory do
   subject(:call) { described_class.call(vaccination_record:) }
 
-  let(:vaccination_record) { create(:vaccination_record, session:, programme:) }
-
-  let(:session) { create(:session, programmes: [programme]) }
+  let(:vaccination_record) { create(:vaccination_record, programme:) }
 
   context "with a single dose programme" do
     let(:programme) { Programme.hpv }
@@ -24,31 +22,17 @@
       triage = vaccination_record.reload.next_dose_delay_triage
       expect(triage).to be_delay_vaccination
       expect(triage.delay_vaccination_until).to eq(28.days.from_now.to_date)
-      expect(triage.performed_by).to eq(vaccination_record.performed_by_user)
+      expect(triage.performed_by).to be_nil
+      expect(triage.team).to be_nil
     end
 
-    context "when not recorded in the service" do
-      let(:session) { nil }
-
-      it "does not create a triage" do
-        expect { call }.not_to(change(Triage, :count))
-      end
-    end
-
-    context "when the vaccination record is missing a performed by user" do
+    context "when performed over 28 days ago" do
       let(:vaccination_record) do
-        create(
-          :vaccination_record,
-          session:,
-          programme:,
-          performed_by_user: nil
-        )
+        create(:vaccination_record, programme:, performed_at: 29.days.ago)
       end
 
-      it "raises an error" do
-        expect { call }.to raise_error(
-          NextDoseTriageFactory::UnknownPerformedBy
-        )
+      it "does not create a triage" do
+        expect { call }.not_to(change(Triage, :count))
       end
     end
   end
diff --git a/spec/models/triage_spec.rb b/spec/models/triage_spec.rb
@@ -16,8 +16,8 @@
 #  created_at              :datetime         not null
 #  updated_at              :datetime         not null
 #  patient_id              :bigint           not null
-#  performed_by_user_id    :bigint           not null
-#  team_id                 :bigint           not null
+#  performed_by_user_id    :bigint
+#  team_id                 :bigint
 #
 # Indexes
 #
@@ -39,8 +39,8 @@
 
   describe "associations" do
     it { should belong_to(:patient) }
-    it { should belong_to(:team) }
-    it { should belong_to(:performed_by) }
+    it { should belong_to(:team).optional(true) }
+    it { should belong_to(:performed_by).optional(true) }
   end
 
   describe "validations" do
diff --git a/spec/policies/triage_policy_spec.rb b/spec/policies/triage_policy_spec.rb
@@ -60,11 +60,15 @@
       let(:team) { create(:team) }
       let(:user) { create(:user, team:) }
 
-      let(:team_batch) { create(:triage, :safe_to_vaccinate, team:) }
-      let(:non_team_batch) { create(:triage, :safe_to_vaccinate) }
-
-      it { should include(team_batch) }
-      it { should_not include(non_team_batch) }
+      let(:triage_for_team) { create(:triage, :safe_to_vaccinate, team:) }
+      let(:triage_for_different_team) do
+        create(:triage, :safe_to_vaccinate, team: create(:team))
+      end
+      let(:triage_for_all_teams) { create(:triage, :safe_to_vaccinate) }
+
+      it { should include(triage_for_team) }
+      it { should_not include(triage_for_different_team) }
+      it { should include(triage_for_all_teams) }
     end
   end
 end
