bulkrax 3.0.0.beta6 → 3.0.0.beta7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 744a122509bc57b9b9a24367c2eee3660d3184bd8209543de43e7f9bf3b1c6ef
-  data.tar.gz: c9156dba83a463872cf700d93d12770b5967a1e28f269aba0141d0ae9a280e8e
+  metadata.gz: 33cb77498f84a977101dd70e7de2ae3853a47c9c9fb514a156df759ab35f6b75
+  data.tar.gz: 49f433acd439eb004c8d95c668811df214fcd1bef5fdbfb1477cbc6cd6d598b7
 SHA512:
-  metadata.gz: 3abe5abd1a882ebe4090a75c8600a9c9e35ede83fdaab22aaf33966d5b412fc256835ccef6ab7eaf3776f5ff7a4b0c27eaf94ac77fccf99985b7ad1dc2172c78
-  data.tar.gz: 6f1387ce3876c65f23b15cb0cf6824040af2071f59a7f2c3d68377c78994d543f1bd7beced5a334e9467bc7285c1930da9acc6ac7c9e2fdddbdcd0b156541386
+  metadata.gz: 58f561feac1a1d3c85f442c2612ed7e52105fb335358dda3eeb07a51433c5edc03d2f4c26402384be1529002e00d5acd46f5d5e51c715d20d27e21bc7198e68d
+  data.tar.gz: 35b539c937e0d66427a0d5f8bf801431b33aaa1d26dfef83786a97f3704a9aafbce4dd33903b7b9f6b1026a8d4339d2b6033b80b1e7aa725bc07d7e463b5493d

data/app/factories/bulkrax/object_factory.rb

@@ -143,13 +143,11 @@ module Bulkrax
       object.attributes = attrs
       object.apply_depositor_metadata(@user)
       object.save!
-      pass_collection_to_be_persisted(parent: find_collection(attributes[related_parents_parsed_mapping]), child: object) if attributes[related_parents_parsed_mapping].present?
     end
 
     def update_collection(attrs)
       object.attributes = attrs
       object.save!
-      pass_collection_to_be_persisted(parent: find_collection(attributes[related_parents_parsed_mapping]), child: object) if attributes[related_parents_parsed_mapping].present?
     end
 
     # This method is heavily inspired by Hyrax's AttachFilesToWorkJob
@@ -182,37 +180,6 @@ module Bulkrax
       actor.update_metadata(file_set_attrs)
     end
 
-    def pass_collection_to_be_persisted(parent:, child:)
-      if parent.is_a? Array
-        parent.each { |par| persist_collection_memberships(par, child) }
-      else
-        persist_collection_memberships(parent, child)
-      end
-    end
-
-    # Add child to parent's #member_collections
-    # Add parent to child's #member_of_collections
-    def persist_collection_memberships(parent, child)
-      parent.reject!(&:blank?) if parent.respond_to?(:reject!)
-      child.reject!(&:blank?) if child.respond_to?(:reject!)
-      return if parent.blank? || child.blank?
-
-      ::Hyrax::Collections::NestedCollectionPersistenceService.persist_nested_collection_for(parent: parent, child: child)
-    end
-
-    def find_collection(id)
-      case id
-      when Hash
-        Collection.find(id[:id])
-      when String
-        Collection.find(id) if id.present?
-      when Array
-        id.map { |i| find_collection(i) }
-      else
-        []
-      end
-    end
-
     def clean_attrs(attrs)
       # avoid the "ArgumentError: Identifier must be a string of size > 0 in order to be treeified" error
       # when setting object.attributes
@@ -237,7 +204,7 @@ module Bulkrax
 
     # Regardless of what the Parser gives us, these are the properties we are prepared to accept.
     def permitted_attributes
-      klass.properties.keys.map(&:to_sym) + %i[id edit_users edit_groups read_groups visibility work_members_attributes admin_set_id member_of_collections_attributes]
+      klass.properties.keys.map(&:to_sym) + %i[id edit_users edit_groups read_groups visibility work_members_attributes admin_set_id]
     end
   end
 end

data/app/jobs/bulkrax/create_relationships_job.rb

@@ -83,17 +83,7 @@ module Bulkrax
     # This is adding the reverse relationship, from the child to the parent
     def collection_parent_work_child
       child_records[:works].each do |child_record|
-        attrs = { id: child_record.id, member_of_collections_attributes: { 0 => { id: parent_record.id } } }
-        ObjectFactory.new(
-          attributes: attrs,
-          source_identifier_value: nil, # sending the :id in the attrs means the factory doesn't need a :source_identifier_value
-          work_identifier: parent_entry&.parser&.work_identifier,
-          related_parents_parsed_mapping: parent_entry&.parser&.related_parents_parsed_mapping,
-          replace_files: false,
-          user: user,
-          klass: child_record.class,
-          importer_run_id: importer_run_id
-        ).run
+        ::Hyrax::Collections::NestedCollectionPersistenceService.persist_nested_collection_for(parent: parent_record, child: child_record)
         # TODO: add counters for :processed_parents and :failed_parents
         Bulkrax::ImporterRun.find(importer_run_id).increment!(:processed_relationships) # rubocop:disable Rails/SkipsModelValidations
       end
@@ -101,20 +91,10 @@ module Bulkrax
 
     # Collection-Collection membership is added to the as member_ids
     def collection_parent_collection_child
-      child_record = child_records[:collections].first
-      attrs = { id: parent_record.id, child_collection_id: child_record.id }
-      ObjectFactory.new(
-        attributes: attrs,
-        source_identifier_value: nil, # sending the :id in the attrs means the factory doesn't need a :source_identifier_value
-        work_identifier: parent_entry&.parser&.work_identifier,
-        related_parents_parsed_mapping: parent_entry&.parser&.related_parents_parsed_mapping,
-        replace_files: false,
-        user: user,
-        klass: parent_record.class,
-        importer_run_id: importer_run_id
-      ).run
-      # TODO: add counters for :processed_parents and :failed_parents
-      Bulkrax::ImporterRun.find(importer_run_id).increment!(:processed_relationships) # rubocop:disable Rails/SkipsModelValidations
+      child_records[:collections].each do |child_record|
+        ::Hyrax::Collections::NestedCollectionPersistenceService.persist_nested_collection_for(parent: parent_record, child: child_record)
+        Bulkrax::ImporterRun.find(importer_run_id).increment!(:processed_relationships) # rubocop:disable Rails/SkipsModelValidations
+      end
     end
 
     # Work-Work membership is added to the parent as member_ids
@@ -124,19 +104,11 @@ module Bulkrax
         records_hash[i] = { id: child_record.id }
       end
       attrs = {
-        id: parent_record.id,
         work_members_attributes: records_hash
       }
-      ObjectFactory.new(
-        attributes: attrs,
-        source_identifier_value: nil, # sending the :id in the attrs means the factory doesn't need a :source_identifier_value
-        work_identifier: parent_entry&.parser&.work_identifier,
-        related_parents_parsed_mapping: parent_entry&.parser&.related_parents_parsed_mapping,
-        replace_files: false,
-        user: user,
-        klass: parent_record.class,
-        importer_run_id: importer_run_id
-      ).run
+      parent_record.reindex_extent = Hyrax::Adapters::NestingIndexAdapter::LIMITED_REINDEX if parent_record.respond_to?(:reindex_extent)
+      env = Hyrax::Actors::Environment.new(parent_record, Ability.new(user), attrs)
+      Hyrax::CurationConcern.actor.update(env)
       # TODO: add counters for :processed_parents and :failed_parents
       Bulkrax::ImporterRun.find(importer_run_id).increment!(:processed_relationships) # rubocop:disable Rails/SkipsModelValidations
     end

data/app/jobs/bulkrax/import_collection_job.rb

@@ -10,7 +10,6 @@ module Bulkrax
       begin
         entry.build
         entry.save
-        add_user_to_permission_template!(entry)
         ImporterRun.find(args[1]).increment!(:processed_records)
         ImporterRun.find(args[1]).increment!(:processed_collections)
         ImporterRun.find(args[1]).decrement!(:enqueued_records)
@@ -22,22 +21,5 @@ module Bulkrax
       end
     end
     # rubocop:enable Rails/SkipsModelValidations
-
-    private
-
-    def add_user_to_permission_template!(entry)
-      user                = ::User.find(entry.importerexporter.user_id)
-      collection          = entry.factory.find
-      permission_template = Hyrax::PermissionTemplate.find_or_create_by!(source_id: collection.id)
-
-      Hyrax::PermissionTemplateAccess.find_or_create_by!(
-        permission_template_id: permission_template.id,
-        agent_id: user.user_key,
-        agent_type: 'user',
-        access: 'manage'
-      )
-
-      collection.reset_access_controls!
-    end
   end
 end

data/app/models/concerns/bulkrax/import_behavior.rb

@@ -11,6 +11,7 @@ module Bulkrax
         unless self.importerexporter.validate_only
           raise CollectionsCreatedError unless collections_created?
           @item = factory.run!
+          add_user_to_permission_templates! if self.class.to_s.include?("Collection")
           parent_jobs if self.parsed_metadata[related_parents_parsed_mapping].present?
           child_jobs if self.parsed_metadata[related_children_parsed_mapping].present?
         end
@@ -24,6 +25,25 @@ module Bulkrax
       return @item
     end
 
+    def add_user_to_permission_templates!
+      permission_template = Hyrax::PermissionTemplate.find_or_create_by!(source_id: @item.id)
+
+      Hyrax::PermissionTemplateAccess.find_or_create_by!(
+        permission_template_id: permission_template.id,
+        agent_id: user.user_key,
+        agent_type: 'user',
+        access: 'manage'
+      )
+      Hyrax::PermissionTemplateAccess.find_or_create_by!(
+        permission_template_id: permission_template.id,
+        agent_id: 'admin',
+        agent_type: 'group',
+        access: 'manage'
+      )
+
+      @item.reset_access_controls!
+    end
+
     def parent_jobs
       self.parsed_metadata[related_parents_parsed_mapping].each do |parent_identifier|
         next if parent_identifier.blank?

data/app/parsers/bulkrax/csv_parser.rb

@@ -4,6 +4,8 @@ require 'csv'
 module Bulkrax
   class CsvParser < ApplicationParser # rubocop:disable Metrics/ClassLength
     include ErroredEntries
+    attr_writer :collections, :file_sets, :works
+
     def self.export_supported?
       true
     end
@@ -17,37 +19,48 @@ module Bulkrax
       @records ||= csv_data.map { |record_data| entry_class.data_for_entry(record_data, nil, self) }
     end
 
-    def collections
-      # retrieve a list of unique collections
+    def build_records
+      @collections = []
+      @works = []
+      @file_sets = []
       records.map do |r|
-        collections = []
         model_field_mappings.each do |model_mapping|
-          collections << r if r[model_mapping.to_sym]&.downcase == 'collection'
+          if r[model_mapping.to_sym]&.downcase == 'collection'
+            @collections << r
+          elsif r[model_mapping.to_sym]&.downcase == 'fileset'
+            @file_sets << r
+          else
+            @works << r
+          end
         end
-        collections
-      end.flatten.compact.uniq
+      end
+      @collections = @collections.flatten.compact.uniq
+      @file_sets = @file_sets.flatten.compact.uniq
+      @works = @works.flatten.compact.uniq
+      true
     end
 
-    def collections_total
-      collections.size
+    def collections
+      build_records if @collections.nil?
+      @collections
     end
 
     def works
-      records - collections - file_sets
+      build_records if @works.nil?
+      @works
     end
 
-    def works_total
-      works.size
+    def file_sets
+      build_records if @file_sets.nil?
+      @file_sets
     end
 
-    def file_sets
-      records.map do |r|
-        file_sets = []
-        model_field_mappings.each do |model_mapping|
-          file_sets << r if r[model_mapping.to_sym]&.downcase == 'fileset'
-        end
-        file_sets
-      end.flatten.compact.uniq
+    def collections_total
+      collections.size
+    end
+
+    def works_total
+      works.size
     end
 
     def file_sets_total
@@ -96,21 +109,24 @@ module Bulkrax
     end
 
     def create_objects(types_array = nil)
+      index = 0
       (types_array || %w[work collection file_set relationship]).each do |type|
         if type.eql?('relationship')
           ScheduleRelationshipsJob.set(wait: 5.minutes).perform_later(importer_id: importerexporter.id)
           next
         end
-        send(type.pluralize).each_with_index do |current_record, index|
-          next unless record_has_source_identifier(current_record, records.find_index(current_record))
-          break if limit_reached?(limit, records.find_index(current_record))
+        send(type.pluralize).each do |current_record|
+          next unless record_has_source_identifier(current_record, index)
+          break if limit_reached?(limit, index)
 
           seen[current_record[source_identifier]] = true
           create_entry_and_job(current_record, type)
           increment_counters(index, "#{type}": true)
+          index += 1
         end
         importer.record_status
       end
+      true
     rescue StandardError => e
       status_info(e)
     end

data/lib/bulkrax/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bulkrax
-  VERSION = '3.0.0.beta6'
+  VERSION = '3.0.0.beta7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bulkrax
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta6
+  version: 3.0.0.beta7
 platform: ruby
 authors:
 - Rob Kaufman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-27 00:00:00.000000000 Z
+date: 2022-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails