hyrax 4.0.0 → 5.0.0.rc2

data/app/helpers/hyrax/work_form_helper.rb

@@ -97,112 +97,5 @@ module Hyrax
         hash[presenter.title_or_label] = presenter.id
       end
     end
-
-    ##
-    # This helper retrieves errors based on form type.
-    #
-    # @param form [Hyrax::Forms::WorkForm] or Hyrax::ChangeSet
-    # @return [String] specific error message
-    def in_works_ids_errors_for(form:)
-      case form
-      when Hyrax::ChangeSet
-        form.errors[:in_works_ids]
-      else
-        form.model.errors[:in_works_ids]
-      end
-    end
-
-    ##
-    # This helper retrieves errors based on form type.
-    #
-    # @param form [Hyrax::Forms::WorkForm] or Hyrax::ChangeSet
-    # @return [String] specific error message
-    def ordered_member_ids_errors_for(form:)
-      case form
-      when Hyrax::ChangeSet
-        form.errors[:ordered_member_ids]
-      else
-        form.model.errors[:ordered_member_ids]
-      end
-    end
-
-    ##
-    # This helper retrieves errors based on form type.
-    #
-    # @param form [Hyrax::Forms::WorkForm] or Hyrax::ChangeSet
-    # @return [String] specific error message
-    def visibility_errors_for(form:)
-      case form
-      when Hyrax::ChangeSet
-        form.errors[:visibility]
-      else
-        form.model.errors[:visibility]
-      end
-    end
-
-    ##
-    # This helper retrieves errors based on form type.
-    #
-    # @param form [Hyrax::Forms::WorkForm] or Hyrax::ChangeSet
-    # @return [String] specific error message
-    def embargo_release_date_errors_for(form:)
-      case form
-      when Hyrax::ChangeSet
-        form.errors[:embargo_release_date]
-      else
-        form.model.errors[:embargo_release_date]
-      end
-    end
-
-    ##
-    # This helper retrieves errors based on form type.
-    #
-    # @param form [Hyrax::Forms::WorkForm] or Hyrax::ChangeSet
-    # @return [String] specific error message
-    def visibility_after_embargo_errors_for(form:)
-      case form
-      when Hyrax::ChangeSet
-        form.errors[:visibility_after_embargo]
-      else
-        form.model.errors[:visibility_after_embargo]
-      end
-    end
-
-    ##
-    # This helper retrieves errors based on form type.
-    #
-    # @param form [Hyrax::Forms::WorkForm] or Hyrax::ChangeSet
-    # @return [String] specific error message
-    def lease_expiration_date_errors_for(form:)
-      case form
-      when Hyrax::ChangeSet
-        form.errors[:lease_expiration_date_errors]
-      else
-        form.model.errors[:lease_expiration_date_errors]
-      end
-    end
-
-    ##
-    # This helper retrieves errors based on form type.
-    #
-    # @param form [Hyrax::Forms::WorkForm] or Hyrax::ChangeSet
-    # @return [String] specific error message
-    def visibility_after_lease_errors_for(form:)
-      case form
-      when Hyrax::ChangeSet
-        form.errors[:visibility_after_lease]
-      else
-        form.model.errors[:visibility_after_lease]
-      end
-    end
-
-    ##
-    # This helper retrieves errors based on form type.
-    #
-    # @param form [Hyrax::Forms::WorkForm] or Hyrax::ChangeSet
-    # @return [String] specific error message
-    def full_collections_errors(form:)
-      form.full_error(:collections) || form.full_error(:member_of_collection_ids)
-    end
   end
 end

data/app/indexers/hyrax/file_set_indexer.rb

@@ -30,6 +30,7 @@ module Hyrax
         solr_doc['original_checksum_tesim'] = object.original_checksum
         solr_doc['alpha_channels_ssi']      = object.alpha_channels
         solr_doc['original_file_id_ssi']    = original_file_id
+        solr_doc['extracted_text_id_ssi']   = extracted_text_id
         solr_doc['generic_type_si'] = 'FileSet'
       end
     end
@@ -46,6 +47,11 @@ module Hyrax
       Hyrax::VersioningService.versioned_file_id object.original_file
     end
 
+    def extracted_text_id
+      return unless object.extracted_text
+      Hyrax::VersioningService.versioned_file_id object.extracted_text
+    end
+
     def file_format
       if object.mime_type.present? && object.format_label.present?
         "#{object.mime_type.split('/').last} (#{object.format_label.join(', ')})"

data/app/indexers/hyrax/location_indexer.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Hyrax
+  ##
+  # Indexes properties common to Hyrax::Resource types
+  module LocationIndexer
+    def to_solr
+      super.tap do |index_document|
+        index_document[:based_near_label_tesim] = based_near_label_lookup(resource.based_near) if resource.respond_to? :based_near
+      end
+    end
+
+    private
+
+    def based_near_label_lookup(locations)
+      locations.map do |loc|
+        if URI.parse(loc)
+          location_service.full_label(loc)
+        else
+          loc
+        end
+      end
+    end
+
+    def location_service
+      Hyrax.config.location_service
+    end
+  end
+end

data/app/indexers/hyrax/valkyrie_file_set_indexer.rb

@@ -3,7 +3,7 @@
 module Hyrax
   ##
   # Indexes Hyrax::FileSet objects
-  class ValkyrieFileSetIndexer < Hyrax::ValkyrieIndexer
+  class ValkyrieFileSetIndexer < Hyrax::ValkyrieIndexer # rubocop:disable Metrics/ClassLength
     include Hyrax::ResourceIndexer
     include Hyrax::PermissionIndexer
     include Hyrax::VisibilityIndexer
@@ -17,11 +17,14 @@ module Hyrax
 
         # Metadata from the FileSet
         solr_doc['file_ids_ssim']                = resource.file_ids&.map(&:to_s)
-        solr_doc['original_file_id_ssi']         = resource.original_file_id.to_s
+        solr_doc['original_file_id_ssi']         = resource.iiif_id
         solr_doc['extracted_text_id_ssi']        = resource.extracted_text_id.to_s
         solr_doc['hasRelatedMediaFragment_ssim'] = resource.representative_id.to_s
         solr_doc['hasRelatedImage_ssim']         = resource.thumbnail_id.to_s
 
+        index_lease(solr_doc)
+        index_embargo(solr_doc)
+
         # Add in metadata from the original file.
         file_metadata = Hyrax::FileSetFileService.new(file_set: resource).original_file
         return solr_doc unless file_metadata
@@ -36,12 +39,13 @@ module Hyrax
 
         solr_doc['file_format_tesim']       = file_format(file_metadata)
         solr_doc['file_format_sim']         = file_format(file_metadata)
-        solr_doc['file_size_lts']           = file_metadata.size[0]
-        solr_doc['type_tesim']              = file_metadata.type.map(&:to_s) if file_metadata.type.present?
+        solr_doc['file_size_lts']           = file_metadata.recorded_size[0]
+        solr_doc['type_tesim']              = file_metadata.pcdm_use.map(&:to_s) if file_metadata.pcdm_use.present?
+        solr_doc['pcdm_use_tesim'] = file_metadata.pcdm_use.map(&:to_s) if file_metadata.pcdm_use.present?
 
         # attributes set by fits
         solr_doc['format_label_tesim']      = file_metadata.format_label if file_metadata.format_label.present?
-        solr_doc['size_tesim']              = file_metadata.size if file_metadata.size.present?
+        solr_doc['size_tesim']              = file_metadata.recorded_size if file_metadata.recorded_size.present?
         solr_doc['well_formed_tesim']       = file_metadata.well_formed if file_metadata.well_formed.present?
         solr_doc['valid_tesim']             = file_metadata.valid if file_metadata.valid.present?
         solr_doc['fits_version_tesim']      = file_metadata.fits_version if file_metadata.fits_version.present?
@@ -56,10 +60,13 @@ module Hyrax
 
         solr_doc['height_tesim']            = file_metadata.height if file_metadata.height.present? # image, video
         solr_doc['width_tesim']             = file_metadata.width if file_metadata.width.present? # image, video
+        solr_doc['height_is']               = Integer(file_metadata.height.first) if file_metadata.height.present?
+        solr_doc['width_is']                = Integer(file_metadata.width.first) if file_metadata.width.present?
 
         # attributes set by fits for audio files
         solr_doc['bit_depth_tesim']         = file_metadata.bit_depth if file_metadata.bit_depth.present?
         solr_doc['channels_tesim']          = file_metadata.channels if file_metadata.channels.present?
+        solr_doc['alpha_channels_ssi']      = file_metadata.channels.first if file_metadata.channels.present?
         solr_doc['data_format_tesim']       = file_metadata.data_format if file_metadata.data_format.present?
         solr_doc['offset_tesim']            = file_metadata.offset if file_metadata.offset.present?
 
@@ -108,5 +115,29 @@ module Hyrax
         file.format_label
       end
     end
+
+    def index_lease(doc)
+      if resource.lease&.active?
+        doc['lease_expiration_date_dtsi'] = resource.lease.lease_expiration_date&.to_datetime
+        doc['visibility_after_lease_ssim'] = resource.lease.visibility_after_lease
+        doc['visibility_during_lease_ssim'] = resource.lease.visibility_during_lease
+      else
+        doc['lease_history_ssim'] = resource&.lease&.lease_history
+      end
+
+      doc
+    end
+
+    def index_embargo(doc)
+      if resource.embargo&.active?
+        doc['embargo_release_date_dtsi'] = resource.embargo.embargo_release_date&.to_datetime
+        doc['visibility_after_embargo_ssim'] = resource.embargo.visibility_after_embargo
+        doc['visibility_during_embargo_ssim'] = resource.embargo.visibility_during_embargo
+      else
+        doc['embargo_history_ssim'] = resource&.embargo&.embargo_history
+      end
+
+      doc
+    end
   end
 end

data/app/indexers/hyrax/valkyrie_work_indexer.rb

@@ -7,6 +7,7 @@ module Hyrax
     include Hyrax::ResourceIndexer
     include Hyrax::PermissionIndexer
     include Hyrax::VisibilityIndexer
+    include Hyrax::LocationIndexer
     include Hyrax::ThumbnailIndexer
     include Hyrax::Indexer(:core_metadata)
 
@@ -25,6 +26,7 @@ module Hyrax
         solr_doc['depositor_tesim'] = [resource.depositor]
         solr_doc['hasRelatedMediaFragment_ssim'] = [resource.representative_id.to_s]
         solr_doc['hasRelatedImage_ssim'] = [resource.thumbnail_id.to_s]
+        solr_doc['hasFormat_ssim'] = resource.rendering_ids.map(&:to_s) if resource.rendering_ids.present?
         index_embargo(solr_doc)
         index_lease(solr_doc)
       end
@@ -43,19 +45,24 @@ module Hyrax
     end
 
     def index_embargo(doc)
-      if Hyrax::EmbargoManager.new(resource: resource).under_embargo?
+      if resource.embargo&.active?
         doc['embargo_release_date_dtsi'] = resource.embargo.embargo_release_date&.to_datetime
         doc['visibility_after_embargo_ssim'] = resource.embargo.visibility_after_embargo
         doc['visibility_during_embargo_ssim'] = resource.embargo.visibility_during_embargo
+      else
+        doc['embargo_history_ssim'] = resource&.embargo&.embargo_history
       end
+
       doc
     end
 
     def index_lease(doc)
-      if Hyrax::LeaseManager.new(resource: resource).under_lease?
+      if resource.lease&.active?
         doc['lease_expiration_date_dtsi'] = resource.lease.lease_expiration_date&.to_datetime
         doc['visibility_after_lease_ssim'] = resource.lease.visibility_after_lease
         doc['visibility_during_lease_ssim'] = resource.lease.visibility_during_lease
+      else
+        doc['lease_history_ssim'] = resource&.lease&.lease_history
       end
 
       doc

data/app/inputs/controlled_vocabulary_input.rb

@@ -44,7 +44,7 @@ class ControlledVocabularyInput < MultiValueInput
   def hidden_id_field(value, index)
     name = name_for(attribute_name, index, 'id')
     id = id_for(attribute_name, index, 'id')
-    hidden_value = value.node? ? '' : value.rdf_subject
+    hidden_value = value.try(:node?) ? '' : value.rdf_subject
     @builder.hidden_field(attribute_name, name: name, id: id, value: hidden_value, data: { id: 'remote' })
   end
 

data/app/jobs/characterize_job.rb

@@ -51,7 +51,7 @@ class CharacterizeJob < Hyrax::ApplicationJob
     # value. So later we'll ensure it's set to the new file's filename.
     reset_title = file_set.title.first == file_set.label
 
-    characterization_service.run(file_set.characterization_proxy, filepath)
+    characterization_service.run(file_set.characterization_proxy, filepath, **Hyrax.config.characterization_options)
     Hyrax.logger.debug "Ran characterization on #{file_set.characterization_proxy.id} (#{file_set.characterization_proxy.mime_type})"
     file_set.characterization_proxy.alpha_channels = channels(filepath) if file_set.image? && Hyrax.config.iiif_image_server?
     file_set.characterization_proxy.save!

data/app/jobs/create_work_job.rb

@@ -17,15 +17,47 @@ class CreateWorkJob < Hyrax::ApplicationJob
   def perform(user, model, attributes, operation)
     operation.performing!
     work = model.constantize.new
-    current_ability = Ability.new(user)
-    env = Hyrax::Actors::Environment.new(work, current_ability, attributes)
-    status = work_actor.create(env)
+    if model.constantize < ActiveFedora::Base
+      status = batch_create_af_work(work, attributes, user)
+      errors = work.errors
+    else
+      result = batch_create_valkyrie_work(work, attributes, user)
+      status = result.success?
+      errors = result.failure&.last
+    end
+
     return operation.success! if status
-    operation.fail!(work.errors.full_messages.join(' '))
+    operation.fail!(errors.full_messages.join(' '))
   end
 
   private
 
+  def batch_create_af_work(work, attributes, user)
+    current_ability = Ability.new(user)
+    env = Hyrax::Actors::Environment.new(work, current_ability, attributes)
+    work_actor.create(env)
+  end
+
+  def batch_create_valkyrie_work(work, attributes, user)
+    uploaded_file_ids = attributes.delete(:uploaded_files)
+    files = Hyrax::UploadedFile.find(uploaded_file_ids)
+    permissions_params = attributes.delete(:permissions_attributes)
+    form = Hyrax::FormFactory.new.build(work, nil, nil)
+    form.validate(attributes)
+
+    transactions['change_set.create_work']
+      .with_step_args(
+        'work_resource.add_file_sets' => { uploaded_files: files },
+        'change_set.set_user_as_depositor' => { user: user },
+        'work_resource.save_acl' => { permissions_params: permissions_params }
+      )
+      .call(form)
+  end
+
+  def transactions
+    Hyrax::Transactions::Container
+  end
+
   def work_actor
     Hyrax::CurationConcern.actor
   end

data/app/jobs/valkyrie_characterization_job.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+class ValkyrieCharacterizationJob < Hyrax::ApplicationJob
+  queue_as Hyrax.config.ingest_queue_name
+  def perform(file_metadata_id)
+    file_metadata = Hyrax.custom_queries.find_file_metadata_by(id: file_metadata_id)
+    Hyrax.config.characterization_service
+         .run(metadata: file_metadata, file: file_metadata.file, **Hyrax.config.characterization_options)
+  end
+end

data/app/jobs/valkyrie_create_derivatives_job.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 class ValkyrieCreateDerivativesJob < Hyrax::ApplicationJob
   queue_as Hyrax.config.ingest_queue_name
-  def perform(_file_set_id, file_id, _filepath = nil)
+  def perform(file_set_id, file_id, _filepath = nil)
     file_metadata = Hyrax.custom_queries.find_file_metadata_by(id: file_id)
     return if file_metadata.video? && !Hyrax.config.enable_ffmpeg
     # Get file into a local path.
@@ -9,15 +9,16 @@ class ValkyrieCreateDerivativesJob < Hyrax::ApplicationJob
     # Call derivatives with the file_set.
     derivative_service = Hyrax::DerivativeService.for(file_metadata)
     derivative_service.create_derivatives(file.disk_path)
+    reindex_parent(file_set_id)
   end
 
   private
 
-  def query_service
-    Hyrax.query_service
-  end
-
-  def storage_adapter
-    Hyrax.storage_adapter
+  def reindex_parent(file_set_id)
+    file_set = Hyrax.query_service.find_by(id: file_set_id)
+    parent = Hyrax.custom_queries.find_parent_work(resource: file_set)
+    return unless parent.thumbnail_id == file_set.id
+    Hyrax.logger.debug { "Reindexing #{parent.id} due to creation of thumbnail derivatives." }
+    Hyrax.index_adapter.save(resource: parent)
   end
 end

data/app/jobs/valkyrie_ingest_job.rb

@@ -25,15 +25,12 @@ class ValkyrieIngestJob < Hyrax::ApplicationJob
   def ingest(file:, pcdm_use:)
     file_set_uri = Valkyrie::ID.new(file.file_set_uri)
     file_set = Hyrax.query_service.find_by(id: file_set_uri)
-
-    updated_metadata = upload_file(
+    upload_file(
       file: file,
       file_set: file_set,
       pcdm_use: pcdm_use,
       user: file.user
     )
-
-    ValkyrieCreateDerivativesJob.perform_later(file_set.id.to_s, updated_metadata.id.to_s)
   end
 
   ##

data/app/models/admin_set.rb

@@ -42,25 +42,6 @@ class AdminSet < ActiveFedora::Base
   before_destroy :check_if_not_default_set, :check_if_empty
   after_destroy :destroy_permission_template
 
-  def self.default_set?(id)
-    Deprecation.warn("'##{__method__}' will be removed in Hyrax 4.0.  " \
-                     "Instead, use 'Hyrax::AdminSetCreateService.default_admin_set?(id:)'.")
-    Hyrax::AdminSetCreateService.default_admin_set?(id: id)
-  end
-
-  def default_set?
-    Deprecation.warn("'##{__method__}' will be removed in Hyrax 4.0.  " \
-                     "Instead, use 'Hyrax::AdminSetCreateService.default_admin_set?(id:)'.")
-    self.class.default_set?(id)
-  end
-
-  # Creates the default AdminSet and an associated PermissionTemplate with workflow
-  def self.find_or_create_default_admin_set_id
-    Deprecation.warn("'##{__method__}' will be removed in Hyrax 4.0.  " \
-                     "Instead, use 'Hyrax::AdminSetCreateService.find_or_create_default_admin_set.id'.")
-    Hyrax::AdminSetCreateService.find_or_create_default_admin_set.id.to_s
-  end
-
   def collection_type_gid
     # allow AdminSet to behave more like a regular Collection
     Hyrax::CollectionType.find_or_create_admin_set_type.to_global_id
@@ -86,17 +67,6 @@ class AdminSet < ActiveFedora::Base
     Sipity::Workflow.find_active_workflow_for(admin_set_id: id)
   end
 
-  ##
-  # @deprecated use PermissionTemplate#reset_access_controls_for instead
-  #
-  # Calculate and update who should have edit access based on who
-  # has "manage" access in the PermissionTemplateAccess
-  def reset_access_controls!
-    Deprecation.warn("reset_access_controls! is deprecated; use PermissionTemplate#reset_access_controls_for instead.")
-
-    permission_template.reset_access_controls_for(collection: self)
-  end
-
   # @api public
   #
   # return an id for the AdminSet.
@@ -120,7 +90,7 @@ class AdminSet < ActiveFedora::Base
   end
 
   def check_if_not_default_set
-    return true unless default_set?
+    return true unless Hyrax::AdminSetCreateService.default_admin_set?(id: id)
     errors[:base] << I18n.t('hyrax.admin.admin_sets.delete.error_default_set')
     throw :abort
   end

data/app/models/collection_branding_info.rb

@@ -19,15 +19,8 @@ class CollectionBrandingInfo < ApplicationRecord
     super()
   end
 
-  def delete(location_path = nil)
-    id = if location_path
-           Deprecation.warn('Passing an explict location path is ' \
-                            'deprecated. Call without arguments instead.')
-           location_path
-         else
-           local_path
-         end
-    storage.delete(id: id)
+  def delete(_location_path = nil)
+    storage.delete(id: local_path)
   end
 
   def find_local_filename(collection_id, role, filename)

data/app/models/concerns/hyrax/ability.rb

@@ -370,6 +370,7 @@ module Hyrax
       can :manage, curation_concerns_models
       can :manage, Sipity::WorkflowResponsibility
       can :manage, :collection_types
+      can :manage, ::FileSet
     end
 
     ##
@@ -418,7 +419,7 @@ module Hyrax
     end
 
     def curation_concerns_models
-      [::FileSet, Hyrax.config.collection_class] + Hyrax.config.curation_concerns
+      [::FileSet, ::Hyrax::FileSet, Hyrax.config.collection_class] + Hyrax.config.curation_concerns
     end
 
     def can_review_submissions?

data/app/models/concerns/hyrax/collection_behavior.rb

@@ -28,9 +28,11 @@ module Hyrax
       validates :collection_type_gid, presence: true
 
       # Need to define here in order to override setter defined by ActiveTriples
-      def collection_type_gid=(new_collection_type_gid, force: false)
+      def collection_type_gid=(new_collection_type_gid)
         new_collection_type_gid = new_collection_type_gid&.to_s
-        raise "Can't modify collection type of this collection" if !force && persisted? && !collection_type_gid_was.nil? && collection_type_gid_was != new_collection_type_gid
+        raise "Can't modify collection type of this collection" if
+          !Thread.current[:force_collection_type_gid] && # Used by update_collection_type_global_ids rake task
+          persisted? && !collection_type_gid_was.nil? && collection_type_gid_was != new_collection_type_gid
         new_collection_type = Hyrax::CollectionType.find_by_gid!(new_collection_type_gid)
         super(new_collection_type_gid)
         @collection_type = new_collection_type
@@ -38,16 +40,6 @@ module Hyrax
       end
     end
 
-    delegate(*Hyrax::CollectionType.settings_attributes, to: :collection_type)
-    ActiveSupport::Deprecation.deprecate_methods(self, *Hyrax::CollectionType.settings_attributes)
-
-    # Get the collection_type when accessed
-    def collection_type
-      Deprecation.warn("'##{__method__}' will be removed in Hyrax 4.0.  " \
-                         "Instead, use Hyrax::CollectionType.for(collection: collection).")
-      @collection_type ||= Hyrax::CollectionType.find_by_gid!(collection_type_gid)
-    end
-
     def collection_type=(new_collection_type)
       self.collection_type_gid = new_collection_type.to_global_id
     end

data/app/models/concerns/hyrax/file_set/derivatives.rb

@@ -43,8 +43,9 @@ module Hyrax
         #          # ./spec/jobs/create_derivatives_job_spec.rb:7:in `block (2 levels) in <top (required)>'
         #
         Hydra::Derivatives.source_file_service = Hyrax::LocalFileService
-        Hydra::Derivatives.output_file_service = Hyrax::PersistDerivatives
-        Hydra::Derivatives::FullTextExtract.output_file_service = Hyrax::PersistDirectlyContainedOutputFileService
+        Hydra::Derivatives.output_file_service = Hyrax::ValkyriePersistDerivatives
+        # Hydra::Derivatives::FullTextExtract.output_file_service = Hyrax::PersistDirectlyContainedOutputFileService
+        Hydra::Derivatives::FullTextExtract.output_file_service = Hyrax::ValkyriePersistDerivatives
         before_destroy :cleanup_derivatives
         # This completely overrides the version in Hydra::Works so that we
         # read and write to a local file. It's important that characterization runs

data/app/models/concerns/hyrax/riiif_file.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+module Hyrax
+  # Adds file locking to Riiif::File
+  # @see RiiifFileResolver
+  class RiiifFile < Riiif::File
+    include ActiveSupport::Benchmarkable
+
+    attr_reader :id
+    def initialize(input_path, tempfile = nil, id:)
+      super(input_path, tempfile)
+      raise(ArgumentError, "must specify id") if id.blank?
+      @id = id
+    end
+
+    # Wrap extract in a read lock and benchmark it
+    def extract(transformation, image_info = nil)
+      Riiif::Image.file_resolver.file_locks[id].with_read_lock do
+        benchmark "RiiifFile extracted #{path} with #{transformation.to_params}", level: :debug do
+          super
+        end
+      end
+    end
+
+    private
+
+    def logger
+      Hyrax.logger
+    end
+  end
+end

data/app/models/concerns/hyrax/solr_document_behavior.rb

@@ -59,7 +59,7 @@ module Hyrax
     ##
     # @return [Boolean]
     def file_set?
-      hydra_model == ::FileSet
+      hydra_model == ::FileSet || hydra_model == Hyrax::FileSet
     end
 
     ##
@@ -91,9 +91,9 @@ module Hyrax
     end
 
     def visibility
-      @visibility ||= if embargo_release_date.present?
+      @visibility ||= if embargo_enforced?
                         Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_EMBARGO
-                      elsif lease_expiration_date.present?
+                      elsif lease_enforced?
                         Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_LEASE
                       elsif public?
                         Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
@@ -108,6 +108,23 @@ module Hyrax
       first(Hyrax.config.collection_type_index_field)
     end
 
+    def embargo_enforced?
+      return false if embargo_release_date.blank?
+
+      indexed_embargo_visibility = first('visibility_during_embargo_ssim')
+      # if we didn't index an embargo visibility, assume the release date means
+      # it's enforced
+      return true if indexed_embargo_visibility.blank?
+
+      # if the visibility and the visibility during embargo are the same, we're
+      # enforcing the embargo
+      self['visibility_ssi'] == indexed_embargo_visibility
+    end
+
+    def lease_enforced?
+      lease_expiration_date.present?
+    end
+
     private
 
     def model_classifier(classifier)

data/app/models/hyrax/collection_type.rb

@@ -49,7 +49,10 @@ module Hyrax
     # @return [Hyrax::PcdmCollection | ::Collection] an instance of Hyrax::CollectionType with id = the model_id portion of the gid (e.g. 3)
     # @raise [ActiveRecord::RecordNotFound] if record matching gid is not found
     def self.for(collection:)
-      find_by_gid!(collection.collection_type_gid)
+      gid = collection.collection_type_gid
+      gid = gid.first if gid.is_a?(Enumerable)
+
+      find_by_gid!(gid)
     end
 
     # Find the collection type associated with the Global Identifier (gid)
@@ -67,7 +70,7 @@ module Hyrax
     # @see #gid
     # @see Hyrax::MultipleMembershipChecker
     def self.gids_that_do_not_allow_multiple_membership
-      where(allow_multiple_membership: false).map(&:gid)
+      where(allow_multiple_membership: false).map { |c| c.to_global_id.to_s }
     end
 
     # Find the collection type associated with the Global Identifier (gid)
@@ -95,18 +98,6 @@ module Hyrax
       SETTINGS_ATTRIBUTES
     end
 
-    ##
-    # @deprecation use #to_global_id
-    #
-    # Return the Global Identifier for this collection type.
-    # @return [String, nil] Global Identifier (gid) for this collection_type (e.g. gid://internal/hyrax-collectiontype/3)
-    #
-    # @see https://github.com/rails/globalid#usage
-    def gid
-      Deprecation.warn('use #to_global_id.')
-      to_global_id.to_s if id
-    end
-
     ##
     # @return [Enumerable<Collection, PcdmCollection>]
     def collections(use_valkyrie: Hyrax.config.use_valkyrie?)