hyrax 5.0.0.rc1 → 5.0.0.rc2

data/app/models/hyrax/file_set.rb

@@ -6,28 +6,47 @@ module Hyrax
   #
   # ## Relationships
   #
-  # ### File Set and Work
+  # ### FileSet and Work
   #
   # * Defined: The relationship is defined by the inverse relationship stored in the
   #   work's `:member_ids` attribute.
-  # * Tested: The work tests the relationship.
-  # * File Set to Work: (1..1)  A file set must be in one and only one work.
+  # * Tested: The test for the Work class tests the relationship.
+  # * FileSet to Work: (n..1)  A FileSet must be in one and only one work. A Work can have zero to many FileSets.
+  # * See Hyrax::Work for code to get and set file sets for the work.
   #
-  # @example Get work for a file set:
+  # @example Get Work for a FileSet:
   #       work = Hyrax.custom_queries.find_parent_work(resource: file_set)
   #
-  # * Work to File Set: (0..m)  A work can have many file sets.
-  #   * See Hyrax::Work for code to get and set file sets for the work.
+  # ### FileSet and FileMetadata
   #
-  # ### File Set and File (TBD)
+  # * Defined: The relationship is defined by the FileSet's `:file_ids` attribute.
+  # * FileSet to FileMetadata: (0..n) A FileSet can have many FileMetadatas. A FileMetadata must be in one and only one FileSet.
+  #
+  # @example Get all FileMetadata for a FileSet:
+  #     file_metadata = Hyrax.custom_queries.find_files(file_set: file_set)
+  #
+  # @example Attach a File to a FileSet through a FileMetadata. This will create
+  #   a FileMetadata for a File object, attach the File to the FileMetadata, and
+  #   attach that FileMetadata to a given FileSet.
+  #     ::Hyrax::ValkyrieUpload.file(
+  #       io: file_io,
+  #       filename: "myfile.jpg",
+  #       file_set: file_set,
+  #       use: pcdm_use,
+  #       user: user
+  #     )
+  #
+  # ### FileMetadata and Files
+  #
+  # * Defined: The relationship is defined by the FileMetadata's `:file_identifier` attribute.
+  # * FileMetadata to File: (1..1) A FileMetadata can have one and only one File
+  #
+  # @example Get a File for a FileMetadata
+  #     file = Hyrax.storage_adapter.find_by(id: file_metadata.file_identifier)
   #
   # @see Hyrax::Work
+  # @see Hyrax::CustomQueries::Navigators::FindFiles#find_files
   # @see Hyrax::CustomQueries::Navigators::ParentWorkNavigator#find_parent_work
-  #
-  # @todo The description in Hydra::Works Shared Modeling is out of date and uses
-  #   terminology to describe the relationships that is no longer used in code.
-  #   Update the model and link to it.  This can be a simple relationship diagram
-  #   with a link to the original Works Shared Modeling for historical perspective.
   # @see https://wiki.duraspace.org/display/samvera/Hydra%3A%3AWorks+Shared+Modeling
   class FileSet < Hyrax::Resource
     include Hyrax::Schema(:core_metadata)
@@ -41,21 +60,55 @@ module Hyrax
     self.characterization_proxy = Hyrax.config.characterization_proxy
 
     attribute :file_ids, Valkyrie::Types::Array.of(Valkyrie::Types::ID) # id for FileMetadata resources
-    attribute :thumbnail_id, Valkyrie::Types::ID.optional # id for FileMetadata resource
-    attribute :original_file_id, Valkyrie::Types::ID.optional # id for FileMetadata resource
-    attribute :extracted_text_id, Valkyrie::Types::ID.optional # id for FileMetadata resource
 
-    ##
-    # @return [Valkyrie::ID]
-    def representative_id
-      id
+    # @return [Hyrax::FileMetadata, nil]
+    def original_file
+      Hyrax.custom_queries.find_original_file(file_set: self)
+    rescue Valkyrie::Persistence::ObjectNotFoundError
+      nil
+    end
+
+    # @return [Valkyrie::ID, nil]
+    def original_file_id
+      original_file&.id
+    end
+
+    # @return [String, Nil] versioned identifier suitable for use in a IIIF manifest
+    def iiif_id
+      orig_file = original_file
+      return nil if orig_file.nil? || orig_file.file_identifier.blank?
+      latest_file = Hyrax::VersioningService.latest_version_of(orig_file)
+      version = latest_file&.version_id ? Digest::MD5.hexdigest(latest_file.version_id) : nil
+      "#{id}/files/#{orig_file.id}#{'/' + version if version}"
+    end
+
+    # @return [Hyrax::FileMetadata, nil]
+    def thumbnail
+      Hyrax.custom_queries.find_thumbnail(file_set: self)
+    rescue Valkyrie::Persistence::ObjectNotFoundError
+      nil
+    end
+
+    # @return [Valkyrie::ID, nil]
+    def thumbnail_id
+      thumbnail&.id
+    end
+
+    # @return [Hyrax::FileMetadata, nil]
+    def extracted_text
+      Hyrax.custom_queries.find_extracted_text(file_set: self)
+    rescue Valkyrie::Persistence::ObjectNotFoundError
+      nil
+    end
+
+    # @return [Valkyrie::ID, nil]
+    def extracted_text_id
+      extracted_text&.id
     end
 
     ##
     # @return [Valkyrie::ID]
-    def representative_id=(_input)
-      # saving a file set using valkyrie would err because this method didn't exist.
-      Rails.logger.warn('This is not a valid method for file sets')
+    def representative_id
       id
     end
 

data/app/models/hyrax/orcid_validator.rb

@@ -7,12 +7,6 @@ module Hyrax
       record.errors.add(:orcid, 'must be a string of 19 characters, e.g., "0000-0000-0000-0000"') unless ORCID_REGEXP.match?(record.orcid)
     end
 
-    # @deprecated
-    def self.match(string)
-      Deprecation.warn "Use 'Hyrax::OrcidValidator.extract_bare_orcid(from:)'"
-      extract_bare_orcid_from(from: string)
-    end
-
     # @api public
     # @param [String] from
     # @return nil if the given string is not in the Orcid form

data/app/models/hyrax/work.rb

@@ -63,7 +63,7 @@ module Hyrax
   #   `it_behaves_like 'has_members'`.  Shared specs are defined in /lib/hyrax/specs/shared_specs/hydra_works.rb.
   # * Work to File Set: (0..m)  A work can have many file sets.
   # @example Add a file set to a work (code from Hyrax::WorkUploadsHandler#append_to_work)
-  #       work.member_ids << file_set.id
+  #       work.member_ids += [file_set.id]
   #       work.representative_id = file_set.id if work.respond_to?(:representative_id) && work.representative_id.blank?
   #       work.thumbnail_id = file_set.id if work.respond_to?(:thumbnail_id) && work.thumbnail_id.blank?
   #       Hyrax.persister.save(resource: work)
@@ -91,11 +91,8 @@ module Hyrax
   #
   # @see /lib/hyrax/specs/shared_specs/hydra_works.rb
   #
-  # @todo The description in Hydra::Works Shared Modeling is out of date and uses
-  #   terminology to describe the relationships that is no longer used in code.
-  #   Update the model and link to it.  This can be a simple relationship diagram
-  #   with a link to the original Works Shared Modeling for historical perspective.
   # @see https://wiki.lyrasis.org/display/samvera/Hydra::Works+Shared+Modeling
+  #   for a historical perspective.
   class Work < Hyrax::Resource
     include Hyrax::Schema(:core_metadata)
 

data/app/presenters/hyrax/collection_presenter.rb

@@ -172,23 +172,6 @@ module Hyrax
       create_work_presenter.first_model
     end
 
-    ##
-    # @deprecated this implementation requires an extra db round trip, had a
-    #   buggy cacheing mechanism, and was largely duplicative of other code.
-    #   all versions of this code are replaced by
-    #   {CollectionsHelper#available_parent_collections_data}.
-    def available_parent_collections(scope:)
-      Deprecation.warn("#{self.class}#available_parent_collections is " \
-                       "deprecated. Use available_parent_collections_data " \
-                       "helper instead.")
-      return @available_parents if @available_parents.present?
-      collection = Hyrax.config.collection_class.find(id)
-      colls = Hyrax::Collections::NestedCollectionQueryService.available_parent_collections(child: collection, scope: scope, limit_to_id: nil)
-      @available_parents = colls.map do |col|
-        { "id" => col.id, "title_first" => col.title.first }
-      end.to_json
-    end
-
     def subcollection_count=(total)
       @subcollection_count = total unless total.nil?
     end

data/app/presenters/hyrax/embargo_presenter.rb

@@ -23,5 +23,9 @@ module Hyrax
     def embargo_history
       solr_document['embargo_history_ssim']
     end
+
+    def enforced?
+      solr_document.embargo_enforced?
+    end
   end
 end

data/app/presenters/hyrax/pcdm_member_presenter_factory.rb

@@ -28,7 +28,7 @@ module Hyrax
     # @return [Array<FileSetPresenter, WorkShowPresenter>]
     # @return [Enumerator<FileSetPresenter>]
     def file_set_presenters
-      return enum_for(:file_set_presenters) unless block_given?
+      return enum_for(:file_set_presenters).to_a unless block_given?
 
       results = query_docs(generic_type: "FileSet")
 
@@ -47,14 +47,14 @@ module Hyrax
     #   we recommend making sparing use of this feature.
     #
     # @overload member_presenters
-    #   @return [Enumerator<FileSetPresenter, WorkShowPresenter>]
+    #   @return [Array<FileSetPresenter, WorkShowPresenter>]
     #   @raise [ArgumentError] if an unindexed id is passed
     # @overload member_presenters
     #   @param [Array<#to_s>] ids
-    #   @return [Enumerator<FileSetPresenter, WorkShowPresenter>]
+    #   @return [Array<FileSetPresenter, WorkShowPresenter>]
     #   @raise [ArgumentError] if an unindexed id is passed
     def member_presenters(ids = object.member_ids)
-      return enum_for(:member_presenters, ids) unless block_given?
+      return enum_for(:member_presenters, ids).to_a unless block_given?
 
       results = query_docs(ids: ids)
 
@@ -109,6 +109,8 @@ module Hyrax
     def query_docs(generic_type: nil, ids: object.member_ids)
       query = "{!terms f=id}#{ids.join(',')}"
       query += "{!term f=generic_type_si}#{generic_type}" if generic_type
+      # works created via ActiveFedora use the _sim field
+      query += "{!term f=generic_type_sim}#{generic_type}" if generic_type
 
       Hyrax::SolrService
         .post(q: query, rows: 10_000)

data/app/presenters/hyrax/version_list_presenter.rb

@@ -5,17 +5,19 @@ module Hyrax
   class VersionListPresenter
     include Enumerable
 
+    attr_reader :versioning_service
+
     ##
-    # @param version_list [Array<#created>]
-    def initialize(version_list)
-      @raw_list = version_list
+    # @param service [Hyrax::VersioningService]
+    def initialize(service)
+      @versioning_service = service
     end
 
     ##
     # @param [Object] an object representing the File Set
     #
-    # @return [Enumerable<Hyrax::VersionPresenter>] an enumerable of presenters
-    #   for the relevant file versions.
+    # @return [Hyrax::VersionListPresenter] an enumerable of presenters for the
+    #   relevant file versions.
     #
     # @raise [ArgumentError] if we can't build an enu
     def self.for(file_set:)
@@ -24,20 +26,27 @@ module Hyrax
                       else
                         Hyrax::FileSetFileService.new(file_set: file_set).original_file
                       end
-      new(Hyrax::VersioningService.new(resource: original_file).versions)
+      new(Hyrax::VersioningService.new(resource: original_file))
     rescue NoMethodError
       raise ArgumentError
     end
 
-    delegate :each, to: :wrapped_list
+    delegate :each, :empty?, to: :wrapped_list
+    delegate :supports_multiple_versions?, to: :versioning_service
 
     private
 
     def wrapped_list
       @wrapped_list ||=
-        @raw_list.map { |v| Hyrax::VersionPresenter.new(v) } # wrap each item in a presenter
-                 .sort { |a, b| b.version.created <=> a.version.created } # sort list of versions based on creation date
-                 .tap { |l| l.first.try(:current!) } # set the first version to the current version
+        begin
+          presenters = @versioning_service.versions.map { |v| Hyrax::VersionPresenter.new(v) } # wrap each item in a presenter
+          if presenters.first&.version&.respond_to?(:created)
+            presenters.sort! { |a, b| b.version.created <=> a.version.created } if presenters.first&.version.respond_to?(:created) # sort list of versions based on creation date
+          else
+            presenters.reverse!
+          end
+          presenters.tap { |l| l.first.try(:current!) } # set the first version to the current version
+        end
     end
   end
 end

data/app/presenters/hyrax/version_presenter.rb

@@ -15,14 +15,29 @@ module Hyrax
       @current = true
     end
 
+    def label
+      version.try(:label) || version.version_id.to_s
+    end
+
+    def uri
+      version.try(:uri) || version.version_id.to_s
+    end
+
     def created
-      @created ||= version.created.in_time_zone.to_formatted_s(:long_ordinal)
+      @created ||= created_time&.in_time_zone&.to_formatted_s(:long_ordinal) || "Unknown"
     end
 
-    def committer
+    def created_time
+      version.try(:created) || version_committer.try(:created_at)
+    end
+
+    def version_committer
       Hyrax::VersionCommitter
-        .find_by(version_id: @version.uri)
-        &.committer_login
+        .find_by(version_id: @version.try(:uri) || @version.try(:version_id))
+    end
+
+    def committer
+      version_committer&.committer_login
     end
   end
 end

data/app/services/hyrax/admin_set_create_service.rb

@@ -18,23 +18,6 @@ module Hyrax
     self.default_admin_set_persister = Hyrax::DefaultAdministrativeSet
 
     class << self
-      # @api public
-      # Creates the default Hyrax::AdministrativeSet and corresponding data
-      # @param admin_set_id [String] The default admin set ID
-      # @param title [Array<String>] The title of the default admin set
-      # @return [TrueClass]
-      # @see Hyrax::AdministrativeSet
-      # @deprecated
-      # TODO: When this deprecated method is removed, update private method
-      #       .create_default_admin_set! to remove the parameters.
-      def create_default_admin_set(admin_set_id: DEFAULT_ID, title: DEFAULT_TITLE)
-        Deprecation.warn("'##{__method__}' will be removed in Hyrax 4.0.  " \
-                         "Instead, use 'Hyrax::AdminSetCreateService.find_or_create_default_admin_set'.")
-        create_default_admin_set!(admin_set_id: admin_set_id, title: title).present?
-      rescue RuntimeError => _err
-        false
-      end
-
       # @api public
       # Finds the default AdministrativeSet if it exists; otherwise, creates it and corresponding data
       # @return [Hyrax::AdministrativeSet] The default admin set.

data/app/services/hyrax/characterization/valkyrie_characterization_service.rb

@@ -15,6 +15,11 @@ class Hyrax::Characterization::ValkyrieCharacterizationService
     new(metadata: metadata, file: file, **options).characterize
     saved = Hyrax.persister.save(resource: metadata)
     Hyrax.publisher.publish('file.metadata.updated', metadata: saved, user: user)
+
+    Hyrax.publisher.publish('file.characterized',
+                            file_set: Hyrax.query_service.find_by(id: saved.file_set_id),
+                            file_id: saved.id.to_s,
+                            path_hint: saved.file_identifier.to_s)
   end
 
   ##

data/app/services/hyrax/collections/collection_member_service.rb

@@ -106,7 +106,7 @@ module Hyrax
         def add_member(collection_id:, new_member:, user:)
           message = Hyrax::MultipleMembershipChecker.new(item: new_member).check(collection_ids: [collection_id], include_current_members: true)
           raise Hyrax::SingleMembershipError, message if message.present?
-          new_member.member_of_collection_ids << collection_id # only populate this direction
+          new_member.member_of_collection_ids += [collection_id] # only populate this direction
           new_member = Hyrax.persister.save(resource: new_member)
           publish_metadata_updated(new_member, user)
           new_member

data/app/services/hyrax/embargo_manager.rb

@@ -12,12 +12,13 @@ module Hyrax
   #       date is today or later.
   #    - "Applied" means the embargo's pre-release visibility has been set on
   #      the resource.
-  #    - "Released" means the embargo's post-release visibility has been set on
-  #      the resource.
   #    - "Enforced" means the object's visibility matches the pre-release
   #      visibility of the embargo; i.e. the embargo has been applied,
   #      but not released.
-  #    - "Deactivate" means that the existing embargo will be removed
+  #    - "Released" means the embargo's post-release visibility has been set on
+  #      the resource.
+  #    - "Deactivate" means that the existing embargo will be removed, even
+  #      if it active.
   #
   # Note that an resource may be `#under_embargo?` even if the embargo is not
   # be `#enforced?` (in this case, the application should seek to apply the
@@ -109,11 +110,25 @@ module Hyrax
           .embargo
       end
 
+      # @return [Boolean]
+      def deactivate_embargo_for(resource:, query_service: Hyrax.query_service)
+        new(resource: resource, query_service: query_service)
+          .deactivate
+      end
+
+      # @return [Boolean]
+      def deactivate_embargo_for!(resource:, query_service: Hyrax.query_service)
+        new(resource: resource, query_service: query_service)
+          .deactivate!
+      end
+
+      # @return [Boolean]
       def release_embargo_for(resource:, query_service: Hyrax.query_service)
         new(resource: resource, query_service: query_service)
           .release
       end
 
+      # @return [Boolean]
       def release_embargo_for!(resource:, query_service: Hyrax.query_service)
         new(resource: resource, query_service: query_service)
           .release!
@@ -149,20 +164,20 @@ module Hyrax
       # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
     end
 
-    # Deactivates the embargo and logs a message to the embargo_history property
-    def deactivate!
-      embargo_state = embargo.active? ? 'active' : 'expired'
-      embargo_record = embargo_history_message(
-        embargo_state,
-        Time.zone.today,
-        embargo.embargo_release_date,
-        embargo.visibility_during_embargo,
-        embargo.visibility_after_embargo
-      )
+    ##
+    # Deactivates the embargo
+    # @return [Boolean]
+    def deactivate
+      release(force: true) &&
+        nullify(force: true)
+    end
 
-      release(force: true)
+    ##
+    # Deactivates the embargo
+    # @return [Boolean]
+    def deactivate!
+      release!(force: true)
       nullify(force: true)
-      embargo.embargo_history += [embargo_record]
     end
 
     ##
@@ -211,15 +226,16 @@ module Hyrax
     ##
     # Drop the embargo by setting its release date and visibility settings to `nil`.
     #
-    # @param force [boolean] force the nullify even when the embargo period is current
+    # @param force [Boolean] force the nullify even when the embargo period is current
     #
-    # @return [void]
+    # @return [Boolean]
     def nullify(force: false)
       return false if !force && under_embargo?
 
       embargo.embargo_release_date = nil
       embargo.visibility_during_embargo = nil
       embargo.visibility_after_embargo = nil
+      true
     end
 
     ##
@@ -231,6 +247,17 @@ module Hyrax
     # @return [Boolean] truthy if the embargo has been applied
     def release(force: false)
       return false if !force && under_embargo?
+
+      embargo_state = embargo.active? ? 'active' : 'expired'
+      history_record = embargo_history_message(
+        embargo_state,
+        Hyrax::TimeService.time_in_utc,
+        embargo.embargo_release_date,
+        embargo.visibility_during_embargo,
+        embargo.visibility_after_embargo
+      )
+      embargo.embargo_history += [history_record]
+
       return true if embargo.visibility_after_embargo.nil?
 
       resource.visibility = embargo.visibility_after_embargo
@@ -266,7 +293,7 @@ module Hyrax
 
     protected
 
-    # Create the log message used when deactivating an embargo
+    # Create the log message used when releasing an embargo
     def embargo_history_message(state, deactivate_date, release_date, visibility_during, visibility_after)
       I18n.t 'hydra.embargo.history_message',
               state: state,

data/app/services/hyrax/embargo_service.rb

@@ -1,24 +1,26 @@
 # frozen_string_literal: true
 module Hyrax
+  ##
+  # Methods for Querying Repository to find Embargoed Objects
   class EmbargoService < RestrictionService
     class << self
-      #
-      # Methods for Querying Repository to find Embargoed Objects
-      #
-
       # Returns all assets with embargo release date set to a date in the past
-      def assets_with_expired_embargoes
+      def assets_with_expired_enforced_embargoes
         builder = Hyrax::ExpiredEmbargoSearchBuilder.new(self)
         presenters(builder)
       end
+      alias assets_with_expired_embargoes assets_with_expired_enforced_embargoes
 
-      # Returns all assets with embargo release date set
-      #   (assumes that when lease visibility is applied to assets
-      #    whose leases have expired, the lease expiration date will be removed from its metadata)
-      def assets_under_embargo
+      ##
+      # Returns all assets with embargoes that are currently enforced,
+      # regardless of whether the embargoes are active or expired.
+      #
+      # @see Hyrax::EmbargoManager
+      def assets_with_enforced_embargoes
         builder = Hyrax::EmbargoSearchBuilder.new(self)
-        presenters(builder)
+        presenters(builder).select(&:enforced?)
       end
+      alias assets_under_embargo assets_with_enforced_embargoes
 
       # Returns all assets that have had embargoes deactivated in the past.
       def assets_with_deactivated_embargoes

data/app/services/hyrax/file_set_derivatives_service.rb

@@ -5,7 +5,7 @@ module Hyrax
     attr_reader :file_set
     delegate :mime_type, to: :file_set
 
-    # @param file_set [Hyrax::FileSet] At least for this class, it must have #uri and #mime_type
+    # @param file_set [Hyrax::FileSet, Hyrax::FileMetadata] At least for this class, it must have #uri and #mime_type
     def initialize(file_set)
       @file_set = file_set
     end
@@ -31,11 +31,11 @@ module Hyrax
 
     def create_derivatives(filename)
       case mime_type
-      when *file_set.class.pdf_mime_types             then create_pdf_derivatives(filename)
-      when *file_set.class.office_document_mime_types then create_office_document_derivatives(filename)
-      when *file_set.class.audio_mime_types           then create_audio_derivatives(filename)
-      when *file_set.class.video_mime_types           then create_video_derivatives(filename)
-      when *file_set.class.image_mime_types           then create_image_derivatives(filename)
+      when *Hyrax.config.derivative_mime_type_mappings[:pdf]    then create_pdf_derivatives(filename)
+      when *Hyrax.config.derivative_mime_type_mappings[:office] then create_office_document_derivatives(filename)
+      when *Hyrax.config.derivative_mime_type_mappings[:audio]  then create_audio_derivatives(filename)
+      when *Hyrax.config.derivative_mime_type_mappings[:video]  then create_video_derivatives(filename)
+      when *Hyrax.config.derivative_mime_type_mappings[:image] then create_image_derivatives(filename)
       end
     end
 
@@ -91,15 +91,15 @@ module Hyrax
 
     def create_audio_derivatives(filename)
       Hydra::Derivatives::AudioDerivatives.create(filename,
-                                                  outputs: [{ label: 'mp3', format: 'mp3', url: derivative_url('mp3') },
-                                                            { label: 'ogg', format: 'ogg', url: derivative_url('ogg') }])
+                                                  outputs: [{ label: 'mp3', format: 'mp3', url: derivative_url('mp3'), mime_type: 'audio/mpeg', container: 'service_file' },
+                                                            { label: 'ogg', format: 'ogg', url: derivative_url('ogg'), mime_type: 'audio/ogg', container: 'service_file' }])
     end
 
     def create_video_derivatives(filename)
       Hydra::Derivatives::VideoDerivatives.create(filename,
-                                                  outputs: [{ label: :thumbnail, format: 'jpg', url: derivative_url('thumbnail') },
-                                                            { label: 'webm', format: 'webm', url: derivative_url('webm') },
-                                                            { label: 'mp4', format: 'mp4', url: derivative_url('mp4') }])
+                                                  outputs: [{ label: :thumbnail, format: 'jpg', url: derivative_url('thumbnail'), mime_type: 'image/jpeg' },
+                                                            { label: 'webm', format: 'webm', url: derivative_url('webm'), mime_type: 'video/webm', container: 'service_file' },
+                                                            { label: 'mp4', format: 'mp4', url: derivative_url('mp4'), mime_type: 'video/mp4', container: 'service_file' }])
     end
 
     def create_image_derivatives(filename)

data/app/services/hyrax/fixity_check_failure_service.rb

@@ -14,7 +14,7 @@ module Hyrax
     end
 
     def message
-      uri = file_set.original_file.uri.to_s
+      uri = checksum_audit_log.checked_uri
       file_title = file_set.title.first
       I18n.t('hyrax.notifications.fixity_check_failure.message', log_date: log_date, file_title: file_title, uri: uri)
     end

data/app/services/hyrax/identifier/dispatcher.rb

@@ -53,8 +53,15 @@ module Hyrax
       #
       # @see #assign_for
       def assign_for!(object:, attribute: :identifier)
-        assign_for(object: object, attribute: attribute).save!
-        object
+        result = assign_for(object: object, attribute: attribute)
+
+        case result
+        when Valkyrie::Resource
+          Hyrax.persister.save(resource: result)
+        else
+          result.save
+          result
+        end
       end
     end
   end

data/app/services/hyrax/listeners/file_metadata_listener.rb

@@ -12,8 +12,16 @@ module Hyrax
       # @param [Dry::Events::Event] event
       # @return [void]
       def on_file_characterized(event)
-        CreateDerivativesJob
-          .perform_later(event[:file_set], event[:file_id], event[:path_hint])
+        file_set = event[:file_set]
+
+        case file_set
+        when ActiveFedora::Base # ActiveFedora
+          CreateDerivativesJob
+            .perform_later(file_set, event[:file_id], event[:path_hint])
+        else
+          ValkyrieCreateDerivativesJob
+            .perform_later(file_set.id.to_s, event[:file_id])
+        end
       end
 
       ##
@@ -39,10 +47,10 @@ module Hyrax
       # @param [Dry::Events::Event] event
       # @return [void]
       def on_file_uploaded(event)
-        # Run characterization
-        Hyrax.config
-             .characterization_service
-             .run(metadata: event[:metadata], file: event[:metadata].file)
+        # Run characterization for original file only
+        return unless event[:metadata]&.original_file?
+
+        ValkyrieCharacterizationJob.perform_later(event[:metadata].id.to_s)
       end
     end
   end