apidae 1.3.5 → 1.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33abbdbe85b4e375a90d5e003724039d802e8c9e817865ab3607a44fca342897
-  data.tar.gz: d2596dfedc91f0306eeef4360c98066cbcebbc2da3587f1c4041a63843ab1948
+  metadata.gz: fcb280b4660f8ea2bbcf7ee76a7b618c00bcf9e363423fae013ce626681b2108
+  data.tar.gz: 073b41e45931ee6690e4edc8e8c07b3f0ca2ec6479471a2726a6e43033a9e6e2
 SHA512:
-  metadata.gz: 3d14fa60b837515f4b0596d49c38d1aa2f5e5136b4a6d5c918bfdad16a56b35c3cfe2c2edf79e2a54876abadd717190aa6b6dfa90dbc2fd14044739c99c5f79c
-  data.tar.gz: 4cd4ccbfc4132dc763b19b3518117b905b254c34824b501e35a805c75d58ac976a544f7515e9285ed80c0768b1acfca6cd53d9b2242dd971127e45fed5ad02c4
+  metadata.gz: a82f16675847e98e2115f06b4185648625eeb2c3d7ebda7967e32cad3e816073a3bccc0549dc6ae4f7eb59465f559459ce32e7d79453b9878ba60527dc54d84e
+  data.tar.gz: c80d4e36df23e913c9a52062eb657a86582be9c9911c7c53289ec638ea0cd41d4d1506e189fad859e70475f099fb6c373d3b141ec87322a5d8a93f596ca1f86e

data/app/models/apidae/apidae_data_parser.rb

@@ -113,7 +113,7 @@ module Apidae
             short_desc: node_value(data_hash, :descriptifCourt, *locales),
             long_desc: node_value(data_hash, :descriptifDetaille, *locales),
             theme_desc: data_hash[:descriptifsThematises].blank? ? {} : Hash[data_hash[:descriptifsThematises].map {|th| [node_id(th, :theme), node_value(th, :description, *locales)]}],
-            private_desc: private_data.blank? ? {} : Hash[private_data.map {|d| [d[:nomTechnique], node_value(d, :descriptif, *locales)]}]
+            private_desc: private_data.blank? ? {} : Hash[private_data.map {|d| [d[:nomTechnique], (node_value(d, :descriptif, *locales).blank? ? {LOCALE_FR => d[:libelleFr]} : node_value(d, :descriptif, *locales))]}]
         }
       end
     end
@@ -253,6 +253,7 @@ module Apidae
         methods = rates_hash[:modesPaiement].blank? ? [] : rates_hash[:modesPaiement].map {|p| p[:id]}
         {
             rates_desc: desc, rates: values, payment_methods: methods,
+            tax_included: rates_hash[:taxeDeSejourIncluse].blank? ? nil : (rates_hash[:taxeDeSejourIncluse] == 'OUI'),
             rates_desc_mode: rates_hash[:tarifsEnClairGenerationMode] == 'AUTOMATIQUE' ? MODE_AUTO : MODE_MANUAL,
             includes: node_value(rates_hash, :leTarifComprend, *locales),
             excludes: node_value(rates_hash, :leTarifNeComprendPas, *locales),
@@ -275,6 +276,8 @@ module Apidae
                                               age_min: presta_hash[:ageMin], age_max: presta_hash[:ageMax]} : {}),
           classification: nodes_ids(data_hash[:classement], data_hash[:classementPrefectoral], data_hash[:classification]) +
               lists_ids(data_hash[:classementsGuides]) + lists_ids(data_hash[:classements]),
+          classification_date: data_hash[:dateClassement],
+          classification_ref: data_hash[:numeroClassement],
           labels: lists_ids(data_hash[:labels], data_hash[:labelsChartesQualite], prestations_hash[:labelsTourismeHandicap]) +
               (node_id(data_hash, :typeLabel) ? [node_id(data_hash, :typeLabel)] : []),
           chains: lists_ids(data_hash[:chaines]) + nodes_ids(data_hash[:chaineEtLabel]),
@@ -288,7 +291,10 @@ module Apidae
           extra: apidae_obj.apidae_type == Obj::SPA ? node_value(data_hash, :formuleHebergement, *locales) : node_value(prestations_hash, :complementAccueil, *locales),
           duration: apidae_obj.apidae_type == Obj::SPA ? {days: data_hash[:nombreJours], nights: data_hash[:nombreNuits]} : data_hash[:dureeSeance],
           certifications: data_hash[:agrements].blank? ? [] : data_hash[:agrements].map {|a| {id: a[:type][:id], identifier: a[:numero]}},
-          business: business_hash
+          business: (business_hash || {}).except(:sallesEquipeesPour, :sallesEquipement, :sallesRestauration, :sallesReunion, :sallesHebergement),
+          business_equipments: lists_ids((business_hash || {})[:sallesEquipeesPour], (business_hash || {})[:sallesEquipement],
+                                         (business_hash || {})[:sallesRestauration], (business_hash || {})[:sallesHebergement]),
+          business_rooms: (business_hash || {})[:sallesReunion]
       }
     end
 
@@ -325,12 +331,14 @@ module Apidae
     def self.parse_booking(reservation_hash, visits_hash, *locales)
       booking_hash = {}
       if reservation_hash
-        booking_hash[:booking_desc] = node_value(reservation_hash, :complement, *locales),
+        booking_hash[:booking_desc] = node_value(reservation_hash, :complement, *locales)
         booking_hash[:booking_entities] = reservation_hash[:organismes]
       end
       if visits_hash
         booking_hash[:visits_allowed] = visits_hash[:visitable] == true
         booking_hash[:visits_desc] = node_value(visits_hash, :complementVisite, *locales)
+        booking_hash[:visits_duration] = visits_hash[:dureeMoyenneVisiteIndividuelle]
+        booking_hash[:visits_services] = lists_ids(visits_hash[:prestationsVisitesGroupees]) + lists_ids(visits_hash[:prestationsVisitesIndividuelles])
       end
       booking_hash
     end
@@ -346,8 +354,14 @@ module Apidae
 
     def self.parse_entity_fields(information_hash, type_data_hash, sp_hash)
       entity_hash = {}
-      if information_hash && information_hash[:structureGestion]
-        entity_hash.merge!({entity_id: information_hash[:structureGestion][:id], service_provider_id: node_id(type_data_hash, :prestataireActivites)})
+      if information_hash
+        if information_hash[:structureGestion]
+          entity_hash.merge!({entity_id: information_hash[:structureGestion][:id], service_provider_id: node_id(type_data_hash, :prestataireActivites)})
+        end
+
+        if information_hash[:informationsLegales]
+          entity_hash.merge!({legal: information_hash[:informationsLegales]})
+        end
       end
       if sp_hash && sp_hash[:prestataireActivites]
         entity_hash[:is_service_provider] = true

data/app/models/apidae/file_import.rb

@@ -31,7 +31,6 @@ module Apidae
           logger.info "Completed #{Town.count} towns update"
         end
         ordered_files(zfile).each do |file|
-          puts "processing #{file.name}"
           if file.file? && file.name.end_with?('.json')
             logger.info "Processing file : #{file.name}"
             if file.name.include?(MODIFIED_DIR)
@@ -45,6 +44,7 @@ module Apidae
             end
           end
         end
+        project.cleanup_selections
         create(result.except(:selections)
                    .merge({remote_file: (zip_file.is_a?(File) ? zip_file.path : zip_file), status: STATUS_COMPLETE, apidae_id: project_id}))
         logger.info "Import results : #{result}"
@@ -170,7 +170,9 @@ module Apidae
     def self.add_or_update_selections(project, selections_json, result)
       selections_hashes = JSON.parse(selections_json, symbolize_names: true)
       deleted_ids = Selection.where(apidae_project_id: project.id).collect {|sel| sel.apidae_id}.uniq - selections_hashes.collect {|sel| sel[:id]}
-      Selection.where(apidae_id: deleted_ids).delete_all
+      apidae_selection_ids = Selection.where(apidae_id: deleted_ids).map {|s| s.id}
+      SelectionObject.where(apidae_selection_id: apidae_selection_ids).delete_all
+      Selection.where(id: apidae_selection_ids).delete_all
       selections_hashes.each do |selection_data|
         logger.info "Updating selection #{selection_data[:id]}"
         Selection.add_or_update(selection_data, project.id)

data/app/models/apidae/obj.rb

@@ -14,16 +14,17 @@ module Apidae
     store_accessor :description_data, :short_desc, :long_desc, :theme_desc, :private_desc
     store_accessor :pictures_data, :pictures
     store_accessor :attachments_data, :attachments
-    store_accessor :type_data, :categories, :themes, :capacity, :classification, :labels, :chains, :area, :track,
-                   :tricky_sections, :products, :audience, :animals, :animals_desc, :extra, :duration, :certifications, :business
-    store_accessor :entity_data, :entity_id, :entity_name, :service_provider_id, :is_service_provider
+    store_accessor :type_data, :categories, :themes, :capacity, :classification, :classification_date,
+                   :classification_ref, :labels, :chains, :area, :track, :tricky_sections, :products, :audience, :animals,
+                   :animals_desc, :extra, :duration, :certifications, :business, :business_equipments, :business_rooms
+    store_accessor :entity_data, :entity_id, :entity_name, :service_provider_id, :is_service_provider, :legal
     store_accessor :contact_data, :telephone, :email, :website, :google, :facebook, :twitter, :yelp, :trip_advisor, :fax,
                    :mobile_website, :shorty_url, :contacts
     store_accessor :location_data, :address, :place, :latitude, :longitude, :access, :territories, :environments, :altitude, :map_reference
     store_accessor :openings_data, :openings_desc, :openings_desc_mode, :openings, :time_periods, :openings_extra
-    store_accessor :rates_data, :rates_desc, :rates_desc_mode, :rates, :payment_methods, :includes, :excludes, :rates_extra
+    store_accessor :rates_data, :rates_desc, :rates_desc_mode, :rates, :payment_methods, :includes, :excludes, :rates_extra, :tax_included
     store_accessor :service_data, :services, :equipments, :comfort, :activities, :challenged, :languages
-    store_accessor :booking_data, :booking_desc, :booking_entities, :visits_allowed, :visits_desc
+    store_accessor :booking_data, :booking_desc, :booking_entities, :visits_allowed, :visits_desc, :visits_duration, :visits_services
     store_accessor :tags_data, :promo, :internal, :linked
     store_accessor :version_data, :versioned_fields
 

data/app/models/apidae/project.rb

@@ -20,5 +20,11 @@ module Apidae
     def versions=(values)
       self.versions_data = values.blank? ? nil : values.join('|')
     end
+
+    def cleanup_selections
+      apidae_selections.reload.each do |s|
+        s.cleanup
+      end
+    end
   end
 end

data/app/models/apidae/selection.rb

@@ -42,6 +42,20 @@ module Apidae
       SelectionObject.where(apidae_selection_id: apidae_sel.id, apidae_object_id: removed_ids).delete_all
     end
 
+    def cleanup
+      obsolete_count = apidae_selection_objects
+        .joins("LEFT JOIN apidae_objs ON apidae_objs.id = apidae_selection_objects.apidae_object_id")
+        .where("apidae_objs.id IS NULL")
+        .delete_all
+      logger.info "Cleaned up #{obsolete_count} obsolete selection-objects associations for selection #{apidae_id}"
+
+      dups = apidae_selection_objects.reload.group(:apidae_object_id)
+                                     .select("COUNT(id), apidae_object_id, ARRAY_AGG(id) AS so_ids")
+                                     .having("COUNT(id) > ?", 1).map {|so| so.so_ids}
+      dups_count = apidae_selection_objects.where(id: dups.map {|d| d.sort[1..-1]}.flatten).delete_all
+      logger.info "Cleaned up #{dups_count} duplicate selection-objects associations for selection #{apidae_id}"
+    end
+
     def results(where_clause, offset, size)
       objects.includes(:town).limit(size).offset(offset).where(where_clause)
     end

data/lib/apidae/version.rb

@@ -1,3 +1,3 @@
 module Apidae
-  VERSION = "1.3.5"
+  VERSION = "1.3.8"
 end

data/test/dummy/db/schema.rb

@@ -2,15 +2,15 @@
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
 #
-# Note that this schema.rb definition is the authoritative source for your
-# database schema. If you need to create the application database on another
-# system, you should be using db:schema:load, not running all the migrations
-# from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
+# This file is the source Rails uses to define your schema when running `bin/rails
+# db:schema:load`. When creating a new database, `bin/rails db:schema:load` tends to
+# be faster and is potentially less error prone than running all of your
+# migrations from scratch. Old migrations may fail to apply correctly if those
+# migrations use external dependencies or application code.
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2020_05_22_124205) do
+ActiveRecord::Schema.define(version: 2021_06_07_214647) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -92,8 +92,10 @@ ActiveRecord::Schema.define(version: 2020_05_22_124205) do
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.jsonb "meta_data"
+    t.boolean "is_active"
     t.index ["apidae_id"], name: "index_apidae_references_on_apidae_id"
     t.index ["apidae_type"], name: "index_apidae_references_on_apidae_type"
+    t.index ["is_active"], name: "index_apidae_references_on_is_active"
   end
 
   create_table "apidae_selection_objects", force: :cascade do |t|
@@ -112,6 +114,13 @@ ActiveRecord::Schema.define(version: 2020_05_22_124205) do
     t.integer "apidae_project_id"
   end
 
+  create_table "apidae_territories", force: :cascade do |t|
+    t.integer "apidae_id"
+    t.string "name"
+    t.integer "apidae_type"
+    t.index ["apidae_id"], name: "index_apidae_territories_on_apidae_id"
+  end
+
   create_table "apidae_towns", id: :serial, force: :cascade do |t|
     t.string "country"
     t.integer "apidae_id"