apidae 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63b211aee25599748e88d29aac6ce145b432b307
-  data.tar.gz: dd74e76a618885e9dbc6306fbe2b96c0db6b15ee
+  metadata.gz: 9dad5ac33a928dbc7b38f6082852b3fbc567f068
+  data.tar.gz: 1314db67b370e78f927c66efa0472fd2b0050b2a
 SHA512:
-  metadata.gz: b877a7868af4dee3939ae6e1faabeb881a30abaf9a0a1e71f3d4b42e50656e9c2cba7a0b471f09806bafb81a131f5cddb32107b75108357ba52cecf04803f68c
-  data.tar.gz: d2c6fb144801f332f1e5b2dac5f100aa6a8cc80c0174146fcc3d2ec799e368655dfc2e2a7b3af2ba511a3a4d6be98d8c54805f673453bd7d5726e093fa73f746
+  metadata.gz: d638d3691a2e55492b57ed553a83b4ed7e610cc8a5b77f936d4009f499a36512c72e47d3e3067810e94fadb25f12f8e639dbb1113d3bbd8cd345d38cbf139b00
+  data.tar.gz: 30131ad110b06adb93f6489ce4fdf2b82992247a8a382df17073d0788be656f448341ad048abbaeab177b2f348b7ab6598643d78d7da142896504de26290a116

data/app/models/apidae/object.rb

@@ -7,6 +7,7 @@ module Apidae
 
     store :pictures_data, accessors: [:pictures], coder: JSON
     store :type_data, accessors: [:categories, :themes], coder: JSON
+    store :entity_data, accessors: [:entity_id, :entity_name]
     store :contact, accessors: [:telephone, :email, :website], coder: JSON
     store :address, accessors: [:address_fields], coder: JSON
     store :openings, accessors: [:description, :opening_periods], coder: JSON
@@ -35,7 +36,7 @@ module Apidae
     WEBSITE = 205
 
 
-    def self.import(json_dir)
+    def self.import_updates(json_dir)
       result = false
       if Dir.exist?(json_dir)
         Dir.foreach(json_dir) do |f|
@@ -45,27 +46,24 @@ module Apidae
             objects_hashes = JSON.parse(objects_json, symbolize_names: true)
             objects_hashes.each do |object_data|
               type_fields = TYPES_DATA[object_data[:type]]
-              existing_obj = Apidae::Object.find_by_apidae_id(object_data[:id])
-              unless existing_obj
-                Apidae::Object.create!(
-                    apidae_id: object_data[:id],
-                    apidae_type: object_data[:type],
-                    apidae_subtype: node_value(object_data[type_fields[:node]], object_data[type_fields[:subtype]]),
-                    title: node_value(object_data, :nom),
-                    short_desc: node_value(object_data[:presentation], :descriptifCourt),
-                    long_desc: node_value(object_data[:presentation], :descriptifDetaille),
-                    contact: contact(object_data[:informations]),
-                    address: address(object_data[:localisation][:adresse]),
-                    town: town(object_data[:localisation][:adresse]),
-                    latitude: latitude(object_data[:localisation]),
-                    longitude: longitude(object_data[:localisation]),
-                    openings: openings(object_data[:ouverture]),
-                    rates: rates(object_data[:descriptionTarif]),
-                    reservation: reservation(object_data[:reservation]),
-                    type_data: object_data[type_fields[:node]],
-                    pictures_data: pictures_urls(object_data[:illustrations])
-                )
-              end
+              apidae_obj = Apidae::Object.first_or_initialize(apidae_id: object_data[:id])
+              apidae_obj.apidae_type = object_data[:type]
+              apidae_obj.apidae_subtype = node_value(object_data[type_fields[:node]], object_data[type_fields[:subtype]])
+              apidae_obj.title = node_value(object_data, :nom)
+              apidae_obj.short_desc = node_value(object_data[:presentation], :descriptifCourt)
+              apidae_obj.long_desc = node_value(object_data[:presentation], :descriptifDetaille)
+              apidae_obj.contact = contact(object_data[:informations])
+              apidae_obj.address = address(object_data[:localisation][:adresse])
+              apidae_obj.town = town(object_data[:localisation][:adresse])
+              apidae_obj.latitude = latitude(object_data[:localisation])
+              apidae_obj.longitude = longitude(object_data[:localisation])
+              apidae_obj.openings = openings(object_data[:ouverture])
+              apidae_obj.rates = rates(object_data[:descriptionTarif])
+              apidae_obj.reservation = reservation(object_data[:reservation])
+              apidae_obj.type_data = object_data[type_fields[:node]]
+              apidae_obj.pictures_data = pictures_urls(object_data[:illustrations])
+              apidae_obj.entity_data = entity_fields(object_data[:informations])
+              apidae_obj.save!
             end
           end
           result = true
@@ -74,6 +72,19 @@ module Apidae
       end
     end
 
+    def self.import_deletions(json_file)
+      result = false
+      if File.exist?(json_file)
+        deleted_json = File.read(json_file)
+        deleted_ids = JSON.parse(deleted_json)
+        deleted_ids.each do |id|
+          Apidae::Object.find_by_apidae_id(id).destroy
+        end
+        result = true
+      end
+      result
+    end
+
     def self.update_fields(json_dir)
       result = false
       if Dir.exist?(json_dir)
@@ -192,6 +203,12 @@ module Apidae
       end
     end
 
+    def self.entity_fields(information_hash)
+      if information_hash && information_hash[:structureGestion]
+        {entity_id: information_hash[:structureGestion][:id]}
+      end
+    end
+
     def contact_text
       entries = []
       JSON.parse(contact).each_pair do |k, v|

data/app/models/apidae/selection.rb

@@ -9,19 +9,23 @@ module Apidae
       selections_json = File.read(json_file)
       selections_hashes = JSON.parse(selections_json, symbolize_names: true)
       selections_hashes.each do |selection_data|
-        existing_sel = Apidae::Selection.find_by_apidae_id(selection_data[:id])
-        unless existing_sel
-          selection = Apidae::Selection.create!(
-              label: selection_data[:nom],
-              apidae_id: selection_data[:id]
-          )
-          if selection_data[:objetsTouristiques]
-            selection_data[:objetsTouristiques].each do |o|
-              apidae_object = Apidae::Object.find_by_apidae_id(o[:id])
-              selection.objects << apidae_object
-              selection.save!
-            end
-          end
+        apidae_sel = Apidae::Selection.first_or_initialize(apidae_id: selection_data[:id])
+        apidae_sel.label = selection_data[:nom]
+        apidae_sel.save!
+
+        current_objs = apidae_sel.objects.collect {|obj| obj.apidae_id}
+        imported_objs = selection_data[:objetsTouristiques] || []
+        added = imported_objs - current_objs
+        removed = current_objs - imported_objs
+
+        added.each do |o|
+          apidae_object = Apidae::Object.find_by_apidae_id(o[:id])
+          apidae_sel.objects << apidae_object
+        end
+
+        removed.each do |o|
+          apidae_object = Apidae::Object.find_by_apidae_id(o[:id])
+          apidae_sel.objects.delete(apidae_object)
         end
       end
     end

data/db/migrate/20170720161134_add_entity_data_to_objects.rb

@@ -0,0 +1,5 @@
+class AddEntityDataToObjects < ActiveRecord::Migration
+  def change
+    add_column :apidae_objects, :entity_data, :text
+  end
+end

data/lib/apidae/version.rb

@@ -1,3 +1,3 @@
 module Apidae
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apidae
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-14 00:00:00.000000000 Z
+date: 2017-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -94,6 +94,7 @@ files:
 - db/migrate/20170513115401_add_pictures_data_to_objects.rb
 - db/migrate/20170513121215_create_apidae_attached_files.rb
 - db/migrate/20170513205932_rename_objects_selections_table.rb
+- db/migrate/20170720161134_add_entity_data_to_objects.rb
 - lib/apidae.rb
 - lib/apidae/engine.rb
 - lib/apidae/version.rb