apidae 1.2.21 → 1.2.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 578c5fe1c18428e8dada2ae1735b1512354342a36902acd857bd9e4edac813f9
-  data.tar.gz: faead9493081103a4f9949f621b72608a04b86dbd396cc265ce08a2e87aa782f
+  metadata.gz: e876e6c54a6f64766c87a2cef8b2490951e5498ce42fc36a033d1efd2167cf85
+  data.tar.gz: 5968880f4a7e81b5053f5d10075a32970dd299d987a68b5565507b68bfc68d1b
 SHA512:
-  metadata.gz: 30d454716bb161d7fcb6f8b54d7e75e486f7f6ca9a4e79d6535197e7270ac351b387e072fd4dd03cf1f5d7e8e9fc171b5bfc2f1d1b6b6a269de52f101bb0396f
-  data.tar.gz: 6569ba1a08d2970773d50c5d3aa966872b854e46419cd7f5136f05245e0698c6e53e2fd4d6a0fcc3fe5e001b93321442eb28297eb2f1a6ebbd7ca7bfa7bf9a42
+  metadata.gz: 395d49eeac109782a8e41b1c0827c2de3f155279a87874b9d5c766e3f49138e8ecc224a81ec88473557799c28731a395639f46f242512ec3e78c4d57d6b50c43
+  data.tar.gz: 824474b65f47c9b060823964c185a83cb9b97be5ae63056dabb902418e5150566ad2c3d83fbf922632737af1cb736f637ad6c9efb162ad229def483a4b004cd2

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/lib/apidae/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apidae
 version: !ruby/object:Gem::Version
-  version: 1.2.21
+  version: 1.2.22
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-28 00:00:00.000000000 Z
+date: 2021-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails