blacklight-spotlight 3.0.0.rc3 → 3.0.1

data/app/jobs/spotlight/cleanup_job_trackers_job.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Spotlight
+  ###
+  # Calls the #set_default_thumbnail method
+  # on the object passed in and calls save
+  ###
+  class CleanupJobTrackersJob < Spotlight::ApplicationJob
+    def perform
+      Spotlight::JobTracker.where(status: 'completed', updated_at: Time.zone.at(0)...Spotlight::Engine.config.reindex_progress_window.minutes.ago).delete_all
+    end
+  end
+end

data/app/jobs/spotlight/default_thumbnail_job.rb

@@ -5,9 +5,7 @@ module Spotlight
   # Calls the #set_default_thumbnail method
   # on the object passed in and calls save
   ###
-  class DefaultThumbnailJob < ActiveJob::Base
-    queue_as :default
-
+  class DefaultThumbnailJob < Spotlight::ApplicationJob
     def perform(thumbnailable)
       thumbnailable.set_default_thumbnail
       thumbnailable.save

data/app/jobs/spotlight/process_bulk_updates_csv_job.rb

@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+require 'csv'
+
+module Spotlight
+  ###
+  class ProcessBulkUpdatesCsvJob < Spotlight::ApplicationJob
+    include Spotlight::JobTracking
+    with_job_tracking(resource: ->(job) { job.arguments.first })
+
+    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+    def perform(exhibit, bulk_update)
+      errors = 0
+      header_converter = ->(header) { header } # Use raw header for columns (since they are configured)
+      csv_path = bulk_update.file.current_path
+      File.open(csv_path) do |f|
+        progress&.total = f.each_line.count(&:present?) - 1 # ignore the header
+
+        ::CSV.table(f, header_converters: header_converter).each do |row|
+          process_row(exhibit, row)
+          progress&.increment
+        rescue StandardError => e
+          job_tracker.append_log_entry(type: :error, exhibit: exhibit, message: e.to_s)
+          errors += 1
+          mark_job_as_failed!
+        end
+
+        exhibit.blacklight_config.repository.connection.commit
+        job_tracker.append_log_entry(type: :info, exhibit: exhibit, message: "#{progress&.progress} of #{progress&.total} (#{errors} errors)")
+      end
+    end
+    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
+
+    private
+
+    # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
+    def process_row(exhibit, row)
+      document = exhibit.blacklight_config.document_model.find(row[config.csv_id])
+      sidecar = document.sidecar(exhibit)
+
+      raise 'Unable to locate document' if document.blank?
+
+      needs_reindex = false
+
+      begin
+        if sidecar.public != to_bool(row[config.csv_visibility])
+          sidecar.update(public: to_bool(row[config.csv_visibility]))
+          needs_reindex = true
+        end
+
+        tag_cols = row.headers.select { |k| k =~ /^#{config.csv_tags_prefix}/ }
+
+        if tag_cols.any?
+          all_tags = sidecar.all_tags_list
+
+          added_tags_cols, removed_tags_cols = tag_cols.partition do |k|
+            to_bool(row[k])
+          end
+
+          existing_or_added_tags = added_tags_cols.map { |x| x.sub(/#{config.csv_tags_prefix}\s/, '') }
+          removed_tags = removed_tags_cols.map { |x| x.sub(/#{config.csv_tags_prefix}\s/, '') }
+
+          if all_tags.difference(existing_or_added_tags).any? || existing_or_added_tags.difference(all_tags).any?
+            exhibit.tag(sidecar, with: all_tags - removed_tags + existing_or_added_tags, on: :tags)
+            needs_reindex = true
+          end
+        end
+      ensure
+        document.reindex(update_params: {}) if needs_reindex
+      end
+    end
+    # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
+
+    def to_bool(value)
+      ActiveModel::Type::Boolean.new.cast(value.to_s.strip)
+    end
+
+    def config
+      Spotlight::Engine.config.bulk_updates
+    end
+  end
+end

data/app/jobs/spotlight/reindex_exhibit_job.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Spotlight
+  ##
+  # Reindex an exhibit by parallelizing resource indexing into multiple batches of reindex jobs
+  class ReindexExhibitJob < Spotlight::ApplicationJob
+    include Spotlight::JobTracking
+    with_job_tracking(resource: ->(job) { job.arguments.first })
+
+    include Spotlight::LimitConcurrency
+
+    def perform(exhibit, batch_size: Spotlight::Engine.config.reindexing_batch_size, batch_count: Spotlight::Engine.config.reindexing_batch_count, **)
+      count = exhibit.resources.count
+
+      # Use the provided batch size, or calculate a reasonable default
+      batch_count = (count.to_f / batch_size).ceil if batch_size
+      batch_count ||= 1 + Math.log(count).round # e.g. 10 => 3, 100 => 6, 1000 => 8
+
+      return Spotlight::ReindexJob.perform_now(exhibit, reports_on: job_tracker) if batch_count == 1
+
+      batch_size ||= (count.to_f / batch_count).ceil
+
+      perform_later_in_batches(exhibit, of: batch_size)
+
+      # mark the job as 'pending' and let the UpdateJobTrackersJob finalize this status after the ReindexJobs finish
+      job_tracker.update(status: 'pending')
+    end
+
+    def perform_later_in_batches(exhibit, of:)
+      last = 0
+      exhibit.resources.select(:id).in_batches(of: of) do |batch|
+        last = batch.last.id
+        Spotlight::ReindexJob.perform_later(exhibit, reports_on: job_tracker, start: batch.first.id, finish: batch.last.id)
+      end
+
+      Spotlight::ReindexJob.perform_later(exhibit, reports_on: job_tracker, start: last)
+    end
+  end
+end

data/app/jobs/spotlight/reindex_job.rb

@@ -3,72 +3,92 @@
 module Spotlight
   ##
   # Reindex the given resources or exhibits
-  class ReindexJob < ActiveJob::Base
-    queue_as :default
+  class ReindexJob < Spotlight::ApplicationJob
+    include Spotlight::JobTracking
+    with_job_tracking(resource: ->(job) { job.exhibit })
 
-    # The validity checker is a seam for implementations to expire unnecessary
-    # indexing tasks if it becomes redundant while waiting in the job queue.
-    class_attribute :validity_checker, default: Spotlight::ValidityChecker.new
-    self.validity_checker ||= Spotlight::ValidityChecker.new if Rails.version < '5.2'
+    include Spotlight::LimitConcurrency
 
     before_perform do |job|
-      job_log_entry = log_entry(job)
-      next unless job_log_entry
+      pagination = job.arguments.last.slice(:start, :finish) if job.arguments.last.is_a? Hash
+      pagination ||= {}
 
-      items_reindexed_estimate = resource_list(job.arguments.first).sum do |resource|
-        resource.document_builder.documents_to_index.size
-      end
-      job_log_entry.update(items_reindexed_estimate: items_reindexed_estimate)
+      progress.total = resource_list(job.arguments.first, **pagination).sum(&:estimated_size)
     end
 
-    around_perform do |job, block|
-      job_log_entry = log_entry(job)
-      job_log_entry&.in_progress!
+    after_perform do
+      exhibit&.touch # rubocop:disable Rails/SkipsModelValidations
+    end
 
-      begin
-        block.call
-      rescue StandardError
-        job_log_entry&.failed!
-        raise
+    after_perform :commit
+
+    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+    def perform(exhibit_or_resources, start: nil, finish: nil, **)
+      errors = 0
+
+      error_handler = lambda do |pipeline, exception, _data|
+        job_tracker.append_log_entry(
+          type: :error,
+          exhibit: exhibit,
+          message: exception.to_s,
+          backtrace: exception.backtrace.first(5).join("\n"),
+          resource_id: (pipeline.source.id if pipeline.source.respond_to?(:id))
+        )
+        mark_job_as_failed!
+        errors += 1
       end
 
-      job_log_entry&.succeeded!
-    end
-
-    def self.perform_later(exhibit_or_resources, log_entry = nil)
-      validity_token = validity_checker.mint(exhibit_or_resources)
+      resource_list(exhibit_or_resources, start: start, finish: finish).each do |resource|
+        resource.reindex(touch: false, commit: false, job_tracker: job_tracker, additional_data: job_data, on_error: error_handler) do |*|
+          progress&.increment
+        end
+      rescue StandardError => e
+        error_handler.call(Struct.new(:source).new(resource), e, nil)
+      end
 
-      super(exhibit_or_resources, log_entry, validity_token)
+      job_tracker.append_log_entry(
+        type: :summary,
+        exhibit: exhibit,
+        message: I18n.t(
+          'spotlight.job_trackers.show.messages.status.in_progress',
+          progress: progress.progress,
+          total: progress.total,
+          errors: (I18n.t('spotlight.job_trackers.show.messages.errors', count: errors) if errors.positive?)
+        ),
+        progress: progress.progress, total: progress.total, errors: errors
+      )
     end
+    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
-    def perform(exhibit_or_resources, log_entry = nil, validity_token = nil)
-      return unless still_valid?(exhibit_or_resources, validity_token)
+    def exhibit
+      exhibit_or_resources = arguments.first
 
-      resource_list(exhibit_or_resources).each do |resource|
-        resource.reindex(log_entry)
+      case exhibit_or_resources
+      when Spotlight::Exhibit
+        exhibit_or_resources
+      when Spotlight::Resource
+        exhibit_or_resources.exhibit
       end
     end
 
     private
 
-    def resource_list(exhibit_or_resources)
-      if exhibit_or_resources.is_a?(Spotlight::Exhibit)
-        exhibit_or_resources.resources.find_each
-      elsif exhibit_or_resources.is_a?(Enumerable)
-        exhibit_or_resources
-      else
-        Array(exhibit_or_resources)
-      end
+    def commit
+      Blacklight.default_index.connection.commit
     end
 
-    def log_entry(job)
-      job.arguments.second if job.arguments.second.is_a?(Spotlight::ReindexingLogEntry)
-    end
+    def job_data
+      return unless job_tracker
 
-    def still_valid?(exhibit_or_resources, validity_token)
-      return true unless validity_token
+      @job_data ||= { Spotlight::Engine.config.job_tracker_id_field => job_tracker.top_level_job_tracker.job_id }
+    end
 
-      validity_checker.check exhibit_or_resources, validity_token
+    def resource_list(exhibit_or_resources, start: nil, finish: nil)
+      if exhibit_or_resources.is_a?(Spotlight::Exhibit)
+        exhibit_or_resources.resources.find_each(start: start, finish: finish)
+      else
+        Array(exhibit_or_resources)
+      end
     end
   end
 end

data/app/jobs/spotlight/remove_tags_job.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Spotlight
+  ###
+  class RemoveTagsJob < Spotlight::ApplicationJob
+    include Spotlight::JobTracking
+    include Spotlight::GatherDocuments
+    with_job_tracking(resource: ->(job) { job.arguments.last[:exhibit] })
+
+    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+    def perform(solr_params:, exhibit:, tags:, **)
+      @errors = 0
+
+      each_document(solr_params, exhibit) do |document|
+        sidecar = document.sidecar(exhibit)
+        all_tags = sidecar.all_tags_list
+        all_tags -= tags
+        exhibit.tag(document.sidecar(exhibit), with: all_tags, on: :tags)
+        document.reindex(update_params: {})
+        progress&.increment
+      rescue StandardError => e
+        job_tracker.append_log_entry(type: :error, exhibit: exhibit, message: e.to_s)
+        @errors += 1
+        mark_job_as_failed!
+      end
+      exhibit.blacklight_config.repository.connection.commit
+      job_tracker.append_log_entry(type: :info, exhibit: exhibit, message: "#{progress.progress} of #{progress.total} (#{@errors} errors)")
+    end
+    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
+  end
+end

data/app/jobs/spotlight/rename_sidecar_field_job.rb

@@ -4,8 +4,9 @@ module Spotlight
   ##
   # After renaming an exhibit-specific field, we also
   # need to update the sidecars that may contain that field
-  class RenameSidecarFieldJob < ActiveJob::Base
-    queue_as :default
+  class RenameSidecarFieldJob < Spotlight::ApplicationJob
+    include Spotlight::JobTracking
+    with_job_tracking(resource: ->(job) { job.arguments.first })
 
     def perform(exhibit, old_field, new_field, old_slug = nil, new_slug = nil)
       exhibit.solr_document_sidecars.find_each do |s|

data/app/jobs/spotlight/rename_tags_job.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Spotlight
+  ###
+  class RenameTagsJob < Spotlight::ApplicationJob
+    include Spotlight::JobTracking
+
+    with_job_tracking(resource: ->(job) { job.arguments.first })
+
+    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+    def perform(exhibit, tag, to: nil, **)
+      @errors = 0
+
+      tag.taggings.owned_by(exhibit).find_each do |tagging|
+        sidecar = tagging.taggable
+        all_tags = sidecar.all_tags_list
+        all_tags -= [tag.name]
+        all_tags += [to] unless to.nil?
+
+        exhibit.tag(sidecar, with: all_tags, on: :tags)
+        sidecar.document.reindex(update_params: {})
+      rescue StandardError => e
+        job_tracker.append_log_entry(type: :error, exhibit: exhibit, message: e.to_s)
+        @errors += 1
+        mark_job_as_failed!
+      end
+
+      exhibit.blacklight_config.repository.connection.commit
+      job_tracker.append_log_entry(type: :info, exhibit: exhibit, message: "#{progress.progress} of #{progress.total} (#{@errors} errors)")
+    end
+    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
+  end
+end

data/app/jobs/spotlight/update_job_trackers_job.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Spotlight
+  ###
+  # Calls the #set_default_thumbnail method
+  # on the object passed in and calls save
+  ###
+  class UpdateJobTrackersJob < Spotlight::ApplicationJob
+    def perform(job_tracker)
+      reports_on = job_tracker.on
+
+      return unless reports_on.is_a? Spotlight::JobTracker
+
+      reports_on.update(status: 'completed') if reports_on.job_trackers.all?(&:completed?)
+      reports_on.update(status: 'failed') if reports_on.job_trackers.any?(&:failed?)
+
+      reports_on.update(data: { progress: reports_on.job_trackers.sum(&:progress), total: reports_on.job_trackers.sum(&:total) })
+    end
+  end
+end

data/app/models/concerns/spotlight/browse_category_search_builder.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+module Spotlight
+  # Enforce exhibit visibility for index queries
+  module BrowseCategorySearchBuilder
+    extend ActiveSupport::Concern
+
+    included do
+      self.default_processor_chain = %i[apply_browse_category_defaults] +
+                                     default_processor_chain +
+                                     %i[fix_up_browse_category_defaults fix_up_browse_category_queries]
+    end
+
+    # Adds a filter that excludes resources that have been marked as not-visible
+    def apply_browse_category_defaults(solr_params)
+      return unless current_browse_category
+
+      solr_params.merge!(browse_category_search_builder.to_hash)
+    end
+
+    def fix_up_browse_category_defaults(solr_params)
+      return if current_browse_category.nil? || search_state.send(:sort_field_key).present?
+
+      solr_params[:sort] = browse_category_search_builder.sort
+    end
+
+    def fix_up_browse_category_queries(solr_params)
+      return unless solr_params.dig(:json, :query, :bool, :must) && blacklight_params[:q]
+
+      # This replicates existing spotlight 2.x search behavior, more or less. It
+      # doesn't take into account the possibility that the browse category query
+      # could use a different search field (which.. doesn't have an existing UI
+      # control.. and may require additional upstream work to properly encapsulate
+      # the two query parameters)
+      solr_params[:json][:query][:bool][:must].map! do |q|
+        q.is_a?(String) ? { edismax: { query: q } } : q
+      end
+    end
+
+    private
+
+    def current_exhibit
+      blacklight_config.current_exhibit
+    end
+
+    def current_browse_category
+      return unless current_exhibit && blacklight_params[:browse_category_id].present?
+
+      @current_browse_category ||= current_exhibit.searches.find(blacklight_params[:browse_category_id])
+    end
+
+    def browse_category_search_builder
+      @browse_category_search_builder ||= begin
+        search_builder = self.class.new(@processor_chain, @scope)
+        search_builder.with(current_browse_category.query_params)
+      end
+    end
+  end
+end