apidae 1.3.9 → 1.3.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66681e7a228d04a5be420fea1d27f363dab5f3abd1431cfcfc9ddc00e1931bc1
-  data.tar.gz: 6872e5a2de4d23d368b00c7bb01639113afc5b1133952ce793a12e7f372885f8
+  metadata.gz: da5768b591408dcf9f2fdadd5ab979b69ef1fcdb0de84c3a9c9eccb5ca11f744
+  data.tar.gz: 4fca91b7f71cc833947426fcd31390c8f94bf7bdff8d196cc176f9bf37c64cf5
 SHA512:
-  metadata.gz: 45e6cf33a4d259a15576d28936fa7f8fc917cf4538d00c8bfec03b45b0bdde200c6cd6d536884030d2fa9d86a2313ec9e63b2bd190ff65ec6e395a19c6310acc
-  data.tar.gz: 40040d7672373c353358d5cba94c10f296eb6d810868d698ad11f0090456c3897c33b2838a8aeeac974bb4465f7420f37a5c5eca09cf91d40572ef4c589735b1
+  metadata.gz: a980dbfb064064fed555cf9f6a58a73ae25d44c1c41b604a0a5afaad67982d3cf58468e2816079ff4d2a158c0c50c3920ac463df538146cf388499eb97c1058a
+  data.tar.gz: efb3d85c63fe98fdc066d3f9b73fcbe2c9c058d0669fc579324c874cdac1b6eeb07e4aadb2bc265904b8878a3004a32c6c6bec6703374edefc4eed990d4c7958

data/app/controllers/apidae/import_controller.rb

@@ -37,6 +37,7 @@ module Apidae
     def run
       success = true
       Export.pending.each do |e|
+        e.update(status: Export::IN_PROGRESS)
         success &&= e.import_data
       end
       success ? head(:ok) : head(:internal_server_error)

data/app/models/apidae/apidae_data_parser.rb

@@ -286,8 +286,8 @@ module Apidae
           tricky_sections: apidae_obj.apidae_type == Obj::EQU ? node_value(data_hash[:itineraire], :passagesDelicats, *locales) : nil,
           products: lists_ids(data_hash[:typesProduit], data_hash[:aopAocIgps], data_hash[:specialites]),
           audience: lists_ids(prestations_hash[:typesClientele]),
-          animals: {allowed: prestations_hash[:animauxAcceptes] == 'ACCEPTES', desc: node_value(prestations_hash, :descriptifAnimauxAcceptes, *locales),
-                    fee: prestations_hash[:animauxAcceptesSupplement] ==	'AVEC_SUPPLEMENT'},
+          animals: {allowed: prestations_hash[:animauxAcceptes] == 'ACCEPTES', unknown: prestations_hash[:animauxAcceptes] == 'NON_DISPONIBLE',
+                    desc: node_value(prestations_hash, :descriptifAnimauxAcceptes, *locales), fee: prestations_hash[:animauxAcceptesSupplement] ==	'AVEC_SUPPLEMENT'},
           extra: apidae_obj.apidae_type == Obj::SPA ? node_value(data_hash, :formuleHebergement, *locales) : node_value(prestations_hash, :complementAccueil, *locales),
           duration: apidae_obj.apidae_type == Obj::SPA ? {days: data_hash[:nombreJours], nights: data_hash[:nombreNuits]} : data_hash[:dureeSeance],
           certifications: data_hash[:agrements].blank? ? [] : data_hash[:agrements].map {|a| {id: a[:type][:id], identifier: a[:numero]}},
@@ -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,6 +25,10 @@ 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

data/app/models/apidae/obj.rb

@@ -80,11 +80,10 @@ module Apidae
     STR = 'STRUCTURE'
     TER = 'TERRITOIRE'
 
-    # Todo : subtype for DEG shoud be :statutsExploitant (double check and fix in 1.2 and master)
     TYPES_DATA = {
         ACT => {node: :informationsActivite, subtype: :activiteType},
         COS => {node: :informationsCommerceEtService, subtype: :commerceEtServiceType},
-        DEG => {node: :informationsDegustation, subtype: :degustationType},
+        DEG => {node: :informationsDegustation, subtype: :statutsExploitant},
         DOS => {node: :informationsDomaineSkiable, subtype: :domaineSkiableType},
         EQU => {node: :informationsEquipement, subtype: :rubrique},
         FEM => {node: :informationsFeteEtManifestation, subtype: :feteEtManifestationType},

data/lib/apidae/version.rb

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

metadata

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