apidae 1.3.12 → 1.3.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da5768b591408dcf9f2fdadd5ab979b69ef1fcdb0de84c3a9c9eccb5ca11f744
-  data.tar.gz: 4fca91b7f71cc833947426fcd31390c8f94bf7bdff8d196cc176f9bf37c64cf5
+  metadata.gz: c7e6234f56f20b1e24b5964c5cab8a3c87b06c518f55bcaa3a9e47df7925d365
+  data.tar.gz: ea9979c29f2d8b0bb3bb3f9ba197a58652ca55ae2394a259e28deb482fce7d9d
 SHA512:
-  metadata.gz: a980dbfb064064fed555cf9f6a58a73ae25d44c1c41b604a0a5afaad67982d3cf58468e2816079ff4d2a158c0c50c3920ac463df538146cf388499eb97c1058a
-  data.tar.gz: efb3d85c63fe98fdc066d3f9b73fcbe2c9c058d0669fc579324c874cdac1b6eeb07e4aadb2bc265904b8878a3004a32c6c6bec6703374edefc4eed990d4c7958
+  metadata.gz: 8142e235f2bd6011881baccdcf4ebecaa8cf147411e2edca72f2724db545de0cab6f78130e33c4b013f78139a1c10c3a1d5f8aefe2098552d029e34ef44e6967
+  data.tar.gz: a1a5b0d82c79b23413353483ead93548b9f31832f989e9c4769c5286d01c877f7d707e661d5ecfc7569391381d5e1c73409814653d0b99279e7385dfbb7b8666

data/app/controllers/apidae/import_controller.rb

@@ -37,8 +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}"
         e.update(status: Export::IN_PROGRESS)
         success &&= e.import_data
+        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/export.rb

@@ -34,6 +34,7 @@ module Apidae
       begin
         open(file_url) do |f|
           begin
+            logger.info "Starting file import for export #{id} - project #{project_id}"
             FileImport.import(f, project_id)
             unless confirm_url.blank?
               uri = URI(confirm_url)
@@ -41,11 +42,13 @@ module Apidae
               Net::HTTP.start(uri.hostname, uri.port) do |http|
                 http.request(req)
               end
+              logger.info "Posted file import callback for export #{id} - project #{project_id}"
             end
             update(status: Export::COMPLETE)
             if Rails.application.config.respond_to?(:apidae_import_callback)
               Rails.application.config.apidae_import_callback.call(self)
             end
+            logger.info "Completed file import for export #{id} - project #{project_id}"
           rescue Exception => ex
             logger.error("Failed to import export file : #{file_url}")
             logger.error("Error is : #{ex} \n#{ex.backtrace.join("\n") unless ex.backtrace.blank?}")

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/lib/apidae/version.rb

@@ -1,3 +1,3 @@
 module Apidae
-  VERSION = "1.3.12"
+  VERSION = "1.3.15"
 end

metadata

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