apidae 1.3.10 → 1.3.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff7e99f43738b625845c69d825db7272d23ac2d65f95750434a5ec9c1f758c21
-  data.tar.gz: a445c317db55b883f9226bc41885445c9d67d481fe5e09bb520ebeb3f5b870b0
+  metadata.gz: bf56887dfb66e43d40e27502ee04927cc5464aec4d0338fe047f35572ed08e55
+  data.tar.gz: 25bd439610b4315b8cdcd6ecc3d9050b7f2572ff805dae27e1baaf964e861841
 SHA512:
-  metadata.gz: 947899964c8bd92cf170f2efa7b26d174422cbaf6c6fee4dc582fe8fce8f1cce9ec4f165dd53147356fceb1a60b7c7b5829f40e2ff17057c9d53555c59967652
-  data.tar.gz: 89de66fd894f4138e5f658d25c4e606f9d797cc2405d3f76bf85b12952b3c6ced414dbf07d1b8fb0e91177346ef28f29f4ffaeab234253b011413369ce6b7050
+  metadata.gz: e42811c794c15006dad38b8f6809d197d1d2c749b86a3cdbe4609a8213783c5fc725d8231c94a70ddff458b014b883225043f105d07b2d72824927ea9d000377
+  data.tar.gz: df8b7b6dddcfbe31746fc1a36ab807de31832f008790b168176431a33cfc85cfa9de0ef29ce0714445c3df57af927fce4228d8871acdd1c1f8b421f42b793d6d

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

@@ -370,7 +370,11 @@ module Apidae
     end
 
     def self.node_id(node, key)
-      node[key][:id] if node && node[key]
+      if node && node[key]
+        node[key].is_a?(Array) ? node[key][0][:id] : node[key][:id]
+      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/lib/apidae/version.rb

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

metadata

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