diff --git a/app/models/immunisation_import_row.rb b/app/models/immunisation_import_row.rb index 3dcbebde4a..7b4dcc2740 100644 --- a/app/models/immunisation_import_row.rb +++ b/app/models/immunisation_import_row.rb @@ -851,13 +851,13 @@ def validate_dose_sequence two_words_connector: " or " ) + dose_sequence_error_message = + "Enter a numeric which must be either #{dose_sequence_examples}." + if dose_sequence.present? || parsed_vaccination_description_string&.dig(:dose_sequence).present? if dose_sequence_value.nil? - errors.add( - field.header, - "Enter a dose sequence number, for example, #{dose_sequence_examples}." - ) + errors.add(field.header, dose_sequence_error_message) elsif maximum_dose_sequence if dose_sequence_value < 1 errors.add(field.header, "must be greater than 0") @@ -879,10 +879,7 @@ def validate_dose_sequence end ) else - errors.add( - field.header, - "Enter a dose sequence number, for example, #{dose_sequence_examples}." - ) + errors.add(field.header, dose_sequence_error_message) end end end diff --git a/spec/models/immunisation_import_row_spec.rb b/spec/models/immunisation_import_row_spec.rb index 619199dfa3..1847e79e19 100644 --- a/spec/models/immunisation_import_row_spec.rb +++ b/spec/models/immunisation_import_row_spec.rb @@ -582,7 +582,7 @@ it "has the correct error message" do immunisation_import_row.valid? expect(immunisation_import_row.errors["DOSE_SEQUENCE"]).to include( - "Enter a dose sequence number, for example, 1 or 2." + "Enter a numeric which must be either 1 or 2." ) end end