klastera 1.5.5.3 → 1.5.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b7a266fca197bb8333a1bfa72e2a36b2bdec447429a1e50e95b5b89dc31fb5f
-  data.tar.gz: fd8ec6949e6fea5015fe33090ecf09a90e9815361d8e861fb42ac856e83ff111
+  metadata.gz: c4b18c6803bcea9323fe454de8293d219fca55d5fade1913dc31e01dadf16efd
+  data.tar.gz: 184638381c45f93db22d2bec40c8d2536c0722dd8ec54d7f3f508502ebe73514
 SHA512:
-  metadata.gz: 29ed3030a1296a3fb95073255642e9bef489fea5d136291d8d6f8e71f5b2b6f8ab040034e56c5dc66e70d09451d1880290fedfbbc904ac105ec7dc58ae4810f8
-  data.tar.gz: 7bc4e57bdac9abc5cf68be34bc64c48dbce81f6db405485e4dca1e6a8079e1d97e28630e159fb5049158a5d0f280fd000849b89e0cf6dfdc87f2a56bd4ae4e6b
+  metadata.gz: 27bd431138c5c6f17f296e2e49a3aaff2846011aca1feb53e500f1eba5e60c0b98f1b69dfc0f9fad9b8c886069882744152fc3b89a4a14951dd21f87a2f3d2c6
+  data.tar.gz: d64254e8c67a7b54d49179f58721547ead68bd363dd4cd6174addd2a13957a21b795da9118289df8f9a228807388d4da8ab6e3639a00447dd3f04cb57e379f08

data/app/models/klastera/concerns/clusterizable.rb

@@ -62,8 +62,11 @@ module Klastera::Concerns::Clusterizable
       end
     end
 
+    # No cuenta las filas marcadas para destruir: quitar una zona con el basurero y volver a agregar
+    # la misma en el mismo guardado deja una sola fila al final, y no es un duplicado.
     def uniqueness_of_cluster_entity_record
-      if cluster_entities.map(&:cluster_id).uniq.size != cluster_entities.size
+      vigentes = cluster_entities.reject(&:marked_for_destruction?)
+      if vigentes.map(&:cluster_id).uniq.size != vigentes.size
         return errors.add(:cluster_entities, I18n.t('klastera.messages.duplicated_cluster_entity') )
       end
     end

data/lib/klastera/version.rb

@@ -1,3 +1,3 @@
 module Klastera
-  VERSION = "1.5.5.3"
+  VERSION = "1.5.5.4"
 end

data/test/models/klastera/clusterizable_nested_attributes_test.rb

@@ -60,5 +60,22 @@ module Klastera
       entity.valid?
       assert entity.errors[:cluster_entities].any?
     end
+
+    test "acepta quitar una zona y volver a agregar la misma en el mismo guardado" do
+      entity, ce, cluster = build_entity_with_cluster
+      entity.assign_attributes(cluster_entities_attributes: {
+        "0" => { "id" => ce.id, "_destroy" => "1" },
+        "1" => { "cluster_id" => cluster.id.to_s, "_destroy" => "false" }
+      })
+      entity.valid?
+      assert_not entity.errors[:cluster_entities].any? { |m| m == I18n.t('klastera.messages.duplicated_cluster_entity') }
+    end
+
+    test "sigue rechazando la misma zona dos veces vigente" do
+      entity, _ce, cluster = build_entity_with_cluster
+      entity.assign_attributes(cluster_entities_attributes: { "1" => { "cluster_id" => cluster.id.to_s, "_destroy" => "false" } })
+      entity.valid?
+      assert entity.errors[:cluster_entities].any?
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: klastera
 version: !ruby/object:Gem::Version
-  version: 1.5.5.3
+  version: 1.5.5.4
 platform: ruby
 authors:
 - Gino Barahona