Merge pull request #6015 from nhsuk/fix-date-time-validation-on-already-vaccinated-flow

Make DraftVaccinationRecord#performed_at_time optional

Author: stevehook

app/models/draft_vaccination_record.rb

@@ -86,9 +86,6 @@ def wizard_steps
 
   on_wizard_step :date_and_time, exact: true do
     validates :performed_at_date, presence: true
-    validates :performed_at_time,
-              presence: true,
-              unless: :national_reporting_user_and_record?
     validate :performed_at_date_within_range
   end
 

spec/features/mmr_already_had_spec.rb

@@ -36,6 +36,7 @@
     expect(page).to have_content("LocationUnknown")
     and_had_been_vaccinated_with_mmr
     and_the_dose_number_is_first
+    and_the_performed_at_date_only_is_set
     and_the_consent_requests_are_sent
     then_the_parent_doesnt_receive_a_consent_request
   end
@@ -72,7 +73,7 @@
     when_i_choose_mmrv_and_continue
     then_i_see_the_mmrv_date_page
 
-    when_i_fill_in_the_date_and_continue
+    when_i_fill_in_the_date_and_time_and_continue
     then_i_see_the_confirmation_page
     and_the_confirmation_summary_is_not_displayed_as_a_warning
 
@@ -83,6 +84,7 @@
     and_i_see_that_the_reporter_is_set
     and_had_been_vaccinated_with_mmrv
     and_the_dose_number_is_second
+    and_the_performed_at_date_and_time_are_set
     and_the_consent_requests_are_sent
     then_the_parent_doesnt_receive_a_consent_request
   end
@@ -207,13 +209,21 @@ def then_i_see_the_mmr_date_instead_of_the_mmr_or_mmrv_page
     expect(page).to have_content("When was the MMR(V) vaccination given?")
   end
 
-  def when_i_fill_in_the_date_and_continue
+  def when_i_fill_in_the_date_and_time_and_continue
     @vaccination_date = 6.months.ago.to_date
     fill_in "Day", with: @vaccination_date.day
     fill_in "Month", with: @vaccination_date.month
     fill_in "Year", with: @vaccination_date.year
     fill_in "Hour", with: "12"
-    fill_in "Minute", with: "00"
+    fill_in "Minute", with: "30"
+    click_on "Continue"
+  end
+
+  def when_i_fill_in_the_date_and_continue
+    @vaccination_date = 6.months.ago.to_date
+    fill_in "Day", with: @vaccination_date.day
+    fill_in "Month", with: @vaccination_date.month
+    fill_in "Year", with: @vaccination_date.year
     click_on "Continue"
   end
 
@@ -283,6 +293,15 @@ def and_the_dose_number_is_second
     expect(vaccination_record.dose_sequence).to be(2)
   end
 
+  def and_the_performed_at_date_and_time_are_set
+    expect(page).to have_content("Date#{@vaccination_date.strftime('%-d %B %Y')}")
+    expect(page).to have_content("Time12:30")
+  end
+
+  def and_the_performed_at_date_only_is_set
+    expect(page).to have_content("Date#{@vaccination_date.strftime('%-d %B %Y')}")
+  end
+
   def and_the_consent_requests_are_sent
     EnqueueSchoolConsentRequestsJob.perform_now
     perform_enqueued_jobs