importo 3.0.27 → 3.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62c79b99be4319cef4d04dd7e20d249af487804ecbac642780005cd4c98369c8
-  data.tar.gz: d2723ed4ed893fdbc769807c8e237d0f84eef5cf2e1a9699dc4f00bf02b3ee6d
+  metadata.gz: 013fc113e0d5a9cd16cd888462a9d5437ee21d329cbe680ed5a905b6fd53dd23
+  data.tar.gz: 2d7b1fadf7a61b4527d02bfc3a206096f0acaa413b26a3cf61ebb43f15a45ef5
 SHA512:
-  metadata.gz: 149e0195bd00dfdbb997cdd0d1dc78327281aa9d40bc75e2b4709c2eb5217bbbb03ec6286e8c0f827f40a345a9de343b26b79124ee2eb97a28da003489e2e9ea
-  data.tar.gz: a90d2e428f8962359893e3eaba9bd276d1ca955a0e342c2917d0c20f8ed848eff930301219445e8cd902c6aae3e1849579cfbe840cda58e64364f641886b90ba
+  metadata.gz: 967c9f7fc07adadaab9707cd6e6b87098a9672026871992b86d985d73e270bb5269cbd2ae244e0c30e85d89f8bbae4e28bc469e07c8bf3013f0820d8a11f6060
+  data.tar.gz: 2c6f5a588b252208692070db52fb65e3a5aa74a42040f9e30acdb8d085725672db888e143b76e28a02ba7b3de3ba8f1b20c33c45af15a52c4b4ea15884ac62a0

data/app/importers/importo/import_job_callback.rb

@@ -10,23 +10,29 @@ module Importo
     end
 
     def complete_import(import)
-      if import.present?
-        results_file = import.importer.results_file
-        results_file = results_file.is_a?(StringIO) ? results_file : File.open(results_file)
-
-        import.result.attach(io: results_file, filename: import.importer.file_name("results"),
-          content_type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
-
-        ActiveRecord::Base.uncached do
-          import.result_message = I18n.t("importo.importers.result_message",
-            nr: import.results.where("details @> ?", {state: "success"}.to_json).count, of: import.importer.send(:row_count))
-        end
-
-        if import.can_complete?
-          import.complete!
-        else
-          import.save!
-        end
+      return if import.blank?
+
+      # Sidekiq's batch :complete event can fire as soon as every row has been
+      # attempted once, even though some rows failed and are still awaiting a
+      # retry. Bail out here so we don't finalize (and report a wrong count)
+      # before every row has actually finished processing.
+      return unless import.results.count == import.importer.send(:row_count)
+
+      results_file = import.importer.results_file
+      results_file = results_file.is_a?(StringIO) ? results_file : File.open(results_file)
+
+      import.result.attach(io: results_file, filename: import.importer.file_name("results"),
+        content_type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
+
+      ActiveRecord::Base.uncached do
+        import.result_message = I18n.t("importo.importers.result_message",
+          nr: import.results.where("details @> ?", {state: "success"}.to_json).count, of: import.importer.send(:row_count))
+      end
+
+      if import.can_complete?
+        import.complete!
+      else
+        import.save!
       end
     end
 
@@ -36,5 +42,9 @@ module Importo
       import = Import.find(options["import_id"])
       complete_import(import)
     end
+
+    # Sidekiq's batch :success event only fires once every job (including
+    # retries) has truly succeeded, so it is the reliable place to finalize.
+    alias_method :on_success, :on_complete
   end
 end

data/lib/importo/adapters/sidekiq_batch_adapter.rb

@@ -21,7 +21,12 @@ module Importo
     end
 
     def on_success(job)
+      # Register for both events: :complete can fire prematurely while rows are
+      # still awaiting a Sidekiq retry, :success only fires once every row has
+      # truly succeeded. ImportJobCallback itself guards against finalizing
+      # before every row has actually finished processing.
       @instance.on(:complete, job.constantize, properties)
+      @instance.on(:success, job.constantize, properties)
     end
 
     def add

data/lib/importo/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: importo
 version: !ruby/object:Gem::Version
-  version: 3.0.27
+  version: 3.0.28
 platform: ruby
 authors:
 - Andre Meij
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-08-25 00:00:00.000000000 Z
+date: 2026-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caxlsx