klastera 1.5.4 → 1.5.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b05f393fbe67e0822de3526d5b46dc7081a79226f45b5fe63985424d73331742
-  data.tar.gz: '09623883ce4911b3cd0df6382c558c7d82f080eb504f3e0dae4e74262acd8df7'
+  metadata.gz: 01b3c7e4c25fc9bfa852d34304d0f0cb12b832da7565375eb9e4cb5f4abc2566
+  data.tar.gz: 5ccc41a05b2e0ae3a5e8f4b16176be63ec752b0a112f3d8c1276bd403b591386
 SHA512:
-  metadata.gz: 9589942522f4442bf44304cb735a022819bb40f0885c077d77289791caf79f266a1f258d3db7f14fc242d0d80858a8c82027b0314f2faf5ef156e45bcf1c89a7
-  data.tar.gz: 3b5d0a9505bd241d3374077ab01d8ddcd2ca83d3f4787763de1658c56f362680b3cb2350e44992a2041834181b7b379c5ad506d4ba83278d140ba6a7d6a775da
+  metadata.gz: 07c277261a1ff65e45ca4413587c3ca51952e497176d2a3e29e361c955a51e2d6d77bd4ae5ee8946e8981d56fa1ec756eed81b12e454f623732e5505a7a09349
+  data.tar.gz: 6f1097125134ab6a528c165df1396697c4c83db96bbfa2265b19f04025a2f72fe5a4e423dcf2a49f23fb0fcb75156911471190e332fae94cd962e2331d0042b7

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

@@ -14,6 +14,7 @@ module Klastera::Concerns::Clusterizable
     validate :uniqueness_of_cluster_entity_record
 
     scope :includes_cluster, -> { includes(cluster_entities: :cluster) }
+    scope :with_clusters, -> { includes(cluster_entities: :cluster) }
 
     def at_least_one_cluster_entity
       if cluster_entities.length == 0 || cluster_entities.reject{|cluster_entity| cluster_entity._destroy == true}.empty?
@@ -26,11 +27,24 @@ module Klastera::Concerns::Clusterizable
     end
 
     ##
-     # This is a legacy method and we don't recommend using it.
-     # Implement directly Klastera.entity_clusters_string_list instead of this method.
-     # TODO: In order to deprecate it, you will need to perform some changes in the main app
+     # This method has been optimized to use preloaded associations when available
+     # Falls back to efficient single-query approach when associations aren't preloaded
      ##
-    def clusters_string_separated_by(separator,attribute=:name)
+    def clusters_string_separated_by(separator, attribute=:name)
+      # Use Rails cache for frequently accessed cluster strings
+      cache_key = [self.cache_key_with_version, :clusters_string, separator, attribute]
+
+      Rails.cache.fetch(cache_key, expires_in: 30.minutes) do
+        Klastera.entity_clusters_string_list!(
+          cluster_entities, separator, attribute
+        )
+      end
+    end
+
+    ##
+     # Optimized version without cache for real-time updates
+     ##
+    def clusters_string_separated_by_uncached(separator, attribute=:name)
       Klastera.entity_clusters_string_list!(
         cluster_entities, separator, attribute
       )
@@ -53,5 +67,49 @@ module Klastera::Concerns::Clusterizable
     def cluster_entity_params
       [ :cluster_id, { cluster_entities_attributes: [:id, :cluster_id, :_destroy] } ]
     end
+
+    ##
+     # Efficiently preload clusters for a collection of entities
+     # This prevents N+1 queries when calling clusters_string_separated_by on multiple entities
+     ##
+    def preload_clusters(collection)
+      return collection if collection.empty?
+
+      ActiveRecord::Associations::Preloader.new.preload(
+        collection,
+        cluster_entities: :cluster
+      )
+      collection
+    end
+
+    ##
+     # Batch update cluster assignments for multiple entities
+     # More efficient than individual updates
+     ##
+    def batch_assign_clusters(entity_ids, cluster_ids)
+      return if entity_ids.empty? || cluster_ids.empty?
+
+      # Clear existing assignments
+      Klastera::ClusterEntity.where(
+        entity_type: self.name,
+        entity_id: entity_ids
+      ).destroy_all
+
+      # Create new assignments
+      cluster_assignments = []
+      entity_ids.each do |entity_id|
+        cluster_ids.each do |cluster_id|
+          cluster_assignments << {
+            entity_type: self.name,
+            entity_id: entity_id,
+            cluster_id: cluster_id,
+            created_at: Time.current,
+            updated_at: Time.current
+          }
+        end
+      end
+
+      Klastera::ClusterEntity.insert_all(cluster_assignments) if cluster_assignments.any?
+    end
   end
 end

data/db/migrate/20250429110829_add_entity_id_index_to_cluster_entities.rb

@@ -0,0 +1,6 @@
+class AddEntityIdIndexToClusterEntities < ActiveRecord::Migration[5.2]
+  disable_ddl_transaction!
+  def change
+    add_index :cluster_entities, :entity_id, algorithm: :concurrently
+  end
+end

data/db/migrate/20250429110830_add_entity_id_index_and_entity_type_index_to_cluster_entities.klastera.rb

@@ -0,0 +1,7 @@
+# This migration comes from klastera (originally 20250429110947)
+class AddEntityIdIndexAndEntityTypeIndexToClusterEntities < ActiveRecord::Migration[5.2]
+  disable_ddl_transaction!
+  def change
+    add_index :cluster_entities, [:entity_id,:entity_type], algorithm: :concurrently
+  end
+end

data/lib/klastera/version.rb

@@ -1,3 +1,3 @@
 module Klastera
-  VERSION = "1.5.4"
+  VERSION = "1.5.5.1"
 end

data/lib/klastera.rb

@@ -46,15 +46,48 @@ module Klastera
     ##
      # Return a string with cluster attribute separated by separator argument
      # A array of cluster ids can be passed fo filter the result
+     # Optimized version that uses preloaded associations when available
      #
     def entity_clusters_string_list!(cluster_entities,separator,attribute=:name,allowed_cluster_ids=nil)
       _cluster_entities = cluster_entities.reject(&:nil?)
       if allowed_cluster_ids.is_a?(Array)
         _cluster_entities.select!{|ce| allowed_cluster_ids.include?(ce.cluster_id)}
       end
-      _cluster_entities.map do |ce|
-        ce.cluster.try(attribute)
-      end.compact.sort.join(separator)
+
+      # Performance optimization: Use preloaded data when available
+      if cluster_entities.respond_to?(:loaded?) && cluster_entities.loaded? &&
+        _cluster_entities.all? { |ce| ce.association(:cluster).loaded? }
+        # Use in-memory data (much faster)
+        _cluster_entities.map do |ce|
+          ce.cluster.try(attribute)
+        end.compact.sort.join(separator)
+      else
+        # Fallback to original method with database query
+        # But use a single query instead of N+1
+
+        cluster_ids = _cluster_entities.filter_map(&:cluster_id).uniq
+        return "" if cluster_ids.empty?
+
+        records = ::Cluster.where(id: cluster_ids).pluck(:id, attribute)
+        return "" if records.empty?
+
+        # clusters_hash = if records.any? && !records.first.is_a?(Array)
+        #   records.map { |id| [id, id] }.to_h
+        # else
+        #   records.to_h
+        # end
+        # _cluster_entities.map do |ce|
+        #   clusters_hash[ce.cluster_id]
+        # end.compact.sort.join(separator)
+
+        clusters_hash = records.first.is_a?(Array) ? records.to_h : records.index_by(&:itself)
+        _cluster_entities
+          .filter_map { |entity| clusters_hash[entity.cluster_id] }
+          .uniq
+          .sort
+          .join(separator)
+
+      end
     end
 
     ##

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: klastera
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.5.5.1
 platform: ruby
 authors:
 - Gino Barahona
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-12 00:00:00.000000000 Z
+date: 2025-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.1.3.2
+        version: 5.2.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.1.3.2
+        version: 5.2.6
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -95,6 +95,8 @@ files:
 - db/migrate/20200518142609_create_klastera_cluster_entities.rb
 - db/migrate/20200908180057_add_cluster_config_to_organization.rb
 - db/migrate/20220602222332_add_unique_index_to_cluster_entities.rb
+- db/migrate/20250429110829_add_entity_id_index_to_cluster_entities.rb
+- db/migrate/20250429110830_add_entity_id_index_and_entity_type_index_to_cluster_entities.klastera.rb
 - lib/klastera.rb
 - lib/klastera/engine.rb
 - lib/klastera/version.rb