apidae 0.9.15 → 0.9.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89bdda0e07dc726d4b70c073ae22f593ee2965a9
-  data.tar.gz: 7d2600b1a6d64a61c915e9bd7863dc2cd5a8d55a
+  metadata.gz: 44c3ad9d98d4c7845e73ba6d2979e9bbc34fc4b3
+  data.tar.gz: 14ba7bc27ce966673c67f4dfff6dda9fd5006ee2
 SHA512:
-  metadata.gz: 284aafe30129b821731551b6823a6063f316420ab11afa39af83f8340c36a8f424864ceac9862486e366268d2a6205ada486d1660f71dc6c3fc202d06c0198d9
-  data.tar.gz: c0b00e51b7f6498a307caafd0ee3e4da5d1f637b6fa11d2c3c44154b5d05db6bb427149ebbbaa86942298653f47cc9b558f1017508c082d849b5cc4ba23b129d
+  metadata.gz: 846477e653788caabc6f5f6240fedf35711bf73d7ffd4c0752ea9d515c680c75c0f009ab5e97636c64b47f3b6b79f74740692186df9fd7eae9a7b1b6c599e903
+  data.tar.gz: 15a4b43ddccf9f665145831dbbb5097d14802f652b38a5e56088657fc7fb90569cbf5afe559880cb750ae2c9200a43092868373bec74202f853fbe7efcd13961

data/app/controllers/apidae/import_controller.rb

@@ -46,7 +46,7 @@ module Apidae
                 http.request(req)
               end
               e.update(status: Export::COMPLETE)
-              if Rails.application.config.apidae_import_callback
+              if Rails.application.config.respond_to?(:apidae_import_callback)
                 Rails.application.config.apidae_import_callback.call(e)
               end
             rescue Exception => ex

data/app/controllers/apidae/objects_controller.rb

@@ -2,10 +2,11 @@ require_dependency "apidae/application_controller"
 
 module Apidae
   class ObjectsController < ApplicationController
-    before_action :set_object, only: [:show, :edit, :update, :destroy]
+    before_action :set_object, only: [:show, :edit, :update, :destroy, :refresh]
     skip_before_action Rails.application.config.apidae_auth, only: [:index, :show]
 
     def index
+      session[:referrer] = request.referrer
       if params[:selection_id]
         @selection = Selection.find(params[:selection_id])
         @objects = @selection.objects.select(:id, :apidae_id, :title, :apidae_type, :updated_at)
@@ -18,42 +19,52 @@ module Apidae
     end
 
     def new
-      @object = Obj.new
+      @obj = Obj.new
     end
 
     def edit
     end
 
     def create
-      @object = Obj.new(object_params)
-
-      if @object.save
-        redirect_to @object, notice: 'Object was successfully created.'
+      @obj = Obj.new(object_params)
+      selection = params[:selection_apidae_id].blank? ? Selection.last : Selection.find_by_apidae_id(params[:selection_apidae_id])
+      if @obj.save && selection.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
       end
     end
 
     def update
-      if @object.update(object_params)
-        redirect_to @object, notice: 'Object was successfully updated.'
+      if @obj.update(object_params)
+        redirect_to @obj, notice: 'Object was successfully updated.'
       else
         render :edit
       end
     end
 
     def destroy
-      @object.destroy
+      @obj.destroy
       redirect_to objects_url, notice: 'Object was successfully destroyed.'
     end
 
+    def refresh
+      referrer = (session.delete(:referrer) || objects_url)
+      if @obj && @obj.selections.first.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
+    end
+
     private
       def set_object
-        @object = Obj.find(params[:id])
+        @obj = Obj.find(params[:id])
       end
 
       def object_params
-        params.require(:object).permit!
+        params.require(:obj).permit!
       end
   end
 end

data/app/controllers/apidae/projects_controller.rb

@@ -20,7 +20,7 @@ module Apidae
       else
         @project = Project.new(project_params)
         if @project.save
-          referrer = session.delete(:referrer)
+          referrer = (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"

data/app/models/apidae/selection.rb

@@ -8,6 +8,8 @@ module Apidae
 
     AGENDA_ENDPOINT = 'agenda/detaille/list-identifiants'
     SELECTION_ENDPOINT = 'recherche/list-identifiants'
+    OBJECTS_ENDPOINT = 'recherche/list-objets-touristiques'
+
     MAX_COUNT = 100
     MAX_LOOPS = 10
 
@@ -70,6 +72,39 @@ module Apidae
       res
     end
 
+    def api_objects(opts = {})
+      key = cache_key(:objects)
+      res = $apidae_cache.read(key)
+      unless res
+        query_args = build_args(OBJECTS_ENDPOINT, opts.merge({selection_ids: [apidae_id]}))
+        res = query_objects_api(query_args, true)
+        $apidae_cache.write(key, res)
+      end
+      res
+    end
+
+    def api_object(apidae_obj_id)
+      query_args = build_args(OBJECTS_ENDPOINT, {obj_ids: [apidae_obj_id], fields: ["@all"]})
+      query_objects_api(query_args, true)
+    end
+
+    def refresh_obj(apidae_obj_id)
+      if apidae_project
+        res = api_object(apidae_obj_id)
+        if res[:results] && res[:results].length == 1
+          obj_data = res[:results].first.deep_symbolize_keys
+          obj = Obj.find_by_apidae_id(apidae_obj_id)
+          if obj
+            refreshed = Obj.update_object(obj, obj_data, apidae_project.locales, apidae_project.versions)
+            if refreshed && Rails.application.config.respond_to?(:apidae_obj_refresh_callback)
+              Rails.application.config.apidae_obj_refresh_callback.call(apidae_obj_id)
+            end
+            refreshed
+          end
+        end
+      end
+    end
+
     def as_text
       "#{label} (#{apidae_id})"
     end
@@ -110,6 +145,32 @@ module Apidae
       end
     end
 
+    def query_objects_api(query_args, all_results = false)
+      query_result = {}
+
+      if all_results
+        loops = 0
+        query_args[:first] = 0
+        query_args[:count] = MAX_COUNT
+        response = JSON.parse get_response(query_args), symbolize_names: false
+        total = response['numFound']
+        query_result[:results] = response['objetsTouristiques'] || {}
+
+        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
+          merge_objects_results(response, query_result)
+        end
+        query_result[:count] = total
+      else
+        response = JSON.parse get_response(query_args), symbolize_names: false
+        query_result[:results] = response['objetsTouristiques'] || {}
+        query_result[:count] = response['numFound']
+      end
+      query_result
+    end
+
     def get_response(args)
       response = ''
       query = JSON.generate args.except(:url)
@@ -137,6 +198,15 @@ module Apidae
       end
     end
 
+    def merge_objects_results(response, result)
+      objects = response['objetsTouristiques']
+      unless objects.blank?
+        if result[:results] && result[:results].is_a?(Array)
+          result[:results] += objects
+        end
+      end
+    end
+
     def build_args(endpoint, opts = {})
       {
           url: "#{Rails.application.config.apidae_api_url}/#{endpoint}",
@@ -145,6 +215,7 @@ module Apidae
           first: opts[:first] || 0,
           count: opts[:count] || MAX_COUNT,
           selectionIds: opts[:selection_ids],
+          identifiants: opts[:obj_ids],
           dateDebut: opts[:from],
           dateFin: opts[:to],
           center: opts[:lat] && opts[:lng] ? {type: 'Point', coordinates: [opts[:lng], opts[:lat]]} : nil,

data/app/views/apidae/objects/edit.html.erb

@@ -2,5 +2,5 @@
 
 <%= render 'form' %>
 
-<%= link_to 'Show', @object %> |
+<%= link_to 'Show', @obj %> |
 <%= link_to 'Back', objects_path %>

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

@@ -1,6 +1,7 @@
 <%= render layout: "/layouts/#{Rails.application.config.apidae_layout}" do |styles| %>
     <div id="apidae_header" class="<%= styles[:header] %>">
-      <%= link_to 'Retour', @selection ? selections_path : root_path, class: styles[:back] %>
+      <%= link_to 'Importer un objet', apidae.new_object_path, class: styles[:objects] %>
+      <%= link_to 'Retour', @selection ? apidae.selections_path : root_path, class: styles[:back] %>
       <h1 class="<%= styles[:h1] %>">Apidae - <%= @selection ? "Sélection \"#{@selection.label}\"" : "Tous les objets touristiques" %></h1>
     </div>
     <div id="apidae_dashboard" class="<%= styles[:wrapper] %>">
@@ -12,6 +13,7 @@
             <th>Identifiant</th>
             <th>Type</th>
             <th>Mise à jour</th>
+            <th></th>
           </tr>
           </thead>
           <tbody class="<%= styles[:table_body] %>">
@@ -21,6 +23,8 @@
                 <td><%= object.apidae_id %></td>
                 <td><%= object.apidae_type %></td>
                 <td><%= object.updated_at.strftime('Le %d/%m/%Y à %H:%M') if object.updated_at %></td>
+                <td><%= link_to 'Rafraîchir', apidae.refresh_object_path(object), method: :post,
+                                data: {confirm: 'Voulez-vous vraiment rafraîchir cet objet ? Les données existantes seront écrasées.'} %></td>
               </tr>
           <% end %>
           <% if @objects.empty? %>

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

@@ -1,5 +1,33 @@
-<h1>New Object</h1>
+<%= 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 objet</h1>
+  </div>
+  <div id="apidae_new_object" class="<%= styles[:wrapper] %>">
+    <div id="apidae_form" class="<%= styles[:body] %>">
+      <%= form_for(@obj, url: objects_url, class: styles[:form]) do |f| %>
+        <% if @obj.errors.any? %>
+          <div id="apidae_form_errors">
+            <ul>
+              <% @obj.errors.full_messages.each do |message| %>
+                <li><%= message %></li>
+              <% end %>
+            </ul>
+          </div>
+        <% end %>
 
-<%= render 'form' %>
-
-<%= link_to 'Back', objects_path %>
+        <div class="<%= styles[:form_field] %>">
+          <div><%= f.label :apidae_id %></div>
+          <div><%= f.text_field :apidae_id %></div>
+        </div>
+        <div class="<%= styles[:form_field] %>">
+          <div><%= label_tag :selection_apidae_id %></div>
+          <div><%= text_field_tag :selection_apidae_id %></div>
+        </div>
+        <div class="<%= styles[:form_actions] %>">
+          <%= f.submit 'Valider' %>
+        </div>
+      <% end %>
+    </div>
+  </div>
+<% end %>

data/config/routes.rb

@@ -1,8 +1,13 @@
 Apidae::Engine.routes.draw do
 
-  resources :objects, only: [:index, :show], path: 'objets'
+  resources :objects, only: [:index, :show, :new, :create], path: 'objets' do
+    post 'refresh', on: :member
+  end
+
   resources :selections, only: [:index] do
-    resources :objects, only: [:index], path: 'objets'
+    resources :objects, only: [:index], path: 'objets' do
+      post 'refresh', on: :member
+    end
   end
   resources :references, only: [:index]
   resources :projects, only: [:index, :new, :create, :edit, :update, :destroy], path: 'projets'

data/db/migrate/20190328122424_add_description_to_apidae_towns.rb

@@ -0,0 +1,5 @@
+class AddDescriptionToApidaeTowns < ActiveRecord::Migration[5.1]
+  def change
+    add_column :apidae_towns, :description, :string
+  end
+end

data/lib/apidae/version.rb

@@ -1,3 +1,3 @@
 module Apidae
-  VERSION = "0.9.15"
+  VERSION = "0.9.16"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apidae
 version: !ruby/object:Gem::Version
-  version: 0.9.15
+  version: 0.9.16
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-02 00:00:00.000000000 Z
+date: 2019-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -168,6 +168,7 @@ files:
 - db/migrate/20190127210921_migrate_localized_apidae_obj_fields.rb
 - db/migrate/20190127213602_migrate_localized_apidae_references.rb
 - db/migrate/20190304142446_migrate_desc_apidae_obj_fields.rb
+- db/migrate/20190328122424_add_description_to_apidae_towns.rb
 - db/migrate/20190418133435_add_index_on_apidae_obj.rb
 - db/migrate/20190517153215_add_description_to_apidae_towns.rb
 - lib/apidae.rb