apidae 1.4.15 → 1.4.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 829fbcc39fd6110c0bbe6900004d1ed3e0efc2a0a345e1c2e0addd151b045d3f
-  data.tar.gz: e8501491443543d72b6fc710ae0a1bcbe18cdaaa40df2942008d1cbc2b0dd625
+  metadata.gz: 2f95b9e7fa42cf5b6e8726526abf2c8dbaef2d903d81d8b114e38879af1fe0ee
+  data.tar.gz: fc0423dd7cb323027a25f1320ccb30a934c1b0788ae29f5cf060d28992ce6a1f
 SHA512:
-  metadata.gz: 5fae148c4eec799645b90c2be7dc211d76211e4a516ab4cbe960d6e436b501462b792670058441533d296c840de9ddf28471fd246913b902e6862c66dfda1844
-  data.tar.gz: 4e237b2628166c531857663f7cc245d8b9bf3998d9702325fde9f9a076bc47159894f9b258b2c2328cfb0678fa20c4464f4921d5f674c341f186a0a76c1418d2
+  metadata.gz: 22ab57e4a74563557f764b757ad3914de05ccae6a3ee346e7e47cf9bf0d247280267c965e820a8b8f78e1bc07c625b5b90beabf7c9ad7e91133b004fedb1073b
+  data.tar.gz: 11211dbdb0423e2b251c45fbee439bade36a9036f1741ebbe56145baf5056fc2d8e1637a81b2a3676d75d40d44e2e01cf9624c0068ff088131d81f7445ab3008

data/app/models/apidae/apidae_data_parser.rb

@@ -270,6 +270,17 @@ module Apidae
           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]),
+          ratings: (lists_ids(data_hash[:labels]).map {|label_id| {id: label_id, type: 'labels'}} +
+            lists_ids(data_hash[:labelsChartesQualite]).map {|label_id| {id: label_id, type: 'labelsChartesQualite'}} +
+            lists_ids(prestations_hash[:labelsTourismeHandicap]).map {|label_id| {id: label_id, type: 'labelsTourismeHandicap'}} +
+            nodes_ids(data_hash[:typeLabel]).map {|label_id| {id: label_id, type: 'typeLabel', ref: data_hash[:numeroAgrementLabel], start_date: data_hash[:dateAgrementLabel]}} +
+            lists_ids(data_hash[:chaines]).map {|ch_id| {id: ch_id, type: 'chaines'}} +
+            nodes_ids(data_hash[:chaineEtLabel]).map {|ch_id| {id: ch_id, type: 'chaineEtLabel'}} +
+            nodes_ids(data_hash[:classement]).map {|c_id| {id: c_id, type: 'classement', start_date: data_hash[:dateClassement], ref: data_hash[:numeroClassement]}} +
+            nodes_ids(data_hash[:classementPrefectoral]).map {|c_id| {id: c_id, type: 'classementPrefectoral', start_date: data_hash[:dateClassement], ref: data_hash[:numeroClassement]}} +
+            nodes_ids(data_hash[:classification]).map {|c_id| {id: c_id, type: 'classification'}} +
+            lists_ids(data_hash[:classementsGuides]).map {|c_id| {id: c_id, type: 'classementsGuides'}} +
+            lists_ids(data_hash[:classements]).map {|c_id| {id: c_id, type: 'classements'}}),
           area: apidae_obj.apidae_type == Obj::DOS ? data_hash.except(:classification) : node_value(data_hash, :lieuDePratique),
           track: apidae_obj.apidae_type == Obj::EQU ? (data_hash[:itineraire] || {}).except(:passagesDelicats) : nil,
           tricky_sections: apidae_obj.apidae_type == Obj::EQU ? node_value(data_hash[:itineraire], :passagesDelicats, *locales) : nil,
@@ -279,7 +290,7 @@ module Apidae
                     desc: node_value(prestations_hash, :descriptifAnimauxAcceptes, *locales), fee: prestations_hash[:animauxAcceptesSupplement] ==	'AVEC_SUPPLEMENT'},
           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]}},
+          certifications: data_hash[:agrements].blank? ? {} : Hash[data_hash[:agrements].map {|a| [a[:type][:id].to_s, a[:numero]]}],
           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]),

data/app/models/apidae/obj.rb

@@ -15,7 +15,7 @@ module Apidae
     store_accessor :description_data, :short_desc, :long_desc, :theme_desc, :private_desc, :accessibility_desc
     store_accessor :pictures_data, :pictures
     store_accessor :attachments_data, :attachments
-    store_accessor :type_data, :categories, :themes, :capacity, :classification, :classification_date,
+    store_accessor :type_data, :categories, :themes, :capacity, :classification, :classification_date, :ratings,
                    :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, :info_entity_id, :info_entity_name, :service_provider_id,

data/app/models/apidae/selection.rb

@@ -40,7 +40,7 @@ module Apidae
 
       removed_ids = Obj.where(apidae_id: removed).map {|o| o.id}
       SelectionObject.where(apidae_selection_id: apidae_sel.id, apidae_object_id: removed_ids).delete_all
-      if added.any? || removed.any? || (apidae_sel.objects.maximum(:updated_at) > apidae_sel.updated_at)
+      if added.any? || removed.any? || (apidae_sel.objects.any? && apidae_sel.objects.maximum(:updated_at) > apidae_sel.updated_at)
         apidae_sel.touch
       end
     end

data/db/migrate/20250323201235_change_objs_certifications_structure.rb

@@ -0,0 +1,15 @@
+class ChangeObjsCertificationsStructure < ActiveRecord::Migration[6.1]
+  def change
+    blank_objs = Apidae::Obj.where("type_data->'certifications'->0->>'id' IS NULL")
+    set_objs = Apidae::Obj.where("type_data->'certifications'->0->>'id' IS NOT NULL")
+
+    blank_objs.update_all("type_data = jsonb_set(type_data, '{certifications}', '{}'::jsonb)")
+
+    set_objs.each do |o|
+      unless o.certifications.is_a?(Hash)
+        o.certifications = o.certifications.blank? ? {} : Hash[o.certifications.map {|c| [c['id'].to_s, c['identifier']]}]
+        o.save!
+      end
+    end
+  end
+end

data/lib/apidae/version.rb

@@ -1,3 +1,3 @@
 module Apidae
-  VERSION = "1.4.15"
+  VERSION = "1.4.17"
 end

data/test/dummy/log/development.log

@@ -13845,3 +13845,10 @@ Migrating to MigrateLocalizedApidaeObjFields (20190127210921)
   Apidae::Obj Load (2.4ms)  SELECT "apidae_objs".* FROM "apidae_objs" WHERE "apidae_objs"."root_obj_id" IS NULL
   TRANSACTION (0.8ms)  ROLLBACK
    (0.5ms)  SELECT pg_advisory_unlock(6140174353533887940)
+   (0.1ms)  SELECT pg_try_advisory_lock(6140174353533887940)
+  ActiveRecord::SchemaMigration Load (1.9ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
+  ActiveRecord::InternalMetadata Load (2.2ms)  SELECT * FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = $1 ORDER BY "ar_internal_metadata"."key" ASC LIMIT 1  [[nil, "environment"]]
+Migrating to MigrateLocalizedApidaeReferences (20190127213602)
+  TRANSACTION (0.2ms)  BEGIN
+  TRANSACTION (0.1ms)  ROLLBACK
+   (0.3ms)  SELECT pg_advisory_unlock(6140174353533887940)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apidae
 version: !ruby/object:Gem::Version
-  version: 1.4.15
+  version: 1.4.17
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-24 00:00:00.000000000 Z
+date: 2025-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -192,6 +192,7 @@ files:
 - db/migrate/20201112080847_create_apidae_territories.rb
 - db/migrate/20210607214647_add_apidae_type_to_apidae_territories.rb
 - db/migrate/20230206113335_add_prev_data_to_apidae_objs.rb
+- db/migrate/20250323201235_change_objs_certifications_structure.rb
 - lib/apidae.rb
 - lib/apidae/engine.rb
 - lib/apidae/version.rb