bulk_ops 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4231e72e9eca7cf205487d52f2613ef8542e37789c117070cb7402cf489f77da
-  data.tar.gz: d788d06b28f38ff386578ef962a14b0e8cc9525f5bb408daa13c4d38ded94e7a
+  metadata.gz: f55b62bd327612efa466184efc9249133480ace66e3069fc7d20705eedfddf0f
+  data.tar.gz: 109e4e3cf3567864eeb15e73d3c6603219ee9577c8333c6cfb012409cac1b957
 SHA512:
-  metadata.gz: b86b3ddb3e462d2b6a098dbcea45a4945e31f88f135e6780eaa84fd908ff238a75f170bb05af3e093d46dab6e7bc52ce59cd6176aa29bc2da2df547866175425
-  data.tar.gz: 54be897f9392fe0e19fc85350ef57d2a1c503d65ff5cb7cbbea44efc6615573fa58d50d61d7e31e323a5271b1d6470dc1d9cddac3998a8d7b1de79195c097733
+  metadata.gz: d1172dd5be0f063944505b86da8a6a8b28913c69f1447523de9685d85524a55cb8a148f48ad112dbd7c158e9b63cab9ca50fbab0d2ff49c3ddd759dbd5940b52
+  data.tar.gz: 119bb5c71f7be6eb8c8514307eead3dcebf31304f1d4221575790ce3d4c931c5f57e9f3eb1157592ce3cbe805dfa2a815141196904a3f38cb533ea804f60a9b8

data/app/controllers/bulk_ops/operations_controller.rb

@@ -6,6 +6,7 @@ module BulkOps
     before_action :define_presenter
     before_action :github_auth
     load_and_authorize_resource
+
     before_action :initialize_options, only: [:new,:show,:edit, :update]
     before_action :initialize_operation, only: [:edit, :destroy, :show, :request_apply, :approve, :csv, :errors, :log, :update, :request, :duplicate]
 
@@ -25,7 +26,7 @@ module BulkOps
       branches = BulkOps::GithubAccess.list_branch_names current_user
       BulkOps::Operation.all.each{|op| op.destroy! unless branches.include?(op.name) }
       @active_operations = BulkOps::Operation.where.not(stage: ['completed','discarded'])
-      @active_operations.each {|op| op.destroy! unless branches.include?(op.name) }
+      @active_operations.each {|op| op.destroy! unless (op.stage == "running") or branches.include?(op.name) }
       @old_operations = BulkOps::Operation.where(stage: ['completed','discarded']) if params["show_old_ops"]
     end
 
@@ -167,25 +168,10 @@ module BulkOps
       #If new options have been defined, update them in github
       if params['edit_options']
         if filtered_options_params && @operation.name
-
           options = @operation.options
-
-          puts "BULKOPS UPDATING OPTIONS"
-          puts "all params: #{params.inspect}"
-          puts "Updating bulk_ops options"
-          puts "new options:"
-          puts filtered_options_params.inspect
-          puts "old options:"
-          puts options.inspect
-
-
           filtered_options_params.each do |option_name, option_value|
             options[option_name] = option_value
           end
-
-          puts "final options:"
-          puts options.inspect
-
           BulkOps::GithubAccess.update_options(@operation.name, options, message: params['git_message'])
           flash[:notice] = "The operation options were updated successfully"
           redirect_to action: "show", id: @operation.id

data/lib/bulk_ops/create_work_job.rb

@@ -11,4 +11,12 @@ class BulkOps::CreateWorkJob < BulkOps::WorkJob
     :create
   end
 
+  def define_work workClass
+    if record_exists?(@work_proxy.work_id)
+        report_error "trying to ingest a work proxy that already has a work attached. Work id: #{@work_proxy.work_id} Proxy id: #{@work_proxy.id}" 
+        return false
+    end
+    @work = workClass.capitalize.constantize.new
+  end
+
 end

data/lib/bulk_ops/update_work_job.rb

@@ -11,4 +11,20 @@ class BulkOps::UpdateWorkJob < BulkOps::WorkJob
     :update
   end
 
+  def define_work workClass=nil
+    # report an error if we can't find the work in solr
+    unless record_exists?(@work_proxy.work_id)
+      report_error "Could not find work to update with id: #{@work_proxy.work_id} referenced by work proxy: #{@work_proxy.id}"  
+      return false
+    end
+    # Report an error if we can't retrieve the work from Fedora.
+    begin
+      @work = ActiveFedora::Base.find(@work_proxy.work_id)
+    rescue ActiveFedora::ObjectNotFoundError
+      report_error "Could not find work to update in Fedora (though it shows up in Solr). Work id: #{@work_proxy.work_id}"
+      return false
+    end
+    return @work
+  end
+
 end

data/lib/bulk_ops/version.rb

@@ -1,3 +1,3 @@
 module BulkOps
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

data/lib/bulk_ops/work_job.rb

@@ -9,7 +9,7 @@ class BulkOps::WorkJob < ActiveJob::Base
   after_perform do |job|
     
     # update BulkOperationsWorkProxy status
-    @work ||= ActiveFedora.find(@work_proxy.work_id)
+    @work ||= ActiveFedora::Base.find(@work_proxy.work_id)
     if  @work.id.nil?
       status = "error"
     else
@@ -41,10 +41,15 @@ class BulkOps::WorkJob < ActiveJob::Base
 
     # Check if the parent operation is finished
     # and do any cleanup if so
-    @work_proxy.operation.check_if_finished
+    
+    if @work_proxy.operation.present? && @work_proxy.operation.respond_to?(:check_if_finished)
+      @work_proxy.operation.check_if_finished 
+    end
+  
   end
 
   def perform(workClass,user_email,attributes,work_proxy_id,visibility=nil)
+    return if status == "complete"
     update_status "starting", "Initializing the job"
     attributes['visibility']= visibility if visibility.present?
     @work_proxy = BulkOps::WorkProxy.find(work_proxy_id)
@@ -52,23 +57,9 @@ class BulkOps::WorkJob < ActiveJob::Base
       report_error("Cannot find work proxy with id: #{work_proxy_id}") 
       return
     end
-    if record_exists?(@work_proxy.work_id)
-      # The work exists in Solr. Presumably we're updating it. 
-      # Report an error if we can't retrieve the work from Fedora.
-      begin
-        @work = ActiveFedora::Base.find(@work_proxy.work_id)
-      rescue ActiveFedora::ObjectNotFoundError
-        report_error "Could not find work to update in Fedora (though it shows up in Solr). Work id: #{@work_proxy.work_id}"
-        return
-      end
-    else # The work is not found in Solr. If we're trying to update a work, we're in trouble.
-      if (type.to_s == "update")
-        report_error "Could not find work to update with id: #{@work_proxy.work_id}" 
-        return
-      end
-      # Create the work we are ingesting
-      @work = workClass.capitalize.constantize.new
-    end
+
+    return unless define_work
+
     user = User.find_by_email(user_email)
     update_status "running", "Started background task at #{DateTime.now.strftime("%d/%m/%Y %H:%M")}"
     ability = Ability.new(user)
@@ -102,4 +93,9 @@ class BulkOps::WorkJob < ActiveJob::Base
     @work_proxy.update(atts)
   end
 
+  def define_work(workClass)
+    #override this unless you want a simple ingest
+    @work = workClass.capitalize.constantize.new
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bulk_ops
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Ned Henry, UCSC Library Digital Initiatives
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-08 00:00:00.000000000 Z
+date: 2019-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails