hyrax 3.3.0 → 3.4.0

data/app/models/hyrax/pcdm_collection.rb

@@ -5,6 +5,40 @@ require_dependency 'hyrax/collection_name'
 module Hyrax
   ##
   # Valkyrie model for Collection domain objects in the Hydra Works model.
+  #
+  # ## Relationships
+  #
+  # ### Collection and Collection (TBA)
+  #
+  # ### Collection and Work
+  #
+  # * Defined: The relationship is defined by the inverse relationship stored in the
+  #   work's `:member_of_collection_ids` attribute.
+  # * Tested: The work tests the relationship.
+  # * Collection to Work: (0..m)  A collection can have many works.
+  #
+  # @example Get works in a collection:
+  #       works = Hyrax.custom_queries.find_child_works(resource: collection)
+  #
+  # * Work to Collection: (0..m)  A work can be in many collections.
+  #   * See Hyrax::Work for code to get and set collections for the work.
+  #
+  # @note Some collection types limit a work to belong to one and only one collection of that type.
+  #
+  # ### All children
+  #
+  # * There are additional methods for finding all children without respect to
+  #   the child's type.
+  #
+  # @example Get works and child collections in a collection using:
+  #       members = Hyrax.custom_queries.find_members_of(resource: collection)
+  #
+  # @see Hyrax::Work
+  #
+  # @see Hyrax::CustomQueries::Navigators::ChildCollectionsNavigator#find_child_collections
+  # @see Hyrax::CustomQueries::Navigators::ChildWorksNavigator#find_child_works
+  # @see Hyrax::CustomQueries::Navigators::CollectionMembers#find_members_of
+  #
   class PcdmCollection < Hyrax::Resource
     include Hyrax::Schema(:core_metadata)
     include Hyrax::Schema(:basic_metadata)
@@ -32,5 +66,27 @@ module Hyrax
     def pcdm_object?
       true
     end
+
+    def permission_manager
+      @permission_manager ||= Hyrax::PermissionManager.new(resource: self)
+    end
+
+    def visibility=(value)
+      visibility_writer.assign_access_for(visibility: value)
+    end
+
+    def visibility
+      visibility_reader.read
+    end
+
+    protected
+
+    def visibility_writer
+      Hyrax::VisibilityWriter.new(resource: self)
+    end
+
+    def visibility_reader
+      Hyrax::VisibilityReader.new(resource: self)
+    end
   end
 end

data/app/models/hyrax/permission_template.rb

@@ -4,7 +4,7 @@ module Hyrax
   # Holds policy data about the workflow and permissions applied objects when
   # they are deposited through an Administrative Set or a Collection. Each
   # template record has a {#source} (through {#source_id}); the template's
-  # rules inform the behavior of objects deposited through that {#source_model}.
+  # rules inform the behavior of objects deposited through that {#source}.
   #
   # The {PermissionTemplate} specifies:
   #
@@ -81,6 +81,10 @@ module Hyrax
     # A bit of an analogue for a `belongs_to :source_model` as it crosses from Fedora to the DB
     # @return [AdminSet, ::Collection]
     # @raise [Hyrax::ObjectNotFoundError] when neither an AdminSet or Collection is found
+    # @note This method will eventually be replaced by #source which returns a Hyrax::Resource
+    #   object.  Many methods are equally able to process both Hyrax::Resource and
+    #   ActiveFedora::Base.  Only call this method if you need the ActiveFedora::Base object.
+    # @see #source
     def source_model
       ActiveFedora::Base.find(source_id)
     rescue ActiveFedora::ObjectNotFoundError
@@ -88,11 +92,11 @@ module Hyrax
     end
 
     # A bit of an analogue for a `belongs_to :admin_set` as it crosses from Fedora to the DB
-    # @deprecated Use #source_model instead
+    # @deprecated Use #source instead
     # @return [AdminSet]
     # @raise [Hyrax::ObjectNotFoundError] when the we cannot find the AdminSet
     def admin_set
-      Deprecation.warn('Use #source_model instead')
+      Deprecation.warn("#admin_set is deprecated; use #source instead.")
       return AdminSet.find(source_id) if AdminSet.exists?(source_id)
       raise Hyrax::ObjectNotFoundError
     rescue ActiveFedora::ActiveFedoraError # TODO: remove the rescue when active_fedora issue #1276 is fixed
@@ -100,11 +104,11 @@ module Hyrax
     end
 
     # A bit of an analogue for a `belongs_to :collection` as it crosses from Fedora to the DB
-    # @deprecated Use #source_model instead
+    # @deprecated Use #source instead
     # @return [Collection]
     # @raise [Hyrax::ObjectNotFoundError] when the we cannot find the Collection
     def collection
-      Deprecation.warn('Use #source_model instead')
+      Deprecation.warn("#collection is deprecated; use #source instead.")
       return ::Collection.find(source_id) if ::Collection.exists?(source_id)
       raise Hyrax::ObjectNotFoundError
     rescue ActiveFedora::ActiveFedoraError # TODO: remove the rescue when active_fedora issue #1276 is fixed
@@ -216,10 +220,12 @@ module Hyrax
     end
 
     ##
+    # @deprecated Use #reset_access_controls_for instead
     # @param interpret_visibility [Boolean] whether to retain the existing
     #   visibility when applying permission template ACLs
     # @return [Boolean]
     def reset_access_controls(interpret_visibility: false)
+      Deprecation.warn("#reset_access_controls is deprecated; use #reset_access_controls_for instead.")
       reset_access_controls_for(collection: source_model,
                                 interpret_visibility: interpret_visibility)
     end

data/app/models/hyrax/work.rb

@@ -4,6 +4,97 @@ module Hyrax
   ##
   # Valkyrie model for `Work` domain objects in the Hydra Works model.
   #
+  # ## Relationships
+  #
+  # ### Administrative Set and Work
+  #
+  # * Defined: The relationship is defined by the work's `:admin_set_id` attribute.
+  # * Tested: The relationship is tested in shared spec `'a Hyrax::Work'` by testing
+  #   `#admin_set_id`.  Shared specs are defined in /lib/hyrax/specs/shared_specs/hydra_works.rb.
+  # * Administrative Set to Work: (1..m) An admin set can have many works.
+  #   * See Hyrax::AdministrativeSet for code to get works in an admin set.
+  # * Work to Administrative Set: (1..1)  A work must be in one and only one admin set.
+  #
+  # @example Set admin set for a work:
+  #       work.admin_set_id = admin_set.id
+  # @example Get admin set a work is in:
+  #       admin_set = Hyrax.query_service.find_by(id: work.admin_set_id)
+  #
+  # ### Collection and Work
+  #
+  # * Defined: The relationship is defined by the work's `:member_of_collection_ids` attribute.
+  # * Tested: The relationship is tested in shared spec `'a Hyrax::Work'` by testing
+  #   `it_behaves_like 'belongs to collections'`.  Shared specs are defined in /lib/hyrax/specs/shared_specs/hydra_works.rb.
+  # * Collection to Work: (0..m)  A collection can have many works.
+  #   * See Hyrax::PcdmCollection for code to get works in a collection.
+  # * Work to Collection: (0..m)  A work can be in many collections.
+  #
+  # @example Add a work to a collection using Hyrax::CollectionMemberService (multiple method options)
+  #       Hyrax::CollectionMemberService.add_members(collection_id: col.id, members: works, user: current_user)
+  # @example Get collections a work is in:
+  #       collections = Hyrax.custom_queries.find_collections_for(resource: work)
+  #
+  # @note Some collection types limit a work to belong to one and only one collection of that type.
+  #
+  # ### Work and Work
+  #
+  # * Defined: The relationship is defined in the parent work's `:member_ids` attribute.
+  # * Tested: The relationship is tested in shared spec `'a Hyrax::Work'` by testing
+  #   `it_behaves_like 'has_members'`.  Shared specs are defined in /lib/hyrax/specs/shared_specs/hydra_works.rb.
+  # * Work to child Work: (0..m)  A work can have many child works.
+  #
+  # @example Add a child work to a work:
+  #       Hyrax::Transactions::Container['work_resource.add_to_parent']
+  #         .call(child_work, parent_id: parent_work.id, user: current_user)
+  # @example Get child works:
+  #       works = Hyrax.custom_queries.find_child_works(resource: parent_work)
+  #
+  # * Work to parent Work: (0..1)  A work can be in at most one parent work.
+  #
+  # @example Get parent work:
+  #       parent_work = Hyrax.custom_queries.find_parent_work(resource: child_work)
+  #
+  # @note `:member_ids` holds ids of child works and file sets.
+  #
+  # ### Work and File Set
+  #
+  # * Defined: The relationship is defined in the parent work's `:member_ids` attribute.
+  # * Tested: The relationship is tested in shared spec `'a Hyrax::Work'` by testing
+  #   `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.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)
+  #       Hyrax.publisher.publish('object.metadata.updated', object: work, user: files.first.user)
+  # @example Get file sets:
+  #       file_sets = Hyrax.custom_queries.find_child_file_sets(resource: work)
+  #
+  # * File Set to Work: (1..1)  A file set must be in one and only one work.
+  #   * See Hyrax::FileSet for code to get the work a file set is in.
+  #
+  # @see Hyrax::AdministrativeSet
+  # @see Hyrax::PcdmCollection
+  # @see Hyrax::FileSet
+  #
+  # @see Hyrax::CollectionMemberService
+  # @see Hyrax::Transactions::Steps::AddToParent
+  # @see Hyrax::Transactions::Steps::AddFileSets
+  # @see Hyrax::WorksControllerBehavior
+  # @see Hyrax::WorkUploadsHandler#append_to_work
+  #
+  # @see Valkyrie query adapter's #find_by
+  # @see Hyrax::CustomQueries::Navigators::CollectionMembers#find_collections_for
+  # @see Hyrax::CustomQueries::Navigators::ParentWorkNavigator#find_parent_work
+  # @see Hyrax::CustomQueries::Navigators::ChildFileSetsNavigator#find_child_file_sets
+  #
+  # @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
   class Work < Hyrax::Resource
     include Hyrax::Schema(:core_metadata)

data/app/models/proxy_deposit_request.rb

@@ -129,7 +129,7 @@ class ProxyDepositRequest < ActiveRecord::Base
 
   # @param [TrueClass,FalseClass] reset (false)  if true, reset the access controls. This revokes edit access from the depositor
   def transfer!(reset = false)
-    ContentDepositorChangeEventJob.perform_later(work, receiving_user, reset)
+    Hyrax::ChangeDepositorService.call(work, receiving_user, reset)
     fulfill!(status: ACCEPTED)
   end
 

data/app/presenters/hyrax/admin_set_presenter.rb

@@ -8,11 +8,11 @@ module Hyrax
     end
 
     def total_items
-      Hyrax::SolrService.count("{!field f=isPartOf_ssim}#{id}")
+      Hyrax::SolrService.count("{!field f=#{Hyrax.config.admin_set_predicate.qname.last}_ssim}#{id}")
     end
 
     def total_viewable_items
-      field_pairs = { "isPartOf_ssim" => id.to_s }
+      field_pairs = { "#{Hyrax.config.admin_set_predicate.qname.last}_ssim" => id.to_s }
       SolrQueryService.new
                       .with_field_pairs(field_pairs: field_pairs)
                       .accessible_by(ability: current_ability)

data/app/presenters/hyrax/pcdm_member_presenter_factory.rb

@@ -97,7 +97,7 @@ module Hyrax
     # @return
     def presenter_for(document:, ability:)
       case document['has_model_ssim'].first
-      when Hyrax::FileSet.name
+      when Hyrax::FileSet.name, ::FileSet.name # ActiveFedora FileSet within a Valkyrie Resource
         Hyrax::FileSetPresenter.new(document, ability)
       else
         Hyrax::WorkShowPresenter.new(document, ability)
@@ -111,7 +111,7 @@ module Hyrax
       query += "{!term f=generic_type_si}#{generic_type}" if generic_type
 
       Hyrax::SolrService
-        .post(query, rows: 10_000)
+        .post(q: query, rows: 10_000)
         .fetch('response')
         .fetch('docs')
     end

data/app/presenters/hyrax/work_show_presenter.rb

@@ -305,9 +305,13 @@ module Hyrax
 
     def member_presenter_factory
       @member_presenter_factory ||=
-        self.class
-            .presenter_factory_class
-            .new(solr_document, current_ability, request)
+        if solr_document.hydra_model < Valkyrie::Resource
+          PcdmMemberPresenterFactory.new(solr_document, current_ability)
+        else
+          self.class
+              .presenter_factory_class
+              .new(solr_document, current_ability, request)
+        end
     end
 
     def graph

data/app/search_builders/hyrax/dashboard/collections_search_builder.rb

@@ -9,7 +9,7 @@ module Hyrax
 
       # This overrides the models in FilterByType
       def models
-        [::AdminSet, ::Collection, Hyrax.config.collection_class].uniq.compact
+        [::AdminSet, Hyrax::AdministrativeSet, ::Collection, Hyrax.config.collection_class].uniq.compact
       end
 
       # adds a filter to exclude collections and admin sets created by the
@@ -19,7 +19,7 @@ module Hyrax
         return if current_ability.admin?
         clauses = [
           '-' + ActiveFedora::SolrQueryBuilder.construct_query_for_rel(depositor: current_user_key),
-          '-' + ActiveFedora::SolrQueryBuilder.construct_query_for_rel(has_model: ::AdminSet.to_s, creator: current_user_key)
+          '-' + ActiveFedora::SolrQueryBuilder.construct_query_for_rel(has_model: Hyrax.config.admin_set_model, creator: current_user_key)
         ]
         solr_parameters[:fq] ||= []
         solr_parameters[:fq] += ["(#{clauses.join(' OR ')})"]

data/app/search_builders/hyrax/dashboard/managed_search_filters.rb

@@ -11,15 +11,55 @@ module Hyrax
 
       # Override to exclude 'public' and 'registered' groups from read access.
       def apply_group_permissions(permission_types, ability = current_ability)
+        search_terms = add_managing_role_search_filter(ability: ability)
         groups = ability.user_groups
-        return [] if groups.empty?
-        permission_types.map do |type|
+        return search_terms if groups.empty?
+        permission_types.each do |type|
           field = solr_field_for(type, 'group')
-          user_groups = type == 'read' ? groups - [::Ability.public_group_name, ::Ability.registered_group_name] : groups
+          delete_groups = [::Ability.public_group_name, ::Ability.registered_group_name]
+          user_groups = type == 'read' ? groups - delete_groups : groups
           next if user_groups.empty?
-          "({!terms f=#{field}}#{user_groups.join(',')})" # parens required to properly OR the clauses together.
+          # parens required to properly OR the clauses together:
+          search_terms << "({!terms f=#{field}}#{user_groups.join(',')})"
         end
+        search_terms
       end
+
+      # Look for a user's managing role and add filters for all admin sets that have permission
+      # templates that include managing roles.
+      #
+      # rubocop:disable Metrics/MethodLength
+      # rubocop:disable Metrics/PerceivedComplexity
+      # rubocop:disable Metrics/CyclomaticComplexity
+      def add_managing_role_search_filter(ability:, search_terms: [])
+        search_terms ||= []
+        # Look for managing role assignement
+        managing_role = Sipity::Role.find_by(name: Hyrax::RoleRegistry::MANAGING)
+        return search_terms if managing_role.blank?
+        agent = ability.current_user.to_sipity_agent
+        return search_terms if agent.workflow_responsibilities.blank?
+        managing_workflow_roles = []
+        agent.workflow_responsibilities.each do |workflow_responsibility|
+          wfr = Sipity::WorkflowRole.find_by(id: workflow_responsibility.workflow_role_id)
+          managing_workflow_roles << wfr if wfr.role_id == managing_role.id
+        end
+        return search_terms if managing_workflow_roles.empty?
+        # if the user has managing responsibilties, then look up the associated admin set ids
+        admin_set_ids = managing_workflow_roles.map do |wfr|
+          wf = Sipity::Workflow.find_by(id: wfr.workflow_id)
+          pt = Hyrax::PermissionTemplate.find_by(id: wf.permission_template_id)
+          pt.source_id
+        end
+        admin_set_ids.uniq!
+        # create search terms for works that are in managed admin sets
+        admin_set_ids.each do |id|
+          search_terms << "isPartOf_ssim:#{id}"
+        end
+        search_terms
+      end
+      # rubocop:enable Metrics/MethodLength
+      # rubocop:enable Metrics/PerceivedComplexity
+      # rubocop:enable Metrics/CyclomaticComplexity
     end
   end
 end

data/app/search_builders/hyrax/dashboard/nested_collections_search_builder.rb

@@ -37,7 +37,7 @@ module Hyrax
 
       def limit_ids
         # exclude current collection from returned list
-        limit_ids = [@collection.id]
+        limit_ids = [@collection.id.to_s]
         # cannot add a parent that is already a parent
         limit_ids += @nesting_attributes.parents if @nesting_attributes.parents && @nest_direction == :as_parent
         limit_ids
@@ -91,7 +91,7 @@ module Hyrax
 
       def exclude_if_already_parent
         # 2) Exclude any of Collection F's direct children
-        "-" + ActiveFedora::SolrQueryBuilder.construct_query(Samvera::NestingIndexer.configuration.solr_field_name_for_storing_parent_ids => @collection.id)
+        "-" + ActiveFedora::SolrQueryBuilder.construct_query(Samvera::NestingIndexer.configuration.solr_field_name_for_storing_parent_ids => @collection.id.to_s)
       end
     end
   end

data/app/search_builders/hyrax/my/collections_search_builder.rb

@@ -10,10 +10,7 @@ class Hyrax::My::CollectionsSearchBuilder < ::Hyrax::CollectionSearchBuilder
   # the current user has deposited
   # @param [Hash] solr_parameters
   def show_only_collections_deposited_by_current_user(solr_parameters)
-    clauses = [
-      ActiveFedora::SolrQueryBuilder.construct_query_for_rel(depositor: current_user_key),
-      ActiveFedora::SolrQueryBuilder.construct_query_for_rel(has_model: ::AdminSet.to_s, creator: current_user_key)
-    ]
+    clauses = [query_for_my_collections]
     solr_parameters[:fq] ||= []
     solr_parameters[:fq] += ["(#{clauses.join(' OR ')})"]
   end
@@ -23,4 +20,14 @@ class Hyrax::My::CollectionsSearchBuilder < ::Hyrax::CollectionSearchBuilder
   def models
     [::AdminSet, Hyrax::AdministrativeSet, ::Collection, Hyrax.config.collection_class].uniq.compact
   end
+
+  private
+
+  def query_for_my_collections
+    query_service = Hyrax::SolrQueryService.new
+    query_service.with_field_pairs(field_pairs: { depositor_ssim: current_user_key }, type: 'terms')
+    query_service.with_field_pairs(field_pairs: { has_model_ssim: Hyrax.config.admin_set_model,
+                                                  creator_ssim: current_user_key }, type: 'terms')
+    query_service.build(join_with: 'OR')
+  end
 end

data/app/services/hyrax/access_control_list.rb

@@ -174,6 +174,19 @@ module Hyrax
       true
     end
 
+    ##
+    # @api public
+    #
+    # Deletes the ACL for the resource
+    #
+    # @return [Boolean]
+    def destroy
+      persister.delete(resource: change_set.resource) if change_set.resource.persisted?
+      @change_set = nil
+
+      true
+    end
+
     private
 
     ##

data/app/services/hyrax/admin_set_create_service.rb

@@ -64,7 +64,7 @@ module Hyrax
         Deprecation.warn("'##{__method__}' will be removed in Hyrax 4.0.  " \
                          "Warning: This method may hide runtime errors.  " \
                          "Instead, use 'Hyrax::AdminSetCreateService.call!'.  ")
-        call!(admin_set: admin_set, creating_user: creating_user, **kwargs).present?
+        call!(admin_set: admin_set_resource(admin_set), creating_user: creating_user, **kwargs).present?
       rescue RuntimeError => err
         raise err if default_admin_set?(id: admin_set.id)
         false
@@ -152,13 +152,22 @@ module Hyrax
         id = find_unsaved_default_admin_set&.id&.to_s if id.blank?
         id
       end
+
+      def admin_set_resource(admin_set)
+        case admin_set
+        when Valkyrie::Resource
+          admin_set
+        else
+          admin_set.valkyrie_resource
+        end
+      end
     end
 
     # @param admin_set [Hyrax::AdministrativeSet | AdminSet] the admin set to operate on
     # @param creating_user [User] the user who created the admin set (if any).
     # @param workflow_importer [#call] imports the workflow
     def initialize(admin_set:, creating_user:, workflow_importer: default_workflow_importer, default_admin_set: false)
-      @admin_set = admin_set
+      @admin_set = Hyrax::AdminSetCreateService.send(:admin_set_resource, admin_set)
       @creating_user = creating_user
       @workflow_importer = workflow_importer
       @default_admin_set = default_admin_set
@@ -182,28 +191,12 @@ module Hyrax
     # @return [Hyrax::AdministrativeSet] The fully created admin set.
     # @raise [RuntimeError] if admin set cannot be persisted
     def create!
-      admin_set.respond_to?(:valkyrie_resource) ? active_fedora_create! : valkyrie_create!
-    end
-
-    private
-
-    def default_admin_set?
-      @default_admin_set
-    end
-
-    def admin_group_name
-      ::Ability.admin_group_name
-    end
-
-    # Creates an admin set, setting the creator and the default access controls.
-    # @return [Hyrax::AdministrativeSet] The fully created admin set.
-    # @raise [RuntimeError] if admin set cannot be persisted
-    def valkyrie_create!
       admin_set.creator = [creating_user.user_key] if creating_user
       updated_admin_set = Hyrax.persister.save(resource: admin_set).tap do |result|
         if result
           ActiveRecord::Base.transaction do
-            permission_template = permissions_create_service.create_default(collection: result,
+            permission_template = PermissionTemplate.find_by(source_id: result.id.to_s) ||
+                                  permissions_create_service.create_default(collection: result,
                                                                             creating_user: creating_user)
             workflow = create_workflows_for(permission_template: permission_template)
             create_default_access_for(permission_template: permission_template, workflow: workflow) if default_admin_set?
@@ -214,23 +207,14 @@ module Hyrax
       updated_admin_set
     end
 
-    # Creates an admin set, setting the creator and the default access controls.
-    # @return [Hyrax::AdministrativeSet] The fully created admin set.
-    # @raise [RuntimeError] if admin set cannot be persisted
-    def active_fedora_create!
-      admin_set.creator = [creating_user.user_key] if creating_user
-      admin_set.save.tap do |result|
-        if result
-          ActiveRecord::Base.transaction do
-            permission_template = permissions_create_service.create_default(collection: admin_set,
-                                                                            creating_user: creating_user)
-            workflow = create_workflows_for(permission_template: permission_template)
-            create_default_access_for(permission_template: permission_template, workflow: workflow) if default_admin_set?
-          end
-        end
-      end
-      raise 'Admin set failed to persist.' unless admin_set.persisted?
-      admin_set.valkyrie_resource
+    private
+
+    def default_admin_set?
+      @default_admin_set
+    end
+
+    def admin_group_name
+      ::Ability.admin_group_name
     end
 
     def create_workflows_for(permission_template:)

data/app/services/hyrax/change_content_depositor_service.rb

@@ -13,6 +13,7 @@ module Hyrax
     #              sets; regardless of true/false make the given user
     #              the depositor of the given work
     def self.call(work, user, reset)
+      Deprecation.warn("This class will be removed in the next major release. Use Hyrax::ChangeDepositorService.call instead.")
       case work
       when ActiveFedora::Base
         call_af(work, user, reset)
@@ -49,7 +50,6 @@ module Hyrax
       apply_valkyrie_changes_to_file_sets(work: work, user: user, reset: reset)
 
       Hyrax.persister.save(resource: work)
-      work
     end
     private_class_method :call_valkyrie
 
@@ -61,7 +61,7 @@ module Hyrax
     private_class_method :apply_depositor_metadata
 
     def self.apply_valkyrie_changes_to_file_sets(work:, user:, reset:)
-      Hyrax.custom_queries.find_child_filesets(resource: work).each do |f|
+      Hyrax.custom_queries.find_child_file_sets(resource: work).each do |f|
         if reset
           f.permission_manager.acl.permissions = []
           f.permission_manager.acl.save

data/app/services/hyrax/change_depositor_service.rb

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+module Hyrax
+  class ChangeDepositorService
+    # Set the given `user` as the depositor of the given `work`; If
+    # `reset` is true, first remove all previous permissions.
+    #
+    # Used to transfer a an existing work, and to set
+    # depositor / proxy_depositor on a work newly deposited
+    # on_behalf_of another user
+    #
+    # @param work [ActiveFedora::Base, Valkyrie::Resource] the work
+    #             that is receiving a change of depositor
+    # @param user [User] the user that will "become" the depositor of
+    #             the given work
+    # @param reset [TrueClass, FalseClass] when true, first clear
+    #              permissions for the given work and contained file
+    #              sets; regardless of true/false make the given user
+    #              the depositor of the given work
+    # @return work, updated if necessary
+    def self.call(work, user, reset)
+      # user_key is nil when there was no `on_behalf_of` in the form
+      return work unless user&.user_key
+      # Don't transfer to self
+      return work if user.user_key == work.depositor
+
+      work = case work
+             when ActiveFedora::Base
+               call_af(work, user, reset)
+             when Valkyrie::Resource
+               call_valkyrie(work, user, reset)
+             end
+      ChangeDepositorEventJob.perform_later(work)
+      work
+    end
+
+    def self.call_af(work, user, reset)
+      work.proxy_depositor = work.depositor
+      work.permissions = [] if reset
+      work.apply_depositor_metadata(user)
+      work.save!
+      Hyrax::PropagateChangeDepositorJob.perform_later(work.id.to_s, user, reset)
+      work
+    end
+    private_class_method :call_af
+
+    # @todo Should this include some dependency injection regarding
+    # the Hyrax.persister and Hyrax.custom_queries?
+    def self.call_valkyrie(work, user, reset)
+      if reset
+        work.permission_manager.acl.permissions = []
+        work.permission_manager.acl.save
+      end
+
+      work.proxy_depositor = work.depositor
+      apply_depositor_metadata(work, user)
+
+      work = Hyrax.persister.save(resource: work)
+      Hyrax::PropagateChangeDepositorJob.perform_later(work.id.to_s, user, reset)
+      work
+    end
+    private_class_method :call_valkyrie
+
+    def self.apply_depositor_metadata(resource, depositor)
+      depositor_id = depositor.respond_to?(:user_key) ? depositor.user_key : depositor
+      resource.depositor = depositor_id if resource.respond_to? :depositor=
+      Hyrax::AccessControlList.new(resource: resource).grant(:edit).to(::User.find_by_user_key(depositor_id)).save
+    end
+    private_class_method :apply_depositor_metadata
+  end
+end

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

@@ -14,7 +14,7 @@ class Hyrax::Characterization::ValkyrieCharacterizationService
   def self.run(metadata:, file:, user: ::User.system_user, **options)
     new(metadata: metadata, file: file, **options).characterize
     saved = Hyrax.persister.save(resource: metadata)
-    Hyrax.publisher.publish('object.metadata.updated', object: saved, user: user)
+    Hyrax.publisher.publish('file.metadata.updated', metadata: saved, user: user)
   end
 
   ##