apidae 1.4.16 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44f3b5a191f7f2f610620e188d2be34c993a5a809fb669732ebcdbed450c1f8b
-  data.tar.gz: 7ffceca9b1cdd04cf30765c28e232a222ed70b39c78cf768637b0864ac98a798
+  metadata.gz: d2e758f9b9ec206503bf49f0b007a703e4b99d0092294b0f28dd563bfd7e0d3c
+  data.tar.gz: 6504e5a2b17c7fb7ac75ce662b8f9273d932ada2219be41d557a461be6b3aca2
 SHA512:
-  metadata.gz: da91c8d99c4c586ab67812a49f66b2ca286e5695082ff93af37fccf6dc4ecd1071ebb024b6a92e34e03c60247779c76b31047d1225afddaa3223b4b3c5aa18d4
-  data.tar.gz: 5440942e4b41d30fe82957254c9ce36bb5cc19be0d7961f757a9e4190349581db698f5d5cd50eb0e390c5c35f668feab7acf4aea584da504335df2c1f4904260
+  metadata.gz: 7a9348ceed64ae7dfa7476e4a444eff649cca4148b5329305e9057e8fcbbae396308cf8e99119b1cbe0518935e254b7471ab0234250215454014ed23c3022325
+  data.tar.gz: f0e3ee4e7945eec4fbb642a5838d29b81fb4c9a6ed34272b781180c30394d79b5f5ab3dc9910b25f0a79061b4058fb5364a50f2ae3a9327e883cc8cd89002d75

data/app/controllers/apidae/objects_controller.rb

@@ -78,6 +78,13 @@ module Apidae
       end
     end
 
+    def search
+      user_selections = Project.where(apidae_id: apidae_user.apidae_projects_ids).map {|p| p.apidae_selection_ids}.flatten.uniq
+      @results = PgSearch::Document.tsv_search(params[:query])
+                        .joins("INNER JOIN apidae_selection_objects AS aso ON (aso.apidae_object_id = pg_search_documents.searchable_id) AND pg_search_documents.searchable_type = 'Apidae::Obj'")
+                        .where("aso.apidae_selection_id IN (?)", user_selections)
+    end
+
     private
       def set_object
         @obj = Obj.find(params[:id])

data/app/controllers/apidae/projects_controller.rb

@@ -3,9 +3,7 @@ require_dependency "apidae/application_controller"
 module Apidae
   class ProjectsController < ApplicationController
     before_action :set_project, only: [:edit, :update, :destroy]
-    skip_before_action :check_user_data!, only: [:create, :realtime]
-    skip_before_action :verify_authenticity_token, only: [:realtime]
-    skip_before_action Rails.application.config.apidae_auth, only: [:realtime]
+    skip_before_action :check_user_data!, only: [:create]
 
     def index
       if user_is_admin?
@@ -49,10 +47,6 @@ module Apidae
       redirect_to request.referrer, notice: 'Le projet a bien été supprimé.'
     end
 
-    def realtime
-      Rails.logger.info "realtime webhook : #{params.to_unsafe_h}"
-    end
-
     private
 
     def set_project

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? ? {} : Hash[data_hash[:agrements].map {|a| [a[:type][:id].to_s, a[:numero]]}],
+          certifications: data_hash[:agrements].blank? ? [] : data_hash[:agrements].map {|a| {id: a[:type][:id], identifier: 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

@@ -1,5 +1,10 @@
+require 'pg_search'
+
 module Apidae
   class Obj < ActiveRecord::Base
+    include PgSearch::Model
+    multisearchable against: [:title, :short_desc, :town_search, :criteria_search],
+                    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
     has_many :apidae_selection_objects, class_name: 'Apidae::SelectionObject', foreign_key: :apidae_object_id
@@ -139,6 +144,27 @@ module Apidae
       self
     end
 
+    def town_search
+      town&.label
+    end
+
+    def criteria_search
+      ([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) +
+        ref_search(equipments, EQUIPMENTS) + ref_search(comfort, COMFORT) + ref_search(activities, ACTIVITIES) +
+        ref_search(challenged, CHALLENGED) + ref_search(audience, AUDIENCE) + ref_search(promo, PROMO) +
+        ref_search(environments, ENVIRONMENTS) + ref_search(products, PRODUCTS) + ref_search(internal, INTERNALS)).compact.uniq
+    end
+
+    def ref_search(ref_values, ref_list, label_key = :label)
+      (ref_values || []).map {|r| ref_list.dig(r, label_key)}
+    end
+
+    def searchable_fields
+      {s_title: title, s_desc: short_desc, s_external_id: apidae_id, s_type: apidae_type, s_picture: main_picture}
+    end
+
     def dig(*keys)
       root_key, *nested_keys = keys
       root_val = self.send(root_key)

data/app/models/apidae/selection.rb

@@ -40,9 +40,6 @@ 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.any? && apidae_sel.objects.maximum(:updated_at) > apidae_sel.updated_at)
-        apidae_sel.touch
-      end
     end
 
     def cleanup

data/app/views/apidae/objects/search.html.erb

@@ -0,0 +1,49 @@
+<%= render layout: "/layouts/#{Rails.application.config.apidae_layout}" do |styles| %>
+  <div id="apidae_header" class="<%= styles[:header] %>">
+    <%= link_to 'Importer un objet', apidae.new_object_path(selection_apidae_id: nil), class: styles[:objects] %>
+    <%= link_to 'Retour', root_path, class: styles[:back] %>
+    <h1 class="<%= styles[:h1] %>">Apidae - Rechercher des objets</h1>
+  </div>
+  <div id="apidae_dashboard" class="<%= styles[:wrapper] %>">
+    <div id="apidae_search_form" class="<%= styles[:body] %>">
+      <%= form_tag(apidae.search_objects_path, method: :get) do %>
+        <%= text_field_tag 'query', @query, placeholder: 'Recherche par mots-clés' %>
+        <%= submit_tag 'Rechercher' %>
+      <% end %>
+      <br/>
+    </div>
+    <div id="apidae_imports_panel" class="<%= styles[:body] %>">
+      <table id="apidae_objects" class="<%= styles[:table] %>">
+        <thead class="<%= styles[:table_head] %>">
+        <tr>
+          <th>Titre</th>
+          <th>Identifiant</th>
+          <th>Type</th>
+          <th>Mise à jour</th>
+          <th></th>
+        </tr>
+        </thead>
+        <tbody class="<%= styles[:table_body] %>">
+        <% @results.each do |object| %>
+          <tr>
+            <td><%= object.searchable_title %></td>
+            <td><%= object.searchable_id %></td>
+            <td><%= object.searchable_category %></td>
+            <td><%= object.updated_at.strftime('Le %d/%m/%Y à %H:%M') if object.updated_at %></td>
+            <td><%= link_to 'Rafraîchir', apidae.refresh_object_path(object), method: :post,
+                            data: {confirm: 'Voulez-vous vraiment rafraîchir cet objet ? Les données existantes seront écrasées.'} %></td>
+          </tr>
+        <% end %>
+        <% if @results.empty? %>
+          <tr>
+            <td colspan="5">Aucun objet importé pour le moment.</td>
+          </tr>
+        <% end %>
+        </tbody>
+      </table>
+    </div>
+  </div>
+<% end %>
+<script>
+
+</script>

data/config/initializers/search.rb

@@ -0,0 +1,23 @@
+Rails.application.config.after_initialize do
+  require 'pg_search'
+
+  PgSearch.multisearch_options = {
+    using: {tsearch: {dictionary: 'fr'}},
+    ignoring: :accents
+  }
+
+  PgSearch::Document.pg_search_scope(:tsv_search, lambda { |*args|
+    {
+      query: args.first,
+      against: [:content],
+      ignoring: :accents,
+      using: {
+        tsearch: {
+          dictionary: 'fr',
+          prefix: true,
+          tsvector_column: ["tsv_content"]
+        }
+      }
+    }
+  })
+end

data/config/routes.rb

@@ -2,6 +2,7 @@ Apidae::Engine.routes.draw do
 
   resources :objects, only: [:index, :show, :new, :create], path: 'objets' do
     post 'refresh', on: :member
+    get 'search', on: :collection
   end
 
   resources :selections, only: [:index] do
@@ -11,10 +12,7 @@ Apidae::Engine.routes.draw do
     end
   end
   resources :references, only: [:index]
-  resources :projects, only: [:index, :new, :create, :edit, :update, :destroy], path: 'projets' do
-    post 'realtime', on: :collection
-  end
-
+  resources :projects, only: [:index, :new, :create, :edit, :update, :destroy], path: 'projets'
 
   match 'import/callback', via: :post, to: 'import#callback'
   match 'import/run', via: :post, to: 'import#run'

data/db/migrate/20250129190137_create_pg_search_documents.rb

@@ -0,0 +1,17 @@
+class CreatePgSearchDocuments < ActiveRecord::Migration[7.2]
+  def up
+    say_with_time("Creating table for pg_search multisearch") do
+      create_table :pg_search_documents do |t|
+        t.text :content
+        t.belongs_to :searchable, polymorphic: true, index: true
+        t.timestamps null: false
+      end
+    end
+  end
+
+  def down
+    say_with_time("Dropping table for pg_search multisearch") do
+      drop_table :pg_search_documents
+    end
+  end
+end

data/db/migrate/20250130110941_add_columns_to_pg_search_documents.rb

@@ -0,0 +1,10 @@
+class AddColumnsToPgSearchDocuments < ActiveRecord::Migration[7.2]
+  def up
+    # extra attributes columns
+    add_column :pg_search_documents, :searchable_fields, :jsonb
+  end
+
+  def down
+    remove_column :pg_search_documents, :searchable_fields, if_exists: true
+  end
+end

data/db/migrate/20250130120941_add_tsv_column_to_pg_search_documents.rb

@@ -0,0 +1,22 @@
+class AddTsvColumnToPgSearchDocuments < ActiveRecord::Migration[7.2]
+  def up
+    execute <<-SQL
+      CREATE TEXT SEARCH CONFIGURATION fr ( COPY = french );
+      ALTER TEXT SEARCH CONFIGURATION fr
+        ALTER MAPPING FOR hword, hword_part, word
+        WITH unaccent, french_stem;
+
+      ALTER TABLE pg_search_documents
+      ADD COLUMN tsv_content tsvector GENERATED ALWAYS AS (
+        to_tsvector('fr', coalesce(content, ''))
+      ) STORED;
+    SQL
+  end
+
+  def down
+    execute <<-SQL
+      DROP TEXT SEARCH CONFIGURATION IF EXISTS fr;
+      ALTER TABLE pg_search_documents DROP COLUMN IF EXISTS tsv_content;
+    SQL
+  end
+end

data/db/migrate/20250130152441_add_gin_index_to_pg_search_documents.rb

@@ -0,0 +1,7 @@
+class AddGinIndexToPgSearchDocuments < ActiveRecord::Migration[7.2]
+  disable_ddl_transaction!
+
+  def change
+    add_index :pg_search_documents, :tsv_content, using: :gin, algorithm: :concurrently
+  end
+end

data/lib/apidae/version.rb

@@ -1,3 +1,3 @@
 module Apidae
-  VERSION = "1.4.16"
+  VERSION = "2.0.0"
 end

data/test/dummy/bin/rails

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
-APP_PATH = File.expand_path('../../config/application', __FILE__)
-require_relative '../config/boot'
-require 'rails/commands'
+APP_PATH = File.expand_path("../config/application", __dir__)
+require_relative "../config/boot"
+require "rails/commands"

data/test/dummy/bin/rake

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
-require_relative '../config/boot'
-require 'rake'
+require_relative "../config/boot"
+require "rake"
 Rake.application.run

data/test/dummy/bin/setup

@@ -1,29 +1,37 @@
 #!/usr/bin/env ruby
-require 'pathname'
+require "fileutils"
 
-# path to your application root.
-APP_ROOT = Pathname.new File.expand_path('../../',  __FILE__)
+APP_ROOT = File.expand_path("..", __dir__)
+APP_NAME = "dummy"
 
-Dir.chdir APP_ROOT do
-  # This script is a starting point to setup your application.
-  # Add necessary setup steps to this file:
+def system!(*args)
+  system(*args, exception: true)
+end
+
+FileUtils.chdir APP_ROOT do
+  # This script is a way to set up or update your development environment automatically.
+  # This script is idempotent, so that you can run it at any time and get an expectable outcome.
+  # Add necessary setup steps to this file.
 
   puts "== Installing dependencies =="
-  system "gem install bundler --conservative"
-  system "bundle check || bundle install"
+  system! "gem install bundler --conservative"
+  system("bundle check") || system!("bundle install")
 
   # puts "\n== Copying sample files =="
   # unless File.exist?("config/database.yml")
-  #   system "cp config/database.yml.sample config/database.yml"
+  #   FileUtils.cp "config/database.yml.sample", "config/database.yml"
   # end
 
   puts "\n== Preparing database =="
-  system "bin/rake db:setup"
+  system! "bin/rails db:prepare"
 
   puts "\n== Removing old logs and tempfiles =="
-  system "rm -f log/*"
-  system "rm -rf tmp/cache"
+  system! "bin/rails log:clear tmp:clear"
 
   puts "\n== Restarting application server =="
-  system "touch tmp/restart.txt"
+  system! "bin/rails restart"
+
+  # puts "\n== Configuring puma-dev =="
+  # system "ln -nfs #{APP_ROOT} ~/.puma-dev/#{APP_NAME}"
+  # system "curl -Is https://#{APP_NAME}.test/up | head -n 1"
 end

data/test/dummy/config/application.rb

@@ -1,24 +1,32 @@
-require File.expand_path('../boot', __FILE__)
+require_relative "boot"
 
-require 'rails/all'
+require "rails/all"
 
+# Require the gems listed in Gemfile, including any gems
+# you've limited to :test, :development, or :production.
 Bundler.require(*Rails.groups)
-require "apidae"
 
 module Dummy
   class Application < Rails::Application
-    # Settings in config/environments/* take precedence over those specified here.
-    # Application configuration should go into files in config/initializers
-    # -- all .rb files in that directory are automatically loaded.
+    # Initialize configuration defaults for originally generated Rails version.
+    config.load_defaults 5.0
 
-    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
-    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
-    # config.time_zone = 'Central Time (US & Canada)'
+    # Please, add to the `ignore` list any other `lib` subdirectories that do
+    # not contain `.rb` files, or that should not be reloaded or eager loaded.
+    # Common ones are `templates`, `generators`, or `middleware`, for example.
+    config.autoload_lib(ignore: %w[assets tasks])
+
+    # Configuration for the application, engines, and railties goes here.
+    #
+    # These settings can be overridden in specific environments using the files
+    # in config/environments, which are processed later.
+    #
+    # config.time_zone = "Central Time (US & Canada)"
+    # config.eager_load_paths << Rails.root.join("extras")
 
-    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
-    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
-    # config.i18n.default_locale = :de
     config.apidae_auth = :dummy_auth
+
+    # Use sql schema format
+    config.active_record.schema_format = :sql
   end
 end
-

data/test/dummy/config/boot.rb

@@ -1,5 +1,3 @@
-# Set up gems listed in the Gemfile.
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__)
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
 
-require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
-$LOAD_PATH.unshift File.expand_path('../../../../lib', __FILE__)
+require "bundler/setup" # Set up gems listed in the Gemfile.

data/test/dummy/config/cable.yml

@@ -0,0 +1,10 @@
+development:
+  adapter: async
+
+test:
+  adapter: test
+
+production:
+  adapter: redis
+  url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %>
+  channel_prefix: dummy_production

data/test/dummy/config/environment.rb

@@ -1,5 +1,5 @@
 # Load the Rails application.
-require File.expand_path('../application', __FILE__)
+require_relative "application"
 
 # Initialize the Rails application.
 Rails.application.initialize!

data/test/dummy/config/environments/development.rb

@@ -1,41 +1,75 @@
+require "active_support/core_ext/integer/time"
+
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
-  # In the development environment your application's code is reloaded on
-  # every request. This slows down response time but is perfect for development
+  # In the development environment your application's code is reloaded any time
+  # it changes. This slows down response time but is perfect for development
   # since you don't have to restart the web server when you make code changes.
-  config.cache_classes = false
+  config.enable_reloading = true
 
   # Do not eager load code on boot.
   config.eager_load = false
 
-  # Show full error reports and disable caching.
-  config.consider_all_requests_local       = true
-  config.action_controller.perform_caching = false
+  # Show full error reports.
+  config.consider_all_requests_local = true
+
+  # Enable server timing.
+  config.server_timing = true
+
+  # Enable/disable caching. By default caching is disabled.
+  # Run rails dev:cache to toggle caching.
+  if Rails.root.join("tmp/caching-dev.txt").exist?
+    config.action_controller.perform_caching = true
+    config.action_controller.enable_fragment_cache_logging = true
+
+    config.cache_store = :memory_store
+    config.public_file_server.headers = { "Cache-Control" => "public, max-age=#{2.days.to_i}" }
+  else
+    config.action_controller.perform_caching = false
+
+    config.cache_store = :null_store
+  end
+
+  # Store uploaded files on the local file system (see config/storage.yml for options).
+  config.active_storage.service = :local
 
   # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false
 
+  # Disable caching for Action Mailer templates even if Action Controller
+  # caching is enabled.
+  config.action_mailer.perform_caching = false
+
+  config.action_mailer.default_url_options = { host: "localhost", port: 3000 }
+
   # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
 
+  # Raise exceptions for disallowed deprecations.
+  config.active_support.disallowed_deprecation = :raise
+
+  # Tell Active Support which deprecation messages to disallow.
+  config.active_support.disallowed_deprecation_warnings = []
+
   # Raise an error on page load if there are pending migrations.
   config.active_record.migration_error = :page_load
 
-  # Debug mode disables concatenation and preprocessing of assets.
-  # This option may cause significant delays in view rendering with a large
-  # number of complex assets.
-  config.assets.debug = true
+  # Highlight code that triggered database queries in logs.
+  config.active_record.verbose_query_logs = true
+
+  # Highlight code that enqueued background job in logs.
+  config.active_job.verbose_enqueue_logs = true
+
+  # Raises error for missing translations.
+  # config.i18n.raise_on_missing_translations = true
 
-  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
-  # yet still be able to expire them through the digest params.
-  config.assets.digest = true
+  # Annotate rendered view with file names.
+  config.action_view.annotate_rendered_view_with_filenames = true
 
-  # Adds additional error checking when serving assets at runtime.
-  # Checks for improperly declared sprockets dependencies.
-  # Raises helpful error messages.
-  config.assets.raise_runtime_errors = true
+  # Uncomment if you wish to allow Action Cable access from any origin.
+  # config.action_cable.disable_request_forgery_protection = true
 
-  # Raises error for missing translations
-  # config.action_view.raise_on_missing_translations = true
+  # Raise error when a before_action's only/except options reference missing actions.
+  config.action_controller.raise_on_missing_callback_actions = true
 end