apidae 1.0.2 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 825f592628dd0818de54c1fce82fa36b7b97140b
-  data.tar.gz: f857a1e30e89a720ab025d2171915e203638fa36
+  metadata.gz: b537e9e99b7f05f62b0c694b52382e7ca9c56c89
+  data.tar.gz: 7943e22b985c52739837a9db2c748b8891e634b1
 SHA512:
-  metadata.gz: c242aa6b115d15716e01db251b30ccb8d76dcdd1a1c118691a090ed3a151742d3ea02d43d39f1bef71855a300e3ee0f736d2fa3bd4cc9aa1d77da9cf7511b13b
-  data.tar.gz: e34650ebe27509274682fa4e968f7d12d1f3f3577cdc5183e0c464595dc65c86ace66f323b21a774a4045a177ac4ac3ca21d225ae6a85bb9941641f442a1a0da
+  metadata.gz: c43827fbbacb7331fe032903e5ab2a5ac0f3e08e482811928d5a610d728c5734eaebd7c07bec35100c91fef71e688e56188ef68d422214336b0d924da8315f45
+  data.tar.gz: be1a882acd0d0714cf655a60bdd71ac329530ba6a125db12940beee9d746cc0d3dd7d62e120bef1909777df51f337fab7402ac7fe24c6da9a9f6e5106ee893c1

data/app/assets/stylesheets/apidae/application.css

@@ -13,3 +13,12 @@
  *= require_tree .
  *= require_self
  */
+
+#apidae_imports_panel > a:first-child {
+    float: right;
+}
+
+#apidae_form label {
+    font-size: 18px;
+    margin-right: 1rem;
+}

data/app/controllers/apidae/dashboard_controller.rb

@@ -16,7 +16,6 @@ module Apidae
         @objects = SelectionObject.where(apidae_selection_id: selections.map {|s| s.id}.uniq).map {|so| so.apidae_object_id}.uniq.count
         @last_imports = FileImport.where(apidae_id: apidae_user.apidae_projects_ids).order(id: :desc).take(100)
       end
-      @references = Reference.count
     end
   end
 end

data/app/controllers/apidae/import_controller.rb

@@ -6,6 +6,7 @@ module Apidae
   class ImportController < ApplicationController
     skip_before_action :verify_authenticity_token
     skip_before_action Rails.application.config.apidae_auth
+    skip_before_action :check_user_data!
 
     # Callback endpoint for Apidae exports
     #
@@ -36,34 +37,62 @@ module Apidae
     def run
       success = true
       Export.pending.each do |e|
-        begin
-          open(e.file_url) do |f|
-            begin
-              FileImport.import(f, e.project_id)
+        success &&= import_data(e)
+      end
+      success ? head(:ok) : head(:internal_server_error)
+    end
+
+    def new
+      @export = Export.new(status: Export::PENDING)
+    end
+
+    def create
+      @export = Export.new(export_params)
+      if @export.save && import_data(@export)
+        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."
+        render :new
+      end
+    end
+
+    private
+
+    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
-              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
+            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
-        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)
         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)
       end
-      success ? head(:ok) : head(:internal_server_error)
+      success
     end
   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?
@@ -24,7 +25,7 @@ module Apidae
       else
         @project = Project.new(project_params)
         if @project.save
-          referrer = (session.delete(:referrer) || projects_url)
+          referrer = params[:redirect_to] || session.delete(:referrer) || projects_url
           redirect_to (referrer + "?apidae_project_id=#{@project.id}"), notice: 'Le projet a bien été créé'
         else
           flash.now[:alert] = "Une erreur s'est produite lors la création du projet"
@@ -54,7 +55,7 @@ module Apidae
 
     def update_project
       if @project.update(project_params)
-        referrer = session.delete(:referrer)
+        referrer = params[:redirect_to] || session.delete(:referrer)
         redirect_to (referrer + "?apidae_project_id=#{@project.id}"), notice: 'Le projet a bien été mis à jour'
       else
         flash.now[:alert] = "Une erreur s'est produite lors la mise à jour du projet"

data/app/models/apidae/apidae_data_parser.rb

@@ -10,6 +10,17 @@ module Apidae
     YELP = 4007
     TRIP_ADVISOR = 4000
 
+    CONTACTS_MAP = {
+        'telephone' => PHONE,
+        'email' => EMAIL,
+        'website' => WEBSITE,
+        'facebook' => FACEBOOK,
+        'google' => GOOGLE,
+        'trip_advisor' => TRIP_ADVISOR,
+        'twitter' => TWITTER,
+        'yelp' => YELP
+    }
+
     MODE_AUTO = 'auto'
     MODE_MANUAL = 'manual'
 
@@ -114,7 +125,7 @@ module Apidae
                 url: pic[:traductionFichiers][0][:url].gsub('http:', 'https:'),
                 description: localized_value(pic, :legende, locale),
                 credits: localized_value(pic, :copyright, locale),
-                expiration_date: pic[:dateLimiteDePublication]
+                expiration_date: pic[:dateLimiteDePublication] || ''
             }
           end
         end
@@ -149,29 +160,29 @@ module Apidae
         contact_entries.each do |c|
           case c[:type][:id]
           when PHONE, ALT_PHONE
-            contact_details[:telephone] ||= []
-            contact_details[:telephone] << c[:coordonnees][:fr]
+            contact_details[:telephone] ||= {}
+            contact_details[:telephone][c[:identifiant]] = c[:coordonnees][:fr]
           when EMAIL
-            contact_details[:email] ||= []
-            contact_details[:email] << c[:coordonnees][:fr]
+            contact_details[:email] ||= {}
+            contact_details[:email][c[:identifiant]] = c[:coordonnees][:fr]
           when WEBSITE
-            contact_details[:website] ||= []
-            contact_details[:website] << c[:coordonnees][:fr]
+            contact_details[:website] ||= {}
+            contact_details[:website][c[:identifiant]] = c[:coordonnees][:fr]
           when GOOGLE
-            contact_details[:google] ||= []
-            contact_details[:google] << c[:coordonnees][:fr]
+            contact_details[:google] ||= {}
+            contact_details[:google][c[:identifiant]] = c[:coordonnees][:fr]
           when FACEBOOK
-            contact_details[:facebook] ||= []
-            contact_details[:facebook] << c[:coordonnees][:fr]
+            contact_details[:facebook] ||= {}
+            contact_details[:facebook][c[:identifiant]] = c[:coordonnees][:fr]
           when TWITTER
-            contact_details[:twitter] ||= []
-            contact_details[:twitter] << c[:coordonnees][:fr]
+            contact_details[:twitter] ||= {}
+            contact_details[:twitter][c[:identifiant]] = c[:coordonnees][:fr]
           when YELP
-            contact_details[:yelp] ||= []
-            contact_details[:yelp] << c[:coordonnees][:fr]
+            contact_details[:yelp] ||= {}
+            contact_details[:yelp][c[:identifiant]] = c[:coordonnees][:fr]
           when TRIP_ADVISOR
-            contact_details[:trip_advisor] ||= []
-            contact_details[:trip_advisor] << c[:coordonnees][:fr]
+            contact_details[:trip_advisor] ||= {}
+            contact_details[:trip_advisor][c[:identifiant]] = c[:coordonnees][:fr]
           else
           end
         end
@@ -210,7 +221,8 @@ 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),
-            time_periods: lists_ids(openings_hash[:indicationsPeriode])
+            time_periods: lists_ids(openings_hash[:indicationsPeriode]),
+            openings_extra: lists_ids(openings_hash[:ouverturesComplementaires])
         }
       end
     end
@@ -338,6 +350,7 @@ module Apidae
               external_id: o[:identifiantTechnique],
               start_date: o[:dateDebut],
               end_date: o[:dateFin],
+              each_year: o[:tousLesAns],
               closing_days: closing_days.blank? ? [] : closing_days.map {|d| d[:dateSpeciale]},
               details: node_value(o, :complementHoraire, *locales),
               time_periods: [

data/app/models/apidae/export.rb

@@ -5,6 +5,8 @@ module Apidae
     COMPLETE = 'complete'
     CANCELLED = 'cancelled'
 
+    validates_presence_of :file_url, :project_id
+
     # Note : handle reset case
     def self.pending
       where(remote_status: 'SUCCESS', status: PENDING).order(:id)

data/app/models/apidae/obj.rb

@@ -18,7 +18,7 @@ module Apidae
     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 :location_data, :address, :place, :latitude, :longitude, :access, :territories, :environments
-    store_accessor :openings_data, :openings_desc, :openings_desc_mode, :openings, :time_periods
+    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
     store_accessor :service_data, :services, :equipments, :comfort, :activities, :challenged, :languages
     store_accessor :booking_data, :booking_desc, :booking_entities

data/app/models/apidae/reference.rb

@@ -5,6 +5,10 @@ module Apidae
 
     store_accessor :meta_data, :category, :parent
 
+    def self.default_scope
+      where(is_active: true)
+    end
+
     def self.import(refs_json)
     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]}]
@@ -15,6 +19,7 @@ module Apidae
           ref.label_data = ref_data.slice(*locales_map.keys).transform_keys {|k| locales_map[k]}
           ref.parent = ref_data[:parent][:id] if ref_data[:parent]
           ref.category = ref_data[:familleCritere] ? ref_data[:familleCritere][:id] : (ref_data[:typeLabel] ? ref_data[:typeLabel][:id] : nil)
+          ref.is_active = ref_data[:actif]
           ref.save!
         end
       end

data/app/views/apidae/dashboard/index.html.erb

@@ -3,13 +3,20 @@
       <%= link_to pluralize(@projects, 'projet', 'projets'), apidae.projects_path, class: styles[:projects] %>
       <%= link_to pluralize(@selections, 'sélection', 'sélections'), apidae.selections_path, class: styles[:selections] %>
       <%= link_to pluralize(@objects, 'objet touristique', 'objets touristiques'), apidae.objects_path, class: styles[:objects] %>
-      <%= link_to (pluralize(@references, 'élément', 'éléments') + ' de référence'), apidae.references_path, class: styles[:references] %>
       <%= link_to 'Retour', :back, class: styles[:back] %>
       <h1 class="<%= styles[:h1] %>">Apidae</h1>
     </div>
     <div id="apidae_dashboard" class="<%= styles[:wrapper] %>">
       <div id="apidae_imports_panel" class="<%= styles[:body] %>">
+        <%= link_to 'Importer un fichier', apidae.import_new_path, class: styles[:projects] %>
         <h2 class="<%= styles[:h2] %>">Derniers imports</h2>
+        <p>
+          Les imports provenant de vos projets Apidae apparaîtront ci-dessous. 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>.<br/>
+          Si vous souhaitez que chaque export soit récupéré automatiquement, veillez à renseigner le paramètre
+          <strong>Url de notification</strong> avec la valeur <strong><%= apidae.import_callback_url %></strong>.
+        </p>
         <table id="apidae_imports" class="<%= styles[:table] %>">
           <thead class="<%= styles[:table_head] %>">
           <tr>

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

@@ -0,0 +1,29 @@
+<%= form_for(@export, url: apidae.import_create_path, method: :post, html: {class: styles[:form]}) do |f| %>
+  <% if @export.errors.any? %>
+    <div id="apidae_form_errors">
+      <ul>
+        <% @export.errors.full_messages.each do |message| %>
+          <li><%= message %></li>
+        <% end %>
+      </ul>
+    </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>.
+  </p>
+
+  <div class="<%= styles[:form_field] %>">
+    <div><%= f.label :project_id %></div>
+    <div><%= f.text_field :project_id, placeholder: "Ex: 1234" %></div>
+  </div>
+  <div class="<%= styles[:form_field] %>">
+    <div><%= f.label :file_url %></div>
+    <div><%= f.text_field :file_url, placeholder: "Ex: http://export.apidae-tourisme.com/exports/1234_20200101-5678_ABCdef.zip" %></div>
+  </div>
+  <%= f.hidden_field :status %>
+  <div class="<%= styles[:form_actions] %>">
+    <%= f.submit 'Valider' %> | <%= link_to 'Retour', :back, class: styles[:back] %>
+  </div>
+<% end %>

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

@@ -0,0 +1,11 @@
+<%= render layout: "/layouts/#{Rails.application.config.apidae_layout}" do |styles| %>
+  <div id="apidae_header" class="<%= styles[:header] %>">
+    <%= link_to 'Retour', :back, class: styles[:back] %>
+    <h1 class="<%= styles[:h1] %>">Apidae - Importer un fichier de données</h1>
+  </div>
+  <div id="apidae_import" class="<%= styles[:wrapper] %>">
+    <div id="apidae_form" class="<%= styles[:body] %>">
+      <%= render 'form', styles: styles %>
+    </div>
+  </div>
+<% end %>

data/config/locales/apidae.fr.yml

@@ -10,12 +10,21 @@ fr:
       apidae/obj:
         apidae_id: Identifiant Apidae
         selection_apidae_id: Sélection Apidae
+      apidae/export:
+        project_id: Identifiant du projet
+        file_url: URL du fichier d'export
     errors:
       models:
         apidae/project:
           attributes:
             apidae_id:
               taken: Un projet avec cet identifiant Apidae existe déjà.
+        apidae/export:
+          attributes:
+            file_url:
+              blank: est requise
+            project_id:
+              blank: est requis
   apidae:
     file_import:
       status:

data/config/routes.rb

@@ -15,6 +15,8 @@ Apidae::Engine.routes.draw do
 
   match 'import/callback', via: :post, to: 'import#callback'
   match 'import/run', via: :post, to: 'import#run'
+  match 'import/new', via: :get, to: 'import#new'
+  match 'import/create', via: :post, to: 'import#create'
 
   root to: 'dashboard#index'
 end

data/db/migrate/20200528101957_add_is_active_to_apidae_references.rb

@@ -0,0 +1,6 @@
+class AddIsActiveToApidaeReferences < ActiveRecord::Migration[5.2]
+  def change
+    add_column :apidae_references, :is_active, :boolean
+    add_index :apidae_references, :is_active, unique: false
+  end
+end

data/lib/apidae/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apidae
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.1
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-25 00:00:00.000000000 Z
+date: 2020-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -106,7 +106,9 @@ files:
 - app/models/apidae/selection_object.rb
 - app/models/apidae/town.rb
 - app/views/apidae/dashboard/index.html.erb
+- app/views/apidae/import/_form.html.erb
 - app/views/apidae/import/callback.html.erb
+- app/views/apidae/import/new.html.erb
 - app/views/apidae/objects/_form.html.erb
 - app/views/apidae/objects/edit.html.erb
 - app/views/apidae/objects/index.html.erb
@@ -178,6 +180,7 @@ files:
 - db/migrate/20200312150008_add_version_data_to_apidae_objs.rb
 - 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
 - lib/apidae.rb
 - lib/apidae/engine.rb
 - lib/apidae/version.rb