apidae 2.0.3 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b42cdaf85f8e59001ee19b5f22f15c5404d82af469803cd48136ba776632221e
-  data.tar.gz: 14b10d413128996dabd723ad2ac40309348b4451053395525493274cfea73921
+  metadata.gz: 876cc230ecafe34a00f73ff1dd29d5e39436c5c5c119ef8ecabfdde8312d6e02
+  data.tar.gz: aa52eae548c0e107ee5627389a000e9a537cb1913332f0640378289eccdab957
 SHA512:
-  metadata.gz: 0b776494bee0b4e3011b6f8c2d1cb951e4a1dc2eb9bed58eb4e1e2962b24ac6d014236f15d13d20720ff428e6d34b61a5682c8cad4084a3b1420ddc68a1d8109
-  data.tar.gz: b1f38f9f5591857648e8c332a6e4e69638877a552ea135c8011063398f750f3ca702c16fce756f42700caaa3f9994648a9f61a4eef72b25c06e5df0fadf87870
+  metadata.gz: 85be12808cd6db3da5a8d05fc39540ac1ab297802f75e879626fd18813e4db79fecb53fe3b4e9088a59a85d5e16ab1c2b2ea5b8f423cd0b3e05e4ac4e3c7126a
+  data.tar.gz: 651a925bf33e2339317b9175cf1bdc28b2718f332e5db86e77f4b9ec375da87c19f5e16a99289569e63f0652a12114dfd4123b2c17dbd1a896a3af7590e14f65

data/app/models/apidae/apidae_data_parser.rb

@@ -279,7 +279,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/export.rb

@@ -32,7 +32,7 @@ module Apidae
     def import_data
       success = true
       begin
-        open(file_url) do |f|
+        URI.open(file_url) do |f|
           begin
             logger.info "Starting file import for export #{id} - project #{project_id}"
             FileImport.import(f, project_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
@@ -224,7 +224,7 @@ module Apidae
       response = ''
       query = JSON.generate args.except(:url)
       logger.debug "Apidae API query : #{args[:url]}?query=#{query}"
-      open("#{args[:url]}?query=#{CGI.escape query}") { |f|
+      URI.open("#{args[:url]}?query=#{CGI.escape query}") { |f|
         f.each_line {|line| response += line if line}
       }
       response

data/db/migrate/20250323184827_change_obj_certifications_structure.rb

@@ -0,0 +1,15 @@
+class ChangeObjCertificationsStructure < ActiveRecord::Migration[7.2]
+  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 = "2.0.3"
+  VERSION = "2.0.5"
 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: 2.0.3
+  version: 2.0.5
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-20 00:00:00.000000000 Z
+date: 2025-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -213,6 +213,7 @@ files:
 - db/migrate/20250130120941_add_tsv_column_to_pg_search_documents.rb
 - db/migrate/20250130152441_add_gin_index_to_pg_search_documents.rb
 - db/migrate/20250318152322_alter_tsv_column_in_pg_search_documents.rb
+- db/migrate/20250323184827_change_obj_certifications_structure.rb
 - lib/apidae.rb
 - lib/apidae/engine.rb
 - lib/apidae/version.rb