apidae 2.0.2 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b59d7df8185fbde86fd4532acbc872b1934cb78bdf416fb09a2d1bd52849be51
-  data.tar.gz: 591556125cfe37d3e48079c0dc85a729e71af01bc6fc0363e7bd4c4dede0568f
+  metadata.gz: 4d7250dcfff0787e618e6dfd622239e656dfc89620fa6e482397b5c0ca489c3f
+  data.tar.gz: 74b5569f9eec506676deb9d6fca8f91c156dc2fafb33b1d2dcdf3846f796213f
 SHA512:
-  metadata.gz: acb9f767ef159db23a6811d8f9e765e4a3a1291ca5d138e4fa86c03fa4bcd919a895911d6ff24af550be968fe09877568b1a0dce1ba0da9ab956d56f007031e5
-  data.tar.gz: 0c804f60d22c6a5b5392636c0bcddfce4b977d0b8868d7affaa122633a0030bbbae897d4367923568d7345c670f706234d7bf2eb6898d7eba6ac6aa06f3e92f0
+  metadata.gz: e2009270aa0638681c64c38d27a4d6489e2186246e1fed3d0da53897bd50197e6837d54ae765d9a705ecb74ef7e376ed4c57785a6ed278b1ac440d97e6396b2e
+  data.tar.gz: a3ef10a3864e4e9e974d9905bfb7715c21144bd3ce2f2c852f7a86ca1d5c2692b8b486edc746fd9fd555245a56ff4c6cd0d8798ad231381791c2a4358bbfc2b1

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/obj.rb

@@ -3,7 +3,7 @@ require 'pg_search'
 module Apidae
   class Obj < ActiveRecord::Base
     include PgSearch::Model
-    multisearchable against: [:title, :short_desc, :town_search, :criteria_search],
+    multisearchable against: [:w_title, :w_town, :w_short_desc, :w_criteria],
                     additional_attributes: -> (o) { { searchable_fields: o.searchable_fields } }
 
     belongs_to :town, class_name: 'Apidae::Town', foreign_key: :town_insee_code, primary_key: :insee_code, optional: true
@@ -144,11 +144,19 @@ module Apidae
       self
     end
 
-    def town_search
-      town&.label
+    def w_title
+      title
     end
 
-    def criteria_search
+    def w_town
+      "#{town&.name}§§§"
+    end
+
+    def w_short_desc
+      "#{short_desc}§§§"
+    end
+
+    def w_criteria
       ([SUBTYPES.dig(apidae_subtype&.to_i, :label)] + ref_search(payment_methods, PAYMENT) +
         ref_search(categories, CATEGORIES) + ref_search(themes, THEMES) + ref_search(labels, LABELS) +
         ref_search(chains, CHAINS) + ref_search(classification, CLASSIFICATION) + ref_search(services, SERVICES) +

data/app/models/apidae/selection.rb

@@ -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/config/initializers/search.rb

@@ -15,6 +15,7 @@ Rails.configuration.to_prepare do
         tsearch: {
           dictionary: 'fr',
           prefix: true,
+          normalization: 4,
           tsvector_column: ["tsv_content"]
         }
       }

data/db/migrate/20250318152322_alter_tsv_column_in_pg_search_documents.rb

@@ -0,0 +1,23 @@
+class AlterTsvColumnInPgSearchDocuments < ActiveRecord::Migration[7.2]
+  def up
+    execute <<-SQL
+      ALTER TABLE pg_search_documents DROP COLUMN IF EXISTS tsv_content;
+      ADD COLUMN tsv_content tsvector GENERATED ALWAYS AS (
+        setweight(to_tsvector('fr', coalesce(split_part(coalesce(content, ''), '§§§', 1), '')), 'A')    ||
+        setweight(to_tsvector('fr', coalesce(split_part(coalesce(content, ''), '§§§', 2), '')), 'B')    ||
+        setweight(to_tsvector('fr', coalesce(split_part(coalesce(content, ''), '§§§', 3), '')), 'C')    ||
+        setweight(to_tsvector('fr', coalesce(split_part(coalesce(content, ''), '§§§', 4), '')), 'D')    ||
+      ) STORED;
+    SQL
+  end
+
+  def down
+    execute <<-SQL
+      ALTER TABLE pg_search_documents DROP COLUMN IF EXISTS tsv_content;
+      ALTER TABLE pg_search_documents
+            ADD COLUMN tsv_content tsvector GENERATED ALWAYS AS (
+              to_tsvector('fr', coalesce(content, ''))
+            ) STORED;
+    SQL
+  end
+end

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.2"
+  VERSION = "2.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apidae
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.4
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-18 00:00:00.000000000 Z
+date: 2025-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -212,6 +212,8 @@ files:
 - db/migrate/20250130110941_add_columns_to_pg_search_documents.rb
 - 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