curation_concerns 2.0.0.rc1 → 2.0.0.rc2

data/app/forms/curation_concerns/forms/work_form.rb

@@ -27,6 +27,10 @@ module CurationConcerns
         super(model)
       end
 
+      def version
+        model.etag
+      end
+
       # The value for embargo_relase_date and lease_expiration_date should not
       # be initialized to empty string
       def initialize_field(key)
@@ -59,6 +63,10 @@ module CurationConcerns
             super
           end
         end
+
+        def build_permitted_params
+          super + [:version]
+        end
       end
 
       private

data/app/indexers/curation_concerns/file_set_indexer.rb

@@ -1,7 +1,7 @@
 module CurationConcerns
   class FileSetIndexer < ActiveFedora::IndexingService
     include IndexesThumbnails
-    STORED_INTEGER = Solrizer::Descriptor.new(:integer, :stored)
+    STORED_LONG = Solrizer::Descriptor.new(:long, :stored)
 
     def generate_solr_document
       super.tap do |solr_doc|
@@ -12,7 +12,7 @@ module CurationConcerns
         solr_doc[Solrizer.solr_name('label', :stored_sortable)] = object.label
         solr_doc[Solrizer.solr_name('file_format')] = file_format
         solr_doc[Solrizer.solr_name('file_format', :facetable)] = file_format
-        solr_doc[Solrizer.solr_name(:file_size, STORED_INTEGER)] = object.file_size[0]
+        solr_doc[Solrizer.solr_name(:file_size, STORED_LONG)] = object.file_size[0]
         solr_doc['all_text_timv'] = object.extracted_text.content if object.extracted_text.present?
         solr_doc['height_is'] = Integer(object.height.first) if object.height.present?
         solr_doc['width_is'] = Integer(object.width.first) if object.width.present?

data/app/jobs/characterize_job.rb

@@ -1,4 +1,6 @@
 class CharacterizeJob < ActiveJob::Base
+  include CurationConcerns::Lockable
+
   queue_as CurationConcerns.config.ingest_queue_name
 
   # @param [FileSet] file_set
@@ -7,11 +9,16 @@ 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?
-    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
+
+    # 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
+
     CreateDerivativesJob.perform_later(file_set, file_id, filename)
   end
 end

data/app/jobs/create_derivatives_job.rb

@@ -1,4 +1,6 @@
 class CreateDerivativesJob < ActiveJob::Base
+  include CurationConcerns::Lockable
+
   queue_as CurationConcerns.config.ingest_queue_name
 
   # @param [FileSet] file_set
@@ -8,12 +10,15 @@ 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)
 
-    file_set.create_derivatives(filename)
+    # 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)
 
-    # 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)
+      # 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
   end
 
   # If this file_set is the thumbnail for the parent work,

data/app/jobs/ingest_file_job.rb

@@ -1,4 +1,6 @@
 class IngestFileJob < ActiveJob::Base
+  include CurationConcerns::Lockable
+
   queue_as CurationConcerns.config.ingest_queue_name
 
   # @param [FileSet] file_set
@@ -15,15 +17,17 @@ class IngestFileJob < ActiveJob::Base
     local_file.mime_type = opts.fetch(:mime_type, nil)
     local_file.original_name = opts.fetch(:filename, File.basename(filepath))
 
-    # 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!
+    # 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
 
     repository_file = file_set.send(relation)
 

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

@@ -14,6 +14,7 @@ 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_behavior.rb

@@ -50,7 +50,7 @@ module CurationConcerns
       # Field name to look up when locating the size of each file in Solr.
       # Override for your own installation if using something different
       def file_size_field
-        Solrizer.solr_name(:file_size, CurationConcerns::FileSetIndexer::STORED_INTEGER)
+        Solrizer.solr_name(:file_size, CurationConcerns::FileSetIndexer::STORED_LONG)
       end
 
       # Solr field name collections and works use to index member ids

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

@@ -24,6 +24,12 @@ 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,6 +16,10 @@ 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/member_presenter_factory.rb

@@ -0,0 +1,70 @@
+module CurationConcerns
+  # Creates the presenters of the members (member works and file sets) of a specific object
+  class MemberPresenterFactory
+    class_attribute :file_presenter_class, :work_presenter_class
+    # 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 = WorkShowPresenter
+
+    def initialize(work, ability, request = nil)
+      @work = work
+      @current_ability = ability
+      @request = request
+    end
+
+    delegate :id, to: :@work
+    attr_reader :current_ability, :request
+
+    # @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
+
+    # @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
+
+    # @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
+
+    private
+
+      # TODO: Extract this to ActiveFedora::Aggregations::ListSource
+      def ordered_ids
+        @ordered_ids ||= begin
+                           ActiveFedora::SolrService.query("proxy_in_ssi:#{id}",
+                                                           rows: 10_000,
+                                                           fl: "ordered_targets_ssim")
+                                                    .flat_map { |x| x.fetch("ordered_targets_ssim", []) }
+                         end
+      end
+
+      # These are the file sets that belong to this work, but not necessarily
+      # in order.
+      # Arbitrarily maxed at 10 thousand; had to specify rows due to solr's default of 10
+      def file_set_ids
+        @file_set_ids ||= begin
+                            ActiveFedora::SolrService.query("{!field f=has_model_ssim}FileSet",
+                                                            rows: 10_000,
+                                                            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
+
+      def presenter_factory_arguments
+        [current_ability, request]
+      end
+
+      def composite_presenter_class
+        CompositePresenterFactory.new(file_presenter_class, work_presenter_class, ordered_ids & file_set_ids)
+      end
+  end
+end

data/app/presenters/curation_concerns/work_show_presenter.rb

@@ -4,17 +4,11 @@ module CurationConcerns
     include PresentsAttributes
     attr_accessor :solr_document, :current_ability, :request
 
-    class_attribute :collection_presenter_class, :file_presenter_class, :work_presenter_class
+    class_attribute :collection_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
 
@@ -41,11 +35,6 @@ module CurationConcerns
              :lease_expiration_date, :rights, :source, :thumbnail_id, :representative_id,
              :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)
     end
@@ -68,22 +57,6 @@ module CurationConcerns
         end
     end
 
-    # @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
@@ -107,33 +80,20 @@ module CurationConcerns
       graph.dump(:ttl)
     end
 
-    private
+    delegate :member_presenters, :file_set_presenters, :work_presenters, to: :member_presenter_factory
 
-      def graph
-        GraphExporter.new(solr_document, request).fetch
-      end
+    private
 
       def presenter_factory_arguments
         [current_ability, request]
       end
 
-      # 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
+      def member_presenter_factory
+        MemberPresenterFactory.new(solr_document, current_ability, request)
       end
 
-      # 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
+      def graph
+        GraphExporter.new(solr_document, request).fetch
       end
   end
 end

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

@@ -8,7 +8,8 @@ module CurationConcerns
       end
 
       def self.stack_actors(curation_concern)
-        [AddAsMemberOfCollectionsActor,
+        [OptimisticLockValidator,
+         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,7 +257,10 @@ module CurationConcerns
             .and(entity_responsibilities[:entity_id].eq(entity.id))
         )
 
-        sub_query_for_user = agent_table.project(agent_table[:proxy_for_id]).where(
+        # 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(
           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_importer.rb

@@ -72,6 +72,7 @@ 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,6 +34,7 @@ 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/curation_concerns/admin/workflow_roles/index.html.erb

@@ -11,7 +11,7 @@
           <tr>
             <td><%= user.user_key %></td>
             <% agent_presenter = @presenter.presenter_for(user) %>
-            <% if agent_presenter %>
+            <% if agent_presenter && agent_presenter.responsibilities_present? %>
               <td>
                 <ul>
                   <% agent_presenter.responsibilities do |responsibility_presenter| %>
@@ -42,4 +42,3 @@
     </div>
   </div>
 </div>
-

data/app/views/curation_concerns/base/_file_manager_member_resource_options.html.erb

@@ -1,10 +1,10 @@
       <div class="form-group radio_buttons member_resource_options">
         <span class="radio">
-          <%= radio_button_tag "thumbnail_id", node.id, @presenter.thumbnail_id == node.id, id: "thumbnail_id_#{node.id}", class: "radio_buttons" %>
+          <%= radio_button_tag "thumbnail_id", node.id, @form.thumbnail_id == node.id, id: "thumbnail_id_#{node.id}", class: "radio_buttons" %>
           <%= label_tag "thumbnail_id_#{node.id}", "Thumbnail" %>
         </span>
         <span class="radio">
-          <%= radio_button_tag "representative_id", node.id, @presenter.representative_id == node.id, id: "representative_id_#{node.id}", class: "radio_buttons" %>
+          <%= radio_button_tag "representative_id", node.id, @form.representative_id == node.id, id: "representative_id_#{node.id}", class: "radio_buttons" %>
           <%= label_tag "representative_id_#{node.id}", "Representative Media" %>
         </span>
       </div>

data/app/views/curation_concerns/base/_file_manager_members.html.erb

@@ -1,5 +1,13 @@
-<ul id="sortable" data-id="<%= @presenter.id %>" data-class-name="<%= @presenter.model_name.plural %>" data-singular-class-name="<%= @presenter.model_name.singular %>" class="list-unstyled grid clearfix">
- <% @presenter.member_presenters.each do |member| %>
-   <%= render "file_manager_member", node: member %>
- <% end %>
-</ul>
+<%= content_tag :ul,
+                id: "sortable",
+                class: "list-unstyled grid clearfix",
+                data: {
+                  id: @form.id,
+                  "class-name" => @form.model_name.plural,
+                  "singular-class-name" => @form.model_name.singular,
+                  version: @form.version
+                } do %>
+  <% @form.member_presenters.each do |member| %>
+    <%= render "file_manager_member", node: member %>
+  <% end %>
+<% end %>

data/app/views/curation_concerns/base/_file_manager_resource_form.html.erb

@@ -1,5 +1,5 @@
 <div class="resource-form-container">
-  <%= simple_form_for [main_app, @presenter], remote: true, html: { id: 'resource-form', 'data-type': 'json' } do |f| %>
+  <%= simple_form_for [main_app, @form], remote: true, html: { id: 'resource-form', 'data-type': 'json' } do |f| %>
     <%= f.input :thumbnail_id, as: :hidden, input_html: { data: {member_link: 'thumbnail_id'}} %>
     <%= f.input :representative_id, as: :hidden, input_html: { data: {member_link: 'representative_id'}} %>
   <% end %>