apidae 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a65b8e65f96393ad346b2e3e75c2d9b03fa36917
-  data.tar.gz: c294dbec3f0fb0ce086d219a64bf4d926d6be51e
+  metadata.gz: 2ffef235022a3e5e342a82ff46a5dfad3d370c32
+  data.tar.gz: 60a0d4200c5e339be76ee86029e14f9ae6df4118
 SHA512:
-  metadata.gz: 816137aec948bde71a5c5ebd274f630f45c72df31ec19c29c162076fa44949fb64388ae68c8be7aa38665eebef470624e58c76fff0713b736e495edcd77beb14
-  data.tar.gz: f7ee150be2b37199b8c21092f0c8760f642cb6dbfd680aaaf2e256f9f1135be7577b81ad3b80959bdbd59c72466bea52a6e6271ef9b2c00b3bca254650429681
+  metadata.gz: 4630f21df2b5684d1ccc37d3d6f60781e9ef43c9d373552122bb38e8ec72c453d8c80ed2453d495a5e0360b2afdf88151c17873d0ef46df737e1b447f0a37ffb
+  data.tar.gz: 57e84b1d31504a0f04e613c33a503ce32ecff246ccbb1e3685fa31dccf687af07f6afb3b2bdcee57935a421de95a14b36f897ad6a3a791e5f873fdf7fb5af6f4

data/app/controllers/apidae/api_controller.rb

@@ -0,0 +1,25 @@
+require_dependency "apidae/application_controller"
+
+module Apidae
+  class ApiController < ApplicationController
+
+    def selection
+      @objects = []
+      unless params[:selection_id].blank?
+        objects_ids = Apidae::Selection.find(params[:selection_id]).api_results[:results]
+        @objects = Apidae::Object.where(id: objects_ids)
+      end
+    end
+
+    def object
+    end
+
+    def agenda
+      @objects = []
+      unless params[:selection_id].blank?
+        objects_ids = Apidae::Selection.find(params[:selection_id]).api_agenda(params[:from], params[:to])[:results]
+        @objects = Apidae::Object.where(id: objects_ids)
+      end
+    end
+  end
+end

data/app/helpers/apidae/api_helper.rb

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

data/app/models/apidae/object.rb

@@ -7,7 +7,7 @@ module Apidae
     has_many :selections, class_name: 'Apidae::Selection', source: :apidae_selection, through: :apidae_selection_objects
 
     store_accessor :pictures_data, :pictures
-    store_accessor :type_data, :categories, :themes, :capacite, :classement, :labels
+    store_accessor :type_data, :categories, :themes, :capacite, :classement, :classementPrefectoral, :labels
     store_accessor :entity_data, :entity_id, :entity_name
     store_accessor :contact, :telephone, :email, :website
     store_accessor :address, :address_fields

data/app/models/apidae/selection.rb

@@ -3,11 +3,12 @@ module Apidae
     has_many :apidae_selection_objects, class_name: 'Apidae::SelectionObject', foreign_key: :apidae_selection_id
     has_many :objects, class_name: 'Apidae::Object', source: :apidae_object, through: :apidae_selection_objects
 
+    AGENDA_ENDPOINT = 'agenda/detaille/list-identifiants'
+    SELECTION_ENDPOINT = 'recherche/list-identifiants'
     MAX_COUNT = 100
     MAX_LOOPS = 10
 
     validates_presence_of :apidae_id, :reference
-
     before_validation :generate_reference, on: :create
 
     def self.add_or_update(selection_data)
@@ -33,73 +34,103 @@ module Apidae
       end
     end
 
-    def agenda(from, to)
-      agenda_entries = Rails.cache.read("#{apidae_id}_#{from}_#{to}")
-      if agenda_entries.nil?
-        query_result = {}
-        config = {
-            url: "#{Rails.application.config.apidae_api_url}/agenda/detaille/list-identifiants",
-            apiKey: Rails.application.config.apidae_api_key,
-            projetId: Rails.application.config.apidae_project_id,
-            first: 0,
-            count: MAX_COUNT,
-            selectionIds: [apidae_id],
-            dateDebut: from,
-            dateFin: to
-        }
+    def results(where_clause, offset, size)
+      objects.includes(:town).limit(size).offset(offset).where(where_clause)
+    end
 
-        loops = 0
+    def total(where_clause)
+      objects.where(where_clause).count
+    end
 
-        response = JSON.parse get_response(config), symbolize_names: false
-        total = response['numFound']
+    def api_results(opts = {})
+      query_args = build_args(SELECTION_ENDPOINT, opts.merge({selection_ids: [apidae_id]}))
+      query_api(query_args, true)
+    end
+
+    def api_agenda(from, to)
+      query_args = build_args(AGENDA_ENDPOINT, {selection_ids: [apidae_id], from: from, to: to})
+      query_api(query_args, true)
+    end
+
+    private
+
+    def query_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['objetTouristiqueIds'] || {}
 
-        while total > query_result[:results].values.flatten.length && loops < MAX_LOOPS
+        while total > results_count(query_result) && loops < MAX_LOOPS
           loops += 1
-          config[:first] += MAX_COUNT
-          response = JSON.parse get_response(config), symbolize_names: false
+          query_args[:first] += MAX_COUNT
+          response = JSON.parse get_response(query_args), symbolize_names: false
           merge_results(response, query_result)
         end
         query_result[:count] = total
-        agenda_entries = query_result
-        Rails.cache.write("#{apidae_id}_#{from}_#{to}", query_result)
+      else
+        response = JSON.parse get_response(query_args), symbolize_names: false
+        query_result[:results] = response['objetTouristiqueIds'] || {}
+        query_result[:count] = response['numFound']
       end
-      agenda_entries
-    end
-
-    def results(where_clause, offset, size)
-      objects.includes(:town).limit(size).offset(offset).where(where_clause)
+      query_result
     end
 
-    def total(where_clause)
-      objects.where(where_clause).count
+    def results_count(result)
+      if result[:results] && result[:results].is_a?(Hash)
+        result[:results].values.flatten.length
+      else
+        result[:results].blank? ? 0 : result[:results].length
+      end
     end
 
-    private
-
-    def get_response(config)
+    def get_response(args)
       response = ''
-      query = JSON.generate config.except(:url)
-      logger.info "Agenda query : #{config[:url]}?query=#{query}"
-      open("#{config[:url]}?query=#{CGI.escape query}") { |f|
+      query = JSON.generate args.except(:url)
+      logger.info "Apidae API query : #{args[:url]}?query=#{query}"
+      open("#{args[:url]}?query=#{CGI.escape query}") { |f|
         f.each_line {|line| response += line if line}
       }
       response
     end
 
-    def merge_results(response, query_results)
-      unless response['objetTouristiqueIds'].nil? || response['objetTouristiqueIds'].empty?
-        first_day = response['objetTouristiqueIds'].keys.first
-        if query_results[:results].has_key?(first_day)
-          query_results[:results][first_day] += response['objetTouristiqueIds'][first_day]
+    def merge_results(response, result)
+      ids = response['objetTouristiqueIds']
+      unless ids.nil? || ids.empty?
+        if result[:results] && result[:results].is_a?(Hash)
+          first_day = ids.keys.first
+          if result[:results].has_key?(first_day)
+            result[:results][first_day] += ids[first_day]
+          else
+            result[:results][first_day] = ids[first_day]
+          end
+          result[:results].merge!(ids.except(first_day))
         else
-          query_results[:results][first_day] = response['objetTouristiqueIds'][first_day]
+          result[:results] += ids
         end
-        query_results[:results].merge!(response['objetTouristiqueIds'].except(first_day))
       end
     end
 
+    def build_args(endpoint, opts = {})
+      {
+          url: "#{Rails.application.config.apidae_api_url}/#{endpoint}",
+          apiKey: Rails.application.config.apidae_api_key,
+          projetId: Rails.application.config.apidae_project_id,
+          first: opts[:first] || 0,
+          count: opts[:count] || MAX_COUNT,
+          selectionIds: opts[:selection_ids],
+          dateDebut: opts[:from],
+          dateFin: opts[:to],
+          center: opts[:lat] && opts[:lng] ? {type: 'Point', coordinates: [opts[:lng], opts[:lat]]} : nil,
+          radius: opts[:radius] ? opts[:radius].to_i : nil,
+          responseFields: opts[:fields] || ['id']
+      }
+    end
+
     def generate_reference
       self.reference ||= (self.label.parameterize || self.apidae_id)
     end

data/lib/apidae/version.rb

@@ -1,3 +1,3 @@
 module Apidae
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end

data/test/controllers/apidae/api_controller_test.rb

@@ -0,0 +1,23 @@
+require 'test_helper'
+
+module Apidae
+  class ApiControllerTest < ActionDispatch::IntegrationTest
+    include Engine.routes.url_helpers
+
+    test "should get selection" do
+      get api_selection_url
+      assert_response :success
+    end
+
+    test "should get object" do
+      get api_object_url
+      assert_response :success
+    end
+
+    test "should get agenda" do
+      get api_agenda_url
+      assert_response :success
+    end
+
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apidae
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-23 00:00:00.000000000 Z
+date: 2018-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -79,11 +79,13 @@ files:
 - app/assets/images/apidae/logo-apidae-grey.svg
 - app/assets/javascripts/apidae/application.js
 - app/assets/stylesheets/apidae/application.css
+- app/controllers/apidae/api_controller.rb
 - app/controllers/apidae/application_controller.rb
 - app/controllers/apidae/dashboard_controller.rb
 - app/controllers/apidae/import_controller.rb
 - app/controllers/apidae/objects_controller.rb
 - app/controllers/apidae/selections_controller.rb
+- app/helpers/apidae/api_helper.rb
 - app/helpers/apidae/application_helper.rb
 - app/helpers/apidae/dashboard_helper.rb
 - app/helpers/apidae/import_helper.rb
@@ -132,6 +134,7 @@ files:
 - lib/apidae/version.rb
 - lib/tasks/apidae_tasks.rake
 - test/apidae_test.rb
+- test/controllers/apidae/api_controller_test.rb
 - test/controllers/apidae/dashboard_controller_test.rb
 - test/controllers/apidae/import_controller_test.rb
 - test/controllers/apidae/objects_controller_test.rb
@@ -275,6 +278,7 @@ test_files:
 - test/test_helper.rb
 - test/apidae_test.rb
 - test/controllers/apidae/selections_controller_test.rb
+- test/controllers/apidae/api_controller_test.rb
 - test/controllers/apidae/objects_controller_test.rb
 - test/controllers/apidae/dashboard_controller_test.rb
 - test/controllers/apidae/import_controller_test.rb