Merge pull request #5964 from nhsuk/fix-already-vaccinated-flow

stevehook · web-flow · commit 4dd42fb3df0a · 2026-02-12T12:10:00.000Z
Fix already vaccinated flow
diff --git a/app/components/app_vaccination_record_summary_component.rb b/app/components/app_vaccination_record_summary_component.rb
@@ -234,17 +234,15 @@ def call
         end
       end
 
-      if @vaccination_record.performed_by.present?
-        summary_list.with_row do |row|
-          row.with_key { "Vaccinator" }
-          row.with_value { vaccinator_value }
-          if (href = @change_links[:vaccinator])
-            row.with_action(
-              text: "Change",
-              visually_hidden_text: "vaccinator",
-              href:
-            )
-          end
+      summary_list.with_row do |row|
+        row.with_key { "Vaccinator" }
+        row.with_value { vaccinator_value }
+        if (href = @change_links[:vaccinator])
+          row.with_action(
+            text: "Change",
+            visually_hidden_text: "vaccinator",
+            href:
+          )
         end
       end
 
@@ -293,6 +291,20 @@ def call
         end
       end
 
+      if @vaccination_record.reported_by.present?
+        summary_list.with_row do |row|
+          row.with_key { "Reported by" }
+          row.with_value { @vaccination_record.reported_by&.full_name }
+        end
+      end
+
+      if @vaccination_record.reported_at.present?
+        summary_list.with_row do |row|
+          row.with_key { "Reported on" }
+          row.with_value { @vaccination_record.reported_at.to_fs(:long) }
+        end
+      end
+
       correct_feature_flags_enabled =
         Programme.all.any? { Flipper.enabled?(:imms_api_sync_job, it) } &&
           Flipper.enabled?(:imms_api_integration)
@@ -327,10 +339,13 @@ def source_value
   end
 
   def outcome_value
-    highlight_if(
-      VaccinationRecord.human_enum_name(:outcome, @vaccination_record.outcome),
-      @vaccination_record.outcome_changed?
-    )
+    outcome = VaccinationRecord.human_enum_name(:outcome, @vaccination_record.outcome)
+
+    if @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
 
   def programme_value
@@ -418,8 +433,10 @@ def vaccinator_value
     value =
       if @vaccination_record.performed_by == @current_user
         "You (#{@current_user.full_name})"
-      else
+      elsif @vaccination_record.performed_by
         @vaccination_record.performed_by&.full_name
+      else
+        "Unknown"
       end
 
     highlight_if(
diff --git a/app/controllers/draft_vaccination_records_controller.rb b/app/controllers/draft_vaccination_records_controller.rb
@@ -147,7 +147,8 @@ def handle_mmr_or_mmrv
   end
 
   def handle_location
-    if @draft_vaccination_record.national_reporting_user_and_record?
+    if @session&.generic_clinic? ||
+         @draft_vaccination_record.national_reporting_user_and_record?
       location_id = update_params[:location_id]
 
       if location_id == "unknown"
diff --git a/app/controllers/patient_sessions/programmes_controller.rb b/app/controllers/patient_sessions/programmes_controller.rb
@@ -19,20 +19,24 @@ def record_already_vaccinated
 
     draft_vaccination_record.clear_attributes
     draft_vaccination_record.update!(
-      first_active_wizard_step: :confirm,
+      dose_sequence: dose_sequence,
+      first_active_wizard_step:
+        eligible_for_mmr_or_mmrv? ? :mmr_or_mmrv : :date_and_time,
       location_id: nil,
       location_name: "Unknown",
       outcome: :already_had,
       patient: @patient,
-      performed_at: Time.current,
-      performed_by_user_id: current_user.id,
       performed_ods_code: current_team.organisation.ods_code,
       programme: @programme,
+      reported_by_id: current_user.id,
+      reported_at: Time.current,
       session: @session,
       source: "service"
     )
 
-    redirect_to draft_vaccination_record_path("confirm")
+    redirect_to draft_vaccination_record_path(
+                  eligible_for_mmr_or_mmrv? ? "mmr-or-mmrv" : "date-and-time"
+                )
   end
 
   private
diff --git a/app/models/draft_vaccination_record.rb b/app/models/draft_vaccination_record.rb
@@ -36,6 +36,8 @@ class DraftVaccinationRecord
   attribute :performed_ods_code, :string
   attribute :programme_type, :string
   attribute :protocol, :string
+  attribute :reported_at, :datetime
+  attribute :reported_by_id, :integer
   attribute :session_id, :integer
   attribute :source, :string
   attribute :supplied_by_user_id, :integer
@@ -59,6 +61,12 @@ def wizard_steps
     [
       :identity,
       (:notes unless national_reporting_user_and_record?),
+      (
+        if programme&.mmr? && (administered? || already_had?) &&
+             patient.eligible_for_mmrv?
+          :mmr_or_mmrv
+        end
+      ),
       :date_and_time,
       (:outcome if can_change_outcome?),
       (:supplier if requires_supplied_by?),
@@ -185,6 +193,10 @@ def already_had?
     outcome == "already_had"
   end
 
+  def reported_as_already_vaccinated?
+    already_had? && reported_by_id.present?
+  end
+
   # So that a form error matches to a field in this model
   alias_method :administered, :administered?
 
@@ -215,6 +227,11 @@ def performed_by_user=(value)
     self.performed_by_user_id = value.id
   end
 
+  def reported_by
+    return nil if reported_by_id.nil?
+    User.find(reported_by_id)
+  end
+
   def session
     return nil if session_id.nil?
 
@@ -400,6 +417,8 @@ def writable_attribute_names
       performed_ods_code
       programme_type
       protocol
+      reported_at
+      reported_by_id
       session_id
       source
       supplied_by_user_id
diff --git a/app/models/vaccination_record.rb b/app/models/vaccination_record.rb
@@ -33,6 +33,7 @@
 #  performed_ods_code                      :string
 #  programme_type                          :enum             not null
 #  protocol                                :integer
+#  reported_at                             :datetime
 #  source                                  :integer          not null
 #  uuid                                    :uuid             not null
 #  created_at                              :datetime         not null
@@ -43,6 +44,7 @@
 #  nhs_immunisations_api_id                :string
 #  patient_id                              :bigint           not null
 #  performed_by_user_id                    :bigint
+#  reported_by_id                          :bigint
 #  session_id                              :bigint
 #  supplied_by_user_id                     :bigint
 #  vaccine_id                              :bigint
@@ -60,6 +62,7 @@
 #  index_vaccination_records_on_performed_by_user_id               (performed_by_user_id)
 #  index_vaccination_records_on_performed_ods_code_and_patient_id  (performed_ods_code,patient_id) WHERE (session_id IS NULL)
 #  index_vaccination_records_on_programme_type                     (programme_type)
+#  index_vaccination_records_on_reported_by_id                     (reported_by_id)
 #  index_vaccination_records_on_session_id                         (session_id)
 #  index_vaccination_records_on_supplied_by_user_id                (supplied_by_user_id)
 #  index_vaccination_records_on_uuid                               (uuid) UNIQUE
@@ -70,6 +73,7 @@
 #  fk_rails_...  (next_dose_delay_triage_id => triages.id)
 #  fk_rails_...  (patient_id => patients.id)
 #  fk_rails_...  (performed_by_user_id => users.id)
+#  fk_rails_...  (reported_by_id => users.id)
 #  fk_rails_...  (session_id => sessions.id)
 #  fk_rails_...  (supplied_by_user_id => users.id)
 #  fk_rails_...  (vaccine_id => vaccines.id)
@@ -108,6 +112,10 @@ class VaccinationRecord < ApplicationRecord
   belongs_to :vaccine, optional: true
 
   belongs_to :performed_by_user, class_name: "User", optional: true
+  belongs_to :reported_by,
+             class_name: "User",
+             foreign_key: :reported_by_id,
+             optional: true
   belongs_to :supplied_by,
              class_name: "User",
              foreign_key: :supplied_by_user_id,
@@ -261,6 +269,10 @@ class << self
 
   def not_administered? = !administered?
 
+  def reported_as_already_vaccinated?
+    already_had? && reported_by_id.present?
+  end
+
   def show_in_academic_year?(current_academic_year)
     if programme.seasonal?
       academic_year == current_academic_year
diff --git a/app/views/draft_vaccination_records/confirm.html.erb b/app/views/draft_vaccination_records/confirm.html.erb
@@ -38,8 +38,8 @@
      show_notes:,
    ) %>
 
-<% if @draft_vaccination_record.administered? %>
-  <% if @draft_vaccination_record.vaccine_method_matches_consent_and_triage? %>
+<% if @draft_vaccination_record.administered? || @draft_vaccination_record.reported_as_already_vaccinated? %>
+  <% if @draft_vaccination_record.vaccine_method_matches_consent_and_triage? || @draft_vaccination_record.reported_as_already_vaccinated? %>
     <%= render AppCardComponent.new do |card| %>
       <% card.with_heading { "Vaccination details" } %>
       <%= render vaccination_summary %>
diff --git a/db/migrate/20260204123247_add_reported_by_and_reported_at_to_vaccination_records.rb b/db/migrate/20260204123247_add_reported_by_and_reported_at_to_vaccination_records.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class AddReportedByAndReportedAtToVaccinationRecords < ActiveRecord::Migration[
+  8.1
+]
+  def change
+    add_reference :vaccination_records,
+                  :reported_by,
+                  foreign_key: {
+                    to_table: :users
+                  },
+                  index: true
+    add_column :vaccination_records, :reported_at, :datetime
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
@@ -955,6 +955,8 @@
     t.string "performed_ods_code"
     t.enum "programme_type", null: false, enum_type: "programme_type"
     t.integer "protocol"
+    t.datetime "reported_at"
+    t.bigint "reported_by_id"
     t.bigint "session_id"
     t.integer "source", null: false
     t.bigint "supplied_by_user_id"
@@ -972,6 +974,7 @@
     t.index ["performed_by_user_id"], name: "index_vaccination_records_on_performed_by_user_id"
     t.index ["performed_ods_code", "patient_id"], name: "index_vaccination_records_on_performed_ods_code_and_patient_id", where: "(session_id IS NULL)"
     t.index ["programme_type"], name: "index_vaccination_records_on_programme_type"
+    t.index ["reported_by_id"], name: "index_vaccination_records_on_reported_by_id"
     t.index ["session_id"], name: "index_vaccination_records_on_session_id"
     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
@@ -1122,6 +1125,7 @@
   add_foreign_key "vaccination_records", "sessions"
   add_foreign_key "vaccination_records", "triages", column: "next_dose_delay_triage_id"
   add_foreign_key "vaccination_records", "users", column: "performed_by_user_id"
+  add_foreign_key "vaccination_records", "users", column: "reported_by_id"
   add_foreign_key "vaccination_records", "users", column: "supplied_by_user_id"
   add_foreign_key "vaccination_records", "vaccines"
 
diff --git a/spec/factories/vaccination_records.rb b/spec/factories/vaccination_records.rb
@@ -33,6 +33,7 @@
 #  performed_ods_code                      :string
 #  programme_type                          :enum             not null
 #  protocol                                :integer
+#  reported_at                             :datetime
 #  source                                  :integer          not null
 #  uuid                                    :uuid             not null
 #  created_at                              :datetime         not null
@@ -43,6 +44,7 @@
 #  nhs_immunisations_api_id                :string
 #  patient_id                              :bigint           not null
 #  performed_by_user_id                    :bigint
+#  reported_by_id                          :bigint
 #  session_id                              :bigint
 #  supplied_by_user_id                     :bigint
 #  vaccine_id                              :bigint
@@ -60,6 +62,7 @@
 #  index_vaccination_records_on_performed_by_user_id               (performed_by_user_id)
 #  index_vaccination_records_on_performed_ods_code_and_patient_id  (performed_ods_code,patient_id) WHERE (session_id IS NULL)
 #  index_vaccination_records_on_programme_type                     (programme_type)
+#  index_vaccination_records_on_reported_by_id                     (reported_by_id)
 #  index_vaccination_records_on_session_id                         (session_id)
 #  index_vaccination_records_on_supplied_by_user_id                (supplied_by_user_id)
 #  index_vaccination_records_on_uuid                               (uuid) UNIQUE
@@ -70,6 +73,7 @@
 #  fk_rails_...  (next_dose_delay_triage_id => triages.id)
 #  fk_rails_...  (patient_id => patients.id)
 #  fk_rails_...  (performed_by_user_id => users.id)
+#  fk_rails_...  (reported_by_id => users.id)
 #  fk_rails_...  (session_id => sessions.id)
 #  fk_rails_...  (supplied_by_user_id => users.id)
 #  fk_rails_...  (vaccine_id => vaccines.id)
diff --git a/spec/features/mmr_already_had_spec.rb b/spec/features/mmr_already_had_spec.rb
diff --git a/spec/features/td_ipv_already_had_spec.rb b/spec/features/td_ipv_already_had_spec.rb
diff --git a/spec/models/vaccination_record_spec.rb b/spec/models/vaccination_record_spec.rb
