apidae 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1f478ace8d9c21c1828378878eab8381ed9ee22
-  data.tar.gz: d2b1c7a2eeff050037b44338aac920f9991f2ee9
+  metadata.gz: a89823d97fa0f65fa985b4c5868cdcad0ddc4c66
+  data.tar.gz: 3ea06983a6b4a0e36b5607dce58f5908048153f7
 SHA512:
-  metadata.gz: 6edb0d4ee75349d2e913d8579d569ea1fe9b4c7b9fd76bcc1a52e47ab677a7c742160eef63b1249f7302590f14779df1428105397a580ce9383f66a49b0618f3
-  data.tar.gz: bc82634c379de6056875538067bf0273f8ddf6bef4ec4b236913603fc35073e76da740e3ff38014d41ebcd3f2702574b33663caf8caebda32be3f041c28f025e
+  metadata.gz: 4682b5926be504889286583e6a316eb3a7940cccd9aaf91408944a165f33dc1134a1b84548e91e57a7825233784b9e4be4fa30792c66b086001ce64087f09bc3
+  data.tar.gz: 3812b82094ed52d53eb62a3ba6110fe7a97ef7a680434fd2109e2e072681e6cd090b5b024188e6436b9741da4b1c8806922dd9d5d08b429bb1a77ac36728a143

data/app/models/apidae/file_import.rb

@@ -8,6 +8,7 @@ module Apidae
     STATUS_CANCELLED = 'cancelled'
 
     TOWNS_FILE = 'communes.json'
+    INTERNAL_FILE = 'criteres_internes.json'
     REFERENCES_FILE = 'elements_reference.json'
     MODIFIED_DIR = 'objets_modifies'
     DELETED_FILE = 'objets_supprimes.json'
@@ -17,6 +18,7 @@ module Apidae
       Zip::File.open(zip_file) do |zfile|
         result = {created: 0, updated: 0, deleted: 0, selections: []}
         Reference.import(zfile.read(REFERENCES_FILE))
+        Reference.import_internal(zfile.read(INTERNAL_FILE))
         logger.info "Completed #{Reference.count} references update"
         Town.import(zfile.read(TOWNS_FILE))
         logger.info "Completed #{Town.count} towns update"

data/app/models/apidae/object.rb

@@ -183,8 +183,7 @@ module Apidae
             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])
+            chains: lists_ids(data_hash[:chaines]) + nodes_ids(data_hash[:chaineEtLabel])
         }
       end
     end
@@ -195,7 +194,7 @@ module Apidae
             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])
+            activities: lists_ids(data_hash[:activites]) + lists_ids(type_data_hash[:activites])
         }
       end
     end

data/app/models/apidae/reference.rb

@@ -1,11 +1,13 @@
 module Apidae
   class Reference < ApplicationRecord
+
+    INTERNAL = 'internal'
+
     def self.import(refs_json)
       refs_hashes = JSON.parse(refs_json, symbolize_names: true)
-      if refs_hashes.length != count
+      if refs_hashes.length != where("apidae_type != ?", INTERNAL).count
         refs_hashes.each do |ref_data|
-          ref = Reference.find_or_initialize_by(apidae_id: ref_data[:id])
-          ref.apidae_type = ref_data[:elementReferenceType]
+          ref = Reference.find_or_initialize_by(apidae_id: ref_data[:id], apidae_type: ref_data[:elementReferenceType])
           ref.label_data = ref_data.slice(:libelleFr, :libelleEn)
           ref.save!
         end
@@ -17,6 +19,17 @@ module Apidae
       import(refs_json)
     end
 
+    def self.import_internal(internal_json)
+      refs_hashes = JSON.parse(internal_json, symbolize_names: true)
+      if refs_hashes.length != where(apidae_type: INTERNAL).count
+        refs_hashes.each do |ref_data|
+          ref = Reference.find_or_initialize_by(apidae_id: ref_data[:id], apidae_type: INTERNAL)
+          ref.label_data = {libelleFr: ref_data[:libelle]}
+          ref.save!
+        end
+      end
+    end
+
     def label(language)
       label_data["libelle#{language.to_s.upcase_first}"]
     end

data/db/migrate/20180319143954_remove_apidae_id_unicity.rb

@@ -0,0 +1,6 @@
+class RemoveApidaeIdUnicity < ActiveRecord::Migration[5.1]
+  def change
+    remove_index :apidae_references, :apidae_id
+    add_index :apidae_references, :apidae_id
+  end
+end

data/lib/apidae/version.rb

@@ -1,3 +1,3 @@
 module Apidae
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apidae
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
@@ -136,6 +136,7 @@ files:
 - 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
+- db/migrate/20180319143954_remove_apidae_id_unicity.rb
 - lib/apidae.rb
 - lib/apidae/engine.rb
 - lib/apidae/version.rb