bulkrax 3.0.0.beta4 → 3.0.0.beta5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29702685c19fb65a1cbf963615774541488af30e48feca79bdbf296edee7d4d8
-  data.tar.gz: f8b902f88a523155bab3d819905ffa25da29cad05178c445541a1159b84c94a9
+  metadata.gz: 994ee06cdd4ed63d0dfa79e0e77b1fb6b017528926a7b891d8ff702a15cf7347
+  data.tar.gz: 55298f93ce2078f1157a1426ce63823b78ae8a04cd4b076947a2ba1ad93ad05c
 SHA512:
-  metadata.gz: 3e6f041b8180b95d6f126649a0fe7da5a02f2a5afae88fd8f79e6f8c04bd9d4e854e4f626eb032132599ae865f8b4c8bdfb26a7f17469bef8426bc702bd88665
-  data.tar.gz: c4fcdb5b393970c9a79569a34e6317616ba96f9a953f5a963b413266621a76cb6a6f8c79de0a1f3b0753cd350e1ea11114d252a7724552b70f06ff4819657eb3
+  metadata.gz: 512b254802875cca2dae6377a1317439b25d35038aacd56ce2db18ee2aaaf9d0f1d22bb2f521ce16366a7a5630d5768468f3949579216fc02502b36e06e6159a
+  data.tar.gz: b25f1d98da59db8bc91f02d90fe44003350d7bf7eb7b67d5610d2006f7e0f5e1b72e9d37601b3a41f01faf34c8c07d8c388e173084edc6ebaf985e5f124f7d4a

data/app/factories/bulkrax/object_factory.rb

@@ -140,16 +140,16 @@ module Bulkrax
     def create_collection(attrs)
       attrs = clean_attrs(attrs)
       attrs = collection_type(attrs)
-      persist_collection_memberships(parent: find_collection(attributes[related_parents_parsed_mapping]), child: object) if attributes[related_parents_parsed_mapping].present?
       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)
-      persist_collection_memberships(parent: find_collection(attributes[related_parents_parsed_mapping]), child: object) if attributes[related_parents_parsed_mapping].present?
       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,9 +182,17 @@ 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:)
+    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?

data/app/jobs/bulkrax/create_relationships_job.rb

@@ -21,7 +21,7 @@ module Bulkrax
 
     queue_as :import
 
-    attr_accessor :child_records, :parent_record, :parent_entry, :importer_run_id
+    attr_accessor :child_records, :child_entry, :parent_record, :parent_entry, :importer_run_id
 
     # @param parent_identifier [String] Work/Collection ID or Bulkrax::Entry source_identifiers
     # @param importer_run [Bulkrax::ImporterRun] current importer run (needed to properly update counters)
@@ -31,7 +31,7 @@ module Bulkrax
     # Whether the @base_entry is the parent or the child in the relationship is determined by the presence of a
     # parent_identifier or child_identifier param. For example, if a parent_identifier is passed, we know @base_entry
     # is the child in the relationship, and vice versa if a child_identifier is passed.
-    def perform(parent_identifier:, importer_run_id:)
+    def perform(parent_identifier:, importer_run_id:) # rubocop:disable Metrics/AbcSize
       pending_relationships = Bulkrax::PendingRelationship.find_each.select do |rel|
         rel.bulkrax_importer_run_id == importer_run_id && rel.parent_id == parent_identifier
       end.sort_by(&:order)
@@ -41,7 +41,7 @@ module Bulkrax
       @child_records = { works: [], collections: [] }
       pending_relationships.each do |rel|
         raise ::StandardError, %("#{rel}" needs either a child or a parent to create a relationship) if rel.child_id.nil? || rel.parent_id.nil?
-        _, child_record = find_record(rel.child_id, importer_run_id)
+        @child_entry, child_record = find_record(rel.child_id, importer_run_id)
         child_record.is_a?(::Collection) ? @child_records[:collections] << child_record : @child_records[:works] << child_record
       end
 
@@ -59,7 +59,7 @@ module Bulkrax
       create_relationships
       pending_relationships.each(&:destroy)
     rescue ::StandardError => e
-      parent_entry.status_info(e)
+      parent_entry ? parent_entry.status_info(e) : child_entry.status_info(e)
       Bulkrax::ImporterRun.find(importer_run_id).increment!(:failed_relationships) # rubocop:disable Rails/SkipsModelValidations
     end
 
@@ -87,8 +87,8 @@ module Bulkrax
         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,
+          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,
@@ -106,8 +106,8 @@ module Bulkrax
       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,
+        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,
@@ -130,8 +130,8 @@ module Bulkrax
       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,
+        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,

data/app/models/bulkrax/csv_entry.rb

@@ -240,8 +240,8 @@ module Bulkrax
       Bulkrax::CsvMatcher
     end
 
-    def possible_collection_ids
-      return @possible_collection_ids if @possible_collection_ids.present?
+    def collection_identifiers
+      return @collection_identifiers if @collection_identifiers.present?
 
       parent_field_mapping = self.class.parent_field(parser)
       return [] unless parent_field_mapping.present? && record[parent_field_mapping].present?
@@ -249,22 +249,25 @@ module Bulkrax
       identifiers = []
       split_references = record[parent_field_mapping].split(/\s*[;|]\s*/)
       split_references.each do |c_reference|
-        matching_collection_entries = importerexporter.entries.select { |e| e.raw_metadata[work_identifier] == c_reference && e.is_a?(CsvCollectionEntry) }
+        matching_collection_entries = importerexporter.entries.select do |e|
+          (e.raw_metadata[source_identifier] == c_reference) &&
+            e.is_a?(CsvCollectionEntry)
+        end
         raise ::StandardError, 'Only expected to find one matching entry' if matching_collection_entries.count > 1
         identifiers << matching_collection_entries.first&.identifier
       end
 
-      @possible_collection_ids = identifiers.compact.presence || []
+      @collection_identifiers = identifiers.compact.presence || []
     end
 
     def collections_created?
-      possible_collection_ids.length == self.collection_ids.length
+      collection_identifiers.length == self.collection_ids.length
     end
 
     def find_collection_ids
       return self.collection_ids if collections_created?
-      if possible_collection_ids.present?
-        possible_collection_ids.each do |collection_id|
+      if collection_identifiers.present?
+        collection_identifiers.each do |collection_id|
           c = find_collection(collection_id)
           skip = c.blank? || self.collection_ids.include?(c.id)
           self.collection_ids << c.id unless skip

data/app/models/bulkrax/importer_run.rb

@@ -5,6 +5,8 @@ module Bulkrax
     belongs_to :importer
     has_many :statuses, as: :runnable, dependent: :destroy
 
-    serialize :parents, Array
+    def parents
+      PendingRelationship.where(bulkrax_importer_run_id: id).pluck(:parent_id).uniq
+    end
   end
 end

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

@@ -11,7 +11,8 @@ module Bulkrax
     def find_record(identifier, importer_run_id = nil)
       # check for our entry in our current importer first
       importer_id = ImporterRun.find(importer_run_id).importer_id
-      record = Entry.find_by(identifier: identifier, importerexporter_id: importer_id) || Entry.find_by(identifier: identifier)
+      default_scope = { identifier: identifier, importerexporter_type: 'Bulkrax::Importer' }
+      record = Entry.find_by(default_scope, importerexporter_id: importer_id) || Entry.find_by(default_scope)
 
       # TODO(alishaevn): discuss whether we are only looking for Collection models here
       # use ActiveFedora::Base.find(identifier) instead?

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

@@ -28,7 +28,6 @@ module Bulkrax
       self.parsed_metadata[related_parents_parsed_mapping].each do |parent_identifier|
         next if parent_identifier.blank?
 
-        add_parent_to_import_run(parent_identifier, importerexporter.last_run)
         PendingRelationship.create!(child_id: self.identifier, parent_id: parent_identifier, bulkrax_importer_run_id: importerexporter.last_run.id, order: self.id)
       end
     end
@@ -37,16 +36,10 @@ module Bulkrax
       self.parsed_metadata[related_children_parsed_mapping].each do |child_identifier|
         next if child_identifier.blank?
 
-        add_parent_to_import_run(self.identifier, importerexporter.last_run)
         PendingRelationship.create!(parent_id: self.identifier, child_id: child_identifier, bulkrax_importer_run_id: importerexporter.last_run.id, order: self.id)
       end
     end
 
-    def add_parent_to_import_run(parent_id, run)
-      run.parents << parent_id
-      run.save
-    end
-
     def find_collection_ids
       self.collection_ids
     end

data/app/views/bulkrax/exporters/show.html.erb

@@ -79,13 +79,12 @@
       <%= @exporter.exporter_runs.last&.total_work_entries %>
     </p>
     <br>
-    <div class="bulkrax-nav-tab-table-left-align">
+    <div class='bulkrax-nav-tab-table-left-align'>
       <h2>Entries</h2>
       <table class='table table-striped'>
         <thead>
           <tr>
             <th>Identifier</th>
-            <th>Collection</th>
             <th>Entry ID</th>
             <th>Status</th>
             <th>Errors</th>
@@ -97,17 +96,12 @@
           <% @work_entries.each do |e| %>
             <tr>
               <td><%= link_to e.identifier, bulkrax.exporter_entry_path(@exporter.id, e.id) %></td>
-              <% if e.parsed_metadata.present? && e.parsed_metadata.dig('collections').present? %>
-                <td><%= e.parsed_metadata.dig('collections').map {|c| c['id'] }.join('; ') %></td>
-              <% elsif e.raw_metadata.present? %>
-                <td><%= Array.wrap(e.raw_metadata.dig('collection')).join(';') %></td>
-              <% else %>
-              <td></td>
-              <% end %>
               <td><%= e.id %></td>
               <% if e.status == 'Complete' %>
                 <td><span class='glyphicon glyphicon-ok' style='color: green;'></span> <%= e.status %></td>
-                <% else %>
+              <% elsif e.status == 'Pending' %>
+                <td><span class='glyphicon glyphicon-option-horizontal' style='color: blue;'></span> <%= e.status %></td>
+              <% else %>
                 <td><span class='glyphicon glyphicon-remove' style='color: red;'></span> <%= e.status %></td>
               <% end %>
               <% if e.last_error.present? %>

data/app/views/bulkrax/importers/show.html.erb

@@ -85,7 +85,6 @@
             <thead>
               <tr>
                 <th>Identifier</th>
-                <th>Collection</th>
                 <th>Entry ID</th>
                 <th>Status</th>
                 <th>Errors</th>
@@ -97,8 +96,6 @@
               <% @work_entries.each do |e| %>
                 <tr>
                   <td><%= link_to e.identifier, bulkrax.importer_entry_path(@importer.id, e.id) %></td>
-                  <% collection_titles = e.collection_ids.map {|id| c = Collection.find id; c.title.first } %>
-                  <td><%= collection_titles.join('; ') %></td>
                   <td><%= e.id %></td>
                   <% if e.status == "Complete" %>
                     <td><span class="glyphicon glyphicon-ok" style="color: green;"></span> <%= e.status %></td>
@@ -178,6 +175,8 @@
                   <td><%= e.id %></td>
                   <% if e.status == "Complete" %>
                     <td><span class="glyphicon glyphicon-ok" style="color: green;"></span> <%= e.status %></td>
+                  <% elsif e.status == "Pending" %>
+                    <td><span class="glyphicon glyphicon-option-horizontal" style="color: blue;"></span> <%= e.status %></td>
                   <% else %>
                     <td><span class="glyphicon glyphicon-remove" style="color: red;"></span> <%= e.status %></td>
                   <% end %>

data/db/migrate/20211203195233_rename_children_counters_to_relationships.rb

@@ -1,6 +1,6 @@
 class RenameChildrenCountersToRelationships < ActiveRecord::Migration[5.2]
   def change
-    rename_column :bulkrax_importer_runs, :processed_children, :processed_relationships
-    rename_column :bulkrax_importer_runs, :failed_children, :failed_relationships
+    rename_column :bulkrax_importer_runs, :processed_children, :processed_relationships unless column_exists?(:bulkrax_importer_runs, :processed_relationships)
+    rename_column :bulkrax_importer_runs, :failed_children, :failed_relationships unless column_exists?(:bulkrax_importer_runs, :failed_relationships)
   end
 end

data/db/migrate/20220301001839_create_bulkrax_pending_relationships.rb

@@ -1,11 +1,13 @@
 class CreateBulkraxPendingRelationships < ActiveRecord::Migration[5.2]
   def change
-    create_table :bulkrax_pending_relationships do |t|
-      t.belongs_to :bulkrax_importer_run, foreign_key: true, null: false
-      t.string :parent_id, null: false
-      t.string :child_id, null: false
+    unless table_exists?(:bulkrax_pending_relationships)
+      create_table :bulkrax_pending_relationships do |t|
+        t.belongs_to :bulkrax_importer_run, foreign_key: true, null: false
+        t.string :parent_id, null: false
+        t.string :child_id, null: false
 
-      t.timestamps
+        t.timestamps
+      end
     end
   end
 end

data/db/migrate/20220303212810_add_order_to_bulkrax_pending_relationships.rb

@@ -1,5 +1,5 @@
 class AddOrderToBulkraxPendingRelationships < ActiveRecord::Migration[5.2]
   def change
-    add_column :bulkrax_pending_relationships, :order, :integer, default: 0
+    add_column :bulkrax_pending_relationships, :order, :integer, default: 0 unless column_exists?(:bulkrax_pending_relationships, :order)
   end
 end

data/lib/bulkrax/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bulkrax
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta4
+  version: 3.0.0.beta5
 platform: ruby
 authors:
 - Rob Kaufman
@@ -366,9 +366,7 @@ files:
 - db/migrate/20220118001339_add_import_attempts_to_entries.rb
 - db/migrate/20220119213325_add_work_counters_to_importer_runs.rb
 - db/migrate/20220301001839_create_bulkrax_pending_relationships.rb
-- db/migrate/20220301020307_add_parents_to_bulkrax_importer_runs.rb
 - db/migrate/20220303212810_add_order_to_bulkrax_pending_relationships.rb
-- db/migrate/20220330165510_remove_array_true_from_importer_run_parents_column.rb
 - lib/bulkrax.rb
 - lib/bulkrax/engine.rb
 - lib/bulkrax/version.rb

data/db/migrate/20220301020307_add_parents_to_bulkrax_importer_runs.rb

@@ -1,5 +0,0 @@
-class AddParentsToBulkraxImporterRuns < ActiveRecord::Migration[5.1]
-  def change
-    add_column :bulkrax_importer_runs, :parents, :text, array: true
-  end
-end

data/db/migrate/20220330165510_remove_array_true_from_importer_run_parents_column.rb

@@ -1,5 +0,0 @@
-class RemoveArrayTrueFromImporterRunParentsColumn < ActiveRecord::Migration[5.2]
-  def change
-    change_column :bulkrax_importer_runs, :parents, :text, array: false, default: nil
-  end
-end