apidae 1.2.20 → 1.2.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3db2f4b2a2867ecf0452eeef11e4c9b547d0c5d749746e59d3f91832a2b49c3e
-  data.tar.gz: 416683aa3f8d745d5511adfc47d084788aaab1cc99c948ed5c5d5e7b39bf0890
+  metadata.gz: 2a717231678597e174e817b7b690bdfc27137476e3ef781954012a149e729f08
+  data.tar.gz: 7a06fc98b8a238c2906bdb814d1f18a43acad992b46feba9e42b1d339d8773e2
 SHA512:
-  metadata.gz: 5e745de182af2dc2cc9295bd0c70224a2aa464cc34a3da976fc22a1901e49f12cf2c865ff50ef5708d7830bd74f0694a26c9c2acaecd900ac7ca690134447d26
-  data.tar.gz: 4207f3dd0e6630f36f77369b0d5b7c7ddd576b303acbecaeb5bb2c3913f0b49f6056c74fe229632b21c2588e5896ff6796d10541e5cd7bf75efc316932445331
+  metadata.gz: 62a2be17446a33688036e3fd07722d549c6f3d9659729363df005f7850b90ff63d167b05c128023b075d7a641262813044a48f3a73b09fcf5e9793bbc1f050cf
+  data.tar.gz: 2ebd92b9cfc5231b9cee622f0121820065870c970b9cd10b219e183f770130fec07b7711afa16fe65b11eb40a6ce7100e3feb5e13d0d1a9d703b2c0cecb9b8e8

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], d[:libelleFr] || node_value(d, :descriptif, *locales)]}]
+            private_desc: private_data.blank? ? {} : Hash[private_data.map {|d| [d[:nomTechnique], {LOCALE_FR => d[:libelleFr]} || node_value(d, :descriptif, *locales)]}]
         }
       end
     end
@@ -331,6 +331,7 @@ module Apidae
       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]
       end
       booking_hash
     end

data/app/models/apidae/file_import.rb

@@ -44,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}"
@@ -169,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

@@ -23,7 +23,7 @@ module Apidae
     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 :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
     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.2.20"
+  VERSION = "1.2.24"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apidae
 version: !ruby/object:Gem::Version
-  version: 1.2.20
+  version: 1.2.24
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-28 00:00:00.000000000 Z
+date: 2021-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails