apidae 1.2.13 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d44db939b2c69c3821b8c82b9e38441b69e63ab7
-  data.tar.gz: 5762520b0275479d67ce316d177c3f750c7519e1
+  metadata.gz: d1f8d7ad0798847cc0b3882958e5f557f1f01219
+  data.tar.gz: 94d139b245115c273ec4c73b385c380bf816da87
 SHA512:
-  metadata.gz: 12d44dcf49f4b3288ed04381405fc0188adb8715aa49cd2586b80a3bdab572780ba47470dfcab7d0033b21c05ebb5a42583ab346cd64c309d62b64d0da92aa3f
-  data.tar.gz: 63edb21d44e5997086a883570ac71de38e3910f85d39c322cbe37acdf377bbb2d764f08af339e1b1703f2279b29543259107610942de3b64830ee828940657ed
+  metadata.gz: 47dea0045600b59233e78a4616396aee8341de70e9121a335741fbe66d39ffea03e18503564a83c4cd9fe496ebe7058b7ba13690c902f794f46967146d65b16d
+  data.tar.gz: 2350154e37a3fac1d56eed268eb322309842fcf8b349c2e2b28c63af4605aa3cb15c1b629f31a60d740ffe6ec6b9778e9c2a9ae4f03414ae9c86a3023661c719

data/app/controllers/apidae/import_controller.rb

@@ -37,7 +37,7 @@ module Apidae
     def run
       success = true
       Export.pending.each do |e|
-        success &&= import_data(e)
+        success &&= e.import_data
       end
       success ? head(:ok) : head(:internal_server_error)
     end
@@ -48,7 +48,7 @@ module Apidae
 
     def create
       @export = Export.new(export_params)
-      if @export.save && import_data(@export)
+      if @export.save && @export.import_data
         redirect_to apidae.root_url, notice: 'Le fichier a bien été importé.'
       else
         flash.now[:alert] = "Une erreur s'est produite lors de l'import du fichier."
@@ -61,43 +61,5 @@ module Apidae
     def export_params
       params.require(:export).permit(:project_id, :file_url, :status)
     end
-
-    def import_data(e)
-      success = true
-      begin
-        open(e.file_url) do |f|
-          begin
-            FileImport.import(f, e.project_id)
-            unless e.confirm_url.blank?
-              uri = URI(e.confirm_url)
-              req = Net::HTTP::Post.new(uri)
-              Net::HTTP.start(uri.hostname, uri.port) do |http|
-                http.request(req)
-              end
-            end
-            e.update(status: Export::COMPLETE)
-            if Rails.application.config.respond_to?(:apidae_import_callback)
-              Rails.application.config.apidae_import_callback.call(e)
-            end
-          rescue Exception => ex
-            logger.error("Failed to import export file : #{e.file_url}")
-            logger.error("Error is : #{ex} \n#{ex.backtrace.join("\n") unless ex.backtrace.blank?}")
-            success = false
-            e.update(status: Export::CANCELLED)
-          end
-        end
-      rescue OpenURI::HTTPError => err
-        logger.error("Failed to download export file : #{e.file_url}")
-        logger.error("Error is : #{err}")
-        success = false
-        e.update(status: Export::CANCELLED)
-      rescue Exception => e
-        logger.error "Failed to import file : #{e.file_url}"
-        logger.error("Error is : #{err}")
-        success = false
-        e.update(status: Export::CANCELLED)
-      end
-      success
-    end
   end
 end

data/app/helpers/apidae/application_helper.rb

@@ -1,6 +1,6 @@
 module Apidae
   module ApplicationHelper
-    include Apidae::ApidaeHelper
+    include ApidaeHelper
 
     def apidae_user
       send(Rails.application.config.apidae_user) if Rails.application.config.respond_to?(:apidae_user)

data/app/helpers/apidae/extendable_helper.rb

@@ -0,0 +1,4 @@
+module Apidae
+  module ExtendableHelper
+  end
+end

data/app/models/apidae/apidae_data_parser.rb

@@ -151,7 +151,6 @@ module Apidae
                 name: localized_value(att, :nom, locale),
                 url: att[:traductionFichiers][0][:url].gsub('http:', 'https:'),
                 type: att[:type],
-                link: att[:link],
                 description: localized_value(att, :legende, locale)
             }
           end
@@ -223,7 +222,6 @@ module Apidae
           loc_data[:latitude] = geoloc_details[:geoJson][:coordinates][1]
           loc_data[:longitude] = geoloc_details[:geoJson][:coordinates][0]
         end
-        loc_data[:altitude] = geoloc_details[:altitude] if geoloc_details
         loc_data[:access] = node_value(geoloc_details, :complement) if geoloc_details
         loc_data[:environments] = location_hash[:environnements].map {|e| e[:id]} if location_hash[:environnements]
       end
@@ -238,7 +236,6 @@ module Apidae
             openings_desc: node_value(openings_hash, :periodeEnClair, *locales),
             openings_desc_mode: openings_hash[:periodeEnClairGenerationMode] == 'AUTOMATIQUE' ? MODE_AUTO : MODE_MANUAL,
             openings: build_openings(openings_hash, *locales),
-            all_year_long: openings_hash[:ouvertTouteLAnnee] == 'OUVERT_TOUTE_L_ANNEE' ? 'true' : 'false',
             time_periods: lists_ids(openings_hash[:indicationsPeriode]),
             openings_extra: lists_ids(openings_hash[:ouverturesComplementaires])
         }
@@ -278,8 +275,7 @@ module Apidae
               (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 == Obj::DOS ? data_hash.except(:classification) : node_value(data_hash, :lieuDePratique),
-          track: apidae_obj.apidae_type == Obj::EQU ? (data_hash[:itineraire] || {}).except(:passagesDelicats) : nil,
-          tricky_sections: apidae_obj.apidae_type == Obj::EQU ? data_hash.dig(:itineraire, :passagesDelicats) : nil,
+          track: apidae_obj.apidae_type == Obj::EQU ? data_hash[:itineraire] : 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),
@@ -321,17 +317,13 @@ module Apidae
       tags
     end
 
-    def self.parse_booking(reservation_hash, visits_hash, *locales)
-      booking_hash = {}
+    def self.parse_booking(reservation_hash, *locales)
       if reservation_hash
-        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_desc: node_value(reservation_hash, :complement, *locales),
+            booking_entities: reservation_hash[:organismes]
+        }
       end
-      booking_hash
     end
 
     def self.parse_town(location_hash)

data/app/models/apidae/export.rb

@@ -1,3 +1,6 @@
+require 'uri'
+require 'net/http'
+
 module Apidae
   class Export < ActiveRecord::Base
 
@@ -20,5 +23,43 @@ module Apidae
     def self.pending
       where(remote_status: 'SUCCESS', status: PENDING).order(:id)
     end
+
+    def import_data
+      success = true
+      begin
+        open(file_url) do |f|
+          begin
+            FileImport.import(f, project_id)
+            unless confirm_url.blank?
+              uri = URI(confirm_url)
+              req = Net::HTTP::Post.new(uri)
+              Net::HTTP.start(uri.hostname, uri.port) do |http|
+                http.request(req)
+              end
+            end
+            update(status: Export::COMPLETE)
+            if Rails.application.config.respond_to?(:apidae_import_callback)
+              Rails.application.config.apidae_import_callback.call(self)
+            end
+          rescue Exception => ex
+            logger.error("Failed to import export file : #{file_url}")
+            logger.error("Error is : #{ex} \n#{ex.backtrace.join("\n") unless ex.backtrace.blank?}")
+            success = false
+            update(status: Export::CANCELLED)
+          end
+        end
+      rescue OpenURI::HTTPError => err
+        logger.error("Failed to download export file : #{file_url}")
+        logger.error("Error is : #{err}")
+        success = false
+        update(status: Export::CANCELLED)
+      rescue Exception => e
+        logger.error "Failed to import file : #{e.file_url}"
+        logger.error("Error is : #{err}")
+        success = false
+        e.update(status: Export::CANCELLED)
+      end
+      success
+    end
   end
 end

data/app/models/apidae/obj.rb

@@ -7,7 +7,6 @@ module Apidae
 
     attr_accessor :locale
     attr_accessor :obj_version
-    attr_accessor :obj_versions
 
     store_accessor :title_data, :title
     store_accessor :owner_data, :owner_name, :owner_id
@@ -15,15 +14,15 @@ module Apidae
     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
+                   :products, :audience, :animals, :animals_desc, :extra, :duration, :certifications, :business
     store_accessor :entity_data, :entity_id, :entity_name, :service_provider_id, :is_service_provider
     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
+    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_extra
     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
     store_accessor :tags_data, :promo, :internal, :linked
     store_accessor :version_data, :versioned_fields
 
@@ -84,7 +83,7 @@ module Apidae
         COS => {node: :informationsCommerceEtService, subtype: :commerceEtServiceType},
         DEG => {node: :informationsDegustation, subtype: :degustationType},
         DOS => {node: :informationsDomaineSkiable, subtype: :domaineSkiableType},
-        EQU => {node: :informationsEquipement, subtype: :rubrique},
+        EQU => {node: :informationsEquipement, subtype: :equipementType},
         FEM => {node: :informationsFeteEtManifestation, subtype: :feteEtManifestationType},
         HCO => {node: :informationsHebergementCollectif, subtype: :hebergementCollectifType},
         HLO => {node: :informationsHebergementLocatif, subtype: :hebergementLocatifType},
@@ -101,7 +100,6 @@ module Apidae
     after_initialize do
       @locale = DEFAULT_LOCALE
       @obj_version = DEFAULT_VERSION
-      @obj_versions = {}
     end
 
     def root_obj
@@ -113,15 +111,11 @@ module Apidae
     end
 
     def in_version(v)
-      if v == DEFAULT_VERSION && root_obj_id.nil?
-        @obj_version = DEFAULT_VERSION
-        self
-      else
-        if @obj_versions[v].nil?
-          @obj_versions[v] = versions.where(version: v).first
-        end
-        @obj_versions[v]
+      @cached_versions ||= {}
+      if @cached_versions[v].nil?
+        @cached_versions[v] = versions.where(version: v).first
       end
+      @cached_versions[v]
     end
 
     def in_locale(l)
@@ -170,7 +164,6 @@ module Apidae
       apidae_obj
     end
 
-    # Note : overrides existing fields (not a merge)
     def self.populate_fields(apidae_obj, object_data, locales)
       type_fields = TYPES_DATA[object_data[:type]]
       apidae_obj.last_update = DateTime.parse(object_data[:gestion][:dateModification]) unless object_data[:gestion].blank?
@@ -185,7 +178,7 @@ module Apidae
       apidae_obj.town = ApidaeDataParser.parse_town(object_data[:localisation])
       apidae_obj.openings_data = ApidaeDataParser.parse_openings(object_data[:ouverture], *locales)
       apidae_obj.rates_data = ApidaeDataParser.parse_rates(object_data[:descriptionTarif], *locales)
-      apidae_obj.booking_data = ApidaeDataParser.parse_booking(object_data[:reservation], object_data[:visites], *locales)
+      apidae_obj.booking_data = ApidaeDataParser.parse_booking(object_data[:reservation], *locales)
       apidae_obj.type_data = ApidaeDataParser.parse_type_data(apidae_obj, object_data[type_fields[:node]], object_data[:prestations],
                                              object_data[:tourismeAffaires], *locales)
       apidae_obj.pictures_data = ApidaeDataParser.parse_pictures_data(object_data[:illustrations], *locales)

data/app/models/apidae/reference.rb

@@ -10,7 +10,7 @@ module Apidae
     end
 
     def self.import(refs_json)
-      locales = Rails.application.config.respond_to?(:apidae_locales) ? Rails.application.config.apidae_locales : [DEFAULT_LOCALE]
+    locales = Rails.application.config.respond_to?(:apidae_locales) ? Rails.application.config.apidae_locales : [DEFAULT_LOCALE]
       locales_map = Hash[locales.map {|loc| ["libelle#{loc.camelize.gsub('-', '')}".to_sym, loc]}]
       refs_hashes = JSON.parse(refs_json, symbolize_names: true)
       if refs_hashes.length != where("apidae_type != ?", INTERNAL).count

data/app/models/apidae/selection.rb

@@ -69,7 +69,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})
+        query_args = build_args(AGENDA_ENDPOINT, {selection_ids: [apidae_id], from: from, to: to, count: 200})
         res = query_api(query_args, true)
         $apidae_cache.write(key, res)
       end
@@ -142,14 +142,15 @@ 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/app/models/apidae/territory.rb

@@ -0,0 +1,18 @@
+module Apidae
+  class Territory < ApplicationRecord
+    def self.import(territories_json)
+      territories_hashes = JSON.parse(territories_json, symbolize_names: true)
+      territories_hashes.each do |t_data|
+        t = Territory.find_or_initialize_by(apidae_id: t_data[:id])
+        t.name = t_data.dig(:nom, :libelleFr)
+
+        t.save!
+      end
+    end
+
+    def self.import_file(json_file)
+      territories_json = File.read(json_file)
+      import(territories_json)
+    end
+  end
+end

data/config/initializers/constants.rb

@@ -25,11 +25,8 @@ module Apidae
   ALL_VERSIONS = [STANDARD_VERSION, WINTER_VERSION, SUMMER_VERSION, CHALLENGED_VERSION, BUSINESS_VERSION,
                   GROUPS_VERSION, ACTIVITIES_VERSION]
 
-  LOCALIZED_FIELDS = [:title, :short_desc, :long_desc, :pictures, :attachments,
-                      :openings_desc, :rates_desc, :includes, :excludes, :extra, :booking_desc]
-  ALL_FIELDS = LOCALIZED_FIELDS + [:theme_desc, :private_desc, :capacity, :telephone, :email, :website,
-                                   :google, :facebook, :twitter, :yelp, :trip_advisor, :fax, :mobile_website, :shorty_url,
-                                   :openings, :openings_extra, :rates, :services, :payment_methods, :categories, :themes,
-                                   :labels, :chains, :classification, :challenged, :environments, :languages, :products,
-                                   :animals, :equipments, :comfort, :activities, :promo, :internal, :linked]
+  LOCALIZED_FIELDS = [:title, :short_desc, :long_desc, :pictures, :attachments, :openings_desc, :rates_desc,
+                      :includes, :excludes, :extra, :booking_desc]
+  ALL_FIELDS = LOCALIZED_FIELDS + [:theme_desc, :private_desc, :capacity, :telephone, :email, :website, :services,
+                                   :equipments, :comfort, :activities, :promo, :internal, :linked]
 end

data/db/migrate/20201112080847_create_apidae_territories.rb

@@ -0,0 +1,10 @@
+class CreateApidaeTerritories < ActiveRecord::Migration[6.0]
+  def change
+    create_table :apidae_territories do |t|
+      t.integer :apidae_id
+      t.string :name
+    end
+
+    add_index :apidae_territories, :apidae_id
+  end
+end

data/db/migrate/20210607214647_add_apidae_type_to_apidae_territories.rb

@@ -0,0 +1,5 @@
+class AddApidaeTypeToApidaeTerritories < ActiveRecord::Migration[6.1]
+  def change
+    add_column :apidae_territories, :apidae_type, :integer
+  end
+end

data/lib/apidae/version.rb

@@ -1,3 +1,3 @@
 module Apidae
-  VERSION = "1.2.13"
+  VERSION = "1.3.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apidae
 version: !ruby/object:Gem::Version
-  version: 1.2.13
+  version: 1.3.3
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-07 00:00:00.000000000 Z
+date: 2021-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -31,6 +31,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -38,20 +41,23 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: jbuilder
   requirement: !ruby/object:Gem::Requirement
@@ -91,6 +97,7 @@ files:
 - app/helpers/apidae/apidae_helper.rb
 - app/helpers/apidae/application_helper.rb
 - app/helpers/apidae/dashboard_helper.rb
+- app/helpers/apidae/extendable_helper.rb
 - app/helpers/apidae/import_helper.rb
 - app/helpers/apidae/objects_helper.rb
 - app/helpers/apidae/references_helper.rb
@@ -104,6 +111,7 @@ files:
 - app/models/apidae/reference.rb
 - app/models/apidae/selection.rb
 - app/models/apidae/selection_object.rb
+- app/models/apidae/territory.rb
 - app/models/apidae/town.rb
 - app/views/apidae/dashboard/index.html.erb
 - app/views/apidae/import/_form.html.erb
@@ -181,6 +189,8 @@ files:
 - db/migrate/20200312150904_add_version_index_on_apidae_objs.rb
 - db/migrate/20200522124205_rename_objs_contact_to_contact_data.rb
 - db/migrate/20200528101957_add_is_active_to_apidae_references.rb
+- db/migrate/20201112080847_create_apidae_territories.rb
+- db/migrate/20210607214647_add_apidae_type_to_apidae_territories.rb
 - lib/apidae.rb
 - lib/apidae/engine.rb
 - lib/apidae/version.rb