ddr-batch 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3cc0d7512f5de4438ed7d531a85b8415412ab8e7
-  data.tar.gz: eedb1553d0cce6964bf053c1e278072fabff52fb
+  metadata.gz: 47936c2a8f4623a57dcffeb7ee73f4d0c70479a0
+  data.tar.gz: 8c6872a2ec76e0ab74566c7e56ef6cebbede24f8
 SHA512:
-  metadata.gz: a4521f1634482447df5b845557a3eb1904aff89d339d851ea65041bd2fb828da8a32c356fb2c7dc8a89cb1d43afd1f7991c527c69c1104d3e5fb9fb0ce1b2062
-  data.tar.gz: 721c3d5457bdf10f92d6ed7693218d0f6cfee503244eab62805949d3440e3c60a900904c797293a4092ffb2f7d1f812e281cf36a0414c1cc7f957788fd46df4a
+  metadata.gz: 07cd699a647c23525d78b81f941c793faca16b270d8456365e241a17df2d9e077f23343f41c77a443a7b0066c08af33688fd7c2baa2626564e4582ec18871744
+  data.tar.gz: 754c0dee555383ad65d5434b09d95ef40638ee0f6e1f39685f22ff044b8daf50952d716121817bf4b6794b032b626e9858381ddfb8d8ab4e87deb221e3cce8b4

data/app/services/ddr/batch/process_batch_objects.rb

@@ -12,21 +12,25 @@ module Ddr::Batch
       # Assume successful processing of all batch objects until proven otherwise.
       success = true
       batch_object_ids.each do |batch_object_id|
-        # Once any batch object included in this job fails to process successfully, do not attempt to process
-        # any remaining batch objects included in this job.  Instead, mark them as "handled" so the batch knows
-        # it's not waiting on them to be handled before it can consider itself "finished".
-        # The use case prompting this behavior is a job containing an Item ingest batch object plus one or more
-        # associated Component ingest batch objects.  If the Item batch object fails to process correctly, we don't
-        # want to attempt to process the Component batch objects.
-        # In the preceding use case, we could skip the remaining batch objects only if the failed batch object is an
-        # Item but there might be future cases in which we don't want to process the remaining batch objects in the
-        # job regardless of which batch object fails.  The failure of any batch object to process should be rare
-        # enough that it doesn't seem harmful to cover this potential broader use case in the current code.
-        if success
-          success = ProcessBatchObject.new(batch_object_id: batch_object_id, operator: operator).execute
-        else
-          batch_object = Ddr::Batch::BatchObject.find(batch_object_id)
-          batch_object.update!(handled: true)
+        batch_object = Ddr::Batch::BatchObject.find(batch_object_id)
+        # Skip batch objects that have already been successfully processed.  This is useful when this service is
+        # called within the context of a BatchObjectsProcessorJob, that job fails, and the failed job is retried.
+        unless batch_object.verified?
+          # Once any batch object included in this job fails to process successfully, do not attempt to process
+          # any remaining batch objects included in this job.  Instead, mark them as "handled" so the batch knows
+          # it's not waiting on them to be handled before it can consider itself "finished".
+          # The use case prompting this behavior is a job containing an Item ingest batch object plus one or more
+          # associated Component ingest batch objects.  If the Item batch object fails to process correctly, we don't
+          # want to attempt to process the Component batch objects.
+          # In the preceding use case, we could skip the remaining batch objects only if the failed batch object is an
+          # Item but there might be future cases in which we don't want to process the remaining batch objects in the
+          # job regardless of which batch object fails.  The failure of any batch object to process should be rare
+          # enough that it doesn't seem harmful to cover this potential broader use case in the current code.
+          if success
+            success = ProcessBatchObject.new(batch_object_id: batch_object.id, operator: operator).execute
+          else
+            batch_object.update!(handled: true)
+          end
         end
       end
     end

data/lib/ddr/batch/version.rb

@@ -1,5 +1,5 @@
 module Ddr
   module Batch
-    VERSION = "1.6.0"
+    VERSION = "1.6.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-batch
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Jim Coble
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-12 00:00:00.000000000 Z
+date: 2018-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: ddr-models
   requirement: !ruby/object:Gem::Requirement