klastera 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8ffbcdd772da4880e6fac3a2fa9165754a873673afb5f2108161d099e634622
-  data.tar.gz: 8541bb3c9c26b8e0084e42b91ef9262b443dbaf1250e4bd209a2fde9db6d92a9
+  metadata.gz: 4fe09e51ca6d275a070d368cd49d916ff2ad2b02f2c06e2afcec708bda66ef88
+  data.tar.gz: 03d542c381f4eaefa9079d8ca47c33c787658faa0cce87127225f52a069bbd46
 SHA512:
-  metadata.gz: e43f85ef19e054e32274ad4c5c99db112333c76fa831383e72f3e0f7d7ad312d5b48519c33794a46ad3148dd4d50cca62117620e756b12933f0889a9891ad631
-  data.tar.gz: dc98ab10fc1588bec841af4b1e3a4caee5b976986e8023b7528c70190ee2b27fb2e230855773aaa1fcf1a28392380b9f63d186b9165e4f5704acf2631cd3d40f
+  metadata.gz: 88d80a8309499a0b61d96a44d3a297fcb87fe9352d46021a7e415a66bb1e2e4776400888396478deacb9108c861bfe69755477e23f9d43ed4273b2ce98206bf5
+  data.tar.gz: 836a8472f3a71fda307b77c4c7c69e038bb9c01f2d364b6fb98817cc096960dca2a4ee7d8eb8735b83fbb1a67bd31e4f168f45871fa79362d6e600ac10aed307

data/lib/klastera.rb

@@ -114,40 +114,30 @@ module Klastera
     end
 
     # 
-    # Untested version for more optimized queries
+    # Optimized version of cluster_scope!
     #
-    def __cluster_scope!(scope,user,organization,cluster_id=nil,same_scope:false)
+    def same_cluster_scope!(scope,user,organization,cluster_id=nil)
       scope_klass = scope_class(scope)
       if organization.is_in_cluster_mode?
-        scope_klass = scope_klass.includes(:organization)
+        scope_klass = scope_klass.eager_load(:organization,cluster_entities: :cluster)
 
         if cluster_id.present?
           cluster_ids = cluster_id.is_a?(Array) ? cluster_id : [cluster_id]
         else
           clusters = cluster_of!(user,organization)
-          cluster_ids = clusters.map(&:id).compact
+          cluster_ids = clusters.map(&:id).compact.sort
         end
 
         scope_klass = scope_klass.select("DISTINCT ON (#{scope.table_name}.id) #{scope.table_name}.id, #{scope.table_name}.*, clusters.*")
 
-        if organization.required_suborganization_mode?
-          scope_klass = scope_klass.includes(cluster_entities: :cluster).where( cluster_entities: { cluster_id: cluster_ids } )
+        if organization.required_suborganization_mode?# || cluster_id # If cluster_id is passed NULL clusters are expected, rigth?
+          scope_klass = scope_klass.where( cluster_entities: { cluster_id: cluster_ids } )
         else
           or_these_cluster_ids = cluster_ids.present? ? " OR cluster_entities.cluster_id IN (#{cluster_ids.join(",")})" : ""
-          scope_klass = scope_klass.joins("
-            LEFT OUTER JOIN cluster_entities
-              ON entity_id = #{scope.table_name}.id
-              AND entity_type = '#{scope}'
-          ").joins("
-            LEFT OUTER JOIN clusters
-              ON clusters.id = cluster_entities.cluster_id
-          ").where("cluster_entities.id IS NULL#{or_these_cluster_ids}")
-        end
-        # Provisional fix to avoid unresolved SQL clashes with the main application due to DISTINCT ON clause
-        unless same_scope
-          scope_klass = scope_class(scope).eager_load(:cluster_entities).where(id: scope_klass.map(&:id))
+          scope_klass = scope_klass.where("cluster_entities.id IS NULL#{or_these_cluster_ids}")
         end
       end
+
       scope_klass.where(organization_id: organization)
     end
 
@@ -245,8 +235,8 @@ module Klastera
     Klastera.cluster_scope!(scope, cluster_user, cluster_organization, cluster_id)
   end
 
-  def __cluster_scope(scope,cluster_id=nil,same_scope:false)
-    Klastera.__cluster_scope!(scope, cluster_user, cluster_organization, cluster_id, same_scope: same_scope)
+  def same_cluster_scope(scope,cluster_id=nil)
+    Klastera.same_cluster_scope!(scope, cluster_user, cluster_organization, cluster_id)
   end
 
   def cluster_of_my_own

data/lib/klastera/version.rb

@@ -1,3 +1,3 @@
 module Klastera
-  VERSION = "1.3.1"
+  VERSION = "1.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: klastera
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Gino Barahona
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-26 00:00:00.000000000 Z
+date: 2020-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails