apidae 1.3.12 → 1.3.15
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/controllers/apidae/import_controller.rb +2 -0
- data/app/models/apidae/export.rb +3 -0
- data/app/models/apidae/reference.rb +11 -9
- data/lib/apidae/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: c7e6234f56f20b1e24b5964c5cab8a3c87b06c518f55bcaa3a9e47df7925d365
|
4
|
+
data.tar.gz: ea9979c29f2d8b0bb3bb3f9ba197a58652ca55ae2394a259e28deb482fce7d9d
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 8142e235f2bd6011881baccdcf4ebecaa8cf147411e2edca72f2724db545de0cab6f78130e33c4b013f78139a1c10c3a1d5f8aefe2098552d029e34ef44e6967
|
7
|
+
data.tar.gz: a1a5b0d82c79b23413353483ead93548b9f31832f989e9c4769c5286d01c877f7d707e661d5ecfc7569391381d5e1c73409814653d0b99279e7385dfbb7b8666
|
@@ -37,8 +37,10 @@ module Apidae
|
|
37
37
|
def run
|
38
38
|
success = true
|
39
39
|
Export.pending.each do |e|
|
40
|
+
logger.info "Running import for Apidae export #{e.id} - Project #{e.project_id}"
|
40
41
|
e.update(status: Export::IN_PROGRESS)
|
41
42
|
success &&= e.import_data
|
43
|
+
logger.info "Apidae export #{e.id} import run complete - Project #{e.project_id}"
|
42
44
|
end
|
43
45
|
success ? head(:ok) : head(:internal_server_error)
|
44
46
|
end
|
data/app/models/apidae/export.rb
CHANGED
@@ -34,6 +34,7 @@ module Apidae
|
|
34
34
|
begin
|
35
35
|
open(file_url) do |f|
|
36
36
|
begin
|
37
|
+
logger.info "Starting file import for export #{id} - project #{project_id}"
|
37
38
|
FileImport.import(f, project_id)
|
38
39
|
unless confirm_url.blank?
|
39
40
|
uri = URI(confirm_url)
|
@@ -41,11 +42,13 @@ module Apidae
|
|
41
42
|
Net::HTTP.start(uri.hostname, uri.port) do |http|
|
42
43
|
http.request(req)
|
43
44
|
end
|
45
|
+
logger.info "Posted file import callback for export #{id} - project #{project_id}"
|
44
46
|
end
|
45
47
|
update(status: Export::COMPLETE)
|
46
48
|
if Rails.application.config.respond_to?(:apidae_import_callback)
|
47
49
|
Rails.application.config.apidae_import_callback.call(self)
|
48
50
|
end
|
51
|
+
logger.info "Completed file import for export #{id} - project #{project_id}"
|
49
52
|
rescue Exception => ex
|
50
53
|
logger.error("Failed to import export file : #{file_url}")
|
51
54
|
logger.error("Error is : #{ex} \n#{ex.backtrace.join("\n") unless ex.backtrace.blank?}")
|
@@ -12,15 +12,17 @@ module Apidae
|
|
12
12
|
def self.import(refs_json)
|
13
13
|
locales = Rails.application.config.respond_to?(:apidae_locales) ? Rails.application.config.apidae_locales : [DEFAULT_LOCALE]
|
14
14
|
locales_map = Hash[locales.map {|loc| ["libelle#{loc.camelize.gsub('-', '')}".to_sym, loc]}]
|
15
|
-
|
16
|
-
|
17
|
-
refs_hashes.
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
15
|
+
if count == 0 || Time.current > (maximum(:updated_at) + 1.day)
|
16
|
+
refs_hashes = JSON.parse(refs_json, symbolize_names: true)
|
17
|
+
if refs_hashes.length != where("apidae_type != ?", INTERNAL).count
|
18
|
+
refs_hashes.each do |ref_data|
|
19
|
+
ref = Reference.find_or_initialize_by(apidae_id: ref_data[:id], apidae_type: ref_data[:elementReferenceType])
|
20
|
+
ref.label_data = ref_data.slice(*locales_map.keys).transform_keys {|k| locales_map[k]}
|
21
|
+
ref.parent = ref_data[:parent][:id] if ref_data[:parent]
|
22
|
+
ref.category = ref_data[:familleCritere] ? ref_data[:familleCritere][:id] : (ref_data[:typeLabel] ? ref_data[:typeLabel][:id] : nil)
|
23
|
+
ref.is_active = ref_data[:actif]
|
24
|
+
ref.save!
|
25
|
+
end
|
24
26
|
end
|
25
27
|
end
|
26
28
|
end
|
data/lib/apidae/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: apidae
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.3.
|
4
|
+
version: 1.3.15
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Jean-Baptiste Vilain
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2022-
|
11
|
+
date: 2022-07-02 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|