fix contributor indexing, cascade deletes on asssetresource, physical…

…_instantiation and digial_instantiation

Gemfile.lock

@@ -41,7 +41,7 @@ GIT
 
 GIT
   remote: https://github.com/samvera/hyrax.git
-  revision: 9ef64090a13abdeaabfaabdee851829093d02cc4
+  revision: 0108fed6c83dd4a449b37cc1a6c19787ec54921d
   branch: double_combo
   specs:
     hyrax (5.0.0.rc2)

app/models/ams/create_member_methods.rb

@@ -12,8 +12,7 @@ def create_child_methods
               condition = { has_model_ssim: child_class.to_s, id: self.members.map(&:id) }
               ActiveFedora::Base.search_with_conditions(condition).collect { |v| SolrDocument.new(v) }
             when Valkyrie::Resource
-              child_works = Hyrax.custom_queries.find_child_works(resource: self).to_a
-              child_works_of_type = child_works.select { |work| work.is_a?(child_class) }
+              child_works_of_type = members.select { |work| work.is_a?(child_class) }
               child_works_of_type.map { |work| resource_to_solr(work) }
             end
           end

app/models/solr_document.rb

@@ -232,6 +232,10 @@ def contributor_role
     self[solr_name('contributor_role')]
   end
 
+  def contributor
+    self[solr_name('contributor')]
+  end
+
   def portrayal
     self[solr_name('portrayal')]
   end

app/services/listeners/cascade_delete_listener.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Listeners
+  class CascadeDeleteListener
+
+    def on_object_deleted(event)
+      resource = event.to_h.fetch(:object) { Hyrax.query_service.find_by(id: event[:object_id]) }
+      return unless resource.is_a?(AssetResource) || resource.is_a?(PhysicalInstantiationResource) || resource.is_a?(DigitalInstantiationResource)
+      resource.members.each do |member|
+        Hyrax.index_adapter.delete(resource: member)
+        Hyrax.persister.delete(resource: member)
+      end
+    end
+  end
+end

app/transactions/ams/steps/handle_contributors.rb

@@ -69,7 +69,7 @@ def create_or_update_contributions(change_set, contributions)
 
       def update_members(change_set, inserts, destroys)
         return if inserts.empty? && destroys.empty?
-        current_member_ids = change_set.member_ids.map(&:id)
+        current_member_ids = change_set.member_ids.map(&:to_s)
         inserts = inserts - current_member_ids
         destroys = destroys & current_member_ids
         change_set.member_ids += inserts.map  { |id| Valkyrie::ID.new(id) }

config/initializers/listeners.rb

@@ -1 +1,2 @@
 Hyrax.publisher.subscribe(Listeners::ValidateAapbListener.new)
+Hyrax.publisher.subscribe(Listeners::CascadeDeleteListener.new)

config/metadata/basic_metadata.yaml

@@ -30,6 +30,8 @@ attributes:
     multiple: true
     form:
       primary: false
+    index_keys:
+      - "contributor_tesim"
   creator:
     type: string
     multiple: true

ops/alpha-deploy.tmpl.yaml

@@ -145,7 +145,7 @@ extraEnvVars: &envVars
     value: string
 
 worker:
-  replicaCount: 1
+  replicaCount: 0
   importReplicaCount: 0
   podSecurityContext:
     runAsUser: 1001