ntq_excelsior_engine 0.2.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db26aed7616f6b7cde6bd010cebee8596832a72f4aae13e1960add0a6b12862f
-  data.tar.gz: e62ab3e9aa286845ff91e0b6c0d8e2a964428e60020745f008adf566c541361c
+  metadata.gz: 3b130c09a6196e7ffa64638bc95608ccfd6db8c93ac68d67d008d3fb84863fb6
+  data.tar.gz: cdd29e415e7bf29150544cd2c3efaff13e7a56f3e111aa24ac1976fa83ffd7cd
 SHA512:
-  metadata.gz: 791ab59aa1a6df01bca499cbfe632dcf31a450bb1485589c729f2460498f7c87163d5f9249302b9fd66ae2b618c34b1a548ccf056d933dbd3cabce74698708d9
-  data.tar.gz: 8016421a65bf3dfbfe04f29928904f118bf7862915f784053871cae78fa69a5fbd0947c874f08a1aa51db474b658f147fa08838df8ed8953682a911498f8587f
+  metadata.gz: 96b1c15d0e0e3db9450be8c89a0306a02a44157cb9347f89c360dc87aa9eb174ead679fd43b418bc8335b13c9bb8b84c89faef4804cd2fad43d6918ac8f0edee
+  data.tar.gz: d9199ad8903b15e5eef88f286353fd589ea492cdfe1b10ffd633475b2cd88f072c59e68be5bc991e69001cc488899e5cab922d4061a7fcebaf8c08e4b5c791ed

data/app/controllers/ntq_excelsior_engine/importers_controller.rb

@@ -13,22 +13,6 @@ module NtqExcelsiorEngine
       send_file "#{Rails.root}/#{@importer.to_s.constantize.sample_file}", disposition: 'attachment'
     end
 
-    def status
-      valid_types = NtqExcelsiorEngine.importers.keys.map(&:to_s)
-
-      importing_files = NtqExcelsiorEngine::Import.importing
-      importing_files = importing_files.where(import_type: params[:type]) if params[:type].present? && valid_types.include?(params[:type])
-
-      job_status_json = {}
-      job_status_json[:refetch] = false
-      importing_files.each do |importing_file|
-        job_status_json[importing_file.import_type] = Sidekiq::Status.get_all(importing_file.job_id)
-        job_status_json[:refetch] = true
-      end
-
-      render json: { status: job_status_json }
-    end
-
   private
 
     def ensure_valid_importer_type!

data/app/controllers/ntq_excelsior_engine/imports_controller.rb

@@ -33,7 +33,7 @@ module NtqExcelsiorEngine
     def create
       @import_file = ::NtqExcelsiorEngine::Import.new import_type: params[:type]
       @import_file.file = file_params
-      yield(import_file) if block_given?
+      yield(@import_file) if block_given?
       @import_file.inspect
       if @import_file.save
         unless NtqExcelsiorEngine.async

data/app/interactors/ntq_excelsior_engine/imports/check_lines.rb

@@ -3,7 +3,7 @@ module NtqExcelsiorEngine
     include Interactor
   
     around do |interactor|
-      if context.actions && context.actions.include?("check") && context.import && context.importer
+      if context.actions && context.actions.include?("check") && context.import && context.importer && context.import.import_lines.any?
         interactor.call
       end
     end

data/app/interactors/ntq_excelsior_engine/imports/import_lines.rb

@@ -3,7 +3,7 @@ module NtqExcelsiorEngine
     include Interactor
   
     around do |interactor|
-      if context.actions && context.actions.include?("import") && context.import && !context.import.error? && context.importer
+      if context.actions && context.actions.include?("import") && context.import && !context.import.error? && context.importer && context.import.import_lines.any?
         interactor.call
       end
     end
@@ -18,7 +18,15 @@ module NtqExcelsiorEngine
           line.update(status: result[:status], line_errors: result[:errors], action: result[:action])
         end
         sleep 2 if NtqExcelsiorEngine.debug
-        import.update(state: import.import_lines.in_error.any? ? 'error' : 'imported')
+        stats = {
+          count: import.import_lines.count,
+          errors: import.import_lines.in_error.count,
+          success: import.import_lines.successes.count,
+          create: import.import_lines.successes.is_create.count,
+          update: import.import_lines.successes.is_update.count
+        }
+        import.update(state: import.import_lines.in_error.any? ? 'error' : 'imported', stats: stats)
+        import.import_lines.delete_all unless NtqExcelsiorEngine.keep_import_lines
       rescue => e
         p e.inspect
         Appsignal.send_error(e)

data/app/interactors/ntq_excelsior_engine/imports/load_lines.rb

@@ -25,6 +25,9 @@ module NtqExcelsiorEngine
         sleep 2 if NtqExcelsiorEngine.debug
         import.update(headers: importer.detect_header_scheme, state: 'buffered')
         import.temp_file.unlink
+      rescue Roo::HeaderRowNotFoundError => e
+        message = e.message.gsub("\/i", "").gsub("/", "").slice(1..-1).chop
+        import.update(state: 'error', error_message: 'header_not_found', backtrace: message.split(', ').join('\n'))
       rescue => e
         Appsignal.send_error(e)
         import.update(state: 'error', backtrace: e.backtrace.join('\n'))

data/app/models/ntq_excelsior_engine/import.rb

@@ -1,11 +1,5 @@
 module NtqExcelsiorEngine
   class Import < ::ApplicationRecord
-    VALID_CONTENT_TYPES = %w[
-      application/vnd.ms-excel
-      application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
-      application/vnd.ms-excel.sheet.macroenabled.12
-      application/vnd.ms-excel.sheet.macroEnabled.12
-    ].freeze
     
     self.table_name = "excelsior_imports"
 
@@ -16,7 +10,7 @@ module NtqExcelsiorEngine
     serialize :stats, Hash
 
     has_one_attached :file
-    has_many :import_lines, foreign_key: :excelsior_import_id
+    has_many :import_lines, foreign_key: :excelsior_import_id, dependent: :delete_all
 
     validates :file, presence: true
     validates :state, presence: true

data/app/views/ntq_excelsior_engine/imports/status.json.jbuilder

@@ -3,11 +3,19 @@ json.set! :data do
   json.state @import_file.state
   if @import_file.error?
     json.error_file download_errors_file_url(@import_file.id)
+    json.error_message @import_file.error_message
+    json.backtrace @import_file.backtrace
   end
-  if %[checked imported importing].include? @import_file.state
+  if %[checked importing].include? @import_file.state
     json.errors_count @import_file.import_lines.in_error.count
     json.success_count @import_file.import_lines.successes.count
     json.create_count @import_file.import_lines.successes.is_create.count
     json.update_count @import_file.import_lines.successes.is_update.count
   end
+  if @import_file.state == "imported"
+    json.errors_count @import_file.stats[:errors]
+    json.success_count @import_file.stats[:success]
+    json.create_count @import_file.stats[:create]
+    json.update_count @import_file.stats[:update]
+  end
 end

data/config/routes.rb

@@ -3,7 +3,6 @@ NtqExcelsiorEngine::Engine.routes.draw do
     get 'importers/show'
     get '/importers/:type' => "importers#show"
     get '/importers/:type/sample_file' => "importers#sample_file", as: :download_sample_file
-    get '/importers/status' => "importers#status"
   
     post '/imports/:type' => "imports#create"
     get '/imports/:id/export_errors' => "imports#export_errors", as: :download_errors_file

data/lib/generators/templates/ntq_excelsior_engine.rb

@@ -8,6 +8,7 @@ NtqExcelsiorEngine.setup do |config|
   #   user: UserImporter
   # }
 
+  # config.keep_import_lines = false
   # config.debug = false
   # config.async = false
   # config.actions_on_create = [:load, :check, :import]

data/lib/ntq_excelsior_engine/version.rb

@@ -1,3 +1,3 @@
 module NtqExcelsiorEngine
-  VERSION = "0.2.0"
+  VERSION = "0.3.1"
 end

data/lib/ntq_excelsior_engine.rb

@@ -17,6 +17,9 @@ module NtqExcelsiorEngine
   mattr_accessor :action_cable
   @@action_cable = false
 
+  mattr_accessor :keep_import_lines
+  @@keep_import_lines = false
+
   mattr_accessor :debug
   @@debug = false
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ntq_excelsior_engine
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Kevin