apidae 1.3.3 → 1.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d1f8d7ad0798847cc0b3882958e5f557f1f01219
-  data.tar.gz: 94d139b245115c273ec4c73b385c380bf816da87
+SHA256:
+  metadata.gz: 75dde9650200cc683aac33972e62266dd313530eb14fdf1adce960666b055752
+  data.tar.gz: 210f1dcc7a842812d00fb4ea471b33c2f00327b4ae32bb1727dc831e878df263
 SHA512:
-  metadata.gz: 47dea0045600b59233e78a4616396aee8341de70e9121a335741fbe66d39ffea03e18503564a83c4cd9fe496ebe7058b7ba13690c902f794f46967146d65b16d
-  data.tar.gz: 2350154e37a3fac1d56eed268eb322309842fcf8b349c2e2b28c63af4605aa3cb15c1b629f31a60d740ffe6ec6b9778e9c2a9ae4f03414ae9c86a3023661c719
+  metadata.gz: f1e8f20bd1163222ad25c737b2d4593159c774f15afe9d10143317540de6fb4cab3f66f09bab4155e41e7459b7728e3bb64ba39f46600011fd1bc7daac561eaa
+  data.tar.gz: 44ca9a17ccd7d50fe8bf878158902f623e007162027abc923293dbbf3ee96e0fde3b41809f1d93b8e33f8000ff85acc68d40d3c1c4c9025db2bcf093caabb815

data/app/models/apidae/apidae_data_parser.rb

@@ -113,7 +113,7 @@ module Apidae
             short_desc: node_value(data_hash, :descriptifCourt, *locales),
             long_desc: node_value(data_hash, :descriptifDetaille, *locales),
             theme_desc: data_hash[:descriptifsThematises].blank? ? {} : Hash[data_hash[:descriptifsThematises].map {|th| [node_id(th, :theme), node_value(th, :description, *locales)]}],
-            private_desc: private_data.blank? ? {} : Hash[private_data.map {|d| [d[:nomTechnique], node_value(d, :descriptif, *locales)]}]
+            private_desc: private_data.blank? ? {} : Hash[private_data.map {|d| [d[:nomTechnique], (node_value(d, :descriptif, *locales).blank? ? {LOCALE_FR => d[:libelleFr]} : node_value(d, :descriptif, *locales))]}]
         }
       end
     end
@@ -151,6 +151,7 @@ module Apidae
                 name: localized_value(att, :nom, locale),
                 url: att[:traductionFichiers][0][:url].gsub('http:', 'https:'),
                 type: att[:type],
+                link: att[:link],
                 description: localized_value(att, :legende, locale)
             }
           end
@@ -222,6 +223,8 @@ module Apidae
           loc_data[:latitude] = geoloc_details[:geoJson][:coordinates][1]
           loc_data[:longitude] = geoloc_details[:geoJson][:coordinates][0]
         end
+        loc_data[:map_reference] = geoloc_details[:reperePlan]
+        loc_data[:altitude] = geoloc_details[:altitude] if geoloc_details
         loc_data[:access] = node_value(geoloc_details, :complement) if geoloc_details
         loc_data[:environments] = location_hash[:environnements].map {|e| e[:id]} if location_hash[:environnements]
       end
@@ -236,6 +239,7 @@ module Apidae
             openings_desc: node_value(openings_hash, :periodeEnClair, *locales),
             openings_desc_mode: openings_hash[:periodeEnClairGenerationMode] == 'AUTOMATIQUE' ? MODE_AUTO : MODE_MANUAL,
             openings: build_openings(openings_hash, *locales),
+            all_year_long: openings_hash[:ouvertTouteLAnnee] == 'OUVERT_TOUTE_L_ANNEE' ? 'true' : 'false',
             time_periods: lists_ids(openings_hash[:indicationsPeriode]),
             openings_extra: lists_ids(openings_hash[:ouverturesComplementaires])
         }
@@ -249,6 +253,7 @@ module Apidae
         methods = rates_hash[:modesPaiement].blank? ? [] : rates_hash[:modesPaiement].map {|p| p[:id]}
         {
             rates_desc: desc, rates: values, payment_methods: methods,
+            tax_included: rates_hash[:taxeDeSejourIncluse].blank? ? nil : (rates_hash[:taxeDeSejourIncluse] == 'OUI'),
             rates_desc_mode: rates_hash[:tarifsEnClairGenerationMode] == 'AUTOMATIQUE' ? MODE_AUTO : MODE_MANUAL,
             includes: node_value(rates_hash, :leTarifComprend, *locales),
             excludes: node_value(rates_hash, :leTarifNeComprendPas, *locales),
@@ -264,18 +269,21 @@ module Apidae
       apidae_obj.apidae_subtype = node_id(data_hash, :rubrique) if apidae_obj.apidae_type == Obj::EQU
       apidae_obj.apidae_subtype = lists_ids(data_hash[:typesHebergement]).first if apidae_obj.apidae_type == Obj::SPA
       {
-          categories: lists_ids(data_hash[:categories], data_hash[:typesDetailles], data_hash[:activiteCategories]),
+          categories: lists_ids(data_hash[:categories], data_hash[:typesDetailles], data_hash[:activiteCategories], data_hash[:typesHabitation]),
           themes: lists_ids(data_hash[:themes]),
           capacity: (data_hash[:capacite] || {})
                         .merge(presta_hash ? {group_min: presta_hash[:tailleGroupeMin], group_max: presta_hash[:tailleGroupeMax],
                                               age_min: presta_hash[:ageMin], age_max: presta_hash[:ageMax]} : {}),
           classification: nodes_ids(data_hash[:classement], data_hash[:classementPrefectoral], data_hash[:classification]) +
               lists_ids(data_hash[:classementsGuides]) + lists_ids(data_hash[:classements]),
+          classification_date: data_hash[:dateClassement],
+          classification_ref: data_hash[:numeroClassement],
           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]),
           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] : nil,
+          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,
           products: lists_ids(data_hash[:typesProduit], data_hash[:aopAocIgps], data_hash[:specialites]),
           audience: lists_ids(prestations_hash[:typesClientele]),
           animals: {allowed: prestations_hash[:animauxAcceptes] == 'ACCEPTES', desc: node_value(prestations_hash, :descriptifAnimauxAcceptes, *locales),
@@ -283,7 +291,10 @@ module Apidae
           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]}},
-          business: business_hash
+          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]),
+          business_rooms: (business_hash || {})[:sallesReunion]
       }
     end
 
@@ -317,13 +328,19 @@ module Apidae
       tags
     end
 
-    def self.parse_booking(reservation_hash, *locales)
+    def self.parse_booking(reservation_hash, visits_hash, *locales)
+      booking_hash = {}
       if reservation_hash
-        {
-            booking_desc: node_value(reservation_hash, :complement, *locales),
-            booking_entities: reservation_hash[:organismes]
-        }
+        booking_hash[:booking_desc] = node_value(reservation_hash, :complement, *locales),
+        booking_hash[:booking_entities] = reservation_hash[:organismes]
+      end
+      if visits_hash
+        booking_hash[:visits_allowed] = visits_hash[:visitable] == true
+        booking_hash[:visits_desc] = node_value(visits_hash, :complementVisite, *locales)
+        booking_hash[:visits_duration] = visits_hash[:dureeMoyenneVisiteIndividuelle]
+        booking_hash[:visits_services] = lists_ids(visits_hash[:prestationsVisitesGroupees]) + lists_ids(visits_hash[:prestationsVisitesIndividuelles])
       end
+      booking_hash
     end
 
     def self.parse_town(location_hash)
@@ -337,8 +354,14 @@ module Apidae
 
     def self.parse_entity_fields(information_hash, type_data_hash, sp_hash)
       entity_hash = {}
-      if information_hash && information_hash[:structureGestion]
-        entity_hash.merge!({entity_id: information_hash[:structureGestion][:id], service_provider_id: node_id(type_data_hash, :prestataireActivites)})
+      if information_hash
+        if information_hash[:structureGestion]
+          entity_hash.merge!({entity_id: information_hash[:structureGestion][:id], service_provider_id: node_id(type_data_hash, :prestataireActivites)})
+        end
+
+        if information_hash[:informationsLegales]
+          entity_hash.merge!({legal: information_hash[:informationsLegales]})
+        end
       end
       if sp_hash && sp_hash[:prestataireActivites]
         entity_hash[:is_service_provider] = true

data/app/models/apidae/file_import.rb

@@ -30,18 +30,21 @@ module Apidae
           Town.import(zfile.read(TOWNS_FILE))
           logger.info "Completed #{Town.count} towns update"
         end
-        zfile.each do |file|
+        ordered_files(zfile).each do |file|
           if file.file? && file.name.end_with?('.json')
             logger.info "Processing file : #{file.name}"
             if file.name.include?(MODIFIED_DIR)
               add_or_update_objects(zfile.read(file.name), result, project.locales, project.versions)
-            elsif file.name.include?(DELETED_FILE)
-              delete_objects(zfile.read(file.name), result)
-            elsif file.name.include?(SELECTIONS_FILE)
+            end
+            if file.name.include?(SELECTIONS_FILE)
               add_or_update_selections(project, zfile.read(file.name), result)
             end
+            if file.name.include?(DELETED_FILE)
+              delete_objects(zfile.read(file.name), result)
+            end
           end
         end
+        project.cleanup_selections
         create(result.except(:selections)
                    .merge({remote_file: (zip_file.is_a?(File) ? zip_file.path : zip_file), status: STATUS_COMPLETE, apidae_id: project_id}))
         logger.info "Import results : #{result}"
@@ -104,12 +107,16 @@ module Apidae
       end
     end
 
+    def self.ordered_files(zfile)
+      zfile.sort_by {|f| f.name.include?(MODIFIED_DIR) ? 0 : (f.name.include?(SELECTIONS_FILE) ? 1 : 2)}
+    end
+
     def self.delete_objects(deleted_json, result)
       deleted_ids = JSON.parse(deleted_json)
       deleted_ids.each do |id|
         obj = Obj.find_by_apidae_id(id)
         if obj
-          obj.destroy!
+          obj.destroy! if obj.selections.empty?
           result[:deleted] += 1
         else
           logger.info "skipping object deletion : #{id}"
@@ -163,7 +170,9 @@ module Apidae
     def self.add_or_update_selections(project, selections_json, result)
       selections_hashes = JSON.parse(selections_json, symbolize_names: true)
       deleted_ids = Selection.where(apidae_project_id: project.id).collect {|sel| sel.apidae_id}.uniq - selections_hashes.collect {|sel| sel[:id]}
-      Selection.where(apidae_id: deleted_ids).delete_all
+      apidae_selection_ids = Selection.where(apidae_id: deleted_ids).map {|s| s.id}
+      SelectionObject.where(apidae_selection_id: apidae_selection_ids).delete_all
+      Selection.where(id: apidae_selection_ids).delete_all
       selections_hashes.each do |selection_data|
         logger.info "Updating selection #{selection_data[:id]}"
         Selection.add_or_update(selection_data, project.id)

data/app/models/apidae/obj.rb

@@ -7,22 +7,24 @@ module Apidae
 
     attr_accessor :locale
     attr_accessor :obj_version
+    attr_accessor :obj_versions
 
     store_accessor :title_data, :title
     store_accessor :owner_data, :owner_name, :owner_id
     store_accessor :description_data, :short_desc, :long_desc, :theme_desc, :private_desc
     store_accessor :pictures_data, :pictures
     store_accessor :attachments_data, :attachments
-    store_accessor :type_data, :categories, :themes, :capacity, :classification, :labels, :chains, :area, :track,
-                   :products, :audience, :animals, :animals_desc, :extra, :duration, :certifications, :business
-    store_accessor :entity_data, :entity_id, :entity_name, :service_provider_id, :is_service_provider
+    store_accessor :type_data, :categories, :themes, :capacity, :classification, :classification_date,
+                   :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, :service_provider_id, :is_service_provider, :legal
     store_accessor :contact_data, :telephone, :email, :website, :google, :facebook, :twitter, :yelp, :trip_advisor, :fax,
                    :mobile_website, :shorty_url, :contacts
-    store_accessor :location_data, :address, :place, :latitude, :longitude, :access, :territories, :environments
+    store_accessor :location_data, :address, :place, :latitude, :longitude, :access, :territories, :environments, :altitude, :map_reference
     store_accessor :openings_data, :openings_desc, :openings_desc_mode, :openings, :time_periods, :openings_extra
-    store_accessor :rates_data, :rates_desc, :rates_desc_mode, :rates, :payment_methods, :includes, :excludes, :rates_extra
+    store_accessor :rates_data, :rates_desc, :rates_desc_mode, :rates, :payment_methods, :includes, :excludes, :rates_extra, :tax_included
     store_accessor :service_data, :services, :equipments, :comfort, :activities, :challenged, :languages
-    store_accessor :booking_data, :booking_desc, :booking_entities
+    store_accessor :booking_data, :booking_desc, :booking_entities, :visits_allowed, :visits_desc, :visits_duration, :visits_services
     store_accessor :tags_data, :promo, :internal, :linked
     store_accessor :version_data, :versioned_fields
 
@@ -83,7 +85,7 @@ module Apidae
         COS => {node: :informationsCommerceEtService, subtype: :commerceEtServiceType},
         DEG => {node: :informationsDegustation, subtype: :degustationType},
         DOS => {node: :informationsDomaineSkiable, subtype: :domaineSkiableType},
-        EQU => {node: :informationsEquipement, subtype: :equipementType},
+        EQU => {node: :informationsEquipement, subtype: :rubrique},
         FEM => {node: :informationsFeteEtManifestation, subtype: :feteEtManifestationType},
         HCO => {node: :informationsHebergementCollectif, subtype: :hebergementCollectifType},
         HLO => {node: :informationsHebergementLocatif, subtype: :hebergementLocatifType},
@@ -100,6 +102,7 @@ module Apidae
     after_initialize do
       @locale = DEFAULT_LOCALE
       @obj_version = DEFAULT_VERSION
+      @obj_versions = {}
     end
 
     def root_obj
@@ -111,11 +114,15 @@ module Apidae
     end
 
     def in_version(v)
-      @cached_versions ||= {}
-      if @cached_versions[v].nil?
-        @cached_versions[v] = versions.where(version: v).first
+      if v == DEFAULT_VERSION && root_obj_id.nil?
+        @obj_version = DEFAULT_VERSION
+        self
+      else
+        if @obj_versions[v].nil?
+          @obj_versions[v] = versions.where(version: v).first
+      end
+        @obj_versions[v]
       end
-      @cached_versions[v]
     end
 
     def in_locale(l)
@@ -164,6 +171,7 @@ module Apidae
       apidae_obj
     end
 
+    # Note : overrides existing fields (not a merge)
     def self.populate_fields(apidae_obj, object_data, locales)
       type_fields = TYPES_DATA[object_data[:type]]
       apidae_obj.last_update = DateTime.parse(object_data[:gestion][:dateModification]) unless object_data[:gestion].blank?
@@ -178,7 +186,7 @@ module Apidae
       apidae_obj.town = ApidaeDataParser.parse_town(object_data[:localisation])
       apidae_obj.openings_data = ApidaeDataParser.parse_openings(object_data[:ouverture], *locales)
       apidae_obj.rates_data = ApidaeDataParser.parse_rates(object_data[:descriptionTarif], *locales)
-      apidae_obj.booking_data = ApidaeDataParser.parse_booking(object_data[:reservation], *locales)
+      apidae_obj.booking_data = ApidaeDataParser.parse_booking(object_data[:reservation], object_data[:visites], *locales)
       apidae_obj.type_data = ApidaeDataParser.parse_type_data(apidae_obj, object_data[type_fields[:node]], object_data[:prestations],
                                              object_data[:tourismeAffaires], *locales)
       apidae_obj.pictures_data = ApidaeDataParser.parse_pictures_data(object_data[:illustrations], *locales)

data/app/models/apidae/project.rb

@@ -20,5 +20,11 @@ module Apidae
     def versions=(values)
       self.versions_data = values.blank? ? nil : values.join('|')
     end
+
+    def cleanup_selections
+      apidae_selections.reload.each do |s|
+        s.cleanup
+      end
+    end
   end
 end

data/app/models/apidae/selection.rb

@@ -42,6 +42,20 @@ module Apidae
       SelectionObject.where(apidae_selection_id: apidae_sel.id, apidae_object_id: removed_ids).delete_all
     end
 
+    def cleanup
+      obsolete_count = apidae_selection_objects
+        .joins("LEFT JOIN apidae_objs ON apidae_objs.id = apidae_selection_objects.apidae_object_id")
+        .where("apidae_objs.id IS NULL")
+        .delete_all
+      logger.info "Cleaned up #{obsolete_count} obsolete selection-objects associations for selection #{apidae_id}"
+
+      dups = apidae_selection_objects.reload.group(:apidae_object_id)
+                                     .select("COUNT(id), apidae_object_id, ARRAY_AGG(id) AS so_ids")
+                                     .having("COUNT(id) > ?", 1).map {|so| so.so_ids}
+      dups_count = apidae_selection_objects.where(id: dups.map {|d| d.sort[1..-1]}.flatten).delete_all
+      logger.info "Cleaned up #{dups_count} duplicate selection-objects associations for selection #{apidae_id}"
+    end
+
     def results(where_clause, offset, size)
       objects.includes(:town).limit(size).offset(offset).where(where_clause)
     end

data/app/models/apidae/territory.rb

@@ -5,7 +5,7 @@ module Apidae
       territories_hashes.each do |t_data|
         t = Territory.find_or_initialize_by(apidae_id: t_data[:id])
         t.name = t_data.dig(:nom, :libelleFr)
-
+        t.apidae_type = t_data.dig(:territoireType, :id)
         t.save!
       end
     end

data/config/initializers/constants.rb

@@ -27,6 +27,9 @@ module Apidae
 
   LOCALIZED_FIELDS = [:title, :short_desc, :long_desc, :pictures, :attachments, :openings_desc, :rates_desc,
                       :includes, :excludes, :extra, :booking_desc]
-  ALL_FIELDS = LOCALIZED_FIELDS + [:theme_desc, :private_desc, :capacity, :telephone, :email, :website, :services,
-                                   :equipments, :comfort, :activities, :promo, :internal, :linked]
+  ALL_FIELDS = LOCALIZED_FIELDS + [:theme_desc, :private_desc, :capacity, :telephone, :email, :website,
+                                   :google, :facebook, :twitter, :yelp, :trip_advisor, :fax, :mobile_website, :shorty_url,
+                                   :openings, :openings_extra, :rates, :services, :payment_methods, :categories, :themes,
+                                   :labels, :chains, :classification, :challenged, :environments, :languages, :products,
+                                   :animals, :equipments, :comfort, :activities, :promo, :internal, :linked]
 end

data/lib/apidae/version.rb

@@ -1,3 +1,3 @@
 module Apidae
-  VERSION = "1.3.3"
+  VERSION = "1.3.7"
 end

data/test/data/shared_selections.json

@@ -0,0 +1,15 @@
+[
+  {
+    "id": 49063,
+    "libelle": {
+      "libelleFr": "Sélection 2"
+    },
+    "nom": "Sélection 2",
+    "objetsTouristiques": [
+      {
+        "type": "STRUCTURE",
+        "id": 503
+      }
+    ]
+  }
+]

data/test/dummy/app/assets/config/manifest.js

@@ -0,0 +1 @@
+//= link_tree ../images

data/test/dummy/db/schema.rb

@@ -2,15 +2,15 @@
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
 #
-# Note that this schema.rb definition is the authoritative source for your
-# database schema. If you need to create the application database on another
-# system, you should be using db:schema:load, not running all the migrations
-# from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
+# This file is the source Rails uses to define your schema when running `bin/rails
+# db:schema:load`. When creating a new database, `bin/rails db:schema:load` tends to
+# be faster and is potentially less error prone than running all of your
+# migrations from scratch. Old migrations may fail to apply correctly if those
+# migrations use external dependencies or application code.
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2020_05_22_124205) do
+ActiveRecord::Schema.define(version: 2021_06_07_214647) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -92,8 +92,10 @@ ActiveRecord::Schema.define(version: 2020_05_22_124205) do
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.jsonb "meta_data"
+    t.boolean "is_active"
     t.index ["apidae_id"], name: "index_apidae_references_on_apidae_id"
     t.index ["apidae_type"], name: "index_apidae_references_on_apidae_type"
+    t.index ["is_active"], name: "index_apidae_references_on_is_active"
   end
 
   create_table "apidae_selection_objects", force: :cascade do |t|
@@ -112,6 +114,13 @@ ActiveRecord::Schema.define(version: 2020_05_22_124205) do
     t.integer "apidae_project_id"
   end
 
+  create_table "apidae_territories", force: :cascade do |t|
+    t.integer "apidae_id"
+    t.string "name"
+    t.integer "apidae_type"
+    t.index ["apidae_id"], name: "index_apidae_territories_on_apidae_id"
+  end
+
   create_table "apidae_towns", id: :serial, force: :cascade do |t|
     t.string "country"
     t.integer "apidae_id"

data/test/dummy/log/development.log

@@ -1,69 +1,24 @@
-  Apidae::Obj Load (1.5ms)  SELECT  "apidae_objs".* FROM "apidae_objs" ORDER BY "apidae_objs"."id" ASC LIMIT $1  [["LIMIT", 1]]
-   (0.2ms)  SELECT pg_try_advisory_lock(6140174353533887940)
-   (1.7ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
-Migrating to AddProjectIdToSelections (20181024072424)
-   (0.2ms)  BEGIN
-   (39.2ms)  ALTER TABLE "apidae_selections" ADD "apidae_project_id" integer
-  ActiveRecord::SchemaMigration Create (0.4ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1) RETURNING "version"  [["version", "20181024072424"]]
-   (0.8ms)  COMMIT
-Migrating to CreateApidaeProjects (20181024072843)
-   (0.1ms)  BEGIN
-   (56.9ms)  CREATE TABLE "apidae_projects" ("id" bigserial primary key, "name" character varying, "apidae_id" integer, "api_key" character varying, "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL)
-  ActiveRecord::SchemaMigration Create (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1) RETURNING "version"  [["version", "20181024072843"]]
-   (2.1ms)  COMMIT
-Migrating to AddApidaeIdToApidaeFileImports (20190111162443)
-   (40.0ms)  BEGIN
-   (0.6ms)  ALTER TABLE "apidae_file_imports" ADD "apidae_id" integer
-  ActiveRecord::SchemaMigration Create (0.4ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1) RETURNING "version"  [["version", "20190111162443"]]
-   (0.6ms)  COMMIT
-Migrating to UpgradeApidaeObjsTitleDataType (20190123142628)
-   (0.1ms)  BEGIN
-   (0.4ms)  ALTER TABLE "apidae_objs" ADD "title_data" jsonb
-  Apidae::Obj Load (0.5ms)  SELECT "apidae_objs".* FROM "apidae_objs"
-   (1.4ms)  ALTER TABLE "apidae_objs" DROP COLUMN "title"
-  ActiveRecord::SchemaMigration Create (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1) RETURNING "version"  [["version", "20190123142628"]]
-   (0.4ms)  COMMIT
-  ActiveRecord::InternalMetadata Load (1.9ms)  SELECT  "ar_internal_metadata".* FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = $1 LIMIT $2  [["key", "environment"], ["LIMIT", 1]]
-   (0.2ms)  BEGIN
-   (0.1ms)  COMMIT
-   (0.2ms)  SELECT pg_advisory_unlock(6140174353533887940)
-   (0.2ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
-   (0.3ms)  SELECT pg_try_advisory_lock(6140174353533887940)
-   (3.6ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
-Migrating to AddBookingDataToApidaeObjs (20190123160046)
-   (0.2ms)  BEGIN
-   (0.7ms)  ALTER TABLE "apidae_objs" ADD "booking_data" jsonb
-  Apidae::Obj Load (1.0ms)  SELECT "apidae_objs".* FROM "apidae_objs"
-   (0.5ms)  ALTER TABLE "apidae_objs" DROP COLUMN "reservation"
-  ActiveRecord::SchemaMigration Create (0.3ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1) RETURNING "version"  [["version", "20190123160046"]]
-   (0.6ms)  COMMIT
-  ActiveRecord::InternalMetadata Load (0.7ms)  SELECT  "ar_internal_metadata".* FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = $1 LIMIT $2  [["key", "environment"], ["LIMIT", 1]]
-   (0.2ms)  BEGIN
-   (0.1ms)  COMMIT
-   (0.2ms)  SELECT pg_advisory_unlock(6140174353533887940)
-   (0.2ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
-   (4.5ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
-   (0.2ms)  SELECT pg_try_advisory_lock(6140174353533887940)
-   (0.6ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
-Migrating to AddLocalesDataToApidaeProjects (20190123214635)
-   (0.2ms)  BEGIN
-   (3.2ms)  ALTER TABLE "apidae_projects" ADD "locales_data" character varying
-  ActiveRecord::SchemaMigration Create (0.3ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1) RETURNING "version"  [["version", "20190123214635"]]
-   (0.5ms)  COMMIT
-  ActiveRecord::InternalMetadata Load (42.2ms)  SELECT  "ar_internal_metadata".* FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = $1 LIMIT $2  [["key", "environment"], ["LIMIT", 1]]
-   (0.2ms)  BEGIN
-   (0.1ms)  COMMIT
-   (0.2ms)  SELECT pg_advisory_unlock(6140174353533887940)
-   (0.2ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
-   (0.5ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
-   (0.2ms)  SELECT pg_try_advisory_lock(6140174353533887940)
-   (0.5ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
-  ActiveRecord::InternalMetadata Load (0.4ms)  SELECT  "ar_internal_metadata".* FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = $1 LIMIT $2  [["key", "environment"], ["LIMIT", 1]]
-   (0.2ms)  BEGIN
-   (0.2ms)  COMMIT
-   (0.2ms)  SELECT pg_advisory_unlock(6140174353533887940)
-   (0.2ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
-  Apidae::Obj Load (26.8ms)  SELECT apidae_id, COUNT(id) FROM "apidae_objs" WHERE "apidae_objs"."root_obj_id" IS NULL GROUP BY "apidae_objs"."apidae_id" HAVING (COUNT(id) > 1)
-  Apidae::Obj Load (2.4ms)  SELECT apidae_id, COUNT(id) FROM "apidae_objs" WHERE "apidae_objs"."root_obj_id" IS NULL GROUP BY "apidae_objs"."apidae_id" HAVING (COUNT(id) > 1)
-  Apidae::Obj Load (0.8ms)  SELECT  "apidae_objs".* FROM "apidae_objs" ORDER BY "apidae_objs"."id" ASC LIMIT $1  [["LIMIT", 1]]
-   (3.4ms)  SELECT COUNT(*) FROM "apidae_objs"
+DEPRECATION WARNING: Initialization autoloaded the constants Apidae::ApidaeHelper, Apidae::ApplicationHelper, Apidae::ApiHelper, Apidae::DashboardHelper, Apidae::ExtendableHelper, Apidae::ImportHelper, Apidae::ObjectsHelper, Apidae::ReferencesHelper, Apidae::SelectionsHelper, and Apidae::ApplicationController.
+
+Being able to do this is deprecated. Autoloading during initialization is going
+to be an error condition in future versions of Rails.
+
+Reloading does not reboot the application, and therefore code executed during
+initialization does not run again. So, if you reload Apidae::ApidaeHelper, for example,
+the expected changes won't be reflected in that stale Module object.
+
+`config.autoloader` is set to `classic`. These autoloaded constants would have been unloaded if `config.autoloader` had been set to `:zeitwerk`.
+
+In order to autoload safely at boot time, please wrap your code in a reloader
+callback this way:
+
+    Rails.application.reloader.to_prepare do
+      # Autoload classes and modules needed at boot time here.
+    end
+
+That block runs when the application boots, and every time there is a reload.
+For historical reasons, it may run twice, so it has to be idempotent.
+
+Check the "Autoloading and Reloading Constants" guide to learn more about how
+Rails autoloads and reloads.
+ (called from <top (required)> at /Users/jbvilain/workspace/apidae-engine-rails/test/dummy/config/environment.rb:5)

data/test/models/apidae/file_import_test.rb

@@ -166,6 +166,29 @@ module Apidae
       assert_equal 0, Selection.count
     end
 
+    test "object deletion cancelled if used by another project" do
+      proj = Project.create(apidae_id: 123)
+      other_proj = Project.create(apidae_id: 456)
+      sel = Selection.create(apidae_id: 49063, apidae_project_id: proj.id, label: 'Sélection 2', reference: 'selection-2')
+      other_sel = Selection.create(apidae_id: 49999, apidae_project_id: other_proj.id, label: 'Sélection 99', reference: 'selection-99')
+      sel.objects << Obj.create(apidae_id: 503, title: 'Société des violoncellistes aixois')
+      sel.objects << Obj.create(apidae_id: 504, title: 'Société des contrebassistes aixois')
+      other_sel.objects << Obj.find_by_apidae_id(504)
+
+      assert_equal 2, sel.objects.count
+      assert_equal 1, other_sel.objects.count
+
+      selections_json = File.read('test/data/shared_selections.json')
+      FileImport.add_or_update_selections(proj, selections_json, @result)
+      deletion_json = File.read('test/data/deletion.json')
+      FileImport.delete_objects(deletion_json, @result)
+
+      assert_equal 2, Obj.count
+      assert_equal({created: 0, updated: 0, deleted: 1, selections:
+        [{:apidae_id=>49063, :reference=>"selection-2", :objects=>1}]}, @result)
+      assert_equal 1, other_sel.objects.count
+    end
+
     test "full import process" do
       Obj.create(apidae_id: 123, title: 'Objet à supprimer')
       Obj.create(apidae_id: 4826186, title: 'Objet à mettre à jour')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apidae
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.7
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-07 00:00:00.000000000 Z
+date: 2022-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -209,10 +209,12 @@ files:
 - test/data/hot_fr_en.json
 - test/data/json_export.zip
 - test/data/selections.json
+- test/data/shared_selections.json
 - test/data/structure.json
 - test/data/update_selections.json
 - test/dummy/README.rdoc
 - test/dummy/Rakefile
+- test/dummy/app/assets/config/manifest.js
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/controllers/application_controller.rb
@@ -245,7 +247,6 @@ files:
 - test/dummy/config/secrets.yml
 - test/dummy/db/schema.rb
 - test/dummy/log/development.log
-- test/dummy/log/test.log
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html
@@ -284,14 +285,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: A Ruby on Rails engine for projects that involve Apidae data
 test_files:
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/views/layouts/application.html.erb
+- test/dummy/app/assets/config/manifest.js
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/helpers/application_helper.rb
@@ -326,7 +327,6 @@ test_files:
 - test/dummy/public/500.html
 - test/dummy/public/404.html
 - test/dummy/db/schema.rb
-- test/dummy/log/test.log
 - test/dummy/log/development.log
 - test/dummy/README.rdoc
 - test/integration/navigation_test.rb
@@ -351,6 +351,7 @@ test_files:
 - test/controllers/apidae/dashboard_controller_test.rb
 - test/controllers/apidae/references_controller_test.rb
 - test/controllers/apidae/import_controller_test.rb
+- test/data/shared_selections.json
 - test/data/equ_groups.json
 - test/data/update_selections.json
 - test/data/json_export.zip