Merge pull request #5653 from nhsuk/alistair/national-reporting-ignore-headers

National reporting - ignore more headers

Author: alistair-white-horne-tng

app/models/immunisation_import_row.rb

@@ -207,7 +207,8 @@ def care_setting = poc? ? @data[:care_setting] : nil
   def clinic_name =
     poc? ? @data[:clinic_name].presence || @data[:event_done_at] : nil
 
-  def combined_vaccination_and_dose_sequence = @data[:vaccination_type]
+  def combined_vaccination_and_dose_sequence =
+    poc? ? @data[:vaccination_type] : nil
 
   def date_of_vaccination =
     @data[:date_of_vaccination].presence || @data[:event_date]
@@ -216,7 +217,7 @@ def delivery_site = @data[:anatomical_site]
 
   def dose_sequence = @data[:dose_sequence]
 
-  def location_type = @data[:event_location_type]
+  def location_type = poc? ? @data[:event_location_type] : nil
 
   def notes = poc? ? @data[:notes] : nil
 
@@ -246,7 +247,7 @@ def performed_ods_code = @data[:organisation_code]
 
   def programme_name = poc? ? @data[:programme] : nil
 
-  def reason_not_administered = @data[:reason_not_vaccinated]
+  def reason_not_administered = poc? ? @data[:reason_not_vaccinated] : nil
 
   def school_name =
     if poc?
@@ -258,7 +259,7 @@ def school_urn = @data[:school_urn].presence || @data[:school_code]
 
   def session_id = poc? ? @data[:session_id] : nil
 
-  def supplied_by_email = @data[:supplier_email]
+  def supplied_by_email = poc? ? @data[:supplier_email] : nil
 
   def time_of_vaccination =
     @data[:time_of_vaccination].presence || @data[:event_time]

spec/models/immunisation_import_row_spec.rb

@@ -1019,6 +1019,30 @@
         end
       end
 
+      shared_examples "when Mavis columns are present, which the bulk upload should ignore" do
+        let(:data) do
+          valid_bulk_flu_data.merge(
+            {
+              "PROGRAMME" => "HPV",
+              "PERFORMING_PROFESSIONAL_EMAIL" => "abc123@example.com",
+              "NOTES" => "Here are some notes",
+              "CARE_SETTING" => 2,
+              "CLINIC_NAME" => "The Hog's Head",
+              "SESSION_ID" => 1,
+              "UUID" => "ABCD1234-26cc-44e4-b886-c3cc90ba01b6",
+              "REASON_NOT_VACCINATED" => "Unwell",
+              "Vaccination type" => "HPV 1",
+              "EVENT_LOCATION_TYPE" => "school",
+              "SUPPLIER_EMAIL" => "abc@example.com"
+            }
+          )
+        end
+
+        it "ignores the Mavis columns" do
+          expect(immunisation_import_row).to be_valid
+        end
+      end
+
       context "of unknown type (no VACCINE_GIVEN)" do
         context "with an empty row" do
           let(:data) { {} }
@@ -1096,6 +1120,8 @@
         end
 
         include_examples "when `VACCINATED` is `N`"
+
+        include_examples "when Mavis columns are present, which the bulk upload should ignore"
       end
 
       context "of type hpv" do
@@ -1127,6 +1153,8 @@
         end
 
         include_examples "when `VACCINATED` is `N`"
+
+        include_examples "when Mavis columns are present, which the bulk upload should ignore"
       end
     end
   end
@@ -2311,7 +2339,11 @@
                 "CARE_SETTING" => 2,
                 "CLINIC_NAME" => "The Hog's Head",
                 "SESSION_ID" => session.id,
-                "UUID" => "ABCD1234-26cc-44e4-b886-c3cc90ba01b6"
+                "UUID" => "ABCD1234-26cc-44e4-b886-c3cc90ba01b6",
+                "REASON_NOT_VACCINATED" => "Unwell",
+                "Vaccination type" => "HPV 1",
+                "EVENT_LOCATION_TYPE" => "school",
+                "SUPPLIER_EMAIL" => "abc@example.com"
               }
             )
           end
@@ -2331,10 +2363,13 @@
           its(:notes) { should be_nil }
 
           its(:location) { should eq location }
+          its(:location_name) { should be_nil }
 
           its(:session) { should be_nil }
 
           its(:uuid) { should_not eq "ABCD1234-26cc-44e4-b886-c3cc90ba01b6" }
+
+          its(:supplied_by) { should be_nil }
         end
 
         include_examples "accepts a VACCINE_GIVEN code",
@@ -2416,7 +2451,11 @@
                 "CARE_SETTING" => 2,
                 "CLINIC_NAME" => "The Hog's Head",
                 "SESSION_ID" => session.id,
-                "UUID" => "ABCD1234-26cc-44e4-b886-c3cc90ba01b6"
+                "UUID" => "ABCD1234-26cc-44e4-b886-c3cc90ba01b6",
+                "REASON_NOT_VACCINATED" => "Unwell",
+                "Vaccination type" => "flu 1",
+                "EVENT_LOCATION_TYPE" => "school",
+                "SUPPLIER_EMAIL" => "abc@example.com"
               }
             )
           end