apidae 1.1.1 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b537e9e99b7f05f62b0c694b52382e7ca9c56c89
-  data.tar.gz: 7943e22b985c52739837a9db2c748b8891e634b1
+  metadata.gz: 0aba2cd1de094aeef3e30a618807daf0373c30e2
+  data.tar.gz: fe93f13f69bfc494f8217c803c4bf0c32f609c73
 SHA512:
-  metadata.gz: c43827fbbacb7331fe032903e5ab2a5ac0f3e08e482811928d5a610d728c5734eaebd7c07bec35100c91fef71e688e56188ef68d422214336b0d924da8315f45
-  data.tar.gz: be1a882acd0d0714cf655a60bdd71ac329530ba6a125db12940beee9d746cc0d3dd7d62e120bef1909777df51f337fab7402ac7fe24c6da9a9f6e5106ee893c1
+  metadata.gz: 362a44da5272c50d931b7511f67c1ce6e001b83e2e3fec284ffcb1641301304eabceb9c1a9e7629665ee6bc5cd47fd6e637057bce37b547e4a4f79b60a833202
+  data.tar.gz: 4c182bf514518cb48efe9f0262088486764c6c747d29d93c9e02b9a1c092557ec88d842ab56e7079d4929b549e16dadd9241dfd725628d4ebb9d821a256a8480

data/app/controllers/apidae/import_controller.rb

@@ -91,6 +91,11 @@ module Apidae
         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

data/app/controllers/apidae/objects_controller.rb

@@ -34,17 +34,15 @@ module Apidae
     def create
       @obj = Obj.new(object_params)
       if Obj.find_by_apidae_id(@obj.apidae_id)
-        redirect_to objects_url, alert: "Cet objet est déjà importé."
-      else
-        selection = params[:selection_apidae_id].blank? ? Selection.last : Selection.find_by_apidae_id(params[:selection_apidae_id])
-        if @obj.save && selection.add_or_refresh_obj(@obj.apidae_id)
-          redirect_to objects_url, notice: "L'objet a bien été importé"
-        else
-          flash[:alert] = "Une erreur s'est produite lors de l'import de l'objet."
-          render :new
+        redirect_to objects_url, alert: "Cet objet est déjà importé." and return
+      elsif !params[:selection_apidae_id].blank?
+        selection = Selection.find_by_apidae_id(params[:selection_apidae_id])
+        if selection && selection.valid_api? && @obj.save && selection.add_or_refresh_obj(@obj.apidae_id)
+          redirect_to objects_url, notice: "L'objet a bien été importé" and return
         end
       end
-
+      flash[:alert] = "Une erreur s'est produite lors de l'import de l'objet."
+      render :new
     end
 
     def update
@@ -62,9 +60,20 @@ module Apidae
 
     def refresh
       referrer = (session.delete(:referrer) || objects_url)
-      if @obj && @obj.selections.first.add_or_refresh_obj(@obj.apidae_id)
-        redirect_to referrer, notice: "L'objet touristique a bien été mis à jour."
-      else
+      begin
+        sel = @obj.selections.find {|s| s.valid_api?}
+        if sel && sel.add_or_refresh_obj(@obj.apidae_id)
+          redirect_to referrer, notice: "L'objet touristique a bien été mis à jour."
+        else
+          redirect_to referrer, alert: "Une erreur s'est produite lors de la mise à jour de l'objet."
+        end
+      rescue OpenURI::HTTPError => err
+        logger.error("Failed to refresh obj : #{@obj.apidae_id}")
+        logger.error("Error is : #{err}")
+        redirect_to referrer, alert: "Une erreur s'est produite lors de la mise à jour de l'objet. Veuillez vérifier que le projet Apidae comporte une clé API valide."
+      rescue Exception => ex
+        logger.error("Failed to refresh obj : #{@obj.apidae_id}")
+        logger.error("Error is : #{err}")
         redirect_to referrer, alert: "Une erreur s'est produite lors de la mise à jour de l'objet."
       end
     end

data/app/models/apidae/apidae_data_parser.rb

@@ -9,6 +9,9 @@ module Apidae
     TWITTER = 3755
     YELP = 4007
     TRIP_ADVISOR = 4000
+    FAX = 202
+    MOBILE_WEBSITE = 3769
+    SHORTY_URL = 4923
 
     CONTACTS_MAP = {
         'telephone' => PHONE,
@@ -18,7 +21,10 @@ module Apidae
         'google' => GOOGLE,
         'trip_advisor' => TRIP_ADVISOR,
         'twitter' => TWITTER,
-        'yelp' => YELP
+        'yelp' => YELP,
+        'fax' => FAX,
+        'mobile_website' => MOBILE_WEBSITE,
+        'shorty_url' => SHORTY_URL
     }
 
     MODE_AUTO = 'auto'
@@ -161,28 +167,37 @@ module Apidae
           case c[:type][:id]
           when PHONE, ALT_PHONE
             contact_details[:telephone] ||= {}
-            contact_details[:telephone][c[:identifiant]] = c[:coordonnees][:fr]
+            contact_details[:telephone][c[:identifiant]] = {value: c[:coordonnees][:fr], description: c.dig(:observation, :libelleFr)}
           when EMAIL
             contact_details[:email] ||= {}
-            contact_details[:email][c[:identifiant]] = c[:coordonnees][:fr]
+            contact_details[:email][c[:identifiant]] = {value: c[:coordonnees][:fr], description: c.dig(:observation, :libelleFr)}
           when WEBSITE
             contact_details[:website] ||= {}
-            contact_details[:website][c[:identifiant]] = c[:coordonnees][:fr]
+            contact_details[:website][c[:identifiant]] = {value: c[:coordonnees][:fr], description: c.dig(:observation, :libelleFr)}
           when GOOGLE
             contact_details[:google] ||= {}
-            contact_details[:google][c[:identifiant]] = c[:coordonnees][:fr]
+            contact_details[:google][c[:identifiant]] = {value: c[:coordonnees][:fr], description: c.dig(:observation, :libelleFr)}
           when FACEBOOK
             contact_details[:facebook] ||= {}
-            contact_details[:facebook][c[:identifiant]] = c[:coordonnees][:fr]
+            contact_details[:facebook][c[:identifiant]] = {value: c[:coordonnees][:fr], description: c.dig(:observation, :libelleFr)}
           when TWITTER
             contact_details[:twitter] ||= {}
-            contact_details[:twitter][c[:identifiant]] = c[:coordonnees][:fr]
+            contact_details[:twitter][c[:identifiant]] = {value: c[:coordonnees][:fr], description: c.dig(:observation, :libelleFr)}
           when YELP
             contact_details[:yelp] ||= {}
-            contact_details[:yelp][c[:identifiant]] = c[:coordonnees][:fr]
+            contact_details[:yelp][c[:identifiant]] = {value: c[:coordonnees][:fr], description: c.dig(:observation, :libelleFr)}
           when TRIP_ADVISOR
             contact_details[:trip_advisor] ||= {}
-            contact_details[:trip_advisor][c[:identifiant]] = c[:coordonnees][:fr]
+            contact_details[:trip_advisor][c[:identifiant]] = {value: c[:coordonnees][:fr], description: c.dig(:observation, :libelleFr)}
+          when FAX
+            contact_details[:fax] ||= {}
+            contact_details[:fax][c[:identifiant]] = {value: c[:coordonnees][:fr], description: c.dig(:observation, :libelleFr)}
+          when MOBILE_WEBSITE
+            contact_details[:mobile_website] ||= {}
+            contact_details[:mobile_website][c[:identifiant]] = {value: c[:coordonnees][:fr], description: c.dig(:observation, :libelleFr)}
+          when SHORTY_URL
+            contact_details[:shorty_url] ||= {}
+            contact_details[:shorty_url][c[:identifiant]] = {value: c[:coordonnees][:fr], description: c.dig(:observation, :libelleFr)}
           else
           end
         end
@@ -230,7 +245,7 @@ module Apidae
     def self.parse_rates(rates_hash, *locales)
       if rates_hash
         desc = rates_hash[:gratuit] ? {DEFAULT_LOCALE => 'gratuit'} : node_value(rates_hash, :tarifsEnClair, *locales)
-        values = rates_hash[:periodes].blank? ? [] : rates_hash[:periodes].map {|p| build_rate(p)}
+        values = rates_hash[:periodes].blank? ? [] : rates_hash[:periodes].map {|p| build_rate(p, *locales)}
         methods = rates_hash[:modesPaiement].blank? ? [] : rates_hash[:modesPaiement].map {|p| p[:id]}
         {
             rates_desc: desc, rates: values, payment_methods: methods,
@@ -331,10 +346,10 @@ module Apidae
 
     private
 
-    def self.build_rate(rate_period)
+    def self.build_rate(rate_period, *locales)
       {
           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)}}
+          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, *locales)}}
       }
     end
 

data/app/models/apidae/export.rb

@@ -7,6 +7,15 @@ module Apidae
 
     validates_presence_of :file_url, :project_id
 
+    before_save :normalize_url
+
+    def normalize_url
+      self.file_url = file_url.strip
+      unless file_url.include?('/')
+        self.file_url = "http://export.apidae-tourisme.com/exports/#{file_url}"
+      end
+    end
+
     # Note : handle reset case
     def self.pending
       where(remote_status: 'SUCCESS', status: PENDING).order(:id)

data/app/models/apidae/obj.rb

@@ -16,7 +16,8 @@ module Apidae
     store_accessor :type_data, :categories, :themes, :capacity, :classification, :labels, :chains, :area, :track,
                    :products, :audience, :animals, :animals_desc, :extra, :duration, :certifications, :business
     store_accessor :entity_data, :entity_id, :entity_name, :service_provider_id
-    store_accessor :contact_data, :telephone, :email, :website, :google, :facebook, :twitter, :yelp, :trip_advisor, :contacts
+    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
     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

data/app/models/apidae/selection.rb

@@ -50,6 +50,10 @@ module Apidae
       objects.where(where_clause).count
     end
 
+    def valid_api?
+      apidae_project && !apidae_project.api_key.blank? && !apidae_project.apidae_id.blank?
+    end
+
     def api_results(opts = {})
       key = cache_key(:results)
       res = $apidae_cache.read(key)
@@ -83,13 +87,13 @@ module Apidae
       res
     end
 
-    def api_object(apidae_obj_id)
-      query_args = build_args(OBJECTS_ENDPOINT, {obj_ids: [apidae_obj_id], fields: ["@all"]})
+    def api_object(apidae_obj_id, fields = ["@all"])
+      query_args = build_args(OBJECTS_ENDPOINT, {obj_ids: [apidae_obj_id], fields: fields})
       query_api(query_args, true, false)
     end
 
     def add_or_refresh_obj(apidae_obj_id)
-      if apidae_project
+      if valid_api?
         res = api_object(apidae_obj_id)
         if res[:results] && res[:results].length == 1
           obj_data = res[:results].first.deep_symbolize_keys
@@ -99,7 +103,7 @@ module Apidae
     end
 
     def add_or_refresh_objs(fields = ["@all"])
-      if apidae_project
+      if valid_api?
         res = api_objects({fields: fields})
         if res[:results] && res[:results].length > 0
           res[:results].each do |result|
@@ -116,8 +120,9 @@ 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: added_obj.id)
       end
+      SelectionObject.create(apidae_selection_id: id, apidae_object_id: obj.id) unless objects.include?(obj)
+
       if Rails.application.config.respond_to?(:apidae_obj_refresh_callback)
         Rails.application.config.apidae_obj_refresh_callback.call(obj.apidae_id)
       end

data/app/views/apidae/import/_form.html.erb

@@ -9,9 +9,10 @@
     </div>
   <% end %>
   <p>
-    Pour que les données soient importées correctement,
-    vos projets doivent être configurés pour exporter les données au format <strong>JSON V2</strong>, en
-    <strong>groupant les objets exportés</strong>.
+    Pour que les données soient importées correctement, vos projets doivent être configurés pour exporter les données
+    au format <strong>JSON V2</strong>, en <strong>groupant les objets exportés</strong>. L'adresse du fichier d'export
+    est à récupérer dans :<br/>
+    <em>Page du projet Apidae > Onglet "Calcul des sélections et Exports " > Accéder à la ficher de l'export > Champ "Fichier d'export"</em>
   </p>
 
   <div class="<%= styles[:form_field] %>">

data/lib/apidae/version.rb

@@ -1,3 +1,3 @@
 module Apidae
-  VERSION = "1.1.1"
+  VERSION = "1.2.3"
 end

data/test/dummy/log/development.log

@@ -63,3 +63,5 @@ Migrating to AddLocalesDataToApidaeProjects (20190123214635)
    (0.2ms)  COMMIT
    (0.2ms)  SELECT pg_advisory_unlock(6140174353533887940)
    (0.2ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
+  Apidae::Obj Load (26.8ms)  SELECT apidae_id, COUNT(id) FROM "apidae_objs" WHERE "apidae_objs"."root_obj_id" IS NULL GROUP BY "apidae_objs"."apidae_id" HAVING (COUNT(id) > 1)
+  Apidae::Obj Load (2.4ms)  SELECT apidae_id, COUNT(id) FROM "apidae_objs" WHERE "apidae_objs"."root_obj_id" IS NULL GROUP BY "apidae_objs"."apidae_id" HAVING (COUNT(id) > 1)

metadata

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