apidae 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3df5740373cfa229b7411e21a55eae04df831561
-  data.tar.gz: ec010b9d61a4cea4fa552180531f606498e04231
+  metadata.gz: d1f8d7ad0798847cc0b3882958e5f557f1f01219
+  data.tar.gz: 94d139b245115c273ec4c73b385c380bf816da87
 SHA512:
-  metadata.gz: 141dca6a42911917ad0722772df54b4f542364de8fe1502586e6710d9a37b0ade5cddd9abf5994b6768d8597b66fe3627f4fa3068d8d8da7506a4f899fa34737
-  data.tar.gz: 17f51ee8066cd53f353bf91f395191bb78255343f65f7978ff01e56c27b9205d91203687ad0c7b4b234cb05b88116decba24df1eba317b51d52992a9baa9495e
+  metadata.gz: 47dea0045600b59233e78a4616396aee8341de70e9121a335741fbe66d39ffea03e18503564a83c4cd9fe496ebe7058b7ba13690c902f794f46967146d65b16d
+  data.tar.gz: 2350154e37a3fac1d56eed268eb322309842fcf8b349c2e2b28c63af4605aa3cb15c1b629f31a60d740ffe6ec6b9778e9c2a9ae4f03414ae9c86a3023661c719

data/app/models/apidae/apidae_data_parser.rb

@@ -44,7 +44,7 @@ module Apidae
         'LUNDI' => MONDAY,
         'MARDI' => TUESDAY,
         'MERCREDI' => WEDNESDAY,
-        'JEUD' => THURSDAY,
+        'JEUDI' => THURSDAY,
         'VENDREDI' => FRIDAY,
         'SAMEDI' => SATURDAY,
         'DIMANCHE' => SUNDAY

data/app/models/apidae/selection.rb

@@ -69,7 +69,7 @@ module Apidae
       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})
+        query_args = build_args(AGENDA_ENDPOINT, {selection_ids: [apidae_id], from: from, to: to, count: 200})
         res = query_api(query_args, true)
         $apidae_cache.write(key, res)
       end
@@ -142,14 +142,15 @@ module Apidae
 
       if all_results
         loops = 0
+        max_loops = only_ids ? 50 : MAX_LOOPS
         query_args[:first] = 0
-        query_args[:count] = MAX_COUNT
+        query_args[:count] ||= MAX_COUNT
         query_args[:locales] ||= apidae_project && !apidae_project.locales.blank? ? apidae_project.locales : [DEFAULT_LOCALE]
         response = JSON.parse get_response(query_args), symbolize_names: false
         total = response['numFound']
         query_result[:results] = (only_ids ? response['objetTouristiqueIds'] : response['objetsTouristiques']) || {}
 
-        while total > results_count(query_result) && loops < MAX_LOOPS
+        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

data/app/models/apidae/territory.rb

@@ -5,6 +5,7 @@ module Apidae
       territories_hashes.each do |t_data|
         t = Territory.find_or_initialize_by(apidae_id: t_data[:id])
         t.name = t_data.dig(:nom, :libelleFr)
+
         t.save!
       end
     end

data/db/migrate/20210607214647_add_apidae_type_to_apidae_territories.rb

@@ -0,0 +1,5 @@
+class AddApidaeTypeToApidaeTerritories < ActiveRecord::Migration[6.1]
+  def change
+    add_column :apidae_territories, :apidae_type, :integer
+  end
+end

data/lib/apidae/version.rb

@@ -1,3 +1,3 @@
 module Apidae
-  VERSION = "1.3.2"
+  VERSION = "1.3.3"
 end

data/test/dummy/log/development.log

@@ -65,3 +65,5 @@ Migrating to AddLocalesDataToApidaeProjects (20190123214635)
    (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)
+  Apidae::Obj Load (0.8ms)  SELECT  "apidae_objs".* FROM "apidae_objs" ORDER BY "apidae_objs"."id" ASC LIMIT $1  [["LIMIT", 1]]
+   (3.4ms)  SELECT COUNT(*) FROM "apidae_objs"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apidae
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-02 00:00:00.000000000 Z
+date: 2021-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -190,6 +190,7 @@ files:
 - db/migrate/20200522124205_rename_objs_contact_to_contact_data.rb
 - db/migrate/20200528101957_add_is_active_to_apidae_references.rb
 - db/migrate/20201112080847_create_apidae_territories.rb
+- db/migrate/20210607214647_add_apidae_type_to_apidae_territories.rb
 - lib/apidae.rb
 - lib/apidae/engine.rb
 - lib/apidae/version.rb