apidae 1.1.0 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f69774e7655cd66923973e23882e6d1d0df0cb2a
-  data.tar.gz: 199df4ea7f45f563e569f9e1229dfdd012f6a2db
+  metadata.gz: b11e939316f83f92542ad8f9dd1d61d6a759b221
+  data.tar.gz: b37d8f51dccc89e83c7f29e7ccb880025482646a
 SHA512:
-  metadata.gz: 671a682f09badf6919a55227c7366478c23bc74456fd58669101ac7a4c9462a5c08cd32a1a58711652bb484c39867c106d338afd9989f08b759af5c4dab375de
-  data.tar.gz: f7ba0f5be1b236da982b133e682c454ff251a1848927db75f54dd827ee0367e4b38a2fa93884dc64aebc29d60bfe04a307d25b33a10cc268ddd4ab82ce786ce5
+  metadata.gz: b6c8fd210ade09f620c897676c89dec75bde2cb94379a6acd69511aeaad495fc080eaad1d14fc0096834e79a7156870a495dde4600f245716b893af8b1458d20
+  data.tar.gz: 3798b7eab1196ab9f2ff594a4d27d6930732894446d7c8fef0793be046f4a0b9bd5f3255a104528a1ff13a0fe1a2772b1843e1deb96dc8ad90bf2fe832d679a7

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

@@ -62,9 +62,19 @@ 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
+        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
+          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/controllers/apidae/projects_controller.rb

@@ -3,6 +3,7 @@ require_dependency "apidae/application_controller"
 module Apidae
   class ProjectsController < ApplicationController
     before_action :set_project, only: [:edit, :update, :destroy]
+    skip_before_action :check_user_data!, only: [:create]
 
     def index
       if user_is_admin?

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

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

@@ -83,8 +83,8 @@ 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
 
@@ -116,8 +116,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.0"
+  VERSION = "1.2.2"
 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.0
+  version: 1.2.2
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-02 00:00:00.000000000 Z
+date: 2020-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails