Ignore other unused columns in national reporting upload

There were some further column headers which aren't on the national
reporting spec, which should be ignored

Jira-Issue: MAV-2952

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
 
@@ -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

@@ -1030,7 +1030,10 @@
               "CLINIC_NAME" => "The Hog's Head",
               "SESSION_ID" => 1,
               "UUID" => "ABCD1234-26cc-44e4-b886-c3cc90ba01b6",
-              "REASON_NOT_VACCINATED" => "Unwell"
+              "REASON_NOT_VACCINATED" => "Unwell",
+              "Vaccination type" => "HPV 1",
+              "EVENT_LOCATION_TYPE" => "school",
+              "SUPPLIER_EMAIL" => "abc@example.com"
             }
           )
         end
@@ -2337,7 +2340,10 @@
                 "CLINIC_NAME" => "The Hog's Head",
                 "SESSION_ID" => session.id,
                 "UUID" => "ABCD1234-26cc-44e4-b886-c3cc90ba01b6",
-                "REASON_NOT_VACCINATED" => "Unwell"
+                "REASON_NOT_VACCINATED" => "Unwell",
+                "Vaccination type" => "HPV 1",
+                "EVENT_LOCATION_TYPE" => "school",
+                "SUPPLIER_EMAIL" => "abc@example.com"
               }
             )
           end
@@ -2357,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",
@@ -2442,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