apidae 0.5.3 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69c164ca2042d8c99b37976a7855695493868feb
-  data.tar.gz: 3c087b2a39f933899226f6b0ea79ea5cb7c97204
+  metadata.gz: e10874c1cd302b232c929a0d3f8f1aadc07a442d
+  data.tar.gz: 46282a888ab5032291bc08ec7d8c5864801c9a52
 SHA512:
-  metadata.gz: 447c7723739c9663d8044826f4532b49019f379b5bddae58f9694cac0a04cacc344990e38feed459873c932c0109222b0a6e5b26eeb069adf52fc2ba41786973
-  data.tar.gz: 905db3f30f57dc87a62fc57cddd449a498de2421327d51cdc50908059b0057fad76d8521bf6cf1f07b3dd2ee03b218517eb5e4d7720e96399ac05eb1f34feb4e
+  metadata.gz: 826e57071ba3eebd560146fa243f9270f6354e1bbfb96680f668d7add65ffde05357edc2854f7d0ae3c2af2b647b287004e239faa3ef5e593542b087d3261512
+  data.tar.gz: 3a77efb3727a59029e018dbf4913683752c981c2fafafdaf2df9cbe5b37e0035557a0edd619d0db6f40fba83dda092b645fe20d407d52a6e9acb0a5f7637ad75

data/app/models/apidae/obj.rb

@@ -2,7 +2,6 @@ module Apidae
   class Obj < ActiveRecord::Base
 
     belongs_to :town, class_name: 'Apidae::Town', foreign_key: :town_insee_code, primary_key: :insee_code
-    # has_many :attached_files, class_name: 'Apidae::AttachedFile'
     has_many :apidae_selection_objects, class_name: 'Apidae::SelectionObject', foreign_key: :apidae_object_id
     has_many :selections, class_name: 'Apidae::Selection', source: :apidae_selection, through: :apidae_selection_objects
 
@@ -10,14 +9,14 @@ module Apidae
     store_accessor :pictures_data, :pictures
     store_accessor :attachments_data, :attachments
     store_accessor :type_data, :categories, :themes, :capacity, :classification, :labels, :chains, :area, :track,
-                   :products, :audience, :animals, :extra, :duration
-    store_accessor :entity_data, :entity_id, :entity_name
+                   :products, :audience, :animals, :extra, :duration, :certifications
+    store_accessor :entity_data, :entity_id, :entity_name, :service_provider_id
     store_accessor :contact, :telephone, :email, :website
-    store_accessor :location_data, :address, :place, :latitude, :longitude, :access
+    store_accessor :location_data, :address, :place, :latitude, :longitude, :access, :territories, :environments
     store_accessor :openings_data, :openings_desc, :openings, :time_periods
-    store_accessor :rates_data, :rates_desc, :rates, :payment_methods
+    store_accessor :rates_data, :rates_desc, :rates, :payment_methods, :includes, :excludes
     store_accessor :service_data, :services, :equipments, :comfort, :activities, :challenged, :languages
-    store_accessor :tags_data, :promo, :internal
+    store_accessor :tags_data, :promo, :internal, :linked
 
     ACT = 'ACTIVITE'
     COS = 'COMMERCE_ET_SERVICE'
@@ -65,25 +64,60 @@ module Apidae
     end
 
     def self.update_object(apidae_obj, object_data)
+      populate_fields(apidae_obj, object_data)
+
+      unless object_data[:aspects].blank?
+        groups_aspect = object_data[:aspects].find {|a| a[:aspect] == 'GROUPES'}
+        if groups_aspect
+          groups_aspect[:type] = apidae_obj.apidae_type
+          aspect_obj = Obj.new
+          populate_fields(aspect_obj, groups_aspect)
+          merge_fields(apidae_obj, aspect_obj)
+        end
+      end
+
+      apidae_obj.save!
+    end
+
+    def self.populate_fields(apidae_obj, object_data)
       type_fields = TYPES_DATA[object_data[:type]]
       apidae_obj.apidae_type = object_data[:type]
       apidae_obj.apidae_subtype = node_id(object_data[type_fields[:node]], type_fields[:subtype])
       apidae_obj.title = node_value(object_data, :nom)
       apidae_obj.description_data = parse_desc_data(object_data[:presentation])
       apidae_obj.contact = contact(object_data[:informations])
-      apidae_obj.location_data = parse_location_data(object_data[:localisation], object_data[type_fields[:node]])
-      apidae_obj.town = town(object_data[:localisation][:adresse])
+      apidae_obj.location_data = parse_location_data(object_data[:localisation], object_data[type_fields[:node]],
+                                                     object_data[:territoires])
+      apidae_obj.town = town(object_data[:localisation])
       apidae_obj.openings_data = parse_openings(object_data[:ouverture])
       apidae_obj.rates_data = parse_rates(object_data[:descriptionTarif])
       apidae_obj.reservation = parse_reservation(object_data[:reservation])
       apidae_obj.type_data = parse_type_data(apidae_obj, object_data[type_fields[:node]], object_data[:prestations])
       apidae_obj.pictures_data = pictures_urls(object_data[:illustrations])
       apidae_obj.attachments_data = attachments_urls(object_data[:multimedias])
-      apidae_obj.entity_data = entity_fields(object_data[:informations])
+      apidae_obj.entity_data = entity_fields(object_data[:informations], object_data[type_fields[:node]])
       apidae_obj.service_data = parse_service_data(object_data[:prestations], object_data[type_fields[:node]])
-      apidae_obj.tags_data = parse_tags_data(object_data[:presentation], object_data[:criteresInternes])
+      apidae_obj.tags_data = parse_tags_data(object_data[:presentation], object_data[:criteresInternes], object_data[:liens])
       apidae_obj.meta_data = object_data[:metadonnees]
-      apidae_obj.save!
+    end
+
+    def self.merge_fields(apidae_obj, aspect_obj)
+      apidae_obj.description_data.merge!(non_empty(aspect_obj.description_data)) if aspect_obj.description_data
+      apidae_obj.contact.merge!(non_empty(aspect_obj.contact)) if aspect_obj.contact
+      apidae_obj.location_data.merge!(non_empty(aspect_obj.location_data)) if aspect_obj.location_data
+      apidae_obj.openings_data.merge!(non_empty(aspect_obj.openings_data)) if aspect_obj.openings_data
+      apidae_obj.rates_data.merge!(non_empty(aspect_obj.rates_data)) if aspect_obj.rates_data
+      apidae_obj.reservation = aspect_obj.reservation unless aspect_obj.reservation.blank?
+      apidae_obj.type_data.merge!(non_empty(aspect_obj.type_data)) if aspect_obj.type_data
+      apidae_obj.pictures_data.merge!(non_empty(aspect_obj.pictures_data)) if aspect_obj.pictures_data
+      apidae_obj.attachments_data.merge!(non_empty(aspect_obj.attachments_data)) if aspect_obj.attachments_data
+      apidae_obj.service_data.merge!(non_empty(aspect_obj.service_data)) if aspect_obj.service_data
+      apidae_obj.tags_data.merge!(non_empty(aspect_obj.tags_data)) if aspect_obj.tags_data
+      apidae_obj.meta_data.merge!(non_empty(aspect_obj.meta_data)) if aspect_obj.meta_data
+    end
+
+    def self.non_empty(data_hash)
+      data_hash.keep_if {|k, v| !v.blank?}
     end
 
     def self.parse_desc_data(data_hash)
@@ -126,9 +160,10 @@ module Apidae
 
     def self.contact(information_hash)
       contact_details = {}
-      contact_entries = information_hash[:moyensCommunication].nil? ? [] : information_hash[:moyensCommunication]
-      contact_entries.each do |c|
-        case c[:type][:id]
+      unless information_hash.blank?
+        contact_entries = information_hash[:moyensCommunication] || []
+        contact_entries.each do |c|
+          case c[:type][:id]
           when PHONE
             contact_details[:telephone] ||= []
             contact_details[:telephone] << c[:coordonnees][:fr]
@@ -139,12 +174,14 @@ module Apidae
             contact_details[:website] ||= []
             contact_details[:website] << c[:coordonnees][:fr]
           else
+          end
         end
       end
       contact_details
     end
 
-    def self.parse_location_data(location_hash, type_data_hash)
+    def self.parse_location_data(location_hash, type_data_hash, territories)
+      loc_data = {}
       unless location_hash.blank?
         address_hash = location_hash[:adresse]
         computed_address = []
@@ -153,19 +190,27 @@ module Apidae
           computed_address << address_hash[:adresse2] unless address_hash[:adresse2].blank?
           computed_address << address_hash[:adresse3] unless address_hash[:adresse3].blank?
         end
-        loc_data = {address: computed_address, place: type_data_hash[:nomLieu]}
+        loc_data.merge!({address: computed_address})
+        loc_data.merge!({place: type_data_hash[:nomLieu]}) if type_data_hash
         geoloc_details = location_hash[:geolocalisation]
         if geoloc_details && geoloc_details[:valide] && geoloc_details[:geoJson]
           loc_data[:latitude] = geoloc_details[:geoJson][:coordinates][1]
           loc_data[:longitude] = geoloc_details[:geoJson][:coordinates][0]
         end
         loc_data[:access] = node_value(geoloc_details, :complement) if geoloc_details
-        loc_data
+        loc_data[:environments] = location_hash[:environnements].map {|e| e[:id]} if location_hash[:environnements]
       end
+      loc_data[:territories] = territories.map {|t| t[:id]} unless territories.blank?
+      loc_data
     end
 
-    def self.town(address_hash = {})
-      (!address_hash.blank? && address_hash[:commune]) ? Town.find_by_apidae_id(address_hash[:commune][:id]) : nil
+    def self.town(location_hash)
+      if location_hash
+        address_hash = location_hash[:adresse]
+        (!address_hash.blank? && address_hash[:commune]) ? Town.find_by_apidae_id(address_hash[:commune][:id]) : nil
+      else
+        nil
+      end
     end
 
     def self.parse_openings(openings_hash)
@@ -183,33 +228,34 @@ module Apidae
         desc = rates_hash[:gratuit] ? 'gratuit' : node_value(rates_hash, :tarifsEnClair)
         values = rates_hash[:periodes].blank? ? [] : rates_hash[:periodes].map {|p| build_rate(p)}
         methods = rates_hash[:modesPaiement].blank? ? [] : rates_hash[:modesPaiement].map {|p| p[:id]}
-        {rates_desc: desc, rates: values, payment_methods: methods}
+        {rates_desc: desc, rates: values, payment_methods: methods, includes: node_value(rates_hash, :leTarifComprend), excludes: node_value(rates_hash, :leTarifNeComprendPas)}
       end
     end
 
-    def self.parse_type_data(apidae_obj, data_hash, presta_hash)
-      if data_hash
-        prestations_hash = presta_hash || {}
-        apidae_obj.apidae_subtype = lists_ids(data_hash[:typesManifestation]).first if apidae_obj.apidae_type == FEM
-        apidae_obj.apidae_subtype = node_id(data_hash, :rubrique) if apidae_obj.apidae_type == EQU
-        {
-            categories: lists_ids(data_hash[:categories], data_hash[:typesDetailles]),
-            themes: lists_ids(data_hash[:themes]),
-            capacity: data_hash[:capacite],
-            classification: nodes_ids(data_hash[:classement], data_hash[:classementPrefectoral], data_hash[:classification]) +
-                                      lists_ids(data_hash[:classementsGuides]) + lists_ids(data_hash[:classements]),
-            labels: lists_ids(data_hash[:labels], prestations_hash[:labelsTourismeHandicap]) +
-                (node_id(data_hash, :typeLabel) ? [node_id(data_hash, :typeLabel)] : []),
-            chains: lists_ids(data_hash[:chaines]) + nodes_ids(data_hash[:chaineEtLabel]),
-            area: apidae_obj.apidae_type == DOS ? data_hash.except(:classification) : nil,
-            track: apidae_obj.apidae_type == EQU ? data_hash[:itineraire] : nil,
-            products: lists_ids(data_hash[:typesProduit], data_hash[:aopAocIgps], data_hash[:specialites]),
-            audience: lists_ids(prestations_hash[:typesClientele]),
-            animals: prestations_hash[:animauxAcceptes] == 'ACCEPTES',
-            extra: node_value(prestations_hash, :complementAccueil),
-            duration: data_hash[:dureeSeance]
-        }
-      end
+    def self.parse_type_data(apidae_obj, type_hash, presta_hash)
+      data_hash = type_hash || {}
+      prestations_hash = presta_hash || {}
+      apidae_obj.apidae_subtype = lists_ids(data_hash[:typesManifestation]).first if apidae_obj.apidae_type == FEM
+      apidae_obj.apidae_subtype = node_id(data_hash, :rubrique) if apidae_obj.apidae_type == EQU
+      apidae_obj.apidae_subtype = lists_ids(data_hash[:typesHebergement]).first if apidae_obj.apidae_type == SPA
+      {
+          categories: lists_ids(data_hash[:categories], data_hash[:typesDetailles], data_hash[:activiteCategories]),
+          themes: lists_ids(data_hash[:themes]),
+          capacity: (data_hash[:capacite] || {}).merge(presta_hash ? {group_min: presta_hash[:tailleGroupeMin], group_max: presta_hash[:tailleGroupeMax]} : {}),
+          classification: nodes_ids(data_hash[:classement], data_hash[:classementPrefectoral], data_hash[:classification]) +
+                                    lists_ids(data_hash[:classementsGuides]) + lists_ids(data_hash[:classements]),
+          labels: lists_ids(data_hash[:labels], prestations_hash[:labelsTourismeHandicap]) +
+              (node_id(data_hash, :typeLabel) ? [node_id(data_hash, :typeLabel)] : []),
+          chains: lists_ids(data_hash[:chaines]) + nodes_ids(data_hash[:chaineEtLabel]),
+          area: apidae_obj.apidae_type == DOS ? data_hash.except(:classification) : node_value(data_hash, :lieuDePratique),
+          track: apidae_obj.apidae_type == EQU ? data_hash[:itineraire] : nil,
+          products: lists_ids(data_hash[:typesProduit], data_hash[:aopAocIgps], data_hash[:specialites]),
+          audience: lists_ids(prestations_hash[:typesClientele]),
+          animals: prestations_hash[:animauxAcceptes] == 'ACCEPTES',
+          extra: apidae_obj.apidae_type == SPA ? node_value(data_hash, :formuleHebergement) : node_value(prestations_hash, :complementAccueil),
+          duration: apidae_obj.apidae_type == 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]}}
+      }
     end
 
     def self.parse_service_data(data_hash, type_data_hash)
@@ -218,15 +264,16 @@ module Apidae
             services: lists_ids(data_hash[:services]),
             equipments: lists_ids(data_hash[:equipements]),
             comfort: lists_ids(data_hash[:conforts]),
-            activities: lists_ids(data_hash[:activites], type_data_hash[:activites],
-                                  type_data_hash[:activitesSportives], type_data_hash[:activitesCulturelles]),
+            activities: lists_ids(data_hash[:activites], type_data_hash ? type_data_hash[:activites] : [],
+                                  type_data_hash ? type_data_hash[:activitesSportives] : [],
+                                  type_data_hash ? type_data_hash[:activitesCulturelles] : []),
             challenged: lists_ids(data_hash[:tourismesAdaptes]),
             languages: lists_ids(data_hash[:languesParlees])
         }
       end
     end
 
-    def self.parse_tags_data(pres_data_hash, crit_data_hash)
+    def self.parse_tags_data(pres_data_hash, crit_data_hash, linked_data_hash)
       tags = {}
       if pres_data_hash
         tags[:promo] = lists_ids(pres_data_hash[:typologiesPromoSitra])
@@ -234,6 +281,10 @@ module Apidae
       unless crit_data_hash.blank?
         tags[:internal] = crit_data_hash.map {|c| c[:id]}
       end
+      unless linked_data_hash.blank? || linked_data_hash[:liensObjetsTouristiquesTypes].blank?
+        tags[:linked] = linked_data_hash[:liensObjetsTouristiquesTypes]
+                            .map {|l| {apidae_id: l[:objetTouristique][:id], apidae_type: l[:objetTouristique][:type], category: l[:type]}}
+      end
       tags
     end
 
@@ -247,9 +298,9 @@ module Apidae
       end
     end
 
-    def self.entity_fields(information_hash)
+    def self.entity_fields(information_hash, type_data_hash)
       if information_hash && information_hash[:structureGestion]
-        {entity_id: information_hash[:structureGestion][:id]}
+        {entity_id: information_hash[:structureGestion][:id], service_provider_id: node_id(type_data_hash, :prestataireActivites)}
       end
     end
 

data/lib/apidae/version.rb

@@ -1,3 +1,3 @@
 module Apidae
-  VERSION = "0.5.3"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apidae
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-27 00:00:00.000000000 Z
+date: 2018-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement