apidae 1.3.13 → 1.3.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf56887dfb66e43d40e27502ee04927cc5464aec4d0338fe047f35572ed08e55
-  data.tar.gz: 25bd439610b4315b8cdcd6ecc3d9050b7f2572ff805dae27e1baaf964e861841
+  metadata.gz: a6e092adead9d8f84f1d6de9b4029bdec48188bfa085dd265adbc8b1a8b57124
+  data.tar.gz: 22717992328c5a0a585a4762f33d9e33cfc7a3704157ab51098b8d53716e3a36
 SHA512:
-  metadata.gz: e42811c794c15006dad38b8f6809d197d1d2c749b86a3cdbe4609a8213783c5fc725d8231c94a70ddff458b014b883225043f105d07b2d72824927ea9d000377
-  data.tar.gz: df8b7b6dddcfbe31746fc1a36ab807de31832f008790b168176431a33cfc85cfa9de0ef29ce0714445c3df57af927fce4228d8871acdd1c1f8b421f42b793d6d
+  metadata.gz: 6b8c334f666305fc53f485a2bb68a867c2280b30f09233e320a03f5d28b2fc302a950260879c1e9900b26c5e00ed9ac48dd3d553b118c78597f7ed072313d89c
+  data.tar.gz: 0d9c5826b752fab4f0802d3a574c970b9bb58f7594c31ec9efd4b6310a750fc5150d1d2e1affa2032f9e25c5eda67bec74c1354a632314c913271c9e47eef64f

data/app/controllers/apidae/import_controller.rb

@@ -37,10 +37,10 @@ module Apidae
     def run
       success = true
       Export.pending.each do |e|
-        logger.info "Running import for Apidae export #{e.id} - Project #{e.project.id}"
+        logger.info "Running import for Apidae export #{e.id} - Project #{e.project_id}"
         e.update(status: Export::IN_PROGRESS)
-        success &&= e.import_data
-        logger.info "Apidae export #{e.id} import run complete - Project #{e.project.id}"
+        success = e.import_data && success
+        logger.info "Apidae export #{e.id} import run complete - Project #{e.project_id}"
       end
       success ? head(:ok) : head(:internal_server_error)
     end

data/app/models/apidae/file_import.rb

@@ -174,7 +174,7 @@ module Apidae
       SelectionObject.where(apidae_selection_id: apidae_selection_ids).delete_all
       Selection.where(id: apidae_selection_ids).delete_all
       selections_hashes.each do |selection_data|
-        logger.info "Updating selection #{selection_data[:id]}"
+        logger.debug "Updating selection #{selection_data[:id]}"
         Selection.add_or_update(selection_data, project.id)
       end
       result[:selections] = Selection.where(apidae_project_id: project.id)

data/app/models/apidae/reference.rb

@@ -12,15 +12,17 @@ module Apidae
     def self.import(refs_json)
     locales = Rails.application.config.respond_to?(:apidae_locales) ? Rails.application.config.apidae_locales : [DEFAULT_LOCALE]
       locales_map = Hash[locales.map {|loc| ["libelle#{loc.camelize.gsub('-', '')}".to_sym, loc]}]
-      refs_hashes = JSON.parse(refs_json, symbolize_names: true)
-      if refs_hashes.length != where("apidae_type != ?", INTERNAL).count
-        refs_hashes.each do |ref_data|
-          ref = Reference.find_or_initialize_by(apidae_id: ref_data[:id], apidae_type: ref_data[:elementReferenceType])
-          ref.label_data = ref_data.slice(*locales_map.keys).transform_keys {|k| locales_map[k]}
-          ref.parent = ref_data[:parent][:id] if ref_data[:parent]
-          ref.category = ref_data[:familleCritere] ? ref_data[:familleCritere][:id] : (ref_data[:typeLabel] ? ref_data[:typeLabel][:id] : nil)
-          ref.is_active = ref_data[:actif]
-          ref.save!
+      if count == 0 || Time.current > (maximum(:updated_at) + 1.day)
+        refs_hashes = JSON.parse(refs_json, symbolize_names: true)
+        if refs_hashes.length != where("apidae_type != ?", INTERNAL).count
+          refs_hashes.each do |ref_data|
+            ref = Reference.find_or_initialize_by(apidae_id: ref_data[:id], apidae_type: ref_data[:elementReferenceType])
+            ref.label_data = ref_data.slice(*locales_map.keys).transform_keys {|k| locales_map[k]}
+            ref.parent = ref_data[:parent][:id] if ref_data[:parent]
+            ref.category = ref_data[:familleCritere] ? ref_data[:familleCritere][:id] : (ref_data[:typeLabel] ? ref_data[:typeLabel][:id] : nil)
+            ref.is_active = ref_data[:actif]
+            ref.save!
+          end
         end
       end
     end

data/app/models/apidae/selection.rb

@@ -53,7 +53,7 @@ module Apidae
                                      .select("COUNT(id), apidae_object_id, ARRAY_AGG(id) AS so_ids")
                                      .having("COUNT(id) > ?", 1).map {|so| so.so_ids}
       dups_count = apidae_selection_objects.where(id: dups.map {|d| d.sort[1..-1]}.flatten).delete_all
-      logger.info "Cleaned up #{dups_count} duplicate selection-objects associations for selection #{apidae_id}"
+      logger.debug "Cleaned up #{dups_count} duplicate selection-objects associations for selection #{apidae_id}"
     end
 
     def results(where_clause, offset, size)

data/lib/apidae/version.rb

@@ -1,3 +1,3 @@
 module Apidae
-  VERSION = "1.3.13"
+  VERSION = "1.3.16"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apidae
 version: !ruby/object:Gem::Version
-  version: 1.3.13
+  version: 1.3.16
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-01 00:00:00.000000000 Z
+date: 2022-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails