apidae 0.9.31 → 0.9.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b11e661ee1dbdf4a10b2e7a99e50355f3e27c999
-  data.tar.gz: e915875e1afc08473c4de6e13e759a4e64db8d4c
+SHA256:
+  metadata.gz: 19f4dc1ae011dc6f13e271bbbbff28eb59710068d444c21c8ac6bf4952f423b9
+  data.tar.gz: 03d28c16f13a83a89918c5b8a790b9651975f68cb681c356c0e065a553b6eaed
 SHA512:
-  metadata.gz: 260c76e1bf42ccdd5e05513ea52a70335f352d0053ce667c5d32fbb254e82b2408e3ae4abcb0941f1f935cb3280b782261367c5bda5e673beac864121f6d8bb7
-  data.tar.gz: 1dc41e22f0c80fc56d0c2d2bbef568b89be652281733c52ca6eed93d1b8e2e9ddf886c836f1b09caffba57b5cedbe5a161a6a1efb88b8e18ad0b282ebc41a777
+  metadata.gz: 18eaa64392193791632314d650ace16fc3cb8f795b3c50b222ecdb76b50ce9501fd8cc2bca664cbbf6941359f0a2d9ac0a23c637d0cec20cab32ccc971bfca69
+  data.tar.gz: 35ebab3b19a709f29e3d75e1abe93563395fa2fa3b50d8c8c93734290973b9ba3e8438f3977c4433d6a820ee6d0f87ef1c0fd7551a2d343b42dd71031d2d71b1

data/app/models/apidae/file_import.rb

@@ -45,6 +45,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 +171,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,12 +14,12 @@ module Apidae
     store_accessor :pictures_data, :pictures
     store_accessor :attachments_data, :attachments
     store_accessor :type_data, :categories, :themes, :capacity, :classification, :labels, :chains, :area, :track,
-                   :products, :audience, :animals, :extra, :duration, :certifications, :business
+                   :products, :audience, :animals, :extra, :duration, :certifications, :business, :complement
     store_accessor :entity_data, :entity_id, :entity_name, :service_provider_id
     store_accessor :contact, :telephone, :email, :website
     store_accessor :location_data, :address, :place, :latitude, :longitude, :access, :territories, :environments
     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
+    store_accessor :rates_data, :rates_desc, :rates_desc_mode, :rates, :payment_methods, :includes, :excludes, :rates_complement
     store_accessor :service_data, :services, :equipments, :comfort, :activities, :challenged, :languages
     store_accessor :booking_data, :booking_desc, :booking_entities
     store_accessor :tags_data, :promo, :internal, :linked
@@ -293,12 +293,18 @@ module Apidae
           when PHONE
             contact_details[:telephone] ||= []
             contact_details[:telephone] << c[:coordonnees][:fr]
+            contact_details[:telephone_details] ||= []
+            contact_details[:telephone_details] << {value: c[:coordonnees][:fr], description: c.dig(:observation, :libelleFr)}
           when EMAIL
             contact_details[:email] ||= []
             contact_details[:email] << c[:coordonnees][:fr]
+            contact_details[:email_details] ||= []
+            contact_details[:email_details] << {value: c[:coordonnees][:fr], description: c.dig(:observation, :libelleFr)}
           when WEBSITE
             contact_details[:website] ||= []
             contact_details[:website] << c[:coordonnees][:fr]
+            contact_details[:website_details] ||= []
+            contact_details[:website_details] << {value: c[:coordonnees][:fr], description: c.dig(:observation, :libelleFr)}
           else
           end
         end
@@ -360,7 +366,8 @@ module Apidae
             rates_desc: desc, rates: values, payment_methods: methods,
             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)
+            excludes: node_value(rates_hash, :leTarifNeComprendPas, *locales),
+            rates_complement: node_value(rates_hash, :complement, *locales)
         }
       end
     end
@@ -390,7 +397,8 @@ module Apidae
           extra: apidae_obj.apidae_type == SPA ? node_value(data_hash, :formuleHebergement, *locales) : node_value(prestations_hash, :complementAccueil, *locales),
           duration: apidae_obj.apidae_type == 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,
+          complement: apidae_obj.apidae_type == SPA ? node_value(prestations_hash, :complementAccueil, *locales) : {},
       }
     end
 
@@ -419,7 +427,7 @@ module Apidae
       end
       unless linked_data_hash.blank? || linked_data_hash[:liensObjetsTouristiquesTypes].blank?
         tags[:linked] = linked_data_hash[:liensObjetsTouristiquesTypes]
-                            .map {|l| {apidae_id: l[:objetTouristique][:id], apidae_type: l[:objetTouristique][:type], category: l[:type]}}
+                            .map {|l| {apidae_id: l[:objetTouristique][:id], apidae_type: l[:objetTouristique][:type], category: l[:type], name: l[:objetTouristique][:nom]}}
       end
       tags
     end

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 = "0.9.31"
+  VERSION = "0.9.34"
 end