apidae 1.3.6 → 1.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f7955611d92ce6a8114bf59cffe2f7a4cd4e9b39c7ce2529bf891d3fc08c2ad
-  data.tar.gz: 0abe8291d4f85db730f5942e3fd3504a2f649594ee56232604b9ff4ee59cd43f
+  metadata.gz: 66681e7a228d04a5be420fea1d27f363dab5f3abd1431cfcfc9ddc00e1931bc1
+  data.tar.gz: 6872e5a2de4d23d368b00c7bb01639113afc5b1133952ce793a12e7f372885f8
 SHA512:
-  metadata.gz: 5c5ae0d93814c8d2245736db124dd635c6ba44963bc18592c6edae81e8f1609fe30dcc37408f80c53e1eadcccae04ca684fb73d537e0996e4aa88874b2870d61
-  data.tar.gz: 4105a6f1f1de41ff52b873ba735633055995a220653b4a209325fd8e17fb8e56a946c1f06add44af7ed3efe0f5ac9a128b2d9aa0eb3b249628771e88972365e0
+  metadata.gz: 45e6cf33a4d259a15576d28936fa7f8fc917cf4538d00c8bfec03b45b0bdde200c6cd6d536884030d2fa9d86a2313ec9e63b2bd190ff65ec6e395a19c6310acc
+  data.tar.gz: 40040d7672373c353358d5cba94c10f296eb6d810868d698ad11f0090456c3897c33b2838a8aeeac974bb4465f7420f37a5c5eca09cf91d40572ef4c589735b1

data/app/models/apidae/apidae_data_parser.rb

@@ -113,7 +113,7 @@ module Apidae
             short_desc: node_value(data_hash, :descriptifCourt, *locales),
             long_desc: node_value(data_hash, :descriptifDetaille, *locales),
             theme_desc: data_hash[:descriptifsThematises].blank? ? {} : Hash[data_hash[:descriptifsThematises].map {|th| [node_id(th, :theme), node_value(th, :description, *locales)]}],
-            private_desc: private_data.blank? ? {} : Hash[private_data.map {|d| [d[:nomTechnique], node_value(d, :descriptif, *locales)]}]
+            private_desc: private_data.blank? ? {} : Hash[private_data.map {|d| [d[:nomTechnique], (node_value(d, :descriptif, *locales).blank? ? {LOCALE_FR => d[:libelleFr]} : node_value(d, :descriptif, *locales))]}]
         }
       end
     end
@@ -253,6 +253,7 @@ module Apidae
         methods = rates_hash[:modesPaiement].blank? ? [] : rates_hash[:modesPaiement].map {|p| p[:id]}
         {
             rates_desc: desc, rates: values, payment_methods: methods,
+            tax_included: rates_hash[:taxeDeSejourIncluse].blank? ? nil : (rates_hash[:taxeDeSejourIncluse] == 'OUI'),
             rates_desc_mode: rates_hash[:tarifsEnClairGenerationMode] == 'AUTOMATIQUE' ? MODE_AUTO : MODE_MANUAL,
             includes: node_value(rates_hash, :leTarifComprend, *locales),
             excludes: node_value(rates_hash, :leTarifNeComprendPas, *locales),
@@ -275,6 +276,8 @@ module Apidae
                                               age_min: presta_hash[:ageMin], age_max: presta_hash[:ageMax]} : {}),
           classification: nodes_ids(data_hash[:classement], data_hash[:classementPrefectoral], data_hash[:classification]) +
               lists_ids(data_hash[:classementsGuides]) + lists_ids(data_hash[:classements]),
+          classification_date: data_hash[:dateClassement],
+          classification_ref: data_hash[:numeroClassement],
           labels: lists_ids(data_hash[:labels], data_hash[:labelsChartesQualite], prestations_hash[:labelsTourismeHandicap]) +
               (node_id(data_hash, :typeLabel) ? [node_id(data_hash, :typeLabel)] : []),
           chains: lists_ids(data_hash[:chaines]) + nodes_ids(data_hash[:chaineEtLabel]),
@@ -288,7 +291,10 @@ module Apidae
           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]}},
-          business: business_hash
+          business: (business_hash || {}).except(:sallesEquipeesPour, :sallesEquipement, :sallesRestauration, :sallesReunion, :sallesHebergement),
+          business_equipments: lists_ids((business_hash || {})[:sallesEquipeesPour], (business_hash || {})[:sallesEquipement],
+                                         (business_hash || {})[:sallesRestauration], (business_hash || {})[:sallesHebergement]),
+          business_rooms: (business_hash || {})[:sallesReunion]
       }
     end
 
@@ -325,12 +331,14 @@ module Apidae
     def self.parse_booking(reservation_hash, visits_hash, *locales)
       booking_hash = {}
       if reservation_hash
-        booking_hash[:booking_desc] = node_value(reservation_hash, :complement, *locales),
+        booking_hash[:booking_desc] = node_value(reservation_hash, :complement, *locales)
         booking_hash[:booking_entities] = reservation_hash[:organismes]
       end
       if visits_hash
         booking_hash[:visits_allowed] = visits_hash[:visitable] == true
         booking_hash[:visits_desc] = node_value(visits_hash, :complementVisite, *locales)
+        booking_hash[:visits_duration] = visits_hash[:dureeMoyenneVisiteIndividuelle]
+        booking_hash[:visits_services] = lists_ids(visits_hash[:prestationsVisitesGroupees]) + lists_ids(visits_hash[:prestationsVisitesIndividuelles])
       end
       booking_hash
     end

data/app/models/apidae/obj.rb

@@ -14,16 +14,17 @@ module Apidae
     store_accessor :description_data, :short_desc, :long_desc, :theme_desc, :private_desc
     store_accessor :pictures_data, :pictures
     store_accessor :attachments_data, :attachments
-    store_accessor :type_data, :categories, :themes, :capacity, :classification, :labels, :chains, :area, :track,
-                   :tricky_sections, :products, :audience, :animals, :animals_desc, :extra, :duration, :certifications, :business
+    store_accessor :type_data, :categories, :themes, :capacity, :classification, :classification_date,
+                   :classification_ref, :labels, :chains, :area, :track, :tricky_sections, :products, :audience, :animals,
+                   :animals_desc, :extra, :duration, :certifications, :business, :business_equipments, :business_rooms
     store_accessor :entity_data, :entity_id, :entity_name, :service_provider_id, :is_service_provider, :legal
     store_accessor :contact_data, :telephone, :email, :website, :google, :facebook, :twitter, :yelp, :trip_advisor, :fax,
                    :mobile_website, :shorty_url, :contacts
     store_accessor :location_data, :address, :place, :latitude, :longitude, :access, :territories, :environments, :altitude, :map_reference
     store_accessor :openings_data, :openings_desc, :openings_desc_mode, :openings, :time_periods, :openings_extra
-    store_accessor :rates_data, :rates_desc, :rates_desc_mode, :rates, :payment_methods, :includes, :excludes, :rates_extra
+    store_accessor :rates_data, :rates_desc, :rates_desc_mode, :rates, :payment_methods, :includes, :excludes, :rates_extra, :tax_included
     store_accessor :service_data, :services, :equipments, :comfort, :activities, :challenged, :languages
-    store_accessor :booking_data, :booking_desc, :booking_entities, :visits_allowed, :visits_desc
+    store_accessor :booking_data, :booking_desc, :booking_entities, :visits_allowed, :visits_desc, :visits_duration, :visits_services
     store_accessor :tags_data, :promo, :internal, :linked
     store_accessor :version_data, :versioned_fields
 
@@ -79,6 +80,7 @@ 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},

data/config/initializers/cache.rb

@@ -1 +1 @@
-$apidae_cache = ActiveSupport::Cache::FileStore.new('cache/apidae', expires_in: 24.hours)
+$apidae_cache = ActiveSupport::Cache::FileStore.new('cache/apidae', expires_in: ENV['APIDAE_CACHE_DURATION'] || 24.hours)

data/lib/apidae/version.rb

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