Merge pull request #6029 from nhsuk/already-vaccinated-mmr-status-updates

First dose of MMR shouldn't make programme status vaccinated

Author: stevehook

app/components/app_vaccination_record_summary_component.rb

@@ -45,7 +45,7 @@ def call
         row.with_value { programme_value }
       end
 
-      if @vaccination_record.administered?
+      if @vaccination_record.administered? && !@vaccination_record.sourced_from_manual_report?
         summary_list.with_row do |row|
           row.with_key { "Vaccine" }
 
@@ -351,12 +351,6 @@ def outcome_value
     outcome =
       VaccinationRecord.human_enum_name(:outcome, @vaccination_record.outcome)
 
-    if Flipper.enabled?(:already_vaccinated) &&
-         @vaccination_record.already_had? &&
-         @vaccination_record.reported_as_already_vaccinated?
-      outcome = VaccinationRecord.human_enum_name(:outcome, "administered")
-    end
-
     highlight_if(outcome, @vaccination_record.outcome_changed?)
   end
 

app/controllers/patient_sessions/programmes_controller.rb

@@ -31,7 +31,7 @@ def record_already_vaccinated
       first_active_wizard_step:,
       location_id: nil,
       location_name: "Unknown",
-      outcome: :already_had,
+      outcome: (Flipper.enabled?(:already_vaccinated) ? :administered : :already_had),
       patient: @patient,
       performed_at: (Time.current unless Flipper.enabled?(:already_vaccinated)),
       performed_by_user_id:
@@ -42,7 +42,7 @@ def record_already_vaccinated
         (current_user.id if Flipper.enabled?(:already_vaccinated)),
       reported_at: (Time.current if Flipper.enabled?(:already_vaccinated)),
       session: @session,
-      source: "service"
+      source: (Flipper.enabled?(:already_vaccinated) ? :manual_report : :service)
     )
 
     redirect_to draft_vaccination_record_path(

app/models/draft_vaccination_record.rb

@@ -70,11 +70,11 @@ def wizard_steps
       :date_and_time,
       (:outcome if can_change_outcome?),
       (:supplier if requires_supplied_by?),
-      (:delivery if administered?),
-      (:dose if administered? && can_be_half_dose?),
-      (:batch if administered?),
+      (:delivery if administered? && !reported_as_already_vaccinated?),
+      (:dose if administered? && can_be_half_dose? && !reported_as_already_vaccinated?),
+      (:batch if administered? && !reported_as_already_vaccinated?),
       (
-        if !already_had? && (session&.generic_clinic? || national_reporting_user_and_record?)
+        if !reported_as_already_vaccinated? && (session&.generic_clinic? || national_reporting_user_and_record?)
           :location
         end
       ),
@@ -162,7 +162,7 @@ def wizard_steps
 
   with_options on: :update,
                if: -> do
-                 required_for_step?(:confirm, exact: true) && administered?
+                 required_for_step?(:confirm, exact: true) && administered? && !reported_as_already_vaccinated?
                end do
     validates :delivery_method,
               :delivery_site,
@@ -191,8 +191,7 @@ def already_had?
   end
 
   def reported_as_already_vaccinated?
-    Flipper.enabled?(:already_vaccinated) && already_had? &&
-      reported_by_id.present?
+    Flipper.enabled?(:already_vaccinated) && administered? && sourced_from_manual_report?
   end
 
   # So that a form error matches to a field in this model
@@ -381,6 +380,8 @@ def sourced_from_consent_refusal? = source == "consent_refusal"
 
   def sourced_from_national_reporting? = source == "national_reporting"
 
+  def sourced_from_manual_report? = source == "manual_report"
+
   def national_reporting_user_and_record?
     @current_user.selected_team.has_national_reporting_access? &&
       sourced_from_national_reporting?
@@ -487,7 +488,7 @@ def vaccine_method
   def can_be_half_dose? = vaccine_method == "nasal"
 
   def can_change_outcome?
-    (outcome != "already_had" || editing? || session.nil? || session.today?) &&
+    ((outcome != "already_had" && reported_at.nil?) || editing? || session.nil? || session.today?) &&
       !national_reporting_user_and_record?
   end
 

app/models/vaccination_record.rb

@@ -195,7 +195,8 @@ class VaccinationRecord < ApplicationRecord
          historical_upload: 1,
          nhs_immunisations_api: 2,
          consent_refusal: 3,
-         national_reporting: 4
+         national_reporting: 4,
+         manual_report: 5
        },
        prefix: "sourced_from",
        validate: true
@@ -272,7 +273,7 @@ class << self
   def not_administered? = !administered?
 
   def reported_as_already_vaccinated?
-    already_had? && reported_by_id.present?
+    administered? && sourced_from_manual_report?
   end
 
   def show_in_academic_year?(current_academic_year)

app/policies/vaccination_record_policy.rb

@@ -27,7 +27,7 @@ def update?
       (
         record.performed_by_user_id == user.id || user.is_nurse? ||
           user.is_prescriber?
-      ) && record.sourced_from_service? &&
+      ) && (record.sourced_from_service? || record.sourced_from_manual_report?) &&
         record.performed_ods_code == user.selected_organisation.ods_code
     elsif team.has_national_reporting_access?
       record.sourced_from_national_reporting? &&

db/migrate/20260217111256_change_vaccination_records_source_check_constraint.rb

@@ -0,0 +1,21 @@
+class ChangeVaccinationRecordsSourceCheckConstraint < ActiveRecord::Migration[8.1]
+  def up
+    remove_check_constraint :vaccination_records, name: "source_check"
+
+    add_check_constraint :vaccination_records,
+                         "(session_id IS NULL AND source != 0 AND source != 5) OR " \
+                           "(session_id IS NOT NULL AND (source = 0 OR source = 5))",
+                         name: "source_check",
+                         validate: false
+  end
+
+  def down
+    remove_check_constraint :vaccination_records, name: "source_check"
+
+    add_check_constraint :vaccination_records,
+                         "(session_id IS NULL AND source != 0) OR " \
+                           "(session_id IS NOT NULL AND source = 0)",
+                         name: "source_check",
+                         validate: false
+  end
+end

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_02_09_161431) do
+ActiveRecord::Schema[8.1].define(version: 2026_02_17_111256) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_catalog.plpgsql"
   enable_extension "pg_trgm"
@@ -994,9 +994,10 @@
     t.index ["supplied_by_user_id"], name: "index_vaccination_records_on_supplied_by_user_id"
     t.index ["uuid"], name: "index_vaccination_records_on_uuid", unique: true
     t.index ["vaccine_id"], name: "index_vaccination_records_on_vaccine_id"
-    t.check_constraint "session_id IS NULL AND source <> 0 OR session_id IS NOT NULL AND source = 0", name: "source_check"
   end
 
+  add_check_constraint "vaccination_records", "session_id IS NULL AND source <> 0 AND source <> 5 OR session_id IS NOT NULL AND (source = 0 OR source = 5)", name: "source_check", validate: false
+
   create_table "vaccines", force: :cascade do |t|
     t.text "brand", null: false
     t.boolean "contains_gelatine", null: false

spec/components/app_vaccination_record_summary_component_spec.rb

@@ -97,6 +97,12 @@
 
       it { should_not have_css(".nhsuk-summary-list__row", text: "Vaccine") }
     end
+
+    context "when manually reported that vaccination was already had" do
+      let(:source) { "manual_report" }
+
+      it { should_not have_css(".nhsuk-summary-list__row", text: "Vaccine") }
+    end
   end
 
   describe "method row" do
@@ -106,6 +112,12 @@
         text: "MethodIntramuscular"
       )
     end
+
+    context "when manually reported that vaccination was already had" do
+      let(:source) { "manual_report" }
+
+      it { should_not have_css(".nhsuk-summary-list__row", text: "MethodIntramuscular") }
+    end
   end
 
   describe "site row" do
@@ -115,6 +127,12 @@
         text: "SiteLeft arm (upper position)"
       )
     end
+
+    context "when manually reported that vaccination was already had" do
+      let(:source) { "manual_report" }
+
+      it { should_not have_css(".nhsuk-summary-list__row", text: "MethodIntramuscular") }
+    end
   end
 
   describe "dose volume row" do
@@ -193,6 +211,12 @@
         before { vaccination_record.dose_sequence = 2 }
 
         it { should have_content("Dose number2nd") }
+
+        context "when manually reported that vaccination was already had" do
+          let(:source) { "manual_report" }
+
+          it { should have_content("Dose number2nd") }
+        end
       end
     end
   end

spec/features/mmr_already_had_spec.rb

@@ -57,11 +57,16 @@
       and_i_see_that_the_vaccinator_is_unknown
       and_i_see_that_the_location_is_unknown
       and_i_see_that_the_reporter_is_set
+      and_i_see_that_there_are_no_vaccine_batch_details
       expect(page).to have_content("LocationUnknown")
       and_had_been_vaccinated_with_mmr
       and_the_dose_number_is_first
       and_the_consent_requests_are_sent
       then_the_parent_doesnt_receive_a_consent_request
+
+      when_the_status_updater_runs
+      and_i_navigate_to_the_patient_record
+      then_i_see_that_the_vaccination_record_has_outcome_vaccinated
     end
 
     scenario "record a patient as already had their 1st MMR dose and then edit dates" do
@@ -132,10 +137,15 @@
       and_i_see_that_the_vaccinator_is_unknown
       and_i_see_that_the_location_is_unknown
       and_i_see_that_the_reporter_is_set
+      and_i_see_that_there_are_no_vaccine_batch_details
       and_had_been_vaccinated_with_mmrv
       and_the_dose_number_is_second
       and_the_consent_requests_are_sent
       then_the_parent_doesnt_receive_a_consent_request
+
+      when_the_status_updater_runs
+      and_i_navigate_to_the_patient_record
+      then_i_see_that_the_vaccination_record_has_outcome_vaccinated
     end
   end
 
@@ -317,6 +327,12 @@ def and_i_see_that_the_reporter_is_set
     expect(page).to have_content("Reported by#{@nurse.full_name}")
   end
 
+  def and_i_see_that_there_are_no_vaccine_batch_details
+    expect(page).not_to have_content("Batch number")
+    expect(page).not_to have_content("Batch expiry date")
+    expect(page).not_to have_content("Site")
+  end
+
   def and_had_been_vaccinated_with_mmr
     vaccination_record = @patient.vaccination_records.last
     expect(vaccination_record.programme_type).to eq("mmr")
@@ -390,4 +406,20 @@ def and_i_see_the_updated_date_in_the_summary
       "Date#{@vaccination_date.strftime("%-d %B %Y")}"
     )
   end
+
+  def when_the_status_updater_runs
+    PatientStatusUpdaterJob.perform_inline(@patient.id)
+  end
+
+  def and_i_navigate_to_the_patient_record
+    visit patient_path(@patient)
+  end
+
+  def then_i_see_that_the_vaccination_record_has_outcome_vaccinated
+    expect(page).to have_content("Vaccination date #{@vaccination_date.strftime("%-d %B %Y")}")
+    expect(page).to have_content("Location Unknown")
+    expect(page).to have_content("Programme MMR")
+    expect(page).to have_content("Source Manual report")
+    expect(page).to have_content("Outcome Vaccinated")
+  end
 end