hyrax 5.0.0.rc1 → 5.0.0.rc3

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/file_set_file_service.rb

@@ -2,8 +2,17 @@
 
 module Hyrax
   ##
-  # A service for accessing specific Hyrax::FileMetadata objects referenced by a
-  # Hyrax::FileSet.
+  # A service for accessing {Hyrax::FileMetadata} resources by their status
+  # within a {Hyrax::FileSet}. For example, this is the home for the abstraction
+  # of a "Primary" file for the FileSet, used for versioning and as the default
+  # source for the FileSet label, etc...
+  #
+  # If you're looking for {Hyrax::FileMetadata} by PCDM Use, use the custom
+  # queries (e.g. +Hyrax.custom_queries.find_original_file+).
+  #
+  # @note housing the "primary" file abstraction here allows us to begin
+  #   separating from the idea that the `pcdmuse:OriginalFile` is special
+  #   in Hyrax in a hard coded way.
   class FileSetFileService
     ##
     # @!attribute [r] file_set
@@ -23,7 +32,7 @@ module Hyrax
     end
 
     ##
-    # Return the Hyrax::FileMetadata which should be considered “original” for
+    # Return the Hyrax::FileMetadata which should be considered “primary” for
     # indexing and version‐tracking.
     #
     # If +file_set.original_file_id+ is defined, it will be used; otherwise,
@@ -32,7 +41,7 @@ module Hyrax
     # first file in its :file_ids.
     #
     # @return [Hyrax::FileMetadata]
-    def original_file
+    def primary_file
       if file_set.original_file_id
         # Always just use original_file_id if it is defined.
         #
@@ -43,13 +52,15 @@ module Hyrax
         # Cache the fallback to avoid needing to do this query twice.
         #
         # See NOTE above regarding use of :find_file_metadata_by.
-        @original_file ||= begin
-                             query_service.custom_queries.find_original_file(file_set: file_set)
-                           rescue Valkyrie::Persistence::ObjectNotFoundError
-                             fallback_id = file_set.file_ids.first
-                             query_service.custom_queries.find_file_metadata_by(id: fallback_id) if fallback_id
-                           end
+        @primary_file ||= begin
+                            query_service.custom_queries.find_original_file(file_set: file_set)
+                          rescue Valkyrie::Persistence::ObjectNotFoundError
+                            fallback_id = file_set.file_ids.first
+                            query_service.custom_queries.find_file_metadata_by(id: fallback_id) if fallback_id
+                          end
       end
     end
+    alias original_file primary_file
+    deprecation_deprecate :original_file
   end
 end

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/form_factory.rb

@@ -23,7 +23,7 @@ module Hyrax
     #
     # @see https://trailblazer.to/2.0/gems/reform/prepopulator.html
     def build(model, _ability, _controller)
-      Hyrax::Forms::ResourceForm.for(model).prepopulate!
+      Hyrax::Forms::ResourceForm.for(resource: model).prepopulate!
     end
   end
 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/lease_manager.rb

@@ -12,12 +12,13 @@ module Hyrax
   #       date is today or later.
   #    - "Applied" means the lease's pre-expiration visibility has been set on
   #      the resource.
-  #    - "Released" means the lease's post-expiration visibility has been set on
-  #      the resource.
   #    - "Enforced" means the object's visibility matches the pre-expiration
   #      visibility of the lease; i.e. the lease has been applied,
   #      but not released.
-  #    - "Deactivate" means that the existing lease will be removed
+  #    - "Released" means the leases's post-release visibility has been set on
+  #      the resource.
+  #    - "Deactivate" means that the existing lease will be removed, even if it
+  #      is active
   #
   class LeaseManager # rubocop:disable Metrics/ClassLength
     ##
@@ -53,11 +54,25 @@ module Hyrax
           .lease
       end
 
+      # @return [Boolean]
+      def deactivate_lease_for(resource:, query_service: Hyrax.query_service)
+        new(resource: resource, query_service: query_service)
+          .deactivate
+      end
+
+      # @return [Boolean]
+      def deactivate_lease_for!(resource:, query_service: Hyrax.query_service)
+        new(resource: resource, query_service: query_service)
+          .deactivate!
+      end
+
+      # @return [Boolean]
       def release_lease_for(resource:, query_service: Hyrax.query_service)
         new(resource: resource, query_service: query_service)
           .release
       end
 
+      # @return [Boolean]
       def release_lease_for!(resource:, query_service: Hyrax.query_service)
         new(resource: resource, query_service: query_service)
           .release!
@@ -93,20 +108,15 @@ module Hyrax
       # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
     end
 
+    def deactivate
+      release(force: true) &&
+        nullify(force: true)
+    end
+
     # Deactivates the lease and logs a message to the lease_history property
     def deactivate!
-      lease_state = lease.active? ? 'active' : 'expired'
-      lease_record = lease_history_message(
-        lease_state,
-        Time.zone.today,
-        lease.lease_expiration_date,
-        lease.visibility_during_lease,
-        lease.visibility_after_lease
-      )
-
       release(force: true)
       nullify(force: true)
-      lease.lease_history += [lease_record]
     end
 
     ##
@@ -153,14 +163,15 @@ module Hyrax
     ##
     # Drop the lease by setting its release date and visibility settings to `nil`.
     #
-    # @param force [boolean] force the nullify even when the lease period is current
-    # @return [void]
+    # @param force [Boolean] force the nullify even when the lease period is current
+    # @return [Boolean]
     def nullify(force: false)
       return false if !force && under_lease?
 
       lease.lease_expiration_date = nil
       lease.visibility_during_lease = nil
       lease.visibility_after_lease = nil
+      true
     end
 
     ##
@@ -172,6 +183,18 @@ module Hyrax
     # @return [Boolean]
     def release(force: false)
       return false if !force && under_lease?
+
+      lease_state = lease.active? ? 'active' : 'expired'
+      history_record = lease_history_message(
+        lease_state,
+        Hyrax::TimeService.time_in_utc,
+        lease.lease_expiration_date,
+        lease.visibility_during_lease,
+        lease.visibility_after_lease
+      )
+
+      lease.lease_history += [history_record]
+
       return true if lease.visibility_after_lease.nil?
 
       resource.visibility = lease.visibility_after_lease
@@ -202,7 +225,7 @@ module Hyrax
       [:visibility_after_lease, :visibility_during_lease, :lease_expiration_date]
     end
 
-    # Create the log message used when deactivating a lease
+    # Create the log message used when releasing a lease
     def lease_history_message(state, deactivate_date, expiration_date, visibility_during, visibility_after)
       I18n.t 'hydra.lease.history_message',
               state: state,

data/app/services/hyrax/lease_service.rb

@@ -1,20 +1,26 @@
 # frozen_string_literal: true
 module Hyrax
+  ##
+  # Methods for Querying Repository to find Objects with leases
   class LeaseService < RestrictionService
     class << self
       # Returns all assets with lease expiration date set to a date in the past
-      def assets_with_expired_leases
+      def assets_with_expired_enforced_leases
         builder = Hyrax::ExpiredLeaseSearchBuilder.new(self)
         presenters(builder)
       end
+      alias assets_with_expired_leases assets_with_expired_enforced_leases
 
-      # Returns all assets with lease expiration 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_lease
+      ##
+      # Returns all assets with leases that are currently enforced,
+      # regardless of whether the leases are active or expired.
+      #
+      # @see Hyrax::LeaseManager
+      def assets_with_enforced_leases
         builder = Hyrax::LeaseSearchBuilder.new(self)
-        presenters(builder)
+        presenters(builder).select(&:enforced?)
       end
+      alias assets_under_lease assets_with_enforced_leases
 
       # Returns all assets that have had embargoes deactivated in the past.
       def assets_with_deactivated_leases

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

@@ -7,7 +7,7 @@ module Hyrax
     #
     # Hyrax's `Ability` behavior depends on the index being up-to-date as
     # concerns-their read/write users/groups, and visibility.
-    class AclIndexListener
+    class ACLIndexListener
       ##
       # Re-index the resource for the updated ACL.
       #

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

@@ -7,7 +7,7 @@ module Hyrax
     #
     # Hyrax's `Ability` behavior depends on the index being up-to-date as
     # concerns-their read/write users/groups, and visibility.
-    class ActiveFedoraAclIndexListener
+    class ActiveFedoraACLIndexListener
       ##
       # Re-index the resource for the updated ACL.
       #

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

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

@@ -9,37 +9,25 @@ module Hyrax
       # @param [Dry::Events::Event] event
       # @return [void]
       def on_object_deleted(event)
-        return unless event.payload.key?(:object) # legacy callback
-        return if event[:object].is_a?(ActiveFedora::Base) # handled by legacy code
+        event = event.to_h
+        return unless event[:object]
 
-        Hyrax.custom_queries.find_child_file_sets(resource: event[:object]).each do |file_set|
-          Hyrax.persister.delete(resource: file_set)
-          Hyrax.publisher
-               .publish('object.deleted', object: file_set, id: file_set.id, user: event[:user])
-        rescue StandardError # we don't uncaught errors looping filesets
-          Hyrax.logger.warn "Failed to delete #{file_set.class}:#{file_set.id} " \
-                            "during cleanup for resource: #{event[:object]}. " \
-                            'This member may now be orphaned.'
+        object = event[:object]
+        user = event[:user]
+        return unless object.is_a?(Hyrax::Work)
+
+        Hyrax.query_service.find_parents(resource: object).each do |parent|
+          parent.member_ids -= [object.id]
+          Hyrax.persister.save(resource: parent)
+          Hyrax.index_adapter.save(resource: parent)
+          Hyrax.publisher.publish('object.membership.updated', object: parent, user: user)
         end
       end
 
       # Called when 'collection.deleted' event is published
       # @param [Dry::Events::Event] event
       # @return [void]
-      def on_collection_deleted(event)
-        return unless event.payload.key?(:collection) # legacy callback
-        return if event[:collection].is_a?(ActiveFedora::Base) # handled by legacy code
-
-        Hyrax.custom_queries.find_members_of(collection: event[:collection]).each do |resource|
-          resource.member_of_collection_ids -= [event[:collection].id]
-          Hyrax.persister.save(resource: resource)
-          Hyrax.publisher
-               .publish('collection.membership.updated', collection: event[:collection], user: event[:user])
-        rescue StandardError
-          Hyrax.logger.warn "Failed to remove collection reference from #{work.class}:#{work.id} " \
-                            "during cleanup for collection: #{event[:collection]}. "
-        end
-      end
+      def on_collection_deleted(event); end
     end
   end
 end

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

@@ -83,6 +83,17 @@ module Hyrax
         Hyrax.index_adapter.delete(resource: event[:collection])
       end
 
+      ##
+      # Remove the resource from the index.
+      #
+      # Called when 'file.metadata.deleted' event is published
+      # @param [Dry::Events::Event] event
+      # @return [void]
+      def on_file_metadata_deleted(event)
+        return unless resource? event.payload[:metadata]
+        Hyrax.index_adapter.delete(resource: event[:metadata])
+      end
+
       private
 
       def resource?(resource)

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

@@ -10,7 +10,11 @@ module Hyrax
       # @param [Dry::Events::Event] event
       # @return [void]
       def on_object_deleted(event)
-        ContentDeleteEventJob.perform_later(event[:id].to_s, event[:user])
+        # Accessing a non-existent key on a Dry::Events::Event will raise a KeyError; hence
+        # we cast the event to a hash
+        event = event.to_h
+        object_id = event[:object]&.id || event[:id]
+        ContentDeleteEventJob.perform_later(object_id.to_s, event[:user])
       end
 
       ##

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

@@ -9,7 +9,8 @@ module Hyrax
       # @param [Dry::Events::Event] event
       # @return [void]
       def on_object_deleted(event)
-        Trophy.where(work_id: event[:id]).destroy_all
+        object_id = event[:object]&.id || event[:id]
+        Trophy.where(work_id: object_id).destroy_all
       rescue StandardError => err
         Hyrax.logger.warn "Failed to delete trophies for #{event[:id]}. " \
                           'These trophies might be orphaned.' \

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

@@ -22,6 +22,7 @@ module Hyrax
       # @param [Dry::Events::Event] event
       # @return [void]
       def on_object_deposited(event)
+        event = event.to_h
         return Hyrax.logger.warn("Skipping workflow initialization for #{event[:object]}; no user is given\n\t#{event}") if
           event[:user].blank?
 
@@ -30,6 +31,18 @@ module Hyrax
         # don't error on known sipity error types; log instead
         Hyrax.logger.error(err)
       end
+
+      ##
+      # Called when 'object.deleted' event is published
+      # @param [Dry::Events::Event] event
+      # @return [void]
+      def on_object_deleted(event)
+        event = event.to_h
+        return unless event[:object]
+        gid = Hyrax::ValkyrieGlobalIdProxy.new(resource: event[:object]).to_global_id
+        return if gid.blank?
+        Sipity::Entity.where(proxy_for_global_id: gid.to_s).destroy_all
+      end
     end
   end
 end

data/app/services/hyrax/listeners.rb

@@ -17,7 +17,8 @@ module Hyrax
   module Listeners
     extend ActiveSupport::Autoload
 
-    autoload :AclIndexListener
+    autoload :ACLIndexListener
+    autoload :ActiveFedoraACLIndexListener
     autoload :BatchNotificationListener
     autoload :FileMetadataListener
     autoload :FileSetLifecycleListener

data/app/services/hyrax/location_service.rb

@@ -10,6 +10,9 @@ module Hyrax
       Rails.cache.fetch(cache_key(id), expires_in: CACHE_EXPIRATION) do
         label.call(find(id))
       end
+    rescue URI::InvalidURIError
+      # Old data may be just a string, display it.
+      uri
     end
 
     private

data/app/services/hyrax/lock_manager.rb

@@ -47,11 +47,10 @@ module Hyrax
     # @api private
     #
     # @note support both a ConnectionPool and a raw Redis client for now.
-    #   we should drop support for `Redis.current` in 5.0.0.
     #   `#then` supports both options. for a ConnectionPool it will block
     #   until a connection is available.
     def pool
-      Hyrax.config.redis_connection || Redis.current
+      Hyrax.config.redis_connection || Redis.new
     end
   end
 end

data/app/services/hyrax/multiple_membership_checker.rb

@@ -145,7 +145,7 @@ module Hyrax
     def collection_titles_from_list(collection_list)
       collection_list.map do |collection|
         collection.title.first
-      end.to_sentence
+      end.sort.to_sentence
     end
   end
 end

data/app/services/hyrax/simple_schema_loader.rb

@@ -15,7 +15,7 @@ module Hyrax
     #   types
     def attributes_for(schema:)
       definitions(schema).each_with_object({}) do |definition, hash|
-        hash[definition.name] = definition.type
+        hash[definition.name] = definition.type.meta(definition.config)
       end
     end
 
@@ -43,6 +43,12 @@ module Hyrax
       end
     end
 
+    def permissive_schema_for_valkrie_adapter
+      metadata_files.each_with_object({}) do |schema_name, ret_hsh|
+        predicate_pairs(ret_hsh, schema_name)
+      end
+    end
+
     ##
     # @api private
     class AttributeDefinition
@@ -154,5 +160,30 @@ module Hyrax
     def config_search_paths
       [Rails.root, Hyrax::Engine.root]
     end
+
+    def metadata_files
+      file_name_arr = []
+      config_search_paths.each { |root_path| file_name_arr += Dir.entries(root_path.to_s + "/config/metadata/") }
+      file_name_arr.reject { |fn| !fn.include?('.yaml') }.uniq.map { |y| y.gsub('.yaml', '') }
+    end
+
+    def predicate_pairs(ret_hsh, schema_name)
+      schema_config(schema_name)['attributes'].each do |name, config|
+        predicate = RDF::URI(config['predicate'])
+        if ret_hsh[name].blank?
+          ret_hsh[name.to_sym] = predicate
+        elsif ret_hsh[name] != predicate
+          multiple_predicate_message(name, ret_hsh[name], predicate)
+        end
+      end
+    end
+
+    def multiple_predicate_message(name, existing, incoming)
+      message =  "The attribute of #{name} has been assigned a predicate multiple times " \
+                 "within the metadata YAMLs. Please be aware that once the attribute's " \
+                 "predicate value is first assigned, any other value will be ignored. " \
+                 "The existing value is #{existing} preventing the use of #{incoming}"
+      Hyrax.logger.warn(message)
+    end
   end
 end

data/app/services/hyrax/solr_service.rb

@@ -9,6 +9,22 @@ module Hyrax
   class SolrService
     COMMIT_PARAMS = { softCommit: true }.freeze
 
+    ##
+    # @!group Class Attributes
+    #
+    # @!attribute additional_solr_get_and_post_params
+    #
+    #   ActiveFedora::SolrService always assumed that it would pass `qt: 'standard'`.  However, as
+    #   Valkyrie arrived, we have a case where we would not pass the `qt: standard`.  We're favoring
+    #   a default value to preserve prior expectations that ActiveFedora::SolrService set and to not
+    #   suddenly break those that switch to Valkyrie and Hyrax::SolrService.
+    #
+    #   @return [Hash<Symbol, String>]
+    #   @see https://github.com/samvera/hyrax/pull/6677
+    class_attribute :additional_solr_get_and_post_params, default: { qt: 'standard' }
+    # @!endgroup Class Attributes
+    ##
+
     ##
     # @!attribute [r] use_valkyrie
     #   @private
@@ -17,7 +33,7 @@ module Hyrax
     delegate :commit, to: :connection
 
     def initialize(use_valkyrie: Hyrax.config.query_index_from_valkyrie)
-      @old_service = ActiveFedora::SolrService
+      @old_service = ActiveFedora::SolrService # What hopefully will be the lone reference to ActiveFedora::SolrService
       @use_valkyrie = use_valkyrie
     end
 
@@ -46,9 +62,8 @@ module Hyrax
     def get(query = nil, **args)
       # Make Hyrax.config.solr_select_path the default SOLR path
       solr_path = args.delete(:path) || Hyrax.config.solr_select_path
-      args = args.merge(q: query) if query.present?
+      args = args.merge(additional_solr_get_and_post_params.merge(q: query)) if query.present?
 
-      args = args.merge(qt: 'standard') unless query.blank? || use_valkyrie
       connection.get(solr_path, params: args)
     end
 
@@ -66,9 +81,8 @@ module Hyrax
     def post(query = nil, **args)
       # Make Hyrax.config.solr_select_path the default SOLR path
       solr_path = args.delete(:path) || Hyrax.config.solr_select_path
-      args = args.merge(q: query) if query.present?
+      args = args.merge(additional_solr_get_and_post_params.merge(q: query)) if query.present?
 
-      args = args.merge(qt: 'standard') unless query.blank? || use_valkyrie
       connection.post(solr_path, data: args)
     end