apidae 0.9.35 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 554f08fb2b68d51b91e7439500fc93bbfa392cc010597072a4ca263b3d3e6929
-  data.tar.gz: 8f92912b6d90880f7241398182cc46060bdef9ffb719e241edca1e6dd4da608f
+SHA1:
+  metadata.gz: 1e5d13058f65857b20c5eb5ebcb31933047d458d
+  data.tar.gz: 57c158bf11ea28f28c25094e2e2b732289cd1b47
 SHA512:
-  metadata.gz: bc5d8c7acdcce8af01ae63bef167e859b40474dca7ff9406a2b18c19747ab119d189d05404f0cbbaf9c81b86148baca14dfde59f7a520383fe41ff93cc4f9388
-  data.tar.gz: c4935867c70676048c8f66a39d088cd8f803b6cb44def3d8adff9718aa8c2df496d3c71a753617bd58b6363134586428ed43b1b7524a8f7152227eb013bff07c
+  metadata.gz: '039e3d10fa484d795ad731c1a178b567f7c793b2a339ea835370f0a3c59318734ecb5bc9cd818073da9d4c16cdaf03d9d833f83c507d8589f39fe41d56c32657'
+  data.tar.gz: 188194787706a94cf7b04854bdd92266095ee95607b24a764ad2ccadda0fec50f076bb9d0631b7bb3454c02c80c74334bb5f313832d10ac012b86ec4ad3c3e23

data/app/models/apidae/file_import.rb

@@ -30,22 +30,18 @@ module Apidae
           Town.import(zfile.read(TOWNS_FILE))
           logger.info "Completed #{Town.count} towns update"
         end
-        ordered_files(zfile).each do |file|
-          puts "processing #{file.name}"
+        zfile.each do |file|
           if file.file? && file.name.end_with?('.json')
             logger.info "Processing file : #{file.name}"
             if file.name.include?(MODIFIED_DIR)
               add_or_update_objects(zfile.read(file.name), result, project.locales, project.versions)
-            end
-            if file.name.include?(SELECTIONS_FILE)
-              add_or_update_selections(project, zfile.read(file.name), result)
-            end
-            if file.name.include?(DELETED_FILE)
+            elsif file.name.include?(DELETED_FILE)
               delete_objects(zfile.read(file.name), result)
+            elsif file.name.include?(SELECTIONS_FILE)
+              add_or_update_selections(project, zfile.read(file.name), result)
             end
           end
         end
-        project.cleanup_selections
         create(result.except(:selections)
                    .merge({remote_file: (zip_file.is_a?(File) ? zip_file.path : zip_file), status: STATUS_COMPLETE, apidae_id: project_id}))
         logger.info "Import results : #{result}"
@@ -108,16 +104,12 @@ module Apidae
       end
     end
 
-    def self.ordered_files(zfile)
-      zfile.sort_by {|f| f.name.include?(MODIFIED_DIR) ? 0 : (f.name.include?(SELECTIONS_FILE) ? 1 : 2)}
-    end
-
     def self.delete_objects(deleted_json, result)
       deleted_ids = JSON.parse(deleted_json)
       deleted_ids.each do |id|
         obj = Obj.find_by_apidae_id(id)
         if obj
-          obj.destroy! if obj.selections.empty?
+          obj.destroy!
           result[:deleted] += 1
         else
           logger.info "skipping object deletion : #{id}"
@@ -171,9 +163,7 @@ module Apidae
     def self.add_or_update_selections(project, selections_json, result)
       selections_hashes = JSON.parse(selections_json, symbolize_names: true)
       deleted_ids = Selection.where(apidae_project_id: project.id).collect {|sel| sel.apidae_id}.uniq - selections_hashes.collect {|sel| sel[:id]}
-      apidae_selection_ids = Selection.where(apidae_id: deleted_ids).map {|s| s.id}
-      SelectionObject.where(apidae_selection_id: apidae_selection_ids).delete_all
-      Selection.where(id: apidae_selection_ids).delete_all
+      Selection.where(apidae_id: deleted_ids).delete_all
       selections_hashes.each do |selection_data|
         logger.info "Updating selection #{selection_data[:id]}"
         Selection.add_or_update(selection_data, project.id)

data/app/models/apidae/obj.rb

@@ -14,12 +14,12 @@ 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, :certifications, :business, :complement
+                   :products, :audience, :animals, :extra, :duration, :certifications, :business
     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, :territories, :environments
-    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_complement
+    store_accessor :openings_data, :openings_desc, :openings_desc_mode, :openings, :time_periods
+    store_accessor :rates_data, :rates_desc, :rates_desc_mode, :rates, :payment_methods, :includes, :excludes
     store_accessor :service_data, :services, :equipments, :comfort, :activities, :challenged, :languages
     store_accessor :booking_data, :booking_desc, :booking_entities
     store_accessor :tags_data, :promo, :internal, :linked
@@ -109,7 +109,11 @@ module Apidae
     end
 
     def in_version(v)
-      versions.where(version: v).first
+      @cached_versions ||= {}
+      if @cached_versions[v].nil?
+        @cached_versions[v] = versions.where(version: v).first
+      end
+      @cached_versions[v]
     end
 
     def in_locale(l)
@@ -293,18 +297,12 @@ module Apidae
           when PHONE
             contact_details[:telephone] ||= []
             contact_details[:telephone] << c[:coordonnees][:fr]
-            contact_details[:telephone_details] ||= []
-            contact_details[:telephone_details] << {value: c[:coordonnees][:fr], description: c.dig(:observation, :libelleFr)}
           when EMAIL
             contact_details[:email] ||= []
             contact_details[:email] << c[:coordonnees][:fr]
-            contact_details[:email_details] ||= []
-            contact_details[:email_details] << {value: c[:coordonnees][:fr], description: c.dig(:observation, :libelleFr)}
           when WEBSITE
             contact_details[:website] ||= []
             contact_details[:website] << c[:coordonnees][:fr]
-            contact_details[:website_details] ||= []
-            contact_details[:website_details] << {value: c[:coordonnees][:fr], description: c.dig(:observation, :libelleFr)}
           else
           end
         end
@@ -345,14 +343,14 @@ module Apidae
       end
     end
 
+    # Note : use internal format for openings storage (ideally Apihours one, to merge data from both sources)
     def self.parse_openings(openings_hash, *locales)
       if openings_hash && openings_hash[:periodeEnClair]
         {
             openings_desc: node_value(openings_hash, :periodeEnClair, *locales),
             openings_desc_mode: openings_hash[:periodeEnClairGenerationMode] == 'AUTOMATIQUE' ? MODE_AUTO : MODE_MANUAL,
             openings: openings_hash[:periodesOuvertures],
-            time_periods: lists_ids(openings_hash[:indicationsPeriode]),
-            openings_extra: lists_ids(openings_hash[:ouverturesComplementaires])
+            time_periods: lists_ids(openings_hash[:indicationsPeriode])
         }
       end
     end
@@ -366,8 +364,7 @@ module Apidae
             rates_desc: desc, rates: values, payment_methods: methods,
             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),
-            rates_complement: node_value(rates_hash, :complement, *locales)
+            excludes: node_value(rates_hash, :leTarifNeComprendPas, *locales)
         }
       end
     end
@@ -382,7 +379,7 @@ module Apidae
           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[:nombrePersonnesMinimum] || presta_hash[:tailleGroupeMin]), group_max: presta_hash[:tailleGroupeMax],
+                        .merge(presta_hash ? {group_min: presta_hash[:tailleGroupeMin], group_max: presta_hash[:tailleGroupeMax],
                                               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]),
@@ -397,8 +394,7 @@ module Apidae
           extra: apidae_obj.apidae_type == SPA ? node_value(data_hash, :formuleHebergement, *locales) : node_value(prestations_hash, :complementAccueil, *locales),
           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]}},
-          business: business_hash,
-          complement: apidae_obj.apidae_type == SPA ? node_value(prestations_hash, :complementAccueil, *locales) : {},
+          business: business_hash
       }
     end
 
@@ -427,7 +423,7 @@ module Apidae
       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], name: l[:objetTouristique][:nom]}}
+                            .map {|l| {apidae_id: l[:objetTouristique][:id], apidae_type: l[:objetTouristique][:type], category: l[:type]}}
       end
       tags
     end
@@ -461,7 +457,7 @@ module Apidae
 
     def self.build_rate(rate_period)
       {
-          id: rate_period[:identifiant], from: rate_period[:dateDebut], to: rate_period[:dateFin],
+          id: rate_period[:identifiant], start_date: rate_period[:dateDebut], end_date: rate_period[:dateFin],
           values: rate_period[:tarifs].blank? ? [] : rate_period[:tarifs].map {|t| {min: t[:minimum], max: t[:maximum], type: t[:type][:id], details: node_value(t, :precisionTarif)}}
       }
     end

data/app/models/apidae/project.rb

@@ -20,11 +20,5 @@ module Apidae
     def versions=(values)
       self.versions_data = values.blank? ? nil : values.join('|')
     end
-
-    def cleanup_selections
-      apidae_selections.reload.each do |s|
-        s.cleanup
-      end
-    end
   end
 end

data/app/models/apidae/selection.rb

@@ -42,20 +42,6 @@ module Apidae
       SelectionObject.where(apidae_selection_id: apidae_sel.id, apidae_object_id: removed_ids).delete_all
     end
 
-    def cleanup
-      obsolete_count = apidae_selection_objects
-        .joins("LEFT JOIN apidae_objs ON apidae_objs.id = apidae_selection_objects.apidae_object_id")
-        .where("apidae_objs.id IS NULL")
-        .delete_all
-      logger.info "Cleaned up #{obsolete_count} obsolete selection-objects associations for selection #{apidae_id}"
-
-      dups = apidae_selection_objects.reload.group(:apidae_object_id)
-                                     .select("COUNT(id), apidae_object_id, ARRAY_AGG(id) AS so_ids")
-                                     .having("COUNT(id) > ?", 1).map {|so| so.so_ids}
-      dups_count = apidae_selection_objects.where(id: dups.map {|d| d.sort[1..-1]}.flatten).delete_all
-      logger.info "Cleaned up #{dups_count} duplicate selection-objects associations for selection #{apidae_id}"
-    end
-
     def results(where_clause, offset, size)
       objects.includes(:town).limit(size).offset(offset).where(where_clause)
     end
@@ -79,7 +65,7 @@ module Apidae
       key = cache_key(:agenda, from, to)
       res = $apidae_cache.read(key)
       unless res
-        query_args = build_args(AGENDA_ENDPOINT, {selection_ids: [apidae_id], from: from, to: to, count: 200})
+        query_args = build_args(AGENDA_ENDPOINT, {selection_ids: [apidae_id], from: from, to: to})
         res = query_api(query_args, true)
         $apidae_cache.write(key, res)
       end
@@ -130,7 +116,7 @@ module Apidae
         obj = Obj.update_object(obj, obj_data, apidae_project.locales, apidae_project.versions)
       else
         obj = Obj.add_object(obj_data, apidae_project.locales, apidae_project.versions)
-        SelectionObject.create(apidae_selection_id: id, apidae_object_id: obj.id)
+        SelectionObject.create(apidae_selection_id: id, apidae_object_id: added_obj.id)
       end
       if Rails.application.config.respond_to?(:apidae_obj_refresh_callback)
         Rails.application.config.apidae_obj_refresh_callback.call(obj.apidae_id)
@@ -149,15 +135,14 @@ module Apidae
 
       if all_results
         loops = 0
-        max_loops = only_ids ? 50 : MAX_LOOPS
         query_args[:first] = 0
-        query_args[:count] ||= MAX_COUNT
+        query_args[:count] = MAX_COUNT
         query_args[:locales] ||= apidae_project && !apidae_project.locales.blank? ? apidae_project.locales : [DEFAULT_LOCALE]
         response = JSON.parse get_response(query_args), symbolize_names: false
         total = response['numFound']
         query_result[:results] = (only_ids ? response['objetTouristiqueIds'] : response['objetsTouristiques']) || {}
 
-        while total > results_count(query_result) && loops < max_loops
+        while total > results_count(query_result) && loops < MAX_LOOPS
           loops += 1
           query_args[:first] += MAX_COUNT
           response = JSON.parse get_response(query_args), symbolize_names: false

data/config/initializers/constants.rb

@@ -8,10 +8,9 @@ module Apidae
   LOCALE_ZH = 'zh'
   LOCALE_ES = 'es'
   LOCALE_PT_BR = 'pt-BR'
-  LOCALE_JP = 'jp'
 
   DEFAULT_LOCALE = LOCALE_FR
-  ALL_LOCALES = [LOCALE_FR, LOCALE_EN, LOCALE_IT, LOCALE_DE, LOCALE_NL, LOCALE_RU, LOCALE_ZH, LOCALE_ES, LOCALE_PT_BR, LOCALE_JP]
+  ALL_LOCALES = [LOCALE_FR, LOCALE_EN, LOCALE_IT, LOCALE_DE, LOCALE_NL, LOCALE_RU, LOCALE_ZH, LOCALE_ES, LOCALE_PT_BR]
 
   STANDARD_VERSION = 'STANDARD'
   WINTER_VERSION = 'HIVER'

data/config/locales/apidae.fr.yml

@@ -32,7 +32,6 @@ fr:
       ru: Russe
       zh: Chinois
       'pt-BR': Brésilien
-      jp: Japonais
     versions:
       STANDARD: Standard
       HIVER: Hiver

data/lib/apidae/version.rb

@@ -1,3 +1,3 @@
 module Apidae
-  VERSION = "0.9.35"
+  VERSION = "0.10.0"
 end