ixport 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03be028cedf3161974f8143be44d6f31d79cc669e0388d266bc787d12a9dcd9e
-  data.tar.gz: e7aec59ef0d4d8288a4062e713f0ef87eb7bc23f3bbda19db8e638eabc2872ad
+  metadata.gz: b40a581b96b5e012197ee7a185f08891e4580fb7f2bc824ddd5de3789ccb9e02
+  data.tar.gz: 9f6e9bde4f0590cfac3524df4695bff2ee132ad47cd8d66938b919fbf5ec2c67
 SHA512:
-  metadata.gz: 2afc07d8cba3ef5d3272d5e74d4981ffd882c4dafe969d70af85dd85947049acea43356b804b8afc7bc4f3a918027f3a6aecebe990c774686cef254420f3873f
-  data.tar.gz: eb1aba5fb3eecb5071f3ce89fd847eea67d0e79bf6270f639fc0d0c24bb92c3216e0ce8924a191622b07c07afae1af004312523db31dcf89436f527ba0897731
+  metadata.gz: 6f3dde1eac2e6e592a49fcf9049c822efa56e70468cbe1666329c8be35beef75e94e03091786bf94f8f0f141619e48a338fa99ecc1b349f6e547461569a7d12d
+  data.tar.gz: 0af9d0471ea9d3e62a0476e1e6ef9a7fa8d9bff8050e90576d7d226e53c620bf90f62261930e52a43a9115b3a97b4b5d0daa450b999d618c3576f2a61bd1db35

data/app/controllers/ixport/application_controller.rb

@@ -13,7 +13,8 @@ module Ixport
 
     def find_import
       @import = Import.find_by(id: params[:import_id] || params[:id], person: ixport_person, account: ixport_account)
-      head :not_found unless @import && allowed?(Ixport.registration(@import.key))
+      registration = @import && Ixport.registrations[@import.key.to_sym]
+      head :not_found unless registration && allowed?(registration)
     end
 
     def ixport_person

data/app/controllers/ixport/export_templates_controller.rb

@@ -10,8 +10,12 @@ module Ixport
     end
 
     def create
-      ExportTemplate.create!(key: @registration.key, name: params[:name], columns: known_columns(@registration), person: ixport_person, account: ixport_account)
-      redirect_to exports_path
+      template = ExportTemplate.new(key: @registration.key, name: params[:name], columns: known_columns(@registration), person: ixport_person, account: ixport_account)
+      return redirect_to exports_path if template.save
+
+      @columns = @registration.exporter.constantize.columns
+      @name_error = template.errors[:name].first
+      render :new, status: :unprocessable_entity
     end
 
     def show
@@ -24,8 +28,12 @@ module Ixport
     end
 
     def update
-      @template.update!(name: params[:name], columns: known_columns(@template.registration))
-      redirect_to exports_path
+      return redirect_to exports_path if @template.update(name: params[:name], columns: known_columns(@template.registration))
+
+      @columns = @template.registration.exporter.constantize.columns
+      @name_error = @template.errors[:name].first
+      @template.restore_attributes
+      render :edit, status: :unprocessable_entity
     end
 
     def destroy
@@ -37,7 +45,8 @@ module Ixport
 
     def find_template
       @template = ExportTemplate.find_by(id: params[:id], account: ixport_account)
-      head :not_found unless @template && allowed?(@template.registration)
+      registration = @template && Ixport.export_registrations[@template.key.to_sym]
+      head :not_found unless registration && allowed?(registration)
     end
 
     def find_chosen_export

data/app/controllers/ixport/runs_controller.rb

@@ -7,15 +7,28 @@ module Ixport
     def create
       runner = Ixport.background_runner
       return run_in_request unless runner
-      return redirect_to import_path(@import) unless @import.status == "pending"
+      return redirect_to import_path(@import) unless claim_pending_import
 
-      @import.update!(status: "running")
-      runner.enqueue(@import)
-      redirect_to @import.wallflower_task_id ? wallflower.task_path(@import.wallflower_task_id) : import_path(@import)
+      hand_over(runner)
     end
 
     private
 
+    def claim_pending_import
+      claimed = Import.where(id: @import.id, status: "pending").update_all(status: "running", updated_at: Time.current) == 1
+      @import.reload if claimed
+      claimed
+    end
+
+    def hand_over(runner)
+      runner.enqueue(@import)
+      redirect_to @import.wallflower_task_id ? wallflower.task_path(@import.wallflower_task_id) : import_path(@import)
+    rescue StandardError => error
+      Rails.error.report(error)
+      @import.update!(status: "pending")
+      redirect_to import_preview_path(@import), flash: { ixport_not_started: true }
+    end
+
     def run_in_request
       @import.run!
       redirect_to import_path(@import)

data/app/models/ixport/export_template.rb

@@ -7,6 +7,8 @@ module Ixport
     belongs_to :person, polymorphic: true
     belongs_to :account, polymorphic: true, optional: true
 
+    validates :name, presence: { message: "Give the template a name." }
+
     def registration
       Ixport.export_registration(key)
     end

data/app/models/ixport/import.rb

@@ -12,11 +12,15 @@ module Ixport
     has_one_attached :file
     has_many :refusals, -> { order(:row_number) }, class_name: "Ixport::ImportRefusal", dependent: :destroy
 
+    STALLED_AFTER = 1.hour
+
     validate :incoming_file_is_usable, on: :create
 
-    def run!(reporter: NullReporter.new)
+    attr_reader :run_error
+
+    def run!(reporter: NullReporter.new, report_failure: true)
       with_lock do
-        walk_and_save(reporter) if status.in?(%w[pending running])
+        walk_and_save(reporter, report_failure) if status.in?(%w[pending running])
       end
     end
 
@@ -28,6 +32,10 @@ module Ixport
       status == "running"
     end
 
+    def stalled?
+      running? && updated_at < STALLED_AFTER.ago
+    end
+
     def failed?
       status == "failed"
     end
@@ -72,7 +80,7 @@ module Ixport
 
     private
 
-    def walk_and_save(reporter)
+    def walk_and_save(reporter, report_failure)
       counts = { add: 0, update: 0 }
       rows = self.rows
       reporter.set_total(rows.size)
@@ -83,7 +91,8 @@ module Ixport
       end
       update!(status: "finished", added_count: counts[:add], updated_count: counts[:update])
     rescue StandardError => error
-      Rails.error.report(error)
+      @run_error = error
+      Rails.error.report(error) if report_failure
       update!(status: "failed", error_message: error.message, added_count: counts[:add], updated_count: counts[:update])
     end
 

data/app/models/ixport/wallflower_task_runner.rb

@@ -6,9 +6,9 @@ module Ixport
 
     def call(task)
       import = Import.find(task.params["import_id"])
-      Ixport.run_import(import, reporter: task)
+      import.run!(reporter: task, report_failure: false)
       task.link_result(ixport.import_path(import))
-      raise ImportFailed, import.error_message if import.failed?
+      raise(import.run_error || ImportFailed.new(import.error_message)) if import.failed?
     end
   end
 end

data/app/views/ixport/export_templates/edit.html.erb

@@ -1,7 +1,7 @@
 <%= ui_form_page(title: "Edit #{@template.name}", subtitle: @template.registration.title, back_url: exports_path) %>
 <%= ui_page(max_width: :md) do %>
   <%= ui_form(action: export_template_path(@template), method: :patch) do %>
-    <%= ui_form_field(attribute: "name", label: "Template name", required: true, value: @template.name) %>
+    <%= ui_form_field(attribute: "name", label: "Template name", required: true, value: @template.name, errors: @name_error.present? ? [tag.span(@name_error, data: { name_error: true })] : []) %>
     <% column_options = @columns.map { |column| [column.label, column.key] } %>
     <% @columns.each_index do |index| %>
       <%= ui_form_field(attribute: "columns[]", label: "Column #{index + 1}", type: :select, options: column_options, include_blank: "None", value: @template.columns[index]) %>

data/app/views/ixport/export_templates/new.html.erb

@@ -1,7 +1,7 @@
 <%= ui_form_page(title: "New #{@registration.title} template", back_url: exports_path) %>
 <%= ui_page(max_width: :md) do %>
   <%= ui_form(action: export_templates_path(@registration.key)) do %>
-    <%= ui_form_field(attribute: "name", label: "Template name", required: true) %>
+    <%= ui_form_field(attribute: "name", label: "Template name", required: true, errors: @name_error.present? ? [tag.span(@name_error, data: { name_error: true })] : []) %>
     <% column_options = @columns.map { |column| [column.label, column.key] } %>
     <% @columns.each_index do |index| %>
       <%= ui_form_field(attribute: "columns[]", label: "Column #{index + 1}", type: :select, options: column_options, include_blank: "None") %>

data/app/views/ixport/imports/show.html.erb

@@ -1,4 +1,6 @@
-<% heading = if @import.running?
+<% heading = if @import.stalled?
+                "Import stalled"
+              elsif @import.running?
                 "Import running"
               elsif @import.failed?
                 "Import failed"
@@ -8,7 +10,10 @@
 <%= ui_show_page(title: heading, back_url: root_path) %>
 <%= ui_page(max_width: :md) do %>
   <%= ui_page_header(title: heading) %>
-  <% if @import.running? %>
+  <% if @import.stalled? %>
+    <%= ui_alert(type: :error, message: tag.span("This import has stopped making progress.", data: { import_stalled: true })) %>
+    <p>Rows saved before it stopped stay saved.</p>
+  <% elsif @import.running? %>
     <%= ui_alert(type: :info, message: tag.span("This import is running.", data: { import_running: true })) %>
   <% else %>
     <% if @import.failed? %>

data/app/views/ixport/previews/show.html.erb

@@ -1,6 +1,9 @@
 <%= ui_show_page(title: "Preview", back_url: import_mapping_path(@import)) %>
 <%= ui_page(max_width: :md) do %>
   <%= ui_page_header(title: "Preview") %>
+  <% if flash[:ixport_not_started].present? %>
+    <%= ui_alert(type: :error, message: tag.span("This import did not start. Run it again.", data: { import_not_started: true })) %>
+  <% end %>
   <%= ui_grid(cols: { default: 1, sm: 3 }) do %>
     <%= ui_stat_card(label: "Will add", value: tag.span(@counts[:add], data: { count: "add" })) %>
     <%= ui_stat_card(label: "Will update", value: tag.span(@counts[:update], data: { count: "update" })) %>

data/lib/ixport/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ixport
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ixport
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Tyler Schneider