Merge pull request #880 from psu-libraries/i#817

Adding work type to csv export

app/blacklight/document/csv.rb

@@ -40,7 +40,7 @@ def blacklight_config
 
     def export_collection
       ::CSV.generate do |csv|
-        csv << ['id'] + fields.map(&:label)
+        csv << ['id', 'work_type'] + fields.map(&:label)
         export_members(csv)
       end
     end
@@ -76,7 +76,7 @@ def export_fields(solr_document)
       values = fields.map do |field|
         to_csv_field(solr_document.send(field.method_name))
       end
-      [solr_document.id].concat(values)
+      [solr_document.id, solr_document.work_type].concat(values)
     end
 
     def fields

spec/blacklight/solr_document_spec.rb

@@ -76,19 +76,19 @@ class MyResource < Valkyrie::Resource
       }
     end
 
-    it { is_expected.to eq("abc123,my_title,,,,,,,,value1||value2,,xyx789,,\n") }
+    it { is_expected.to eq("abc123,,my_title,,,,,,,,value1||value2,,xyx789,,\n") }
 
     context 'with a collection containing works and file sets' do
       let(:collection) { create :library_collection }
       let(:work) { create :work, :with_file, member_of_collection_ids: [collection.id], title: 'Work One' }
-      let(:work1_csv) { "#{work.id},Work One,,,,,,,,,,#{collection.id},," }
-      let(:file_set1_csv) { "#{work.member_ids.first},hello_world.txt,,,,,,,,,,,," }
+      let(:work1_csv) { "#{work.id},Generic,Work One,,,,,,,,,,#{collection.id},," }
+      let(:file_set1_csv) { "#{work.member_ids.first},,hello_world.txt,,,,,,,,,,,," }
       let(:work2) { create :work, :with_file, member_of_collection_ids: [collection.id], title: 'Work Two' }
-      let(:work2_csv) { "#{work2.id},Work Two,,,,,,,,,,#{collection.id},," }
-      let(:file_set2_csv) { "#{work2.member_ids.first},hello_world.txt,,,,,,,,,,,," }
+      let(:work2_csv) { "#{work2.id},Generic,Work Two,,,,,,,,,,#{collection.id},," }
+      let(:file_set2_csv) { "#{work2.member_ids.first},,hello_world.txt,,,,,,,,,,,," }
 
       let(:csv_header) do
-        'id,title,subtitle,description,alternate_ids,creator,audio_field,created,document_field,'\
+        'id,work_type,title,subtitle,description,alternate_ids,creator,audio_field,created,document_field,'\
         'generic_field,map_field,member_of_collection_ids,moving_image_field,still_image_field'
       end
 
@@ -122,8 +122,8 @@ class MyResource < Valkyrie::Resource
       end
 
       let(:file_set) { create(:file_set) }
-      let(:work_csv) { 'abc123,my_title,,,,,,,,value1||value2,,xyx789,,' }
-      let(:file_set_csv) { "#{file_set.id},Original File Name,,,,,,,,,,,," }
+      let(:work_csv) { 'abc123,,my_title,,,,,,,,value1||value2,,xyx789,,' }
+      let(:file_set_csv) { "#{file_set.id},,Original File Name,,,,,,,,,,,," }
 
       before { file_set }