apidae 1.3.11 → 1.3.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bee9036918ecb7ac147dca2b69a63f0604f0bde51cdfaa3f873f7b4d186aec1f
-  data.tar.gz: 6f7334fedf936fbfa88714f4d94b930d855299661fc9c6c2f0b2dd312cc5609f
+  metadata.gz: 8b0a75e107222c0e4c95387eb3f11641bfa62796c499c46915366a7035b8c685
+  data.tar.gz: 567423739b0f9f87341111fe33b6e2260465d47583ab282fef0234b1f5e79cf7
 SHA512:
-  metadata.gz: d6d7c79ee27939c1263092dcad1dfe786ea0cf2a69af8d02ef408336076c7527d56fad0b8954dac5c674e3f2a837b1af6ca79996a437fdbb06fb6391340413f1
-  data.tar.gz: 45ef9cd81e5bc646a103536488410dbec175cc75b7272ddd5a3ddf97ee7f265af1c807df2b120140c40edd505abdafc9a1ae387dcafcbb8e764afa3c781d71d5
+  metadata.gz: 49b000ca4218681cabfa00dea2ec31c28fe4d0cd9fb7147a1ca23f411e1c659caf711a229c736c6c4971d0827411d9682b90aea751f4ef297f5f1c241fee9983
+  data.tar.gz: 5655202cdbeb55bc7103563933631b082d0827de6b9fab2335630312a3fca1304cfd96ac33c931867338bf4264dc2e9cb6f9dab5fe438d87b20d77936c752759

data/app/controllers/apidae/import_controller.rb

@@ -37,7 +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/apidae_data_parser.rb

@@ -375,7 +375,6 @@ module Apidae
       else
         nil
       end
-
     end
 
     private

data/app/models/apidae/export.rb

@@ -5,6 +5,7 @@ module Apidae
   class Export < ActiveRecord::Base
 
     PENDING = 'pending'
+    IN_PROGRESS = 'in_progress'
     COMPLETE = 'complete'
     CANCELLED = 'cancelled'
 
@@ -24,11 +25,16 @@ module Apidae
       where(remote_status: 'SUCCESS', status: PENDING).order(:id)
     end
 
+    def self.in_progress
+      where(remote_status: 'SUCCESS', status: IN_PROGRESS)
+    end
+
     def import_data
       success = true
       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)
@@ -36,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.11"
+  VERSION = "1.3.14"
 end

metadata

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