fix: import collection export zip when directory entries present (#1841)

* test: test import with modified zip (missing schema.json, rezipped)

* fix: skip directory entries when parsing import collection zip

lib/import/import_collections.rb

@@ -31,9 +31,13 @@ def extract
       att = Tempfile.new(encoding: 'ascii-8bit')
       att.write(@att.read_file)
       att.rewind
+
       Zip::File.open(att.path) do |zip_file|
         # Handle entries one by one
         zip_file.each do |entry|
+          # do nothing for directory entry
+          next if entry.ftype == :directory
+
           data = entry.get_input_stream.read.force_encoding('UTF-8')
           case entry.name
           when 'export.json'

spec/factories/attachments.rb

@@ -84,6 +84,12 @@
       file_path { Rails.root.join('spec/fixtures/import/collection_samples.zip') }
     end
 
+    # copy of the collection_samples.zip file but with removed schema.json file
+    # and reziped (zip contains directory entries)
+    trait :with_edited_collection_zip do
+      file_path { Rails.root.join('spec/fixtures/import/collection_samples_edited.zip') }
+    end
+
     trait :with_reaction_collection_zip do
       file_path { Rails.root.join('spec/fixtures/import/collection_reaction.zip') }
     end

spec/lib/import/import_collections_spec.rb

@@ -19,9 +19,10 @@
 
     let(:importer) { Import::ImportCollections.new(attachment, user.id) }
 
-    describe 'import a collection with samples' do
+    describe 'import a collection with samples, with directories in the zip structure and missing schema.json' do
       let(:import_id) { 'collection_samples' }
-      let(:attachment) { create(:attachment, :with_sample_collection_zip) }
+      # let(:attachment) { create(:attachment, :with_sample_collection_zip) }
+      let(:attachment) { create(:attachment, :with_edited_collection_zip) }
 
       it 'successfully import 2 samples' do # rubocop:disable RSpec/MultipleExpectations
         importer.execute