Merge pull request #3583 from nhsuk/batch-name-validation-import

Ensure batch name is validated on import

Author: thomasleese

app/models/batch.rb

@@ -42,10 +42,12 @@ class Batch < ApplicationRecord
   scope :not_expired,
         -> { where.not(expiry: nil).where("expiry > ?", Time.current) }
 
+  NAME_FORMAT = /\A[A-Za-z0-9]+\z/
+
   validates :name,
             presence: true,
             format: {
-              with: /\A[A-Za-z0-9]+\z/
+              with: NAME_FORMAT
             },
             length: {
               minimum: 2,

app/models/immunisation_import_row.rb

@@ -487,6 +487,8 @@ def validate_batch_name
       if batch_name.present?
         if batch_name.to_s.length > 100
           errors.add(batch_name.header, "is greater than 100 characters long")
+        elsif batch_name.to_s !~ Batch::NAME_FORMAT
+          errors.add(batch_name.header, "must be only letters and numbers")
         end
       elsif offline_recording?
         if batch_name.nil?

spec/models/immunisation_import_row_spec.rb

@@ -190,6 +190,17 @@
       end
     end
 
+    context "with an invalid batch name" do
+      let(:data) { { "VACCINATED" => "Y", "BATCH_NUMBER" => "[invalid]" } }
+
+      it "has errors" do
+        expect(immunisation_import_row).to be_invalid
+        expect(immunisation_import_row.errors["BATCH_NUMBER"]).to eq(
+          ["must be only letters and numbers"]
+        )
+      end
+    end
+
     context "with an invalid postcode" do
       let(:data) { { "PERSON_POSTCODE" => "ABC DEF" } }