klastera 1.2.4 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5cc4bc5d29598040f68599863b41983f415778050bc988fb0c35b67e7d9e264b
-  data.tar.gz: d96dd17be603a6683084bc34c9c040c51e4cb9422af7a2956c97860f812299ae
+  metadata.gz: 4fe09e51ca6d275a070d368cd49d916ff2ad2b02f2c06e2afcec708bda66ef88
+  data.tar.gz: 03d542c381f4eaefa9079d8ca47c33c787658faa0cce87127225f52a069bbd46
 SHA512:
-  metadata.gz: ad8633404c203750947c1566d4c1d883bd7c33c1eae58982bb0489d62e769255caad49d75277244ad4b50f79fd95ef361c37408078d5ff657a7da7324d3bf75a
-  data.tar.gz: a4c6e14fafdd2eaa1c7664901a1590800d89006a257412b04b483c313fcdc61a1797340028ffe0e9c0bd9a15d38c3783d823bba4d665cd194dd8790d2369e971
+  metadata.gz: 88d80a8309499a0b61d96a44d3a297fcb87fe9352d46021a7e415a66bb1e2e4776400888396478deacb9108c861bfe69755477e23f9d43ed4273b2ce98206bf5
+  data.tar.gz: 836a8472f3a71fda307b77c4c7c69e038bb9c01f2d364b6fb98817cc096960dca2a4ee7d8eb8735b83fbb1a67bd31e4f168f45871fa79362d6e600ac10aed307

data/app/assets/stylesheets/klastera/clusters.css.scss

@@ -8,4 +8,39 @@
       background: none;
     }
   }
-}
+}
+
+#cluster-remote-table {
+  .cluster-id { width: 70px; }
+  .cluster-order { width: 70px; }
+  .cluster-color { width: 70px; }
+  .odd .colorless { color: #F9F9F9 }
+  .even .colorless { color: #FFF }
+  tr:hover .colorless { color: #444; opacity: 0.2;}
+}
+
+#cluster-remote-form {
+  h4.blank-modal-title {
+    margin: 0;
+    line-height: 28px;
+    letter-spacing: 0.05rem;
+    font-size: 21px;
+    font-weight: 400;
+    color: #666;
+  }
+}
+
+
+ul.klastera-option-help {
+  padding-left: 20px;
+  list-style-type: disc;
+}
+
+ul.klastera-option-help li {
+  margin-bottom: 10px;
+  padding-bottom: 5px;
+  border-bottom: 1px solid #DDD;
+}
+
+ul.klastera-option-help li b { color: #8A8A8A; font-weight: 400; }
+ul.klastera-option-help li b:first-child { color: #2E5F9B; font-weight: bold; }

data/app/controllers/klastera/clusters_controller.rb

@@ -33,13 +33,11 @@ module Klastera
 
     def destroy
       new_cluster_id = params.require(:transfer).permit(:new_cluster_id).values.first rescue nil
-      @transfer = Transfer.new(
-        current_cluster: @cluster,
-        new_cluster_id: new_cluster_id
-      )
+      @transfer = Transfer.new( current_cluster: @cluster, new_cluster_id: new_cluster_id )
       if @transfer.valid?
-        @transfer.to!(::Cluster.related_entities.map{|re|re.constantize})
-        @cluster.destroy
+        if @transfer.apply!
+          @cluster.destroy
+        end
         set_clusters
       end
     end

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

@@ -11,6 +11,8 @@ module Klastera::Concerns::Cluster
     MODES = [ :required_suborganization, :optional_suborganization, :optional_filter ].freeze
 
     belongs_to :organization, class_name: Klastera.organization_class
+    has_many :cluster_users
+    has_many :cluster_entities, dependent: :destroy
 
     scope :of, -> (organization,except_ids=[]) {
       _scope = where(organization: organization)
@@ -41,7 +43,7 @@ module Klastera::Concerns::Cluster
     end
 
     def has_related_entities_using_it?
-      ::Cluster.total_records_assign_to(self) > 0
+      self.cluster_entities.size > 0
     end
 
     def can_transfer_and_destroy?
@@ -59,24 +61,5 @@ module Klastera::Concerns::Cluster
   end
   
   module ClassMethods
-    def related_entities(attr_needed: :class_name, macro: :has_many)
-      ::Cluster.reflections.map do |association_name, reflection| 
-        reflection.send(attr_needed) if reflection.macro == macro
-      end.compact
-    end
-
-    def total_records_assign_to(cluster_instance)
-      related_entities(attr_needed: :name).inject(0) do |total, association_name|
-        entity = cluster_instance.send(association_name)
-        if entity.respond_to?(:cluster_id)
-          total+=entity.where(cluster_id: cluster_instance.id).count
-        end
-        total
-      end
-    end
-
-    def modes_as_strings
-      ::Cluster::MODES.map{|m|m.to_s}
-    end
   end
 end

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

@@ -4,11 +4,8 @@ module Klastera::Concerns::ClusterFilter
   included do
     include ActiveModel::Model
     include ActiveModel::Validations::Callbacks
-    attr_accessor :cluster_id
 
-    def kcluster_id
-      self.cluster_id == 'without_cluster' ? nil : self.cluster_id
-    end
+    attr_accessor :cluster_id
   end
   
   module ClassMethods

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

@@ -3,55 +3,39 @@ module Klastera::Concerns::ClusterUser
 
   included do
     self.table_name = 'cluster_users'
-
     belongs_to :user
     belongs_to :cluster
-
     validates :cluster_id, presence: true
-
-    scope :of, -> (user,organization) {
-      Rails.logger.warn("DON'T USE THIS SCOPE DIRECTLY: Use ::ClusterUser.clusters_from class method instead!")
-      includes(:cluster).where(user_id: user, "clusters.organization_id": organization)
-    }
   end
   
   module ClassMethods
+    ##
+     # Return a Cluster::ActiveRecord_Relation of organization (and) user
+     #
+    def clusters_of(organization,and_user=nil)
+      and_user_id = and_user.present? ? { users: { id: and_user } }  : {}
+      ::Cluster.eager_load(cluster_users: :user).where({ organization_id: organization }.merge(and_user_id) )
+    end
 
     ##
-    # Returns a hash with the users with cluster relation
-    #
-    def user_clusters_from(organization)
-      users_hash = {}
-      organization_cluster_ids = ::Cluster.of(organization).map(&:id)
-      ::ClusterUser.includes(:user).where(cluster_id: organization_cluster_ids).each do |cluster_user|
-        user_id = cluster_user.user_id || :uncluster
-        users_hash[user_id] ||= []
-        users_hash[user_id] << cluster_user.cluster_id
-      end
-      users_hash
+     # Return a User::ActiveRecord_Relation of organization (and) user
+     #
+    def users_of(organization)
+      ::User.eager_load(:cluster_users).where(users: { organization_id: organization } )
     end
 
     ##
-     # Returns a Cluster::ActiveRecord_Relation
+     # Return a hash of users and its clusters
      #
-     ##
-    def clusters_from(user,organization)
-      clusters = []
-      unless user.can_admin_clusters?
-        # We could return cu.clusters but you may quering this result and a array can't handle order, where and etc.
-        # So we take only the cluster_ids and perfome a new search in order to get a Cluster::ActiveRecord_Relation 
-        # like the else block.
-        # TODO: resolve it without quering twice
-        clusters_id = ::ClusterUser.of(user,organization).map(&:cluster_id)
-        clusters = ::Cluster.where(id: clusters_id)
-        # Add a empty cluster instance to handle models without a cluster assignation. Only for use and show modes
-        if organization.optional_mode?
-          clusters << ::Cluster.new({nid: :without_cluster, name: I18n.t('klastera.without_cluster')})
-        end
-      else
-        clusters = ::Cluster.of(organization)
+    def users_hash_of(organization)
+      users = {}
+      rows = self.users_of(organization).pluck("users.id AS user_id","cluster_users.cluster_id").uniq
+      rows.each do |row|
+        user_id = row.first
+        users[user_id] ||= []
+        users[user_id] << row.last
       end
-      clusters
+      users
     end
   end
 end

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

@@ -11,10 +11,6 @@ module Klastera::Concerns::Clusterizable
     validate :at_least_one_cluster_entity, if: proc { self.organization.required_suborganization_mode? }
     validate :uniqueness_of_cluster_entity_record
 
-    scope :related_clusters, ->() {
-      includes(:cluster_entities).where("cluster_entities.entity_id = #{self.table_name}.id")
-    }
-
     def at_least_one_cluster_entity
       if cluster_entities.length == 0 || cluster_entities.reject{|cluster_entity| cluster_entity._destroy == true}.empty?
         return errors.add(:cluster_entities, I18n.t('klastera.messages.at_least_one_cluster_entity'))

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

@@ -4,7 +4,7 @@ module Klastera::Concerns::Organization
     
     has_many :clusters
     
-    validates :use_cluster_as, inclusion: { in: ::Cluster.modes_as_strings , message: I18n.t('klastera.clusters.wrong_option') }, if: proc{ use_cluster_as.present? }
+    validates :use_cluster_as, inclusion: { in: ::Cluster::MODES.map{|m|m.to_s}, message: I18n.t('klastera.clusters.wrong_option') }, if: proc{ use_cluster_as.present? }
 
     # Return a symbol version of use_cluster_as value
     def cluster_mode

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

@@ -7,20 +7,14 @@ module Klastera::Concerns::Transfer
     include ActiveModel::Model
     include ActiveModel::Validations::Callbacks
 
-    attr_accessor :current_cluster, :new_cluster_id, :entities_transfered
+    attr_accessor :current_cluster, :new_cluster_id
 
     validates :current_cluster, presence: true
     validates :new_cluster_id, presence: true, if: proc { self.required_transfer? }
 
     validate do
       new_cluster = ::Cluster.find(self.new_cluster_id.to_i) rescue nil
-      #
-      # In my time, to_a? didnt work
-      # current_cluster.class returned:
-      #   Cluster(id: integer, name: string, nid: text, organization_id: integer, created_at: datetime, updated_at: datetime, color: string)
-      #
-      # If you see this, please fixe it. Thanks
-      #
+
       if current_cluster.class.name != 'Cluster' || current_cluster.try(:is_the_last_record_in_required_suborganization_mode?)
         errors.add(:current_cluster, I18n.t('klastera.messages.current_cluster.cant_transfer'))
       elsif self.required_transfer? && new_cluster_id.present? && new_cluster.nil?
@@ -33,22 +27,19 @@ module Klastera::Concerns::Transfer
       end
     end
 
-    ##
-    #
-    #
-    def to!(related_entities)
-      self.entities_transfered = 0
-      related_entities.each do |entity|
-        if entity.is_a?(Class) && entity.respond_to?(:cluster_id)
-          self.entities_transfered += entity.where(
-            cluster_id: self.current_cluster.id
-          ).update_all(cluster_id: self.new_cluster_id)
-        end
-      end
-    end
-
     def required_transfer?
       self.current_cluster.required_transfer? && self.current_cluster.has_related_entities_using_it?
     end
+
+    ##
+    # A returned boolean is expected. It should always be true even nothing is
+    # transfered, and it only will return false if creation fails.
+    #
+    def apply!
+      Klastera::ClusterEntity.create(current_cluster.cluster_entities.map{ |relation|
+        next if self.new_cluster_id.blank?
+        { cluster_id: self.new_cluster_id, entity_id: relation.entity_id, entity_type: relation.entity_type }
+      }.compact)
+    end
   end
 end

data/app/views/klastera/clusters/_form.html.erb

@@ -3,16 +3,16 @@
 
   <div class="<%=classes_for_remote_modal_body()%>">
     <div class="row">
-      <div class="col-xs-12">
+      <div class="col-xs-6">
         <%= f.input :name, as: :string, label: t('klastera.cluster_name') %>
       </div>
-      <div class="col-xs-12">
+      <div class="col-xs-6">
         <%= f.input :nid, as: :string, label: t('klastera.cluster_nid') %>
       </div>
-      <div class="col-xs-12">
+      <div class="col-xs-6">
         <%= f.input :color, as: :string, label: t('klastera.cluster_color'), input_html: { class: 'color-picker'} %>
       </div>
-      <div class="col-xs-12">
+      <div class="col-xs-6">
         <%= f.input :order, as: :string, label: t('klastera.cluster_order') %>
       </div>
     </div>

data/app/views/klastera/clusters/_form_transfer.html.erb

@@ -2,8 +2,8 @@
 <%= simple_form_for( @transfer,  url: cluster_path(@cluster), method: :delete, remote: true, html: { autocomplete: :off, class: 'destroy-form slim-form-field' } ) do |f| %>
   <%=render 'layouts/remote_form/header', o: @cluster, title: title, fa: :qrcode %>
   <div class="<%=classes_for_remote_modal_body()%>">
-    <h4 class="text-center">Esta acción es irreversible.<br/>¿Está seguro?</h4>
-    <% if ::Cluster.total_records_assign_to(@cluster) > 0 %>
+    <h4 class="blank-modal-title text-center">Esta acción es irreversible<br/>¿Está seguro?</h4>
+    <% if @cluster.cluster_entities.size > 0 %>
       <br />
       <div class="row">
         <% if can_transfer_and_destroy %>

data/app/views/klastera/clusters/_table.html.erb

@@ -1,4 +1,4 @@
-<table class="table table-striped table-hover table-condensed table-bordered datatable">
+<table class="table table-striped table-hover table-condensed table-bordered datatable table">
   <thead>
     <tr>
       <th class="text-center cluster-id"><%=t('klastera.cluster_id')%></th>
@@ -6,7 +6,7 @@
       <th class="text-center cluster-color"><%=t('klastera.cluster_color')%></th>
       <th class="text-center cluster-name"><%=t('klastera.cluster_name')%></th>
       <th class="text-center cluster-nid"><%=t('klastera.cluster_nid')%></th>
-      <th class="cogs-actions four-icons"><span class="fa fa-cogs"></span></th>
+      <th class="cogs-actions two-icons"><span class="fa fa-cogs"></span></th>
     </tr>
   </thead>
   <tbody>
@@ -19,7 +19,7 @@
         </td>
         <td class="text-center cluster-name"><%= cluster.name %></td>
         <td class="text-center cluster-nid"><%= cluster.nid %></td>
-        <td class="cogs-actions four-icons">
+        <td class="cogs-actions two-icons">
           <%= link_to edit_cluster_path(cluster), class:'btn btn-primary btn-xs', title: t('shared.actions.edit'), "data-toggle": "modal", "data-target": "#remote-modal-block" do %>
             <span class="fa fa-pencil-square-o"></span>
           <% end %>
@@ -30,12 +30,4 @@
       </tr>
     <% end %>
   </tbody>
-</table>
-<style type="text/css">
-  .cluster-id { width: 70px; }
-  .cluster-order { width: 70px; }
-  .cluster-color { width: 70px; }
-  .odd .colorless { color: #F9F9F9 }
-  .even .colorless { color: #FFF }
-  tr:hover .colorless { color: #F5F5F5 }
-</style>
+</table>

data/app/views/klastera/clusters/index.html.erb

@@ -18,4 +18,4 @@
 
 </div>
 
-<%= render 'layouts/remote_form/modal'%>
+<%= render 'layouts/remote_form/modal', width: 'md' %>

data/app/views/layouts/klastera/_cluster_entity_fields.html.erb

@@ -1,6 +1,6 @@
 <tr class="nested-fields">
   <td class="field">
-    <%= f.select :cluster_id, @cluster_clusters.map{|c|[c.name,c.id]}, { include_blank: true }, { class: 'form-control' } %>
+    <%= f.select :cluster_id, @clusters_session.map{|c|[c.name,c.id]}, { include_blank: true }, { class: 'form-control' } %>
   </td>
   <td class="action vertical-align-middle text-center" width="44">
     <%= link_to_remove_association f, class: 'btn btn-danger btn-xs text-danger' do %>

data/app/views/layouts/klastera/_cluster_filter.html.erb

@@ -7,7 +7,7 @@
   <%=yield(f) if block_given? %>
 
   <% if cluster_organization.is_in_cluster_mode? %>
-    <% cluster_collection = cluster_clusters.map{|c|[c.name,(c.id||c.nid)]} %>
+    <% cluster_collection = cluster_of_my_own.map{|c|[c.name,(c.id||c.nid)]} %>
     <% if cluster_collection.size > 1 %>
       <div class="inline-label-control-block">
         <%= f.input :cluster_id, collection: cluster_collection, prompt: t('klastera.clusters.all'), label: false, wrapper: false %>

data/app/views/layouts/klastera/_cluster_selector.html.erb

@@ -4,7 +4,7 @@
 %>
 <% if cluster_organization.is_in_cluster_mode? || other_visibility_reason %>
   <% 
-    cluster_collection = @cluster_clusters || cluster_clusters
+    cluster_collection = @clusters_session || cluster_of_my_own
     label = t('klastera.cluster.title')
   %>
   <% if f.nil? %>

data/app/views/layouts/klastera/_nested_cluster_entity.html.erb

@@ -1,5 +1,5 @@
 <% if cluster_organization.is_in_cluster_mode? %>
-  <% @cluster_clusters = cluster_clusters %>
+  <% @clusters_session = cluster_of_my_own %>
   <div class="col-xs-12">
     <% if hide_title||=false %>
       <div class="form-group file required <%=f.object.class.name.parameterize%>_cluster_entity<%=' has-error' if f.object.errors.has_key?(:cluster_entities)%>">
@@ -27,7 +27,7 @@
           <table id="cluster-entities" class="table table-striped">
             <tbody class="cluster-entity-rows">
               <%= f.fields_for :cluster_entities do |cluster_entity|%>
-                <% next unless @cluster_clusters.map(&:id).include?(cluster_entity.try(:object).try(:cluster_id)) %>
+                <% next unless @clusters_session.map(&:id).include?(cluster_entity.try(:object).try(:cluster_id)) %>
                 <%= render 'layouts/klastera/cluster_entity_fields', f: cluster_entity %>
               <% end %>
             </body>

data/app/views/layouts/klastera/_options.html.erb

@@ -19,20 +19,4 @@
 <script type="text/javascript">
   var popoverTemplate = '<div class="popover" role="tooltip"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'
   $('.klastera-cluster-option').popover({ template: popoverTemplate, html: true, trigger: 'click', });
-</script>
-
-<style type="text/css">
-  ul.klastera-option-help {
-    padding-left: 20px;
-    list-style-type: disc;
-  }
-
-  ul.klastera-option-help li {
-    margin-bottom: 10px;
-    padding-bottom: 5px;
-    border-bottom: 1px solid #DDD;
-  }
-
-  ul.klastera-option-help li b { color: #8A8A8A; font-weight: 400; }
-  ul.klastera-option-help li b:first-child { color: #2E5F9B; font-weight: bold; }
-</style>
+</script>

data/lib/klastera.rb

@@ -5,14 +5,17 @@ module Klastera
 
   extend ActiveSupport::Concern
 
+  UNCLUSTERED_ENTITY = 'without_cluster'
   KLSTR_HELPERS = %i[
-    cluster_user cluster_organization user_has_more_than_one_cluster
-    cluster_scope cluster_clusters cluster_scope_filtered clusters_from
-    user_clusters_string_list
+    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
   ]
 
   class << self
 
+    ##
+     #
+     #
     def set_cluster_entities_attributes!(entity,array_cluster_ids)
       cluster_entities_attributes = {}
       entity_cluster_entities = entity.try(:cluster_entities) || []
@@ -35,94 +38,109 @@ module Klastera
       cluster_entities_attributes
     end
 
-    #
-    # I like to wrap methods
-    #
-    def cluster_scope_filtered!(scope,cluster_id,user,organization,includes=[])
-      self.filter_clusterized_collection_with!(
-        organization,
-        cluster_id,
-        self.cluster_scope!(user,organization,scope,includes)
-      )
-    end
-
-    #
-    # In order to this works, active_record_collection argument
-    # should be passed through cluster_scope! method before.
-    #
-    def filter_clusterized_collection_with!(cluster_organization,cluster_id,active_record_collection)
-      if cluster_organization.is_in_cluster_mode?
-        if cluster_id.present?
-          cluster_array = [cluster_id]
-          # Based on force/use/show definition we don't really need this validation.
-          # A force cluster organization won't return an entity out of a cluster, but
-          # we don't know if the clusterized entities are fully definition-compliant.
-          cluster_array << nil if cluster_organization.optional_suborganization_mode?
-          active_record_collection = active_record_collection.joins(:cluster_entities).where("cluster_entities.cluster_id": cluster_array)
-        end
-        # you may use a block only with clusterizable data
-        yield(active_record_collection) if block_given?
-      end
-      active_record_collection
-    end
-
-    #
-    #
-    #
-    def set_collection_before_group_by_entity!(cluster_organization,active_record_collection,model_class,entity_params)
+    ##
+     #
+     #
+    def set_collection_before_group_by_entity!(active_record_collection,entity_params,organization)
       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
-      if model_class.try(:reflections).try(:keys).try(:include?,entity_params[0])
+      model_class = active_record_collection.model.base_class
+      model_relations = model_class.reflections.keys
+      if model_relations.include?(entity_params[0])
         entity_params << "#{entity_params[0]}_id".to_sym
         if entity_params[0] == 'cluster'
-          entity_params << :unclustered if cluster_organization.is_in_cluster_mode?
-          active_record_collection = Klastera.filter_clusterized_collection_with!(
-            cluster_organization,
+          entity_params << I18n.t("klastera.#{UNCLUSTERED_ENTITY}") if organization.is_in_cluster_mode?
+          active_record_collection = Klastera.filter_clusterized!(
+            active_record_collection,
             entity_params[2],
-            active_record_collection
+            organization
           )
         end
-        yield(
-          active_record_collection,
-          entity_params_keys.zip(entity_params).to_h)
+        yield( active_record_collection, entity_params_keys.zip(entity_params).to_h )
       end
     end
 
-    ##
-     # Returns a ::Cluster::ActiveRecord_Relation from a given scope
-     #
-    def clusters_from!(user,organization,scope,includes=[])
-      cluster_scope!(user,organization,scope,includes).related_clusters
+    #
+    # 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)
+      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]
+          # 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?
+          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?
+      end
+      active_record_collection
     end
 
     ##
-     # Returns a scope filtered by clusters or its
-     # organization if the cluster mode is not active.
+     # If the cluster mode is not active, this returns a scope filtered by clusters of its organization/users/cluster
      #
-    def cluster_scope!(user,organization,scope,includes=[])
+    def cluster_scope!(scope,user,organization,cluster_id=nil)
       scope_klass = scope_class(scope).where(organization_id: organization)
-      session_clusters(user,organization) do |clusters|
-        if organization.is_in_cluster_mode?
-          scope_klass = scope_klass.select("DISTINCT ON (#{scope.table_name}.id) #{scope.table_name}.id, #{scope.table_name}.*")
-          scope_klass = scope_klass.includes(includes) if includes.present?
-          cluster_ids = clusters.map(&:id)
-          if organization.required_suborganization_mode?
-            scope_klass = scope_klass.joins(:cluster_entities).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}'
-            ").where("cluster_entities.id IS NULL#{or_these_cluster_ids}")
-          end
-          # Provisional fix to avoid SQL clashes due to DISTINCT ON clause
-          scope_klass = scope_class(scope).where(organization_id: organization).where(id: scope_klass.map(&:id))
+      if organization.is_in_cluster_mode?
+
+        if cluster_id.present?
+          # 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)
+          cluster_ids = clusters.map(&:id).compact
         end
+
+        scope_klass = scope_klass.select("DISTINCT ON (#{scope.table_name}.id) #{scope.table_name}.id, #{scope.table_name}.*")
+
+        if organization.required_suborganization_mode?
+          scope_klass = scope_klass.joins(:cluster_entities).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}'
+          ").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
+        scope_klass = scope_class(scope).eager_load(:cluster_entities).where(id: scope_klass.map(&:id), organization_id: organization)
       end
       scope_klass
     end
 
+    # 
+    # Optimized version of cluster_scope!
+    #
+    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.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.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
+          or_these_cluster_ids = cluster_ids.present? ? " OR cluster_entities.cluster_id IN (#{cluster_ids.join(",")})" : ""
+          scope_klass = scope_klass.where("cluster_entities.id IS NULL#{or_these_cluster_ids}")
+        end
+      end
+
+      scope_klass.where(organization_id: organization)
+    end
+
     ##
      # TODO:
      # Implement a validation to ensure that
@@ -135,19 +153,19 @@ module Klastera
     end
 
     ##
-     # Returns a cluster array if organization is using the cluster mode
-     #
+     # Returns a Cluster::ActiveRecord_Relation if the organization is using the cluster mode.
      # Use this only to get current_user/organization clusters
-     # understanding this wont be useful out of a cluster mode context.
      #
-     ##
-    def session_clusters(user,organization)
-      clusters = organization.is_in_cluster_mode? ? ::ClusterUser.clusters_from(user,organization) : []
-      if block_given?
-        clusters = clusters.reject{|c|c.id.blank?}
-        yield(clusters)
+    def cluster_of!(user,organization)
+      # A cluster user with role Root or Admin retrieve every cluster of its organizations
+      and_this_user = user.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.
+      if organization.optional_mode? # For use and show modes only
+        active_record_collection << ::Cluster.new({nid: UNCLUSTERED_ENTITY, name: I18n.t("klastera.#{UNCLUSTERED_ENTITY}")})
       end
-      clusters
+      active_record_collection
     end
 
     ##
@@ -165,12 +183,11 @@ module Klastera
     end
 
     ##
-     # cluster_clusters needs the logged user and its organization
-     # that why, we perfomed this logic here
+     # 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)
-      @_session_clusters ||= self.session_clusters(user,organization)
-      self.entity_clusters_string_list!(cluster_entities, separator, attribute, @_session_clusters.map(&:id))
+      @clusters_session ||= self.cluster_of!(user,organization)
+      self.entity_clusters_string_list!(cluster_entities, separator, attribute, @clusters_session.map(&:id))
     end
   end
 
@@ -183,8 +200,8 @@ module Klastera
   end
 
   def user_has_more_than_one_cluster
-    @cluster_clusters ||= cluster_clusters
-    @cluster_clusters.size > 1
+    @clusters_session ||= cluster_of_my_own
+    @clusters_session.size > 1
   end
 
   def set_the_lonely_cluster
@@ -192,7 +209,7 @@ module Klastera
     parameters = params.require( form_model ) rescue nil
     lonely_cluster = parameters.blank? ? false : parameters.permit( :lonely_cluster ).present?
     if lonely_cluster
-      params[form_model][:cluster_id] = cluster_clusters.first.try(:id)
+      params[form_model][:cluster_id] = cluster_of_my_own.first.try(:id)
     end
   end
 
@@ -210,26 +227,20 @@ module Klastera
     [ :cluster_id ].concat( ::ClusterFilter.attributes )
   end
 
-  def cluster_scope(scope,includes=[])
-    Klastera.cluster_scope!(cluster_user,cluster_organization,scope,includes)
+  def filter_clusterized(active_record_collection,cluster_id)
+    Klastera.filter_clusterized!(active_record_collection, cluster_id, cluster_organization)
   end
 
-  def cluster_clusters
-    Klastera.session_clusters(cluster_user,cluster_organization)
+  def cluster_scope(scope,cluster_id=nil)
+    Klastera.cluster_scope!(scope, cluster_user, cluster_organization, cluster_id)
   end
 
-  def cluster_scope_filtered(scope,cluster_id,includes=[])
-    Klastera.cluster_scope_filtered!(
-      scope,
-      cluster_id,
-      cluster_user,
-      cluster_organization,
-      includes
-    )
+  def same_cluster_scope(scope,cluster_id=nil)
+    Klastera.same_cluster_scope!(scope, cluster_user, cluster_organization, cluster_id)
   end
 
-  def clusters_from(scope,includes=[])
-    Klastera.clusters_from!(cluster_user,cluster_organization,scope,includes)
+  def cluster_of_my_own
+    Klastera.cluster_of!(cluster_user, cluster_organization)
   end
 
   def user_clusters_string_list(object_entity,separator,attribute=:name)
@@ -242,6 +253,10 @@ 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)
+  end
+
   included do
     Klastera::KLSTR_HELPERS.each do |action|
       if respond_to?(:helper_method)

data/lib/klastera/version.rb

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

data/lib/tasks/klastera_tasks.rake

@@ -13,6 +13,11 @@ namespace :klastera do
         klass = args.entity.constantize
         ActiveRecord::Base.transaction do
           klass.where.not(cluster_id: nil).each do |entity|
+            if entity.cluster.blank?
+              puts "Cluster ID #{entity.cluster_id} was not found!"
+              puts "skip..."
+              next
+            end
             Klastera::ClusterEntity.create(entity: entity, cluster: entity.cluster)
           end
         end

metadata

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