enable importable concern to display flash errors or flash alerts

Author: McEileen

app/controllers/concerns/importable.rb

@@ -27,11 +27,13 @@ def import_csv
       data = File.read(params[:file].path, encoding: "BOM|UTF-8")
       csv = CSV.parse(data, headers: true, skip_blanks: true)
       if csv.count.positive? && csv.first.headers.all? { |header| !header.nil? }
-        errors = resource_model.import_csv(csv, current_organization.id)
-        if errors.empty?
+        errors, warnings = resource_model.import_csv(csv, current_organization.id)
+        if errors.empty? && warnings.empty?
           flash[:notice] = "#{resource_model_humanized} were imported successfully!"
-        else
+        elsif errors.present?
           flash[:error] = "The following #{resource_model_humanized} did not import successfully:\n#{errors.join("\n")}"
+        elsif warnings.present?
+          flash[:alert] = "The following #{resource_model_humanized} imported with warnings:\n#{warnings.join("\n")}"
         end
       else
         flash[:error] = "Check headers in file!"

app/models/concerns/provideable.rb

@@ -15,7 +15,7 @@ def self.import_csv(csv, organization)
 
         loc.save!
       end
-      []
+      [[], []]
     end
 
     def self.csv_export_headers

app/models/donation_site.rb

@@ -38,6 +38,7 @@ class DonationSite < ApplicationRecord
 
   def self.import_csv(csv, organization)
     errors = []
+    warnings = []
     csv.each_with_index do |row, index|
       loc = DonationSite.new(row.to_hash)
       loc.organization_id = organization
@@ -47,7 +48,7 @@ def self.import_csv(csv, organization)
         errors << "Row #{index + 2}, #{row.to_hash["name"]} - #{loc.errors.full_messages.join(", ")}"
       end
     end
-    errors
+    [errors, warnings]
   end
 
   def self.csv_export_headers

app/models/partner.rb

@@ -54,8 +54,6 @@ class Partner < ApplicationRecord
 
   validate :correct_document_mime_type
 
-  validate :default_storage_location_belongs_to_organization
-
   before_save { email&.downcase! }
   before_create :default_send_reminders_to_false, if: :send_reminders_nil?
   before_update :invite_new_partner, if: :should_invite_because_email_changed?
@@ -104,6 +102,7 @@ def approvable?
   # better to extract this outside of the model
   def self.import_csv(csv, organization_id)
     errors = []
+    warnings = []
     organization = Organization.find(organization_id)
 
     csv.each do |row|
@@ -112,12 +111,12 @@ def self.import_csv(csv, organization_id)
       svc = PartnerCreateService.new(organization: organization, partner_attrs: hash_rows)
       svc.call
       if svc.errors.present? && svc.partner.errors.blank?
-        errors << "#{svc.partner.name}: #{svc.errors.full_messages.to_sentence}"
+        warnings << "#{svc.partner.name}: #{svc.errors.full_messages.to_sentence}"
       elsif svc.errors.present?
         errors << "#{svc.partner.name}: #{svc.partner.errors.full_messages.to_sentence}"
       end
     end
-    errors
+    [errors, warnings]
   end
 
   def partials_to_show
@@ -162,13 +161,6 @@ def family_zipcodes_list
     families.pluck(:guardian_zip_code).uniq
   end
 
-  def default_storage_location_belongs_to_organization
-    location_ids = organization&.storage_locations&.pluck(:id)
-    unless location_ids&.include?(default_storage_location_id) || default_storage_location_id.nil?
-      errors.add(:default_storage_location_id, "The default storage location is not a storage location for this partner's organization")
-    end
-  end
-
   def correct_document_mime_type
     if documents.attached? && documents.any? { |doc| !doc.content_type.in?(ALLOWED_MIME_TYPES) }
       errors.add(:documents, "Must be a PDF or DOC file")

app/models/storage_location.rb

@@ -123,7 +123,7 @@ def self.import_csv(csv, organization)
       loc.organization_id = organization
       loc.save!
     end
-    []
+    [[], []]
   end
 
   # NOTE: We should generalize this elsewhere -- Importable concern?

spec/models/donation_site_spec.rb

@@ -43,7 +43,7 @@
       data = File.read(duplicated_name_csv_path, encoding: "BOM|UTF-8")
       csv = CSV.parse(data, headers: true)
 
-      errors = DonationSite.import_csv(csv, organization.id)
+      errors, _ = DonationSite.import_csv(csv, organization.id)
       expect(errors).not_to be_empty
       expect(errors.first).to match(/Row/)
       expect(errors.first).to include("Name must be unique within the organization")
@@ -55,7 +55,7 @@
       data = File.read(valid_csv_path, encoding: "BOM|UTF-8")
       csv = CSV.parse(data, headers: true)
 
-      errors = DonationSite.import_csv(csv, organization.id)
+      errors, _ = DonationSite.import_csv(csv, organization.id)
       expect(errors).to be_empty
       expect(DonationSite.count).to eq 1
 
@@ -67,7 +67,7 @@
       data = File.read(invalid_csv_path, encoding: "BOM|UTF-8")
       csv = CSV.parse(data, headers: true)
 
-      errors = DonationSite.import_csv(csv, organization.id)
+      errors, _ = DonationSite.import_csv(csv, organization.id)
       expect(errors).not_to be_empty
       expect(errors.first).to match(/Row/)
       expect(errors.first).to include("can't be blank")

spec/requests/partners_requests_spec.rb

@@ -608,7 +608,8 @@
 
       it "presents a flash error message" do
         subject
-        expect(response).to have_error "The following Partners did not import successfully:\nPartner 4: default_storage_location The default storage location is not a storage location for this partner's organization"
+        expect(flash[:alert]).to be_present
+        expect(flash[:alert]).to match(/The following Partners imported with warnings/)
       end
     end