importo 3.0.15 → 3.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 129f39dcc8d61a3eb8f38629fbcd97d176c645cff64ffbef92ec56344a3d3e63
-  data.tar.gz: 4ed23b370e993fd94d5a364d1dfa8632a4dcc2cfd875db1c4d00f8ec31058523
+  metadata.gz: 67757044a87ce6eda6eceddd937b93404eda3cc979298f2d22316ea6db0e6eb1
+  data.tar.gz: 603c9602c07ac03a0fab0ed20f9dc81fec5df0bfb153f758add2d05f29bd418e
 SHA512:
-  metadata.gz: c8e202ba1d1d0c12d60b33bf13c2a3ecab28e039d5864cbf5c4b451a0addd0d86aa10a8db6010570414dc6007ec642cccdaee1314ba773225d30f00f41c4d9a7
-  data.tar.gz: a9ef9e5b42b6c11218717a4c2b213409be6e102bf543771f7472710dfc14c4a54f5285edea56256faec0afa5041455e4f083ae566c26934c7bca59e339393b06
+  metadata.gz: '070083420acdf0dd06ab2b59c1595e4e76906b8594944ac00c091baf82c9465efd56c8a90b270d368d7f2571322ee6ec5134195f3e83f4b1764bb97880ad9015'
+  data.tar.gz: 744f9d63c5d552c673ab7bb4e83a147605e8c1558e60e3545a95e298cac6683114e96385d74794db6ac1fff02ab4e963d214c3f2a720f77e9653c6a1c8d2233c

data/app/adapters/importo/sidekiq_batch_adapter.rb

@@ -8,7 +8,7 @@ module Importo
       @instance = Sidekiq::Batch.new
     end
 
-    delegate :description=, to: :@instance
+    delegate :description=, :bid, to: :@instance
 
     def on_success(job)
       @instance.on(:success, job.constantize, properties)

data/app/importers/concerns/importable.rb

@@ -132,6 +132,7 @@ module Importable
     batch.on_success("Importo::ImportJobCallback")
 
     batch.add do
+      bid = batch.bid
       column_with_delay = columns.select { |k, v| v.delay.present? }
       loop_data_rows do |attributes, index|
         if column_with_delay.present?
@@ -140,8 +141,8 @@ module Importable
             v.delay.call(attributes[k])
           end.compact
         end
-        Importo::ImportJob.set(wait_until: (delay.max * index).seconds.from_now).perform_async(JSON.dump(attributes), index, import.id) if delay.present?
-        Importo::ImportJob.perform_async(JSON.dump(attributes), index, import.id) unless delay.present?
+        Importo::ImportJob.set(wait_until: (delay.max * index).seconds.from_now).perform_async(JSON.dump(attributes), index, import.id, bid) if delay.present?
+        Importo::ImportJob.perform_async(JSON.dump(attributes), index, import.id, bid) unless delay.present?
       end
     end
 

data/app/importers/importo/import_job_callback.rb

@@ -2,7 +2,7 @@ module Importo
   class ImportJobCallback
     include Rails.application.routes.url_helpers
 
-    def on_complete(options)
+    def on_success(_status, options)
       options = options.deep_stringify_keys
       import = Import.find(options["import_id"])
       if import.present?

data/app/jobs/importo/import_job.rb

@@ -20,7 +20,7 @@ module Importo
       end
     end
 
-    def perform(attributes, index, import_id)
+    def perform(attributes, index, import_id, bid)
       self.class.execute_row(attributes, index, import_id, false, bid)
     end
 
@@ -33,7 +33,7 @@ module Importo
       batch = Importo::SidekiqBatchAdapter.find(bid)
 
       if !import.completed? && import.can_complete? && batch.finished?
-        ImportJobCallback.new.on_complete(import_id: import_id)
+        ImportJobCallback.new.on_success(batch.status, {import_id: import_id})
       end
     end
   end

data/lib/importo/test_helpers.rb

@@ -30,7 +30,7 @@ module Importo
       import.save!
 
       ImportService.perform(import: import)
-      ImportJobCallback.new.on_complete({import_id: import.id})
+      ImportJobCallback.new.on_success({import_id: import.id})
       import
     end
   end

data/lib/importo/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Importo
-  VERSION = "3.0.15"
+  VERSION = "3.0.16"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: importo
 version: !ruby/object:Gem::Version
-  version: 3.0.15
+  version: 3.0.16
 platform: ruby
 authors:
 - Andre Meij
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-09-18 00:00:00.000000000 Z
+date: 2024-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caxlsx