imp_exp 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42f84a9aaed6b4a80794ed02449694a7f0c50d6dc841f27ec14c69fcd7bb652a
-  data.tar.gz: 966b67cb74a39106e413662f39a0459f763f3633312ed0bbfbffa63927962fd8
+  metadata.gz: 94c393f1951d6c5ce96e649b5ddebeb783e4602d136808852826903bdc656374
+  data.tar.gz: e4ddda971aeaa6f46fce2fa376dfd904b7e3f1fc43a289aef5d6980ec6520e0e
 SHA512:
-  metadata.gz: b2de04fb8dc295e3b4358b552c95dbe005eecb667332ac5ce3656c496c7e9a087ce7be6c4a3f7aff92694db32b542b92e73dcae92f38ebbf93151595fba80db1
-  data.tar.gz: 4099b4a62d555bc165852b1cf78c9ce3389804c930d03f9d91caae8c2fc8a3c793a15d79efd4fc61a666353a330ab6da4045aa2e72cd6e7f34fecced51eab6da
+  metadata.gz: 0d192022028986ba40750b6abe36b480c0a7167657b71cb2a2528edc4760bfaa61f1a543a73a6893cdf1fd916bfd70ccc2d8aee6f5cbaa95107d9801a79fc2be
+  data.tar.gz: 8ffdaf906fa00dbc63613d18334aef5f5c89007e892dcc17669f35efcbe7cea9696fd3d43696e2f8435e1ee2fe93f804c4567d5f0ea3444bf6fc36109ec45f9f

data/app/services/imp_exp/importers/base.rb

@@ -81,9 +81,14 @@ module ImpExp
             next
           end
 
-          if record.save(context: :import)
-            model.after_save(record)
-            @imported[model.model_name] += 1
+          begin
+            if model.save(record)
+              @imported[model.model_name] += 1
+              next
+            end
+          rescue ActiveRecord::RecordNotUnique => e
+            message = I18n.t('imp_exp.importer.record_not_unique', details: unique_violation_details_suffix(e))
+            upsert_error_messages(model_name, line, row.to_s, message)
             next
           end
 
@@ -97,6 +102,12 @@ module ImpExp
         Rails.env.local?
       end
 
+      def unique_violation_details_suffix(exception)
+        details = exception.cause&.message || exception.message
+        details = details.to_s.strip
+        details.present? ? "(#{details})" : ""
+      end
+
       def attributes_from_row(row, model)
         row.slice(*model.attribute_to_import_names)
       end
@@ -133,7 +144,7 @@ module ImpExp
 
           full_file_path = File.join(files_directory_path, file_path.strip)
           begin
-            file = File.open(full_file_path)
+            file = File.open(full_file_path) # rubocop:disable Style/FileOpen
             record.send(file_attribute_name).attach(io: file, filename: File.basename(file_path))
           rescue Errno::ENOENT
             error_msg = I18n.t('imp_exp.importer.file_not_found', file_path: file_path)

data/app/services/imp_exp/models/base.rb

@@ -143,7 +143,9 @@ module ImpExp
         "#{active_storage_file.name}-#{active_storage_file.record.code}#{file_extension(active_storage_file)}"
       end
 
-      def after_save(_record); end
+      def save(record)
+        record.save(context: :import)
+      end
 
       private
 

data/app/services/imp_exp/serializers/whole_records.rb

@@ -26,7 +26,7 @@ module ImpExp
           return [ImpExp::Serializers::Errors::WrongFormat.new("#{relation_name} error | #{message}")]
         end
 
-        unless data.is_a?(Array) && data.all? { |datum| datum.is_a?(Hash) }
+        unless data.is_a?(Array) && data.all?(Hash)
           return [ImpExp::Serializers::Errors::WrongFormat.new("#{relation_name} should be an array of hashes")]
         end
 

data/config/locales/en.yml

@@ -4,6 +4,7 @@ en:
       invalid_columns: "The %{model_name} sheet does not contain the expected columns. Expected columns: %{expected_columns} Columns in the file: %{in_file_columns}."
       invalid_sheets: "The file does not contain the expected sheets. Expected sheets: %{expected_sheets} Sheets in the file: %{in_file_sheets}."
       record_not_found: "%{model_name} with %{conditions} conditions has not been found."
+      record_not_unique: "Unique constraint violation. Check the code field. Details: %{details}."
       wrong_format: "Format error: %{message}."
       model_errors: "%{model_name} sheet - Row %{line}: %{messages}"
       data_validation_error: "%{model_name} sheet - Row %{line} - Column \"%{column}\": value \"%{value}\" incorrect, expected value: %{expected}"

data/config/locales/fr.yml

@@ -4,7 +4,8 @@ fr:
       invalid_columns: "La feuille %{model_name} ne contient pas les colonnes attendues. Colonnes attendues : %{expected_columns}. Colonnes dans le fichier : %{in_file_columns}."
       invalid_sheets: "Le fichier ne contient pas les feuilles attendues. Feuilles attendues : %{expected_sheets}. Feuilles dans le fichier : %{in_file_sheets}."
       record_not_found: "%{model_name} avec les conditions %{conditions} n'a pas été trouvé."
+      record_not_unique: "Violation de contrainte d'unicité. Vérifiez les champs code. Détails : %{details}."
       wrong_format: "Erreur de format : %{message}."
       model_errors: "Feuille %{model_name} - Ligne %{line} : %{messages}"
       data_validation_error: "Feuille %{model_name} - Ligne %{line} - Colonne \"%{column}\" : valeur \"%{value}\" incorrecte, valeur attendue : %{expected}"
-      file_not_found: "Fichier %{file_path} non trouvé."
+      file_not_found: "Fichier %{file_path} non trouvé."

data/lib/imp_exp/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ImpExp
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: imp_exp
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Dev team Nerya
@@ -139,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Import data from xlsx into a rails app and export data to xlsx from a rails
   app