merge main

app/controllers/importo/imports_controller.rb

@@ -28,21 +28,11 @@ def create
         render :new
         return
       end
-      @import = Import.new(import_params.merge(locale: I18n.locale, importo_ownable: Importo.config.current_import_owner))
+      @import = Import.new(import_params.merge(locale: I18n.locale,
+                                               importo_ownable: Importo.config.current_import_owner.call))
       if @import.valid?
         @import.save!
         redirect_to action: :preview, id: @import.id, kind: @import.kind
-      else
-        flash[:error] = t('.flash.error')
-        render :new
-      end
-    end
-
-    def upload
-      @import = Import.find(params[:id])
-      @import.confirm! if @import.can_confirm?
-      if @import.valid? && @import.schedule!
-        redirect_to action: :index
       else
         Signum.error(Current.user, text: t('.flash.error', error: @import.errors&.full_messages&.join('.')))
         render :new
@@ -65,6 +55,18 @@ def undo
       end
     end
 
+    def upload
+      @import = Import.find(params[:id])
+      @import.confirm! if @import.can_confirm?
+      if @import.valid? && @import.schedule!
+        flash[:notice] = t('.flash.success', id: @import.id)
+        redirect_to action: :index
+      else
+        flash[:error] = t('.flash.error')
+        render :new
+      end
+    end
+
     def destroy
       @import = Import.where(importo_ownable: Importo.config.current_import_owner.call).find(params[:id])
       redirect_to(action: :index, alert: 'Not allowed') && return unless Importo.config.admin_can_destroy.call(@import)

app/models/importo/import.rb

@@ -7,7 +7,6 @@ class Import < Importo::ApplicationRecord
     belongs_to :importo_ownable, polymorphic: true
 
     has_many :message_instances, as: :messagable
-    has_many :results, class_name: 'Importo::Result', dependent: :delete_all
 
     validates :kind, presence: true
     validates :original, presence: true
@@ -31,7 +30,7 @@ class Import < Importo::ApplicationRecord
       state :reverted
 
       after_transition any => any do |imprt, transition|
-        imprt.importer.state_changed(imprt, transition)
+        CallbackService.perform_later(import: imprt&.id, callback: transition.to_name)
       end
 
       after_transition any => :scheduled, do: :schedule_import

test/models/importo/import_test.rb

@@ -57,6 +57,7 @@ class ImportTest < ActiveSupport::TestCase
       import.original.attach(io: simple_sheet([%w[id name description], %w[aid atest atest-description]]),
                              filename: 'simple_sheet.xlsx')
       assert import.save, import.errors.messages
+
       import.confirm
       import.schedule
       assert_equal 'scheduled', import.state