enable csv import of partners with six fields

McEileen · McEileen · commit 2601e4c317e2 · 2025-04-27T20:54:16.000-04:00
diff --git a/app/models/partner.rb b/app/models/partner.rb
@@ -54,6 +54,8 @@ class Partner < ApplicationRecord
 
   validate :correct_document_mime_type
 
+  validate :default_storage_location_belongs_to_organization
+
   before_save { email&.downcase! }
   before_update :invite_new_partner, if: :should_invite_because_email_changed?
 
@@ -157,6 +159,13 @@ 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")
diff --git a/app/services/partner_create_service.rb b/app/services/partner_create_service.rb
@@ -9,6 +9,12 @@ def initialize(organization:, partner_attrs:)
   end
 
   def call
+    if partner_attrs["default_storage_location"]
+      default_storage_location_name = partner_attrs["default_storage_location"].titlecase
+      default_storage_location_id = StorageLocation.find_by(name: default_storage_location_name)&.id
+      partner_attrs.delete("default_storage_location")
+      partner_attrs["default_storage_location_id"] = default_storage_location_id
+    end
     @partner = organization.partners.build(partner_attrs)
 
     if @partner.valid?
diff --git a/app/views/dashboard/_getting_started_prompt.html.erb b/app/views/dashboard/_getting_started_prompt.html.erb
@@ -141,7 +141,7 @@
         layout: "shared/csv_import_modal",
         locals: {
           import_type: "Partners",
-          csv_template_url: "/partners_template.csv",
+          csv_template_url: "/partners_template_updated.csv",
           csv_import_url: import_csv_partners_path,
         },
       ) do %>
diff --git a/app/views/partners/index.html.erb b/app/views/partners/index.html.erb
@@ -56,7 +56,7 @@
           layout: "shared/csv_import_modal",
           locals: {
             import_type: "Partners",
-            csv_template_url: "/partners_template.csv",
+            csv_template_url: "/partners_template_updated.csv",
             csv_import_url: import_csv_partners_path
           }
       ) do %>
diff --git a/public/partners_template.csv b/public/partners_template.csv
diff --git a/public/partners_template_updated.csv b/public/partners_template_updated.csv
@@ -0,0 +1,4 @@
+name,email,default_storage_location,send_reminders,quota,notes
+Partner 1,partner1@example.com,"Smithsonian Conservation Center",false,20,"test note 1"
+Partner 2,partner2@example.com,"Smithsonian Conservation Center",false,30,"test note 2"
+Partner 3,partner3@example.com,"Smithsonian Conservation Center",true,10,"test note 3"
diff --git a/spec/fixtures/files/partners.csv b/spec/fixtures/files/partners.csv
diff --git a/spec/fixtures/files/partners_with_bom_encoding.csv b/spec/fixtures/files/partners_with_bom_encoding.csv
@@ -1,21 +1,21 @@
-﻿name,email
-Beaverton Police Department,krodriguez@beavertonoregon.gov
-Catholic Charities,lcrombie@catholiccharitiesoregon.org
-Clackamas Service Center,debramason@cscoregon.org
-Healthy Familes of Clackamas County,bkersens@healthyfamiliescc.org
-Dollar for Portland,jared@dollorfor.org
-Emmanuel Housing Center,shauntemeyers@emmanuelpdx.org
-Helensview School,hgandee@mesd.k12.or.us
-JOIN,ccarroll@joinpdx.org
-Job Corps (PIVOT),zutz.kayla@jobcorps.org
-NARA,christman@naranw.org
-NW Housing Alternatives,doty@nwhousing.org
-Pregnancy Resource Center,debbie@portlandprc.org
-Portland Homeless Family Solutions,emma@pdxhfs.org
-Raphael House,lvold@raphaelhouse.com
-The Rebecca Foundation's Cloth Diaper Closet,portland@clothforall.org
-Rose Haven,adeol@rosehaven.org
-Self Enhancement Inc.,stephaniep@selfenhancement.org
-Teen Parent Services (PPS),lgovan@pps.net
-Volunteers of America,cross@voaor.org
-Central City Concern,lindsey.ramsey@ccconcern.org
+﻿name,email,default_storage_location,send_reminders,quota,notes
+Beaverton Police Department,krodriguez@beavertonoregon.gov,"Smithsonian Conservation Center",true,50,"great partner"
+Catholic Charities,lcrombie@catholiccharitiesoregon.org,"Smithsonian Conservation Center",true,50,"great partner"
+Clackamas Service Center,debramason@cscoregon.org,"Smithsonian Conservation Center",true,50,"great partner"
+Healthy Familes of Clackamas County,bkersens@healthyfamiliescc.org,"Smithsonian Conservation Center",true,50,"great partner"
+Dollar for Portland,jared@dollorfor.org,"Smithsonian Conservation Center",true,50,"great partner"
+Emmanuel Housing Center,shauntemeyers@emmanuelpdx.org,"Smithsonian Conservation Center",true,50,"great partner"
+Helensview School,hgandee@mesd.k12.or.us,"Smithsonian Conservation Center",true,50,"great partner"
+JOIN,ccarroll@joinpdx.org,"Smithsonian Conservation Center",true,50,"great partner"
+Job Corps (PIVOT),zutz.kayla@jobcorps.org,"Smithsonian Conservation Center",true,50,"great partner"
+NARA,christman@naranw.org,"Smithsonian Conservation Center",true,50,"great partner"
+NW Housing Alternatives,doty@nwhousing.org,"Smithsonian Conservation Center",true,50,"great partner"
+Pregnancy Resource Center,debbie@portlandprc.org,"Smithsonian Conservation Center",true,50,"great partner"
+Portland Homeless Family Solutions,emma@pdxhfs.org,"Smithsonian Conservation Center",true,50,"great partner"
+Raphael House,lvold@raphaelhouse.com,"Smithsonian Conservation Center",true,50,"great partner"
+The Rebecca Foundation's Cloth Diaper Closet,portland@clothforall.org,"Smithsonian Conservation Center",true,50,"great partner"
+Rose Haven,adeol@rosehaven.org,"Smithsonian Conservation Center",true,50,"great partner"
+Self Enhancement Inc.,stephaniep@selfenhancement.org,"Smithsonian Conservation Center",true,50,"great partner"
+Teen Parent Services (PPS),lgovan@pps.net,"Smithsonian Conservation Center",true,50,"great partner"
+Volunteers of America,cross@voaor.org,"Smithsonian Conservation Center",true,50,"great partner"
+Central City Concern,lindsey.ramsey@ccconcern.org,"Smithsonian Conservation Center",true,50,"great partner"
diff --git a/spec/fixtures/files/partners_with_duplicates.csv b/spec/fixtures/files/partners_with_duplicates.csv
diff --git a/spec/fixtures/files/partners_with_six_fields.csv b/spec/fixtures/files/partners_with_six_fields.csv
@@ -0,0 +1,4 @@
+name,email,default_storage_location,send_reminders,quota,notes
+Partner 1,partner1@example.com,"Smithsonian Conservation Center",true,50,"great partner"
+Partner 2,partner2@example.com,"Smithsonian Conservation Center",true,75,"such a great partner"
+Partner 4,partner4@example.com,"Smithsonian Conservation Center",false,80,"really ten out of ten"
diff --git a/spec/fixtures/files/partners_with_six_fields_and_duplicates.csv b/spec/fixtures/files/partners_with_six_fields_and_duplicates.csv
@@ -0,0 +1,4 @@
+name,email,default_storage_location,send_reminders,quota,notes
+Partner 1,partner1@example.com,"Smithsonian Conservation Center",true,50,"great partner"
+Partner 2,partner2@example.com,"Smithsonian Conservation Center",true,75,"such a great partner"
+Partner 3,partner3@example.com,"Smithsonian Conservation Center",true,80,"yay, a partner"
diff --git a/spec/fixtures/files/partners_with_six_fields_capitalized_location.csv b/spec/fixtures/files/partners_with_six_fields_capitalized_location.csv
@@ -0,0 +1,4 @@
+name,email,default_storage_location,send_reminders,quota,notes
+Partner 1,partner1@example.com,"SMITHSONIAN CONSERVATION CENTER",true,50,"great partner"
+Partner 2,partner2@example.com,"Smithsonian Conservation Center",true,75,"such a great partner"
+Partner 4,partner4@example.com,"Smithsonian Conservation Center",false,80,"really ten out of ten"
diff --git a/spec/fixtures/files/partners_with_six_fields_invalid_location.csv b/spec/fixtures/files/partners_with_six_fields_invalid_location.csv
@@ -0,0 +1,2 @@
+name,email,default_storage_location,send_reminders,quota,notes
+Partner 4,partner4@example.com,"Invalid",false,80,"really ten out of ten"
diff --git a/spec/models/partner_spec.rb b/spec/models/partner_spec.rb
@@ -257,15 +257,20 @@
 
   describe "import_csv" do
     let(:organization) { create(:organization) }
+    before do
+      create(:storage_location, organization: organization)
+      create(:storage_location, organization: organization, name: "shed")
+      create(:storage_location, organization: organization, name: "building")
+    end
 
     it "imports partners from a csv file and prevents multiple imports" do
       before_import = Partner.count
-      import_file_path = Rails.root.join("spec", "fixtures", "files", "partners.csv")
+      import_file_path = Rails.root.join("spec", "fixtures", "files", "partners_with_six_fields.csv")
       data = File.read(import_file_path, encoding: "BOM|UTF-8")
       csv = CSV.parse(data, headers: true)
       Partner.import_csv(csv, organization.id)
       expect(Partner.count).to eq before_import + 3
-      import_file_path2 = Rails.root.join("spec", "fixtures", "files", "partners_with_duplicates.csv")
+      import_file_path2 = Rails.root.join("spec", "fixtures", "files", "partners_with_six_fields_and_duplicates.csv")
       data2 = File.read(import_file_path2, encoding: "BOM|UTF-8")
       csv2 = CSV.parse(data2, headers: true)
       Partner.import_csv(csv2, organization.id)
@@ -280,6 +285,28 @@
         Partner.import_csv(csv, organization.id)
       end.to change { Partner.count }.by(20)
     end
+
+    it "imports partners that have six fields" do
+      import_file_path = Rails.root.join("spec", "fixtures", "files", "partners_with_six_fields.csv")
+      data = File.read(import_file_path, encoding: "BOM|UTF-8")
+      csv = CSV.parse(data, headers: true)
+      expect do
+        Partner.import_csv(csv, organization.id)
+      end.to change { Partner.count }.by(3)
+    end
+
+    it "imports partners with the correct values for fields" do
+      import_file_path = Rails.root.join("spec", "fixtures", "files", "partners_with_six_fields.csv")
+      data = File.read(import_file_path, encoding: "BOM|UTF-8")
+      csv = CSV.parse(data, headers: true)
+      Partner.import_csv(csv, organization.id)
+
+      partner = Partner.last # how test storage location is correct?
+      expect(StorageLocation.find(partner.default_storage_location_id).name).to eq("Smithsonian Conservation Center")
+      expect(partner.send_reminders).to eq(false)
+      expect(partner.quota).to eq(80)
+      expect(partner.notes).to eq("really ten out of ten")
+    end
   end
 
   describe '#quantity_year_to_date' do
diff --git a/spec/requests/partners_requests_spec.rb b/spec/requests/partners_requests_spec.rb
@@ -235,7 +235,7 @@
             enable_quantity_based_requests: true)
         end
 
-        it "orders partners alphaetically" do
+        it "orders partners alphabetically" do
           get partners_path(partner, format: response_format)
 
           csv = CSV.parse(response.body)
@@ -428,9 +428,12 @@
 
   describe "POST #import_csv" do
     let(:model_class) { Partner }
+    let!(:outside_organization) { create(:organization) }
+    let!(:invalid_storage_location) { create(:storage_location, name: 'invalid', organization: outside_organization) }
+    let!(:valid_storage_location) { create(:storage_location, organization: organization) }
 
     context "with a csv file" do
-      let(:file) { fixture_file_upload("#{model_class.name.underscore.pluralize}.csv", "text/csv") }
+      let(:file) { fixture_file_upload("partners_with_six_fields.csv", "text/csv") }
       subject { post import_csv_partners_path, params: { file: file } }
 
       it "invokes .import_csv" do
@@ -494,6 +497,61 @@
         expect(response).to have_error(/Partner 2: Email is invalid/)
       end
     end
+
+    context "csv file with default storage location, email preferences, quota, and notes" do
+      let(:file) { fixture_file_upload("partners_with_six_fields.csv", "text/csv") }
+      subject { post import_csv_partners_path, params: { file: file } }
+
+      it "invokes .import_csv" do
+        expect(model_class).to respond_to(:import_csv).with(2).arguments
+      end
+
+      it "redirects to :index" do
+        subject
+        expect(response).to be_redirect
+      end
+
+      it "presents a flash notice message" do
+        subject
+        expect(response).to have_notice "#{model_class.name.underscore.humanize.pluralize} were imported successfully!"
+      end
+    end
+
+    context "csv file with an invalid storage location" do
+      let!(:current_organization) { create(:organization) }
+      let!(:outside_organization) { create(:organization) }
+      let!(:outside_storage_location) { create(:storage_location, name: "Invalid", organization: outside_organization) }
+      let(:file) { fixture_file_upload("partners_with_six_fields_invalid_location.csv", "text/csv") }
+      before do
+        allow(controller).to receive(:current_organization).and_return(current_organization)
+      end
+
+      subject { post import_csv_partners_path, params: { file: file } }
+
+      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"
+      end
+    end
+
+    context "csv file with a valid all-caps storage location" do
+      let(:file) { fixture_file_upload("partners_with_six_fields.csv", "text/csv") }
+      subject { post import_csv_partners_path, params: { file: file } }
+
+      it "invokes .import_csv" do
+        expect(model_class).to respond_to(:import_csv).with(2).arguments
+      end
+
+      it "redirects to :index" do
+        subject
+        expect(response).to be_redirect
+      end
+
+      it "presents a flash notice message" do
+        subject
+        expect(response).to have_notice "#{model_class.name.underscore.humanize.pluralize} were imported successfully!"
+      end
+    end
   end
 
   describe "POST #create" do

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@`
`56`	`56`	`layout: "shared/csv_import_modal",`
`57`	`57`	`locals: {`
`58`	`58`	`import_type: "Partners",`
`59`		`- csv_template_url: "/partners_template.csv",`
	`59`	`+ csv_template_url: "/partners_template_updated.csv",`
`60`	`60`	`csv_import_url: import_csv_partners_path`
`61`	`61`	`}`
`62`	`62`	`) do %>`