apidae 1.4.14 → 1.4.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 717c235716f2c331eb81b73500c416a68de4850638d828f6364f42c8d6f7e83b
-  data.tar.gz: 05200e0529e5c7d7d1655735208671a7ed98ac46119f66c090e9e9689fc1edb1
+  metadata.gz: 44f3b5a191f7f2f610620e188d2be34c993a5a809fb669732ebcdbed450c1f8b
+  data.tar.gz: 7ffceca9b1cdd04cf30765c28e232a222ed70b39c78cf768637b0864ac98a798
 SHA512:
-  metadata.gz: 7adb1fd2f131e01da43c6a42861ba6204ba0ab28e15a7e9d1a99b9d77e2b614b68e28801bfdff008adeb0016f6c088f6a1148e77c5b06fe0fee1e600ccb64519
-  data.tar.gz: e9d015d7585d39aea7fc5e79b0c988cb772d25b48c12051a1f36051f25e5a40be61f03f09719f2d2e08f0fab5b9542ad314e87049b597c3a0d5c1e64420b5104
+  metadata.gz: da91c8d99c4c586ab67812a49f66b2ca286e5695082ff93af37fccf6dc4ecd1071ebb024b6a92e34e03c60247779c76b31047d1225afddaa3223b4b3c5aa18d4
+  data.tar.gz: 5440942e4b41d30fe82957254c9ce36bb5cc19be0d7961f757a9e4190349581db698f5d5cd50eb0e390c5c35f668feab7acf4aea584da504335df2c1f4904260

data/app/controllers/apidae/projects_controller.rb

@@ -3,7 +3,9 @@ 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]
+    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]
 
     def index
       if user_is_admin?
@@ -47,6 +49,10 @@ 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? ? [] : 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/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/config/routes.rb

@@ -11,7 +11,10 @@ Apidae::Engine.routes.draw do
     end
   end
   resources :references, only: [:index]
-  resources :projects, only: [:index, :new, :create, :edit, :update, :destroy], path: 'projets'
+  resources :projects, only: [:index, :new, :create, :edit, :update, :destroy], path: 'projets' do
+    post 'realtime', on: :collection
+  end
+
 
   match 'import/callback', via: :post, to: 'import#callback'
   match 'import/run', via: :post, to: 'import#run'

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.14"
+  VERSION = "1.4.16"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apidae
 version: !ruby/object:Gem::Version
-  version: 1.4.14
+  version: 1.4.16
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-18 00:00:00.000000000 Z
+date: 2025-03-23 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