ddr-batch 1.2.0.rc1 → 1.2.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e99d993322b0feb42c08dd0a367aa2cbb9a8bd36
-  data.tar.gz: 7d3ea407d8f1cc09f33725c8c54cbbb934967a98
+  metadata.gz: 6af55cc37d93326bdcad084634c17b1ef3206412
+  data.tar.gz: 806152ec7c04f3f88eda1b325f9c72cc814fe523
 SHA512:
-  metadata.gz: 8954284d5fed970fbaa7ee95626bafc28f7e906ba668d657d95279191555f842b6b5832943bc9034fdcf5bf699f27ad2d7c2d412d34cb4d89f6d9fff24bb1eb5
-  data.tar.gz: 2de0336399b640e5b3b85daa2ca65ebd1ac31f85e259907d80701d68198c8969e1dc155024ebe9a3bbe16b50cc61703677fe5cb2a9392d2306e2d5094b914bcc
+  metadata.gz: 7d1d932ba6ebc49a97e81a0f127b2b0bc60c05cf189322fd704db0ec7fc12ff74b2c8f5f4839de1df7f3d3530306d548a631ceb0f11cf8f40dec05df6ae1c89d
+  data.tar.gz: 9472b3ccec76010514e8e529aebc01ae0c56369308cb601c859ce22cc8986b4933d7870eaf34e5f601764c5a905cad59eee4a21d891481960f52df2a8561f4af

data/app/mailers/ddr/batch/batch_processor_run_mailer.rb

@@ -9,6 +9,9 @@ module Ddr::Batch
       @title = "Batch Processor Run #{@batch.status} #{@batch.outcome}"
       @host = `uname -n`.strip
       @subject = "[#{@host}] #{@title}"
+      @size = @batch.batch_objects.size
+      @handled = @batch.handled_count
+      @success = @batch.success_count
       from = "#{`echo $USER`.strip}@#{@host}"
       attachments["details.txt"] = File.read(@batch.logfile.path)
       mail(from: from, to: @batch.user.email, subject: @subject)

data/app/models/ddr/batch/batch.rb

@@ -26,6 +26,10 @@ module Ddr::Batch
       batch_objects.where(handled: true).count
     end
 
+    def success_count
+      batch_objects.where(verified: true).count
+    end
+
     def time_to_complete
       unless start.nil?
         if handled_count > 0

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

@@ -60,7 +60,7 @@ module Ddr::Batch
       end
 
       def update_batch(batch)
-        outcome = batch.success.eql?(batch.batch_objects.size) ? Batch::OUTCOME_SUCCESS : Batch::OUTCOME_FAILURE
+        outcome = batch.success_count.eql?(batch.batch_objects.size) ? Batch::OUTCOME_SUCCESS : Batch::OUTCOME_FAILURE
         logfile = File.new(Ddr::Batch::Log.file_path(batch.id))
         batch.update!(stop: DateTime.now,
                       status: Batch::STATUS_FINISHED,

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

@@ -13,7 +13,6 @@ module Ddr::Batch
 
       def batch_object_handled(batch_object, batch)
         log_batch_object_messages(batch_object, batch.id)
-        update_batch(batch_object, batch)
         unless batch.unhandled_objects?
           ActiveSupport::Notifications.instrument('finished.batch.batch.ddr', batch_id: batch.id)
         end
@@ -26,10 +25,6 @@ module Ddr::Batch
         end
         logger.close
       end
-
-      def update_batch(batch_object, batch)
-        batch_object.verified? ? batch.update!(success: batch.success + 1) : batch.update!(failure: batch.failure + 1)
-      end
     end
 
   end

data/app/views/ddr/batch/batch_processor_run_mailer/send_notification.html.erb

@@ -22,13 +22,13 @@ td { text-align: right; }
 	  Outcome: <%= @batch.outcome %>
 	</p>
 	<p>
-	  Objects in batch: <%= @batch.batch_objects.size %><br />
-	  Successfully processed: <%= @batch.success %><br />
-	  Processing failures: <%= @batch.failure %><br />
-	  Unprocessed: <%= @batch.batch_objects.size - @batch.success - @batch.failure %>
+	  Objects in batch: <%= @size %><br />
+	  Successfully processed: <%= @success %><br />
+	  Processing failures: <%= @handled - @success %><br />
+	  Unprocessed: <%= @size - @handled %>
 	</p>
 	<p>
 	  See attachment for details of batch run.
 	</p>
   </body>
-</html>
+</html>

data/app/views/ddr/batch/batch_processor_run_mailer/send_notification.text.erb

@@ -12,9 +12,9 @@ Stopped at: <%= @batch.stop %>
 Status: <%= @batch.status %>
 Outcome: <%= @batch.outcome %>
 
-Objects in batch: <%= @batch.batch_objects.size %>
-Successfully processed: <%= @batch.success %>
-Processing failures: <%= @batch.failure %>
-Unprocessed: <%= @batch.batch_objects.size - @batch.success - @batch.failure %>
+Objects in batch: <%= @size %>
+Successfully processed: <%= @success %>
+Processing failures: <%= @handled - @success %>
+Unprocessed: <%= @size - @handled %>
 
-See attachment for details of batch run.
+See attachment for details of batch run.

data/db/migrate/20161222192611_remove_columns_from_batch.rb

@@ -0,0 +1,13 @@
+class RemoveColumnsFromBatch < ActiveRecord::Migration
+  def up
+    remove_column :batches, :failure
+    remove_column :batches, :success
+  end
+
+  def down
+    change_table :batches do |t|
+      t.integer  "failure",               default: 0
+      t.integer  "success",               default: 0
+    end
+  end
+end

data/lib/ddr/batch/version.rb

@@ -1,5 +1,5 @@
 module Ddr
   module Batch
-    VERSION = "1.2.0.rc1"
+    VERSION = "1.2.0.rc2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-batch
 version: !ruby/object:Gem::Version
-  version: 1.2.0.rc1
+  version: 1.2.0.rc2
 platform: ruby
 authors:
 - Jim Coble
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-19 00:00:00.000000000 Z
+date: 2016-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -210,6 +210,7 @@ files:
 - db/migrate/20160816164010_create_batch_object_roles.rb
 - db/migrate/20161115191636_add_columns_to_batch_object.rb
 - db/migrate/20161116142512_create_batch_object_messages.rb
+- db/migrate/20161222192611_remove_columns_from_batch.rb
 - lib/ddr-batch.rb
 - lib/ddr/batch.rb
 - lib/ddr/batch/batch_user.rb