batches_task_processor 0.3.3 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35e87c4ae1e2728db3bf365e2bb9ceb74aa7d5605bc5fbf5a94aea4fd9559637
-  data.tar.gz: 65da53cfe48a3aedc8eece776e3100edb5d4d1e29a2b0b99123a6f50f0aa5ee2
+  metadata.gz: 1c894648bfdda3e00af8f84664db6b9bc93c9841b75db626b1b7246a5bd122f7
+  data.tar.gz: 40730cbc8b5009f5889c823fb7f62ce9fad74667c1a995bdeb9640bc2423cbd3
 SHA512:
-  metadata.gz: 6c2a0f73cd1385dba738cc8a09c2159889f067d9e9743f33bae49feb4085c41b49293599b70241a31bdc9612c52e26a31568a56f69ef51b428a9855df7ed3f60
-  data.tar.gz: bc945ab30a45c47d0519380cd85efd5c15534c7ba5eb1915deed65777ce3e88aa95910311fbdc64d1e7623e085d6c1857bd305e6261f6effc24e5ee367dd2887
+  metadata.gz: f470bd0a5de883797fff0cde140f87ab9b61142a148945dad289b47769ed51b213ead81f72c8998cdb7b928b0937a34b892050618c4cf7a175a42afa559049bb
+  data.tar.gz: 9fc74754e669dbba709ab01b156b6e2bba1fa59c2edfb989438791a1f2ec11ca4f1a04ab90a36025051ed281a697810f4b7b47bbc59505d5682df86341bc815e

data/lib/batches_task_processor/model.rb

@@ -4,7 +4,7 @@ require 'csv'
 module BatchesTaskProcessor
   class Model < ActiveRecord::Base
     self.table_name = 'batches_task_processors'
-    has_many :items, class_name: 'BatchesTaskProcessor::ModelItem', dependent: :destroy, foreign_key: :batches_task_processors_id
+    has_many :items, class_name: 'BatchesTaskProcessor::ModelItem', dependent: :delete_all, foreign_key: :batches_task_processors_id
     validates :process_item, presence: true
     validates :key, presence: true
     before_save :apply_data_uniqueness
@@ -38,11 +38,16 @@ module BatchesTaskProcessor
     end
 
     def status
-      Rails.logger.info "Process status: #{task_model.items.count}/#{task_model.data.count}"
+      Rails.logger.info "Process status: #{items.count}/#{data.count}"
+    end
+
+    def retry_failures
+      start!
     end
 
     def export
-      path = Rails.root.join('tmp/batches_task_processor_result.csv')
+      filename = (key || 'batches_task_processor_result').try(:parameterize)
+      path = Rails.root.join("tmp/#{filename}.csv")
       data = items.pluck(:key, :result, :error_details)
       data = [['Key', 'Result', 'Error details']] + data
       File.write(path, data.map(&:to_csv).join)

data/lib/batches_task_processor/processor.rb

@@ -55,7 +55,7 @@ module BatchesTaskProcessor
       (items.try(:find_each) || items.each).with_index(1) do |item, index|
         key = item.try(:id) || item
         break log('Process cancelled') if process_cancelled?
-        next log("Skipping #{key}...") if already_processed?(key)
+        next if already_processed?(key)
 
         start_process_item(item, job, key, index)
       end
@@ -72,18 +72,19 @@ module BatchesTaskProcessor
     def start_process_item(item, job, key, index)
       log "Processing key: #{key}, job: #{job}, counter: #{index}/#{task_model.qty_items_job}"
       result = process_item(item)
-      task_model.items.create!(key: key, result: result.to_s[0..255])
+      task_model.items.where(key: key).first_or_initialize.update!(result: result, error_details: nil)
     rescue => e
-      task_model.items.create!(key: key, error_details: e.message)
+      task_model.items.where(key: key).first_or_initialize.update!(result: nil, error_details: e.message)
       log "Process failed #{job}/#{key}: #{e.message}"
     end
 
     def already_processed?(key)
-      task_model.items.where(key: key).exists?
+      task_model.items.where(key: key, error_details: nil).exists?
     end
 
     def process_cancelled?
-      task_model.state == 'cancelled'
+      state = BatchesTaskProcessor::Model.select(:state).find(task_model.id).state
+      state == 'cancelled'
     end
 
     def log(msg)

data/lib/batches_task_processor/version.rb

@@ -1,3 +1,3 @@
 module BatchesTaskProcessor
-  VERSION = "0.3.3"
+  VERSION = "0.3.6"
 end

data/lib/db/migrate/20220727101904_add_batches_task_processor.rb

@@ -18,7 +18,7 @@ class AddBatchesTaskProcessor < ActiveRecord::Migration[5.0]
     create_table :batches_task_processor_items do |t|
       t.belongs_to :batches_task_processors, foreign_key: true, index: { name: 'index_batches_task_processors_parent_id' }
       t.string :key
-      t.text :result
+      t.text :result, limit: 999999
       t.text :error_details
       t.timestamps
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: batches_task_processor
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.6
 platform: ruby
 authors:
 - Owen Peredo
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-03 00:00:00.000000000 Z
+date: 2022-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails