curation_concerns 1.7.8 → 2.0.0.rc1

data/app/indexers/curation_concerns/collection_indexer.rb

@@ -10,6 +10,11 @@ module CurationConcerns
         # Index the size of the collection in bytes
         solr_doc[Solrizer.solr_name(:bytes, STORED_LONG)] = object.bytes
         solr_doc['thumbnail_path_ss'] = thumbnail_path
+
+        object.in_collections.each do |col|
+          (solr_doc['member_of_collection_ids_ssim'] ||= []) << col.id
+          (solr_doc['member_of_collections_ssim'] ||= []) << col.first_title
+        end
       end
     end
   end

data/app/indexers/curation_concerns/work_indexer.rb

@@ -6,6 +6,8 @@ module CurationConcerns
     def generate_solr_document
       super.tap do |solr_doc|
         solr_doc[Solrizer.solr_name('member_ids', :symbol)] = object.member_ids
+        solr_doc[Solrizer.solr_name('member_of_collections', :symbol)] = object.member_of_collections.map(&:first_title)
+        solr_doc[Solrizer.solr_name('member_of_collection_ids', :symbol)] = object.member_of_collections.map(&:id)
         Solrizer.set_field(solr_doc, 'generic_type', 'Work', :facetable)
       end
     end

data/app/jobs/characterize_job.rb

@@ -1,6 +1,4 @@
 class CharacterizeJob < ActiveJob::Base
-  include CurationConcerns::Lockable
-
   queue_as CurationConcerns.config.ingest_queue_name
 
   # @param [FileSet] file_set
@@ -9,16 +7,11 @@ class CharacterizeJob < ActiveJob::Base
   def perform(file_set, file_id, filepath = nil)
     filename = CurationConcerns::WorkingDirectory.find_or_retrieve(file_id, file_set.id, filepath)
     raise LoadError, "#{file_set.class.characterization_proxy} was not found" unless file_set.characterization_proxy?
-
-    # Prevent other jobs from trying to modify the FileSet at the same time
-    acquire_lock_for(file_set.id) do
-      Hydra::Works::CharacterizationService.run(file_set.characterization_proxy, filename)
-      Rails.logger.debug "Ran characterization on #{file_set.characterization_proxy.id} (#{file_set.characterization_proxy.mime_type})"
-      file_set.characterization_proxy.save!
-      file_set.update_index
-      file_set.parent.in_collections.each(&:update_index) if file_set.parent
-    end
-
+    Hydra::Works::CharacterizationService.run(file_set.characterization_proxy, filename)
+    Rails.logger.debug "Ran characterization on #{file_set.characterization_proxy.id} (#{file_set.characterization_proxy.mime_type})"
+    file_set.characterization_proxy.save!
+    file_set.update_index
+    file_set.parent.in_collections.each(&:update_index) if file_set.parent
     CreateDerivativesJob.perform_later(file_set, file_id, filename)
   end
 end

data/app/jobs/create_derivatives_job.rb

@@ -1,6 +1,4 @@
 class CreateDerivativesJob < ActiveJob::Base
-  include CurationConcerns::Lockable
-
   queue_as CurationConcerns.config.ingest_queue_name
 
   # @param [FileSet] file_set
@@ -10,15 +8,12 @@ class CreateDerivativesJob < ActiveJob::Base
     return if file_set.video? && !CurationConcerns.config.enable_ffmpeg
     filename = CurationConcerns::WorkingDirectory.find_or_retrieve(file_id, file_set.id, filepath)
 
-    # Prevent other jobs from trying to modify the FileSet at the same time
-    acquire_lock_for(file_set.id) do
-      file_set.create_derivatives(filename)
+    file_set.create_derivatives(filename)
 
-      # Reload from Fedora and reindex for thumbnail and extracted text
-      file_set.reload
-      file_set.update_index
-      file_set.parent.update_index if parent_needs_reindex?(file_set)
-    end
+    # Reload from Fedora and reindex for thumbnail and extracted text
+    file_set.reload
+    file_set.update_index
+    file_set.parent.update_index if parent_needs_reindex?(file_set)
   end
 
   # If this file_set is the thumbnail for the parent work,

data/app/jobs/ingest_file_job.rb

@@ -1,6 +1,4 @@
 class IngestFileJob < ActiveJob::Base
-  include CurationConcerns::Lockable
-
   queue_as CurationConcerns.config.ingest_queue_name
 
   # @param [FileSet] file_set
@@ -17,17 +15,15 @@ class IngestFileJob < ActiveJob::Base
     local_file.mime_type = opts.fetch(:mime_type, nil)
     local_file.original_name = opts.fetch(:filename, File.basename(filepath))
 
-    # Prevent other jobs from trying to modify the FileSet at the same time
-    acquire_lock_for(file_set.id) do
-      # Tell AddFileToFileSet service to skip versioning because versions will be minted by
-      # VersionCommitter when necessary during save_characterize_and_record_committer.
-      Hydra::Works::AddFileToFileSet.call(file_set,
-                                          local_file,
-                                          relation,
-                                          versioning: false)
-      # Persist changes to the file_set
-      file_set.save!
-    end
+    # Tell AddFileToFileSet service to skip versioning because versions will be minted by
+    # VersionCommitter when necessary during save_characterize_and_record_committer.
+    Hydra::Works::AddFileToFileSet.call(file_set,
+                                        local_file,
+                                        relation,
+                                        versioning: false)
+
+    # Persist changes to the file_set
+    file_set.save!
 
     repository_file = file_set.send(relation)
 

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

@@ -14,7 +14,6 @@ module CurationConcerns
 
       # user can version if they can edit
       alias_action :versions, to: :update
-      alias_action :file_manager, to: :update
 
       if admin?
         admin_permissions

data/app/models/concerns/curation_concerns/collection.rb

@@ -6,9 +6,23 @@ module CurationConcerns
     include CurationConcerns::RequiredMetadata
     include Hydra::Works::CollectionBehavior
 
+    # Add members using the members association.
     def add_members(new_member_ids)
       return if new_member_ids.nil? || new_member_ids.empty?
       members << ActiveFedora::Base.find(new_member_ids)
     end
+
+    # Add member objects by adding this collection to the objects' member_of_collection association.
+    def add_member_objects(new_member_ids)
+      Array(new_member_ids).each do |member_id|
+        member = ActiveFedora::Base.find(member_id)
+        member.member_of_collections << self
+        member.save!
+      end
+    end
+
+    def member_objects
+      ActiveFedora::Base.where("member_of_collection_ids_ssim:#{id}")
+    end
   end
 end

data/app/models/concerns/curation_concerns/required_metadata.rb

@@ -11,6 +11,10 @@ module CurationConcerns
         index.as :stored_searchable, :facetable
       end
 
+      def first_title
+        title.first
+      end
+
       # We reserve date_uploaded for the original creation date of the record.
       # For example, when migrating data from a fedora3 repo to fedora4,
       # fedora's system created date will reflect the date when the record

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

@@ -174,6 +174,10 @@ module CurationConcerns
       first(Solrizer.solr_name('workflow_state_name', :symbol))
     end
 
+    def member_of_collection_ids
+      fetch(Solrizer.solr_name('member_of_collection_ids', :symbol), [])
+    end
+
     private
 
       def date_field(field_name)

data/app/models/concerns/curation_concerns/work_behavior.rb

@@ -24,12 +24,6 @@ module CurationConcerns::WorkBehavior
     self.indexer = CurationConcerns::WorkIndexer
   end
 
-  # TODO: Move this into ActiveFedora
-  def etag
-    raise "Unable to produce an etag for a unsaved object" unless persisted?
-    ldp_source.head.etag
-  end
-
   module ClassMethods
     # This governs which partial to draw when you render this type of object
     def _to_partial_path #:nodoc:

data/app/presenters/curation_concerns/admin/workflow_role_presenter.rb

@@ -16,10 +16,6 @@ module CurationConcerns
           @agent = agent
         end
 
-        def responsibilities_present?
-          @agent.workflow_responsibilities.any?
-        end
-
         def responsibilities
           @agent.workflow_responsibilities.each do |responsibility|
             yield ResponsibilityPresenter.new(responsibility)

data/app/presenters/curation_concerns/collection_presenter.rb

@@ -29,5 +29,9 @@ module CurationConcerns
     def total_items
       @solr_document.fetch('member_ids_ssim', []).length
     end
+
+    def to_s
+      title.first
+    end
   end
 end

data/app/presenters/curation_concerns/work_show_presenter.rb

@@ -4,11 +4,17 @@ module CurationConcerns
     include PresentsAttributes
     attr_accessor :solr_document, :current_ability, :request
 
-    class_attribute :collection_presenter_class
+    class_attribute :collection_presenter_class, :file_presenter_class, :work_presenter_class
 
     # modify this attribute to use an alternate presenter class for the collections
     self.collection_presenter_class = CollectionPresenter
 
+    # modify this attribute to use an alternate presenter class for the files
+    self.file_presenter_class = FileSetPresenter
+
+    # modify this attribute to use an alternate presenter class for the child works
+    self.work_presenter_class = self
+
     # Methods used by blacklight helpers
     delegate :has?, :first, :fetch, :export_formats, :export_as, to: :solr_document
 
@@ -33,7 +39,12 @@ module CurationConcerns
     delegate :title, :date_created, :date_modified, :date_uploaded, :description,
              :creator, :contributor, :subject, :publisher, :language, :embargo_release_date,
              :lease_expiration_date, :rights, :source, :thumbnail_id, :representative_id,
-             to: :solr_document
+             :member_of_collection_ids, to: :solr_document
+
+    # @return [Array<FileSetPresenter>] presenters for the orderd_members that are FileSets
+    def file_set_presenters
+      @file_set_presenters ||= member_presenters(ordered_ids & file_set_ids)
+    end
 
     def workflow
       @workflow ||= WorkflowPresenter.new(solr_document, current_ability)
@@ -57,10 +68,26 @@ module CurationConcerns
         end
     end
 
-    # @return [Array<CollectionPresenter>] presenters for the collections that this work is a member of
-    def collection_presenters
-      PresenterFactory.build_presenters(in_collection_ids,
-                                        collection_presenter_class,
+    # @return [Array<WorkShowPresenter>] presenters for the ordered_members that are not FileSets
+    def work_presenters
+      @work_presenters ||= member_presenters(ordered_ids - file_set_ids, work_presenter_class)
+    end
+
+    # @param [Array<String>] ids a list of ids to build presenters for
+    # @param [Class] presenter_class the type of presenter to build
+    # @return [Array<presenter_class>] presenters for the ordered_members (not filtered by class)
+    def member_presenters(ids = ordered_ids, presenter_class = composite_presenter_class)
+      PresenterFactory.build_presenters(ids, presenter_class, *presenter_factory_arguments)
+    end
+
+    def composite_presenter_class
+      CompositePresenterFactory.new(file_presenter_class, work_presenter_class, ordered_ids & file_set_ids)
+    end
+
+    # Get presenters for the collections this work is a member of via the member_of_collections association.
+    # @return [Array<CollectionPresenter>] presenters
+    def member_of_collection_presenters
+      PresenterFactory.build_presenters(member_of_collection_ids, collection_presenter_class,
                                         *presenter_factory_arguments)
     end
 
@@ -80,27 +107,33 @@ module CurationConcerns
       graph.dump(:ttl)
     end
 
-    delegate :member_presenters, :file_set_presenters, :work_presenters, to: :member_presenter_factory
-
     private
 
-      def presenter_factory_arguments
-        [current_ability, request]
+      def graph
+        GraphExporter.new(solr_document, request).fetch
       end
 
-      # @return [Array<String>] ids of the collections that this work is a member of
-      def in_collection_ids
-        ActiveFedora::SolrService.query("{!field f=member_ids_ssim}#{id}",
-                                        fl: ActiveFedora.id_field)
-                                 .map { |x| x.fetch(ActiveFedora.id_field) }
+      def presenter_factory_arguments
+        [current_ability, request]
       end
 
-      def member_presenter_factory
-        MemberPresenterFactory.new(solr_document, current_ability, request)
+      # TODO: Extract this to ActiveFedora::Aggregations::ListSource
+      def ordered_ids
+        @ordered_ids ||= begin
+                           ActiveFedora::SolrService.query("proxy_in_ssi:#{id}", fl: "ordered_targets_ssim")
+                                                    .flat_map { |x| x.fetch("ordered_targets_ssim", []) }
+                         end
       end
 
-      def graph
-        GraphExporter.new(solr_document, request).fetch
+      # These are the file sets that belong to this work, but not necessarily
+      # in order.
+      def file_set_ids
+        @file_set_ids ||= begin
+                            ActiveFedora::SolrService.query("{!field f=has_model_ssim}FileSet",
+                                                            fl: ActiveFedora.id_field,
+                                                            fq: "{!join from=ordered_targets_ssim to=id}id:\"#{id}/list_source\"")
+                                                     .flat_map { |x| x.fetch(ActiveFedora.id_field, []) }
+                          end
       end
   end
 end

data/app/search_builders/curation_concerns/collection_member_search_builder.rb

@@ -1,5 +1,19 @@
 module CurationConcerns
-  class CollectionMemberSearchBuilder < CurationConcerns::MemberSearchBuilder
+  class CollectionMemberSearchBuilder < ::SearchBuilder
     include CurationConcerns::FilterByType
+
+    class_attribute :collection_membership_field
+    self.collection_membership_field = 'member_of_collection_ids_ssim'
+
+    # Defines which search_params_logic should be used when searching for Collection members
+    self.default_processor_chain += [:member_of_collection]
+
+    delegate :collection, to: :scope
+
+    # include filters into the query to only include the collection memebers
+    def member_of_collection(solr_parameters)
+      solr_parameters[:fq] ||= []
+      solr_parameters[:fq] << "#{collection_membership_field}:#{collection.id}"
+    end
   end
 end

data/app/services/curation_concerns/actors/actor_factory.rb

@@ -8,8 +8,7 @@ module CurationConcerns
       end
 
       def self.stack_actors(curation_concern)
-        [OptimisticLockValidator,
-         AddToCollectionActor,
+        [AddAsMemberOfCollectionsActor,
          AddToWorkActor,
          AssignRepresentativeActor,
          AttachFilesActor,

data/app/services/curation_concerns/workflow/grant_edit_to_depositor.rb

@@ -4,7 +4,7 @@ module CurationConcerns
     # grants the creator the ability to alter it.
     class GrantEditToDepositor
       def self.call(target:, **)
-        target.edit_users += [target.depositor]
+        target.edit_users = [target.depositor]
       end
     end
   end

data/app/services/curation_concerns/workflow/permission_query.rb

@@ -257,10 +257,7 @@ module CurationConcerns
             .and(entity_responsibilities[:entity_id].eq(entity.id))
         )
 
-        # PostgreSQL requires an explicit cast from string to integer
-        cast = Arel::Nodes::NamedFunction.new "CAST", [agent_table[:proxy_for_id].as("integer")]
-
-        sub_query_for_user = agent_table.project(cast).where(
+        sub_query_for_user = agent_table.project(agent_table[:proxy_for_id]).where(
           agent_table[:id].in(workflow_agent_id_subquery)
             .or(agent_table[:id].in(entity_agent_id_subquery))
         ).where(

data/app/services/curation_concerns/workflow/workflow_factory.rb

@@ -6,7 +6,7 @@ module CurationConcerns
 
       # @param work [#to_global_id]
       # @param attributes [Hash]
-      # @param strategy [#name] strategy for finding which workflow to use. Defaults to an instance of WorkflowByModelNameStrategy
+      # @param strategy [#name] strategy for finding which workflow to use. Defaults to an instance of DefaultWorkflowStrategy
       # @return [TrueClass]
       def self.create(work, attributes, user, strategy = nil)
         strategy ||= workflow_strategy.new(work, attributes)

data/app/services/curation_concerns/workflow/workflow_importer.rb

@@ -72,7 +72,6 @@ module CurationConcerns
           workflow = Sipity::Workflow.find_or_initialize_by(name: configuration.fetch(:name)) do |wf|
             wf.label = configuration.fetch(:label, nil)
             wf.description = configuration.fetch(:description, nil)
-            wf.allows_access_grant = configuration.fetch(:allows_access_grant, nil)
             wf.save!
           end
 

data/app/services/curation_concerns/workflow/workflow_schema.rb

@@ -34,7 +34,6 @@ module CurationConcerns
         required(:name).filled(:str?) # Sipity::Workflow#name
         optional(:label).filled(:str?) # Sipity::Workflow#label
         optional(:description).filled(:str?) # Sipity::Workflow#description
-        optional(:allows_access_grant).filled(:bool?) # Sipity::Workflow#allows_access_grant?
         required(:actions).each do
           required(:name).filled(:str?) # Sipity::WorkflowAction#name
           required(:from_states).each do

data/app/views/catalog/_action_menu_partials/_default.html.erb

@@ -1,4 +1,4 @@
-<% if can?(:edit, document) || can?(:collect, document) %>
+<% if can?(:edit, document) %>
   <div class="btn-group">
     <button class="btn btn-default btn-small dropdown-toggle" data-toggle="dropdown" href="#">Select an action <span class="caret"></span></button>
     <ul class="dropdown-menu">
@@ -20,12 +20,6 @@
           <% end %>
         </li>
       <% end %>
-      <% if can? :collect, document %>
-        <li>
-          <%= link_to_select_collection document %>
-        </li>
-      <% end %>
     </ul>
-    <%= render 'collections/add_to_collection_modal', collectible: document if can? :collect, document %>
   </div>
 <% end %>

data/app/views/collections/_document_header.html.erb

@@ -2,8 +2,4 @@
       <div class="documentHeader clearfix">
         <% # main title container for doc partial view -%>
           <h5 class="index_title"><%= t('blacklight.search.documents.counter', :counter => (document_counter + 1 + @response.params[:start].to_i)) %><%= link_to_document document, :label=>document_show_link_field(document), :counter => (document_counter + 1 + @response.params[:start].to_i) %></h5>
-
-        <div class="documentFunctions span2">
-          <%= button_for_remove_from_collection(@collection, document) %>
-        </div>
       </div>

data/app/views/collections/_edit_actions.html.erb

@@ -1,5 +1,4 @@
 <h2 class="non lower">Actions</h2>
 <p>
   <%= link_to "Go to Browse View", collection_path %>  &nbsp;&nbsp;
-  <%= link_to "Add files from your dashboard",  search_path_for_my_works %>
 </p>

data/app/views/collections/_form.html.erb

@@ -16,6 +16,7 @@
       <%= f.submit class: 'btn btn-primary require-contributor-agreement' %>
       <% if @form.persisted? %>
         <%= link_to 'Cancel', collection_path(@form), class: 'btn btn-link' %>
+        <%= link_to "Delete", [main_app, @form], class: 'btn btn-danger pull-right', data: { confirm: "Delete this Collection?" }, method: :delete %>
       <% else %>
         <%= link_to 'Cancel', main_app.root_path, class: 'btn btn-link' %>
       <% end %>