apidae 1.3.15 → 1.3.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7e6234f56f20b1e24b5964c5cab8a3c87b06c518f55bcaa3a9e47df7925d365
-  data.tar.gz: ea9979c29f2d8b0bb3bb3f9ba197a58652ca55ae2394a259e28deb482fce7d9d
+  metadata.gz: c2dc14def4a5ccba14984b121294b512f2974f03f5e404864e6c8cd2e439e260
+  data.tar.gz: 7030d0d62645128f239702bbcf7553995168b72656afbafbc4ac9596640bb061
 SHA512:
-  metadata.gz: 8142e235f2bd6011881baccdcf4ebecaa8cf147411e2edca72f2724db545de0cab6f78130e33c4b013f78139a1c10c3a1d5f8aefe2098552d029e34ef44e6967
-  data.tar.gz: a1a5b0d82c79b23413353483ead93548b9f31832f989e9c4769c5286d01c877f7d707e661d5ecfc7569391381d5e1c73409814653d0b99279e7385dfbb7b8666
+  metadata.gz: 99bafa98550f2800639d48ffc5c22c44f810c12d1298d2b7b0453d1b96c20e5adb60217c0c51db5af35efcc81619a8a4cdf1f6890ec2e4f44c01d5df6cd595d5
+  data.tar.gz: b5ca9bd5f07c12658e93ececba16a282629c0e78949658e3a2a38b53de45f872b843c5c8ab49d70e4a5b2f2d2878c107899506fbeb4a2c7375a776b85b88511f

data/app/controllers/apidae/import_controller.rb

@@ -39,7 +39,7 @@ module Apidae
       Export.pending.each do |e|
         logger.info "Running import for Apidae export #{e.id} - Project #{e.project_id}"
         e.update(status: Export::IN_PROGRESS)
-        success &&= e.import_data
+        success = e.import_data && success
         logger.info "Apidae export #{e.id} import run complete - Project #{e.project_id}"
       end
       success ? head(:ok) : head(:internal_server_error)

data/app/models/apidae/apidae_data_parser.rb

@@ -233,7 +233,7 @@ module Apidae
     end
 
     # Note : use internal format for openings storage (ideally Apihours one, to merge data from both sources)
-    def self.parse_openings(openings_hash, *locales)
+    def self.parse_openings(openings_hash, opening_days, *locales)
       if openings_hash && openings_hash[:periodeEnClair]
         {
             openings_desc: node_value(openings_hash, :periodeEnClair, *locales),
@@ -241,7 +241,8 @@ module Apidae
             openings: build_openings(openings_hash, *locales),
             all_year_long: openings_hash[:ouvertTouteLAnnee] == 'OUVERT_TOUTE_L_ANNEE' ? 'true' : 'false',
             time_periods: lists_ids(openings_hash[:indicationsPeriode]),
-            openings_extra: lists_ids(openings_hash[:ouverturesComplementaires])
+            openings_extra: lists_ids(openings_hash[:ouverturesComplementaires]),
+            opening_days: opening_days
         }
       end
     end

data/app/models/apidae/file_import.rb

@@ -174,7 +174,7 @@ module Apidae
       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]}"
+        logger.debug "Updating selection #{selection_data[:id]}"
         Selection.add_or_update(selection_data, project.id)
       end
       result[:selections] = Selection.where(apidae_project_id: project.id)

data/app/models/apidae/obj.rb

@@ -21,7 +21,7 @@ module Apidae
     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 :openings_data, :openings_desc, :openings_desc_mode, :openings, :time_periods, :openings_extra, :opening_days
     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, :visits_duration, :visits_services
@@ -184,7 +184,7 @@ module Apidae
       apidae_obj.location_data = ApidaeDataParser.parse_location_data(object_data[:localisation], object_data[type_fields[:node]],
                                                      object_data[:territoires])
       apidae_obj.town = ApidaeDataParser.parse_town(object_data[:localisation])
-      apidae_obj.openings_data = ApidaeDataParser.parse_openings(object_data[:ouverture], *locales)
+      apidae_obj.openings_data = ApidaeDataParser.parse_openings(object_data[:ouverture], object_data[:datesOuverture], *locales)
       apidae_obj.rates_data = ApidaeDataParser.parse_rates(object_data[:descriptionTarif], *locales)
       apidae_obj.booking_data = ApidaeDataParser.parse_booking(object_data[:reservation], object_data[:visites], *locales)
       apidae_obj.type_data = ApidaeDataParser.parse_type_data(apidae_obj, object_data[type_fields[:node]], object_data[:prestations],

data/app/models/apidae/selection.rb

@@ -53,7 +53,7 @@ module Apidae
                                      .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}"
+      logger.debug "Cleaned up #{dups_count} duplicate selection-objects associations for selection #{apidae_id}"
     end
 
     def results(where_clause, offset, size)

data/lib/apidae/version.rb

@@ -1,3 +1,3 @@
 module Apidae
-  VERSION = "1.3.15"
+  VERSION = "1.3.17"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apidae
 version: !ruby/object:Gem::Version
-  version: 1.3.15
+  version: 1.3.17
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-02 00:00:00.000000000 Z
+date: 2022-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails