apidae 1.2.22 → 1.2.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e876e6c54a6f64766c87a2cef8b2490951e5498ce42fc36a033d1efd2167cf85
-  data.tar.gz: 5968880f4a7e81b5053f5d10075a32970dd299d987a68b5565507b68bfc68d1b
+  metadata.gz: 2407ded3bf635d320fc63285f4856a6665cf01f4bd59ffcc61dd5b4fbd5c0195
+  data.tar.gz: a6015865bc0699672c36abec0628cfc22031ab4bec70ee49a26a33134c459f9b
 SHA512:
-  metadata.gz: 395d49eeac109782a8e41b1c0827c2de3f155279a87874b9d5c766e3f49138e8ecc224a81ec88473557799c28731a395639f46f242512ec3e78c4d57d6b50c43
-  data.tar.gz: 824474b65f47c9b060823964c185a83cb9b97be5ae63056dabb902418e5150566ad2c3d83fbf922632737af1cb736f637ad6c9efb162ad229def483a4b004cd2
+  metadata.gz: '08f5b492b0e87e04e51de3fd8f91274c89f5420648effb6a48113aa0b567ba4bf6c6041e0c7c56f2c66b6478f9cae6ce32f4af3d83f9bdd9b35a36db2d81fbef'
+  data.tar.gz: d44a1b68ac1bb5155e280f743aa985ea3487b92939f4857ce2eacb73afda126eded590ee562c768a6f64eef3ad88cc6441d2e2702d4780abfdfe4c3642bc3a1f

data/app/models/apidae/file_import.rb

@@ -44,6 +44,7 @@ module Apidae
             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}"
@@ -169,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/lib/apidae/version.rb

@@ -1,3 +1,3 @@
 module Apidae
-  VERSION = "1.2.22"
+  VERSION = "1.2.23"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apidae
 version: !ruby/object:Gem::Version
-  version: 1.2.22
+  version: 1.2.23
 platform: ruby
 authors:
 - Jean-Baptiste Vilain