ntq_excelsior 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4443b707f72d72748af1e8d5c728aef25ea2f7175704f653bebf2b1897ea1784
-  data.tar.gz: 7fdc4700b25c1d5773638186fb5e22f2afd9fa956cf755a5f4c6eccf4fb4f5d3
+  metadata.gz: a5a967c15c3f10e6a7e22795e99b73d9be8e2ba2c98ea756672f587bf2c0c348
+  data.tar.gz: 6a90997fc04c6a6b7a45cc38d27be78be86266c90dec229427fb71f72f556adc
 SHA512:
-  metadata.gz: eb6b8a3fbe5ccf2ef25eb5ae3156e40c33fe8d3d67dda073b44a986fe0d4003e6a13ccd871868f2823259e06bd3b89a8c05fac433410927bdcd4337110aacdda
-  data.tar.gz: d0e1c3218ca3f1d85d627a35e594772df18cbe87ba7d6af5e37ad4932c4bb2acfa5823896e6e62457286b9125aefa57435bcdb0f2d450e7ca7a494f68df74b48
+  metadata.gz: d26fe0bd71a850e06cc17941700c4d9b0abe6f1b7d329d3bc74e872b1cd138f359d8357a98e67278f63be585073ae46dc3e70de83dde800a5bf5cc22073960fa
+  data.tar.gz: be8aa18475f1a4520ca5ad4aa22eb6b06bb98c564a6ef7c26d35a95b8650055e5bddc745a5ba24684f95ffc6288157d37a288ed9be6d076ede64f2337ac6acf1

data/README.md

@@ -87,9 +87,39 @@ send_data stream, type: 'application/xlsx', filename: "filename.xlsx"
 ```ruby
 class UserImporter < NtqExcelsior::Importer
 
-  model_klass User
+  model_klass "User"
+
+  primary_key :email
+
+  # autosave false
+
+  structure [{
+    header: "Email",
+    description: "Email de l'utilisateur a créer ou modifier",
+    required: true,
+  }, 
+  {
+    header: "Actif",
+    description: "Utilisateur activé",
+    required: true,
+    values: [
+      {
+        header: "True",
+        description: "Activé",
+      }, {
+        header: "False",
+        description: "Inactivé",
+      }
+    ]
+  }, {
+    header: "Prénom",
+    required: true,
+  }, {
+    header: "Nom",
+    required: true,
+  }]
 
-  primary_key :id
+  sample_file "/import_samples/users.xlsx"
 
   schema({
     email: 'Email',
@@ -112,6 +142,11 @@ class UserImporter < NtqExcelsior::Importer
     end
   end
 end
+
+importer = UserImporter.new
+importer.file = file
+result = importer.import
+# { success_count: 2, error_lines: [] }
 ```
 
 ## Development

data/lib/ntq_excelsior/importer.rb

@@ -7,6 +7,14 @@ module NtqExcelsior
 
     class << self
 
+      def autosave(value = nil)
+        @autosave ||= value
+      end
+
+      def autoset(value = nil)
+        @autoset ||= value
+      end
+
       def spreadsheet_options(value = nil)
         @spreadsheet_options ||= value
       end
@@ -61,10 +69,10 @@ module NtqExcelsior
       spreadsheet.sheet(spreadsheet.sheets[0]).parse(header_search: required_headers)
     end
 
-    def detect_header_scheme(line)
+    def detect_header_scheme
       return @header_scheme if @header_scheme
       @header_scheme = {}
-      l = line.dup
+      l = spreadsheet_data[0].dup
 
       self.class.schema.each do |field, column_config|
         header = column_config.is_a?(Hash) ? column_config[:header] : column_config
@@ -84,7 +92,7 @@ module NtqExcelsior
     def parse_line(line)
       parsed_line = {}
       line.each do |header, value|
-        header_scheme = detect_header_scheme(line)
+        header_scheme = detect_header_scheme
         if header.to_s == self.class.primary_key.to_s
           parsed_line[self.class.primary_key] = value
           next
@@ -109,20 +117,58 @@ module NtqExcelsior
     # id for default query in model
     # line in case an override is needed to find correct record
     def find_or_initialize_record(line)
-      raise "Primary key must be set for using the default find_or_initialize" unless self.class.primary_key
+      return nil unless self.class.primary_key && self.class.model_klass
+
+      if line[self.class.primary_key.to_sym].present?
+        if self.class.primary_key.to_sym == :id
+          record = self.class.model_klass.constantize.find_by id: line[self.class.primary_key.to_sym]
+        else
+          record = self.class.model_klass.constantize.find_or_initialize_by("#{self.class.primary_key}": line[self.class.primary_key.to_sym])
+        end
+      end
+      record = self.class.model_klass.constantize.new unless record
+      record
+    end
 
-      self.class.model_klass.find_or_initialize_by("#{self.class.primary_key}": line[self.class.primary_key.to_sym])
+    def record_attributes(record)
+      return @record_attributes if @record_attributes
+
+      @record_attributes = self.class.schema.keys.select{|k| k.to_sym != :id && record.respond_to?(:"#{k}=") }
+    end
+
+    def set_record_fields(record, line)
+      attributes_to_set = record_attributes(record)
+      attributes_to_set.each do |attribute|
+        record.send(:"#{attribute}=", line[attribute])
+      end
+      record
     end
 
     def import_line(line, save: true)
       record = find_or_initialize_record(line)
+      @success = false
+      @action = nil
+      @errors = []
+      
+      if (!self.class.autoset.nil? || self.class.autoset)
+        record = set_record_fields(record, line)
+      end
 
       yield(record, line) if block_given?
 
-      status = {}
-      return { status: :success } if record.save
+      if (self.class.autosave.nil? || self.class.autosave)
+        @action = record.persisted? ? 'update' : 'create'
+        if save
+          @success = record.save
+        else
+          @success = record.valid?
+        end
+        @errors = record.errors.full_messages.concat(@errors) if record.errors.any?
+      end
+
+      return { status: :success, action: @action } if @success
 
-      return { status: :error, errors: record.errors.full_messages.join(", ")  }
+      return { status: :error, errors: @errors.join(", ") }
     end
 
     def import(save: true, status_tracker: nil)

data/lib/ntq_excelsior/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module NtqExcelsior
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ntq_excelsior
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Kevin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-02-24 00:00:00.000000000 Z
+date: 2023-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caxlsx