Merge pull request #5898 from nhsuk/clear-out-draft-vaccination-record

Clear out draft vaccination record

Author: misaka

app/controllers/vaccination_records_controller.rb

@@ -9,10 +9,17 @@ def show
   end
 
   def update
-    DraftVaccinationRecord.new(
-      request_session: session,
-      current_user:
-    ).read_from!(@vaccination_record)
+    draft_vaccination_record =
+      DraftVaccinationRecord.new(request_session: session, current_user:)
+    # TODO: Refactor this so that we don't need to clear out the attributes from
+    #       the draft record(s) in this use case. This likely means changing
+    #       RequestSessionPersistable to do this clearing out. One possible
+    #       approach would be to change `new` to instantiate without loading
+    #       values from the session, and adding `new_from_session` to replace
+    #       the existing functionality in `new`.
+    draft_vaccination_record.clear!
+    draft_vaccination_record.clear_changes_information
+    draft_vaccination_record.read_from!(@vaccination_record)
 
     redirect_to draft_vaccination_record_path("confirm")
   end

app/models/draft_vaccination_record.rb

@@ -49,8 +49,6 @@ def initialize(current_user:, **attributes)
               if: :performed_by_user
             }
 
-  validates :source, inclusion: { in: VaccinationRecord.sources.keys }
-
   def wizard_steps
     [
       :identity,
@@ -146,6 +144,7 @@ def wizard_steps
               :protocol,
               presence: true
     validates :full_dose, inclusion: { in: [true, false] }
+    validates :source, inclusion: { in: VaccinationRecord.sources.keys }
   end
 
   def administered?

spec/features/edit_vaccination_record_spec.rb

@@ -424,6 +424,21 @@
       then_i_should_see_the_vaccination_record
       and_i_should_see_the_patient_based_breadcrumb
     end
+
+    scenario "User edits two vaccination records with different delivery methods" do
+      given_i_am_signed_in
+      and_a_bulk_uploaded_vaccination_record_exists
+      and_a_vaccination_record_with_a_different_delivery_method_exists
+
+      when_i_visit_the_first_vaccination_record_directly
+      and_i_click_on_edit_vaccination_record
+
+      and_i_visit_the_flu_vaccination_record_directly
+      and_i_click_on_edit_vaccination_record
+      and_i_click_on_save_changes
+
+      then_i_should_see_a_success_message
+    end
   end
 
   def given_an_hpv_programme_is_underway
@@ -541,6 +556,33 @@ def and_a_bulk_uploaded_vaccination_record_exists
       )
   end
 
+  def and_a_vaccination_record_with_a_different_delivery_method_exists
+    @flu_programme = Programme.flu
+    @flu_vaccine = @flu_programme.vaccines.first
+    @flu_batch =
+      create(:batch, :not_expired, team: @team, vaccine: @flu_vaccine)
+
+    @flu_vaccination_record =
+      create(
+        :vaccination_record,
+        :sourced_from_bulk_upload,
+        uploaded_by: @team.users.first,
+        delivery_method: :nasal_spray,
+        delivery_site: :nose,
+        batch: @flu_batch,
+        vaccine: @flu_batch.vaccine,
+        patient: @patient,
+        programme: @flu_programme,
+        performed_by_user: nil,
+        performed_by_given_name: "Albus",
+        performed_by_family_name: "Dumbledore"
+      )
+
+    expect(@flu_vaccination_record.delivery_method).not_to eq(
+      @vaccination_record.delivery_method
+    )
+  end
+
   def and_a_delayed_triage_exists
     delay_date = @vaccination_record.performed_at + 28.days
     @delayed_triage =
@@ -996,6 +1038,13 @@ def when_i_visit_the_vaccination_record_directly
     visit vaccination_record_path(@vaccination_record)
   end
 
+  alias_method :when_i_visit_the_first_vaccination_record_directly,
+               :when_i_visit_the_vaccination_record_directly
+
+  def and_i_visit_the_flu_vaccination_record_directly
+    visit vaccination_record_path(@flu_vaccination_record)
+  end
+
   def and_i_should_see_the_session_specific_breadcrumb
     breadcrumb = page.find(".nhsuk-breadcrumb")
     expect(breadcrumb).to have_content("Sessions")
@@ -1030,4 +1079,18 @@ def and_i_should_see_the_patient_based_breadcrumb
     expect(breadcrumb).to have_content("Children")
     expect(breadcrumb).not_to have_content("Sessions")
   end
+
+  def when_i_edit_the_first_vaccination_record
+    visit vaccination_record_path(@vaccination_record)
+
+    click_on "Edit vaccination record"
+    click_on "Save changes"
+  end
+
+  def then_i_should_see_a_success_message
+    expect(page).to have_alert(
+      "Success",
+      text: "Vaccination outcome recorded for flu"
+    )
+  end
 end

spec/models/draft_vaccination_record_spec.rb

@@ -227,6 +227,8 @@
     end
 
     context "when source is 'service'" do
+      before { draft_vaccination_record.wizard_step = :confirm }
+
       let(:attributes) { valid_administered_attributes }
 
       it "is valid" do
@@ -236,6 +238,8 @@
     end
 
     context "when source is invalid" do
+      before { draft_vaccination_record.wizard_step = :confirm }
+
       let(:attributes) do
         valid_administered_attributes.merge(source: "invalid_source")
       end
@@ -249,6 +253,8 @@
     end
 
     context "when source is nil" do
+      before { draft_vaccination_record.wizard_step = :confirm }
+
       let(:attributes) { valid_administered_attributes.except(:source) }
 
       it "is invalid" do