klastera 1.3.2 → 1.3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4fe09e51ca6d275a070d368cd49d916ff2ad2b02f2c06e2afcec708bda66ef88
-  data.tar.gz: 03d542c381f4eaefa9079d8ca47c33c787658faa0cce87127225f52a069bbd46
+  metadata.gz: 7fae7d83f8b939309532cb345a38bc9c4f76bfca455b16ccda6ad17283f6851e
+  data.tar.gz: f62a4b00a2c526c47b95464263dcca6de69d880b6095fdba41204fd14eff66b2
 SHA512:
-  metadata.gz: 88d80a8309499a0b61d96a44d3a297fcb87fe9352d46021a7e415a66bb1e2e4776400888396478deacb9108c861bfe69755477e23f9d43ed4273b2ce98206bf5
-  data.tar.gz: 836a8472f3a71fda307b77c4c7c69e038bb9c01f2d364b6fb98817cc096960dca2a4ee7d8eb8735b83fbb1a67bd31e4f168f45871fa79362d6e600ac10aed307
+  metadata.gz: 591f79de0e4332c44454b172eee9aea5491cfbee45ed2d942f67841a6918ff22323d0f0219e15ee60709672de8e190e9d466a822b96eb82b213dfecec5b22647
+  data.tar.gz: bb1b6e5ec7c8c4795f1662f7d0d9e58a758f0594547bd2ac64408efcb77a02fef103a0f1c349a6243d0023620f2fc23c631761f78ea5ced6a2c9640428b215eb

data/lib/klastera/version.rb

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

data/lib/klastera.rb

@@ -8,7 +8,8 @@ module Klastera
   UNCLUSTERED_ENTITY = 'without_cluster'
   KLSTR_HELPERS = %i[
     cluster_user cluster_organization user_has_more_than_one_cluster cluster_scope cluster_of_my_own
-    user_clusters_string_list set_collection_before_group_by_entity __cluster_scope
+    user_clusters_string_list set_collection_before_group_by_entity same_cluster_scope
+    cluster_scope_through_of
   ]
 
   class << self
@@ -41,7 +42,7 @@ module Klastera
     ##
      #
      #
-    def set_collection_before_group_by_entity!(active_record_collection,entity_params,organization)
+    def set_collection_before_group_by_entity!(active_record_collection,entity_params,organization,include_nil_by_rule=true)
       entity_params_keys = [:entity_name,:entity_attribute,:entity_id,:entity_id_attribute,:unamed]
       entity_params[:entity_id] ||= nil #Ensures the entity_id attribute presence even if there is no filter
       entity_params = entity_params.slice(*entity_params_keys).values
@@ -54,7 +55,8 @@ module Klastera
           active_record_collection = Klastera.filter_clusterized!(
             active_record_collection,
             entity_params[2],
-            organization
+            organization,
+            include_nil_by_rule
           )
         end
         yield( active_record_collection, entity_params_keys.zip(entity_params).to_h )
@@ -64,14 +66,14 @@ module Klastera
     #
     # In order to this work, the active_record_collection argument should be a cluster_scope! return.
     #
-    def filter_clusterized!(active_record_collection,cluster_id,organization)
+    def filter_clusterized!(active_record_collection,cluster_id,organization,include_nil_by_rule=true)
       if organization.is_in_cluster_mode? && cluster_id.present?
           # Ensures that an array of ids is used in the statement
-          cluster_array = cluster_id.is_a?(Array) ? cluster_id : [cluster_id]
+          cluster_array = cluster_id.is_a?(Array) ? cluster_id.dup : [cluster_id]
           # If we receive a UNCLUSTERED_ENTITY request, it means that we should filter by entities without clusters.
           # The optional_mode?(show/use) condition add to this method an ambivalent use,
           # where you can filter a unique value or multiple including NULL ones.
-          cluster_array << nil if cluster_array.delete(UNCLUSTERED_ENTITY) || organization.optional_mode?
+          cluster_array << nil if include_nil_by_rule || cluster_id == UNCLUSTERED_ENTITY && ( cluster_array.delete(UNCLUSTERED_ENTITY) || organization.optional_mode? )
           active_record_collection = active_record_collection.where(cluster_entities: { cluster_id: cluster_array.uniq })
           # You should use a block with clusterable data only
           yield(active_record_collection) if block_given?
@@ -90,7 +92,7 @@ module Klastera
           # Ensures that an array of id is used in the statement
           cluster_ids = cluster_id.is_a?(Array) ? cluster_id : [cluster_id]
         else
-          clusters = cluster_of!(user,organization)
+          clusters = cluster_of!(organization,user)
           cluster_ids = clusters.map(&:id).compact
         end
 
@@ -124,12 +126,10 @@ module Klastera
         if cluster_id.present?
           cluster_ids = cluster_id.is_a?(Array) ? cluster_id : [cluster_id]
         else
-          clusters = cluster_of!(user,organization)
+          clusters = cluster_of!(organization,user)
           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?# || cluster_id # If cluster_id is passed NULL clusters are expected, rigth?
           scope_klass = scope_klass.where( cluster_entities: { cluster_id: cluster_ids } )
         else
@@ -141,6 +141,18 @@ module Klastera
       scope_klass.where(organization_id: organization)
     end
 
+    # 
+    # Filter non-clustered entity through a clusterized one
+    #
+    def cluster_scope_through_of!(relation,cluster_entity_klass,scope_klass,user,organization,cluster_id=nil)
+      scope_class(scope_klass).joins(relation => :cluster_entities).where(
+        organization_id: organization,
+        "#{relation}_id" => same_cluster_scope!(
+          cluster_entity_klass, user, organization, cluster_id
+        )
+      )
+    end
+
     ##
      # TODO:
      # Implement a validation to ensure that
@@ -156,9 +168,11 @@ module Klastera
      # Returns a Cluster::ActiveRecord_Relation if the organization is using the cluster mode.
      # Use this only to get current_user/organization clusters
      #
-    def cluster_of!(user,organization)
+    def cluster_of!(organization,user)
       # A cluster user with role Root or Admin retrieve every cluster of its organizations
-      and_this_user = user.can_admin_clusters? ? nil : user
+      # Thats why we pass a nil object to avoid user filter, but if you pass a nil user as argument
+      # The result is the same as if the user was a admin, BE CAREFUL!
+      and_this_user = user.try(:can_admin_clusters?) ? nil : user
       # We weill return a cluster active record collection that can be filtered
       active_record_collection = ::ClusterUser.clusters_of(organization,and_this_user)
       # Add a empty cluster instance to handle models without a cluster assignation.
@@ -186,7 +200,7 @@ module Klastera
      # cluster_of! needs a user and a organization. that why we perfomed this logic here
      #
     def user_clusters_string_list!(user,organization,cluster_entities,separator,attribute=:name)
-      @clusters_session ||= self.cluster_of!(user,organization)
+      @clusters_session ||= Klastera.cluster_of!(organization,user)
       self.entity_clusters_string_list!(cluster_entities, separator, attribute, @clusters_session.map(&:id))
     end
   end
@@ -227,8 +241,8 @@ module Klastera
     [ :cluster_id ].concat( ::ClusterFilter.attributes )
   end
 
-  def filter_clusterized(active_record_collection,cluster_id)
-    Klastera.filter_clusterized!(active_record_collection, cluster_id, cluster_organization)
+  def filter_clusterized(active_record_collection,cluster_id,include_nil_by_rule=true)
+    Klastera.filter_clusterized!(active_record_collection, cluster_id, cluster_organization, include_nil_by_rule)
   end
 
   def cluster_scope(scope,cluster_id=nil)
@@ -239,8 +253,12 @@ module Klastera
     Klastera.same_cluster_scope!(scope, cluster_user, cluster_organization, cluster_id)
   end
 
+  def cluster_scope_through_of(relation,cluster_entity_klass,scope_klass,cluster_id=nil)
+    Klastera.cluster_scope_through_of!(relation, cluster_entity_klass, scope_klass, cluster_user, cluster_organization, cluster_id )
+  end
+
   def cluster_of_my_own
-    Klastera.cluster_of!(cluster_user, cluster_organization)
+    Klastera.cluster_of!(cluster_organization,cluster_user)
   end
 
   def user_clusters_string_list(object_entity,separator,attribute=:name)
@@ -253,8 +271,8 @@ module Klastera
     )
   end
 
-  def set_collection_before_group_by_entity(active_record_collection,entity_params,&block)
-    Klastera.set_collection_before_group_by_entity!(active_record_collection, params, cluster_organization, &block)
+  def set_collection_before_group_by_entity(active_record_collection,entity_params,include_nil_by_rule=true,&block)
+    Klastera.set_collection_before_group_by_entity!(active_record_collection, params, cluster_organization, include_nil_by_rule, &block)
   end
 
   included do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: klastera
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3.1
 platform: ruby
 authors:
 - Gino Barahona
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-02 00:00:00.000000000 Z
+date: 2020-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -127,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Clusterization Engine