apidae 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca327da8846362b8b4d42d7b790a1bbac50229d6
-  data.tar.gz: b4135ce2daf5695c6343a2cf9b06e60767d2e539
+  metadata.gz: 0d660259bcadee0fabcc6f39060167d89080073e
+  data.tar.gz: 00915aa948657fac17f4f023ec677e72b7c067c9
 SHA512:
-  metadata.gz: 17a9555a666ade062b8f6212b82d6c1e3c09fb1cb1861865deb64a9db5eeb12a9023179fdf36bc53b11516b11fc284c9a59feb022debcdaeb91d69edb0fc1ea6
-  data.tar.gz: 168c8bfa214b379ded608250ea9bc676c19cc1e3749ec63851bc2b8f08e084e4be179089fa4c9eb80d3ef260a03ea39f67bf2de3d4207a1e602e76afe1a08295
+  metadata.gz: 5b26d1d9e7012f9f1e6c04227b1be4c8fd15b7170562b628149615f78d238fee03429676cce28d1c9a75c2917e935d951f5fcca0a806ae43b7463b5f67481931
+  data.tar.gz: a80d476fe8b5be391448e3f4c033f694f51feb8bfd290bc9dec67c077d333ea2f45ef8042603f38388c204561959055358ed99a3bfc6bfe16a1ef2985ff17760

data/app/models/apidae/file_import.rb

@@ -7,6 +7,8 @@ module Apidae
     STATUS_COMPLETE = 'complete'
     STATUS_CANCELLED = 'cancelled'
 
+    TOWNS_FILE = 'communes.json'
+    REFERENCES_FILE = 'elements_reference.json'
     MODIFIED_DIR = 'objets_modifies'
     DELETED_FILE = 'objets_supprimes.json'
     SELECTIONS_FILE = 'selections.json'
@@ -14,8 +16,13 @@ module Apidae
     def self.import(zip_file)
       Zip::File.open(zip_file) do |zfile|
         result = {created: 0, updated: 0, deleted: 0, selections: []}
+        Reference.import(zfile.read(REFERENCES_FILE))
+        logger.info "Completed #{Reference.count} references update"
+        Town.import(zfile.read(TOWNS_FILE))
+        logger.info "Completed #{Town.count} towns update"
         zfile.each do |file|
           if file.file? && file.name.end_with?('.json')
+            logger.info "Processing file : #{file.name}"
             if file.name.include?(MODIFIED_DIR)
               add_or_update_objects(zfile.read(file.name), result)
             elsif file.name.include?(DELETED_FILE)
@@ -25,7 +32,7 @@ module Apidae
             end
           end
         end
-        puts "Import results : #{result}"
+        logger.info "Import results : #{result}"
         result
       end
     end
@@ -35,7 +42,7 @@ module Apidae
       import_updates(File.join(dir, MODIFIED_DIR), result)
       import_deletions(File.join(dir, DELETED_FILE), result)
       import_selections(File.join(dir,SELECTIONS_FILE), result)
-      puts "Import results : #{result}"
+      logger.info "Import results : #{result}"
       result
     end
 
@@ -80,7 +87,7 @@ module Apidae
           obj.destroy!
           result[:deleted] += 1
         else
-          puts "skipping object deletion : #{id}"
+          logger.info "skipping object deletion : #{id}"
         end
       end
     end
@@ -116,7 +123,7 @@ module Apidae
                                           description: pic[:description], credits: pic[:credits])
               attached.save
             rescue OpenURI::HTTPError => e
-              puts "Could not retrieve attached picture for object #{title} - Error is #{e.message}"
+              logger.error "Could not retrieve attached picture for object #{title} - Error is #{e.message}"
             end
           end
         end
@@ -133,6 +140,7 @@ module Apidae
       deleted_ids = Apidae::Selection.all.collect {|sel| sel.apidae_id}.uniq - selections_hashes.collect {|sel| sel[:id]}
       Apidae::Selection.where(apidae_id: deleted_ids).delete_all
       selections_hashes.each do |selection_data|
+        logger.info "Updating selection #{selection_data[:id]}"
         Apidae::Selection.add_or_update(selection_data)
       end
       result[:selections] = Apidae::Selection.all

data/app/models/apidae/object.rb

@@ -7,6 +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 :attachments_data, :attachments
     store_accessor :type_data, :categories, :themes, :capacite, :classement, :classementPrefectoral, :labels
     store_accessor :entity_data, :entity_id, :entity_name
     store_accessor :contact, :telephone, :email, :website
@@ -77,6 +78,7 @@ module Apidae
       apidae_obj.reservation = parse_reservation(object_data[:reservation])
       apidae_obj.type_data = object_data[type_fields[:node]]
       apidae_obj.pictures_data = pictures_urls(object_data[:illustrations])
+      apidae_obj.attachments_data = attachments_urls(object_data[:illustrations])
       apidae_obj.entity_data = entity_fields(object_data[:informations])
       apidae_obj.service_data = object_data[:prestations]
       apidae_obj.save!
@@ -97,6 +99,19 @@ module Apidae
       {pictures: pics_data}
     end
 
+    def self.attachments_urls(attachments_array)
+      atts_data = []
+      unless attachments_array.blank?
+        attachments_array.select { |att| att.is_a?(Hash) && !att[:traductionFichiers].blank? }.each do |att|
+          atts_data << {
+              name: node_value(att, :nom),
+              url: att[:traductionFichiers][0][:url]
+          }
+        end
+      end
+      {attachments: atts_data}
+    end
+
     def self.contact(information_hash)
       contact_details = {}
       contact_entries = information_hash[:moyensCommunication].nil? ? [] : information_hash[:moyensCommunication]

data/app/models/apidae/reference.rb

@@ -0,0 +1,24 @@
+module Apidae
+  class Reference < ApplicationRecord
+    def self.import(refs_json)
+      refs_hashes = JSON.parse(refs_json, symbolize_names: true)
+      if refs_hashes.length != 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.label_data = ref_data.slice(:libelleFr, :libelleEn)
+          ref.save!
+        end
+      end
+    end
+
+    def self.import_file(json_file)
+      refs_json = File.read(json_file)
+      import(refs_json)
+    end
+
+    def label(language)
+      label_data["libelle#{language.to_s.upcase_first}"]
+    end
+  end
+end

data/app/models/apidae/selection.rb

@@ -28,10 +28,7 @@ module Apidae
         Apidae::SelectionObject.create(apidae_selection_id: apidae_sel.id, apidae_object_id: obj.id)
       end
 
-      removed.each do |o|
-        obj = Apidae::Object.find_by_apidae_id(o)
-        Apidae::SelectionObject.destroy(apidae_selection_id: apidae_sel.id, apidae_object_id: obj.id)
-      end
+      Apidae::SelectionObject.where(apidae_selection_id: apidae_sel.id, apidae_object_id: removed).delete_all
     end
 
     def results(where_clause, offset, size)

data/app/models/apidae/town.rb

@@ -1,14 +1,23 @@
 module Apidae
   class Town < ActiveRecord::Base
-    def self.import(json_file)
-      result = true
-      towns_json = File.read(json_file)
+    def self.import(towns_json)
       towns_hashes = JSON.parse(towns_json, symbolize_names: true)
-      towns_hashes.each do |town_data|
-        Town.create!(name: town_data[:nom], postal_code: town_data[:codePostal], insee_code: town_data[:code],
-                     country: 'fr', apidae_id: town_data[:id])
+      if towns_hashes.length != count
+        countries = Hash[Reference.where(apidae_type: "Pays").map {|ref| [ref.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]
+          town.postal_code = town_data[:codePostal]
+          town.insee_code = town_data[:code]
+          town.country = countries[town_data[:pays][:id]]
+          town.save!
+        end
       end
-      result
+    end
+
+    def self.import_file(json_file)
+      towns_json = File.read(json_file)
+      import(towns_json)
     end
 
     def label

data/db/migrate/20180307164936_add_attachments_data_to_apidae_objects.rb

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

data/db/migrate/20180307170349_create_apidae_references.rb

@@ -0,0 +1,12 @@
+class CreateApidaeReferences < ActiveRecord::Migration[5.1]
+  def change
+    create_table :apidae_references do |t|
+      t.integer :apidae_id
+      t.string :apidae_type
+      t.jsonb :label_data
+      t.index :apidae_id, unique: true
+
+      t.timestamps
+    end
+  end
+end

data/lib/apidae/version.rb

@@ -1,3 +1,3 @@
 module Apidae
-  VERSION = "0.2.8"
+  VERSION = "0.2.9"
 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: 20180222105302) do
+ActiveRecord::Schema.define(version: 20180307170349) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -71,6 +71,7 @@ ActiveRecord::Schema.define(version: 20180222105302) do
     t.jsonb "entity_data"
     t.jsonb "service_data"
     t.jsonb "rates_data"
+    t.jsonb "attachments_data"
   end
 
   create_table "apidae_objects_selections", id: :serial, force: :cascade do |t|
@@ -78,6 +79,15 @@ ActiveRecord::Schema.define(version: 20180222105302) do
     t.integer "selection_id"
   end
 
+  create_table "apidae_references", force: :cascade do |t|
+    t.integer "apidae_id"
+    t.string "apidae_type"
+    t.jsonb "label_data"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["apidae_id"], name: "index_apidae_references_on_apidae_id", unique: true
+  end
+
   create_table "apidae_selection_objects", force: :cascade do |t|
     t.integer "apidae_selection_id"
     t.integer "apidae_object_id"

data/test/dummy/log/development.log

@@ -307,3 +307,28 @@ Migrating to RenameOpeningsToOpeningsData (20180222105302)
    (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
+   (6.6ms)  SELECT pg_try_advisory_lock(6140174353533887940)
+   (2.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
+Migrating to AddAttachmentsDataToApidaeObjects (20180307164936)
+   (0.2ms)  BEGIN
+   (32.7ms)  ALTER TABLE "apidae_objects" ADD "attachments_data" jsonb
+  SQL (0.4ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1) RETURNING "version"  [["version", "20180307164936"]]
+   (0.6ms)  COMMIT
+  ActiveRecord::InternalMetadata Load (1.0ms)  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
+   (0.2ms)  SELECT pg_try_advisory_lock(6140174353533887940)
+   (0.5ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
+Migrating to CreateApidaeReferences (20180307170349)
+   (0.1ms)  BEGIN
+   (17.5ms)  CREATE TABLE "apidae_references" ("id" bigserial primary key, "apidae_id" integer, "apidae_type" character varying, "label_data" jsonb, "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL)
+   (0.8ms)  CREATE UNIQUE INDEX  "index_apidae_references_on_apidae_id" ON "apidae_references"  ("apidae_id")
+  SQL (0.3ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1) RETURNING "version"  [["version", "20180307170349"]]
+   (1.2ms)  COMMIT
+  ActiveRecord::InternalMetadata Load (0.4ms)  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

data/test/fixtures/apidae/references.yml

@@ -0,0 +1,11 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+one:
+  apidae_id: 1
+  apidae_type: MyString
+  label_data: 
+
+two:
+  apidae_id: 1
+  apidae_type: MyString
+  label_data: 

data/test/models/apidae/reference_test.rb

@@ -0,0 +1,9 @@
+require 'test_helper'
+
+module Apidae
+  class ReferenceTest < ActiveSupport::TestCase
+    # test "the truth" do
+    #   assert true
+    # end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apidae
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-06 00:00:00.000000000 Z
+date: 2018-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -96,6 +96,7 @@ files:
 - app/models/apidae/export.rb
 - app/models/apidae/file_import.rb
 - app/models/apidae/object.rb
+- app/models/apidae/reference.rb
 - app/models/apidae/selection.rb
 - app/models/apidae/selection_object.rb
 - app/models/apidae/town.rb
@@ -129,6 +130,8 @@ files:
 - db/migrate/20180218231319_add_service_data_to_apidae_objects.rb
 - db/migrate/20180222104915_add_rates_data_to_apidae_objects.rb
 - 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
 - lib/apidae.rb
 - lib/apidae/engine.rb
 - lib/apidae/version.rb
@@ -186,6 +189,7 @@ files:
 - test/fixtures/apidae/attached_files.yml
 - test/fixtures/apidae/exports.yml
 - test/fixtures/apidae/objects.yml
+- test/fixtures/apidae/references.yml
 - test/fixtures/apidae/selection_objects.yml
 - test/fixtures/apidae/selections.yml
 - test/fixtures/apidae/towns.yml
@@ -194,6 +198,7 @@ files:
 - test/models/apidae/export_test.rb
 - test/models/apidae/file_import_test.rb
 - test/models/apidae/object_test.rb
+- test/models/apidae/reference_test.rb
 - test/models/apidae/selection_object_test.rb
 - test/models/apidae/selection_test.rb
 - test/models/apidae/town_test.rb
@@ -267,10 +272,12 @@ test_files:
 - test/models/apidae/selection_test.rb
 - test/models/apidae/file_import_test.rb
 - test/models/apidae/export_test.rb
+- test/models/apidae/reference_test.rb
 - test/models/apidae/attached_file_test.rb
 - test/models/apidae/town_test.rb
 - test/fixtures/apidae/selection_objects.yml
 - test/fixtures/apidae/towns.yml
+- test/fixtures/apidae/references.yml
 - test/fixtures/apidae/objects.yml
 - test/fixtures/apidae/selections.yml
 - test/fixtures/apidae/attached_files.yml