apidae 0.2.9 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d660259bcadee0fabcc6f39060167d89080073e
-  data.tar.gz: 00915aa948657fac17f4f023ec677e72b7c067c9
+  metadata.gz: c31e50b18e7ff1d211b61703728b267bf388649c
+  data.tar.gz: d33de8c1b3d227c5f133811446645f9715427347
 SHA512:
-  metadata.gz: 5b26d1d9e7012f9f1e6c04227b1be4c8fd15b7170562b628149615f78d238fee03429676cce28d1c9a75c2917e935d951f5fcca0a806ae43b7463b5f67481931
-  data.tar.gz: a80d476fe8b5be391448e3f4c033f694f51feb8bfd290bc9dec67c077d333ea2f45ef8042603f38388c204561959055358ed99a3bfc6bfe16a1ef2985ff17760
+  metadata.gz: 16f8ae25874db45da9f5739846db146b74d27f05f6ff9346a0deee3f54fed5329ad6a7597c01ec59c7b128b17f7d902ec1d71aa227308048872a05c2e81b7740
+  data.tar.gz: cd4e15709a33f4de68a004c1a3baf6ba040efe676481e182c4b2dc3709ad9865c95b79c9acfe69595e2b89b72c8fe3e1541d7a083c236f66042e0956b04fae75

data/app/models/apidae/file_import.rb

@@ -32,6 +32,7 @@ module Apidae
             end
           end
         end
+        create(result.except(:selections).merge({remote_file: zip_file, status: STATUS_COMPLETE}))
         logger.info "Import results : #{result}"
         result
       end

data/app/models/apidae/object.rb

@@ -8,13 +8,14 @@ module Apidae
 
     store_accessor :pictures_data, :pictures
     store_accessor :attachments_data, :attachments
-    store_accessor :type_data, :categories, :themes, :capacite, :classement, :classementPrefectoral, :labels
+    store_accessor :type_data, :categories, :themes, :capacity, :classification, :labels, :chains
     store_accessor :entity_data, :entity_id, :entity_name
     store_accessor :contact, :telephone, :email, :website
     store_accessor :address, :address_fields
     store_accessor :openings_data, :openings_desc, :openings
     store_accessor :rates_data, :rates_desc, :rates, :payment_methods
-    store_accessor :service_data, :services, :equipements, :labelsTourismeHandicap
+    store_accessor :service_data, :services, :equipments, :comfort, :activities
+    store_accessor :tags_data, :tags
 
     ACT = 'ACTIVITE'
     COS = 'COMMERCE_ET_SERVICE'
@@ -76,11 +77,13 @@ module Apidae
       apidae_obj.openings_data = parse_openings(object_data[:ouverture])
       apidae_obj.rates_data = parse_rates(object_data[:descriptionTarif])
       apidae_obj.reservation = parse_reservation(object_data[:reservation])
-      apidae_obj.type_data = object_data[type_fields[:node]]
+      apidae_obj.type_data = parse_type_data(object_data[type_fields[:node]], object_data[:prestations])
       apidae_obj.pictures_data = pictures_urls(object_data[:illustrations])
-      apidae_obj.attachments_data = attachments_urls(object_data[:illustrations])
+      apidae_obj.attachments_data = attachments_urls(object_data[:multimedias])
       apidae_obj.entity_data = entity_fields(object_data[:informations])
-      apidae_obj.service_data = object_data[:prestations]
+      apidae_obj.service_data = parse_service_data(object_data[:prestations], object_data[type_fields[:node]])
+      apidae_obj.tags_data = parse_tags_data(object_data[:presentation], object_data[:criteresInternes])
+      apidae_obj.meta_data = object_data[:metadonnees]
       apidae_obj.save!
     end
 
@@ -172,6 +175,42 @@ module Apidae
       end
     end
 
+    def self.parse_type_data(data_hash, prestations_hash)
+      if data_hash
+        {
+            categories: lists_ids(data_hash[:categories]),
+            themes: lists_ids(data_hash[:themes]),
+            capacity: data_hash[:capacite],
+            classification: nodes_ids(data_hash[:classement], data_hash[:classementPrefectoral]),
+            labels: lists_ids(data_hash[:labels], prestations_hash[:labelsTourismeHandicap]),
+            chains: lists_ids(data_hash[:chaines]) + nodes_ids(data_hash[:chaineEtLabel]),
+            activities: lists_ids(data_hash[:activites])
+        }
+      end
+    end
+
+    def self.parse_service_data(data_hash, type_data_hash)
+      if data_hash
+        {
+            services: lists_ids(data_hash[:services]),
+            equipments: lists_ids(data_hash[:equipements]),
+            comfort: lists_ids(data_hash[:conforts]),
+            activities: lists_ids(data_hash[:activites]) + lists_ids(data_hash[:activites])
+        }
+      end
+    end
+
+    def self.parse_tags_data(pres_data_hash, crit_data_hash)
+      tags = []
+      if pres_data_hash
+        tags += lists_ids(pres_data_hash[:typologiesPromoSitra])
+      end
+      unless crit_data_hash.blank?
+        tags += crit_data_hash.map {|c| c[:id]}
+      end
+      {tags: tags}
+    end
+
     def self.parse_reservation(reservation_hash)
       if reservation_hash
         if reservation_hash[:complement]
@@ -218,11 +257,15 @@ module Apidae
     end
 
     def self.node_id(node, key)
-      if node && node[key]
-        node[key][:id]
-      else
-        ''
-      end
+      node[key][:id] if node && node[key]
+    end
+
+    def self.lists_ids(*lists)
+      lists.blank? ? [] : lists.map {|l| l.blank? ? [] : l.map {|elt| elt[:id]}}.flatten.uniq
+    end
+
+    def self.nodes_ids(*nodes)
+      nodes.blank? ? [] : nodes.select {|n| !n.blank?}.map {|n| n[:id]}
     end
   end
 end

data/app/models/apidae/selection.rb

@@ -40,13 +40,25 @@ module Apidae
     end
 
     def api_results(opts = {})
-      query_args = build_args(SELECTION_ENDPOINT, opts.merge({selection_ids: [apidae_id]}))
-      query_api(query_args, true)
+      key = cache_key(:results)
+      res = $apidae_cache.read(key)
+      unless res
+        query_args = build_args(SELECTION_ENDPOINT, opts.merge({selection_ids: [apidae_id]}))
+        res = query_api(query_args, true)
+        $apidae_cache.write(key, res)
+      end
+      res
     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)
+      key = cache_key(:agenda, from, to)
+      res = $apidae_cache.read(key)
+      unless res
+        query_args = build_args(AGENDA_ENDPOINT, {selection_ids: [apidae_id], from: from, to: to})
+        res = query_api(query_args, true)
+        $apidae_cache.write(key, res)
+      end
+      res
     end
 
     private
@@ -131,5 +143,9 @@ module Apidae
     def generate_reference
       self.reference ||= (self.label.parameterize || self.apidae_id)
     end
+
+    def cache_key(*args)
+      "#{apidae_id}_#{args.map {|a| a.to_s.parameterize}.join('_')}"
+    end
   end
 end

data/app/models/apidae/town.rb

@@ -3,7 +3,7 @@ module Apidae
     def self.import(towns_json)
       towns_hashes = JSON.parse(towns_json, symbolize_names: true)
       if towns_hashes.length != count
-        countries = Hash[Reference.where(apidae_type: "Pays").map {|ref| [ref.id, ref.label(:fr)]}]
+        countries = Hash[Reference.where(apidae_type: "Pays").map {|ref| [ref.apidae_id, ref.label(:fr)]}]
         towns_hashes.each do |town_data|
           town = Town.find_or_initialize_by(apidae_id: town_data[:id])
           town.name = town_data[:nom]

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

@@ -10,7 +10,9 @@
           <thead class="<%= styles[:table_head] %>">
           <tr>
             <th>Date</th>
-            <th>Fichier</th>
+            <th>Créations</th>
+            <th>Mises à jour</th>
+            <th>Suppressions</th>
             <th>Statut</th>
           </tr>
           </thead>
@@ -18,8 +20,10 @@
           <% @last_imports.each do |import| %>
               <tr>
                 <td><%= import.updated_at.strftime('Le %d/%m/%Y à %H:%M') if import.updated_at %></td>
-                <td><%= import.remote_file %></td>
-                <td><%= import.status %></td>
+                <td><%= import.created %></td>
+                <td><%= import.updated %></td>
+                <td><%= import.deleted %></td>
+                <td><%= t "apidae.file_import.status.#{import.status}" %></td>
               </tr>
           <% end %>
           <% if @last_imports.empty? %>

data/config/initializers/cache.rb

@@ -0,0 +1 @@
+$apidae_cache = ActiveSupport::Cache::FileStore.new('cache/apidae', expires_in: 24.hours)

data/config/locales/apidae.fr.yml

@@ -0,0 +1,7 @@
+fr:
+  apidae:
+    file_import:
+      status:
+        pending: En cours
+        complete: Terminé
+        cancelled: Annulé

data/db/migrate/20180314093512_add_tags_data_to_apidae_objects.rb

@@ -0,0 +1,5 @@
+class AddTagsDataToApidaeObjects < ActiveRecord::Migration[5.1]
+  def change
+    add_column :apidae_objects, :tags_data, :jsonb
+  end
+end

data/db/migrate/20180314132631_add_meta_data_to_apidae_objects.rb

@@ -0,0 +1,5 @@
+class AddMetaDataToApidaeObjects < ActiveRecord::Migration[5.1]
+  def change
+    add_column :apidae_objects, :meta_data, :jsonb
+  end
+end

data/lib/apidae/version.rb

@@ -1,3 +1,3 @@
 module Apidae
-  VERSION = "0.2.9"
+  VERSION = "0.3.0"
 end

data/test/dummy/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20180307170349) do
+ActiveRecord::Schema.define(version: 20180314093512) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -72,6 +72,7 @@ ActiveRecord::Schema.define(version: 20180307170349) do
     t.jsonb "service_data"
     t.jsonb "rates_data"
     t.jsonb "attachments_data"
+    t.jsonb "tags_data"
   end
 
   create_table "apidae_objects_selections", id: :serial, force: :cascade do |t|

data/test/dummy/log/development.log

@@ -332,3 +332,15 @@ Migrating to CreateApidaeReferences (20180307170349)
    (0.1ms)  COMMIT
    (0.2ms)  SELECT pg_advisory_unlock(6140174353533887940)
    (0.2ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
+   (0.2ms)  SELECT pg_try_advisory_lock(6140174353533887940)
+   (2.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
+Migrating to AddTagsDataToApidaeObjects (20180314093512)
+   (0.2ms)  BEGIN
+   (2.6ms)  ALTER TABLE "apidae_objects" ADD "tags_data" jsonb
+  SQL (0.3ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1) RETURNING "version"  [["version", "20180314093512"]]
+   (1.1ms)  COMMIT
+  ActiveRecord::InternalMetadata Load (1.3ms)  SELECT  "ar_internal_metadata".* FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = $1 LIMIT $2  [["key", "environment"], ["LIMIT", 1]]
+   (0.1ms)  BEGIN
+   (0.1ms)  COMMIT
+   (0.2ms)  SELECT pg_advisory_unlock(6140174353533887940)
+   (0.2ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apidae
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.3.0
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-08 00:00:00.000000000 Z
+date: 2018-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -113,6 +113,8 @@ files:
 - app/views/apidae/selections/new.html.erb
 - app/views/apidae/selections/show.html.erb
 - app/views/layouts/apidae/application.html.erb
+- config/initializers/cache.rb
+- config/locales/apidae.fr.yml
 - config/routes.rb
 - db/migrate/20170512212941_create_apidae_selections.rb
 - db/migrate/20170512214641_create_apidae_objects.rb
@@ -132,6 +134,8 @@ files:
 - db/migrate/20180222105302_rename_openings_to_openings_data.rb
 - db/migrate/20180307164936_add_attachments_data_to_apidae_objects.rb
 - db/migrate/20180307170349_create_apidae_references.rb
+- db/migrate/20180314093512_add_tags_data_to_apidae_objects.rb
+- db/migrate/20180314132631_add_meta_data_to_apidae_objects.rb
 - lib/apidae.rb
 - lib/apidae/engine.rb
 - lib/apidae/version.rb