forest_liana 9.17.1 → 9.17.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16bdb91facdb11410af87209603b89aee45670322979b84bcb586a753fe47179
-  data.tar.gz: 0c748d62bc3081e48a2ad46f1c7a27ce133b7e5c2b2eb9e9fa1f5c64c2a6491e
+  metadata.gz: 44ec79f4e42ec91b8c5306d87672aab03a6b30072e88e27fdcb311d3d7d2c8de
+  data.tar.gz: e5f37934ccdbf40a78499fd22fcafcd037b8eed1b12034c773bbb499d16b60c7
 SHA512:
-  metadata.gz: 426d29525742b6b53c939838a6db17ccfc40f781fa3ae9bc1e9d085170468944d9487c52c653c5d5ff45ea991303ceb809916c1b6e49389153baf3476026a448
-  data.tar.gz: 1f7db109fff86b8d6ac6bfb53e31aa0a6e2a449a8074243359ece98c69058a4f361aa0ce92f4d632dfd08a0e758e316e70e2b09d446fcfa646d029fe394969c5
+  metadata.gz: 93d789834be64fe90cdc9b58c8201df5b75396d627a1138ec1d46e437cfb60d7d63246ece332db3890a6a0cb5eb672683655abc5736dc5c85d38ab2aea47e41a
+  data.tar.gz: 91b3c9bf5856f4b628ca31b4140bab3f00b96bd3a7afe670cefaa8701499a86e2fca9e0c431b7a621c86283bae0eefa13afb5104f25ad89589105eb007fa34b9

data/app/services/forest_liana/base_getter.rb

@@ -1,5 +1,7 @@
 module ForestLiana
   class BaseGetter
+    include ForestLiana::RecordFindable
+
     def get_collection(collection_name)
       ForestLiana.apimap.find { |collection| collection.name.to_s == collection_name }
     end

data/app/services/forest_liana/belongs_to_updater.rb

@@ -1,5 +1,7 @@
 module ForestLiana
   class BelongsToUpdater
+    include ForestLiana::RecordFindable
+
     attr_accessor :errors
 
     def initialize(resource, association, params)
@@ -12,7 +14,7 @@ module ForestLiana
 
     def perform
       begin
-        @record = @resource.find(@params[:id])
+        @record = find_record(@resource, @resource, @params[:id])
         if (SchemaUtils.polymorphic?(@association))
           if @data.nil?
             new_value = nil

data/app/services/forest_liana/has_many_associator.rb

@@ -1,5 +1,7 @@
 module ForestLiana
   class HasManyAssociator
+    include ForestLiana::RecordFindable
+
     def initialize(resource, association, params)
       @resource = resource
       @association = association
@@ -8,8 +10,8 @@ module ForestLiana
     end
 
     def perform
-      @record = @resource.find(@params[:id])
-      associated_records = @resource.find(@params[:id]).send(@association.name)
+      @record = find_record(@resource, @resource, @params[:id])
+      associated_records = @record.send(@association.name)
 
       if @data.is_a?(Array)
         @data.each do |record_added|

data/app/services/forest_liana/has_many_dissociator.rb

@@ -1,5 +1,7 @@
 module ForestLiana
   class HasManyDissociator
+    include ForestLiana::RecordFindable
+
     def initialize(resource, association, params, forest_user)
       @resource = resource
       @association = association
@@ -10,8 +12,8 @@ module ForestLiana
     end
 
     def perform
-      @record = @resource.find(@params[:id])
-      associated_records = @resource.find(@params[:id]).send(@association.name)
+      @record = find_record(@resource, @resource, @params[:id])
+      associated_records = @record.send(@association.name)
 
       remove_association = !@with_deletion || @association.macro == :has_and_belongs_to_many
       if @data.is_a?(Array)

data/app/services/forest_liana/has_many_getter.rb

@@ -29,6 +29,9 @@ module ForestLiana
 
       if association_class.primary_key.is_a?(Array)
         adapter_name = association_class.connection.adapter_name.downcase
+        pk_columns = association_class.primary_key.map do |pk|
+          "#{association_class.table_name}.#{pk}"
+        end.join(', ')
 
         if adapter_name.include?('sqlite')
           # For SQLite: concatenate columns for DISTINCT count
@@ -37,12 +40,9 @@ module ForestLiana
           end.join(" || '|' || ")
 
           @records_count = @records.distinct.count(Arel.sql(pk_concat))
+        elsif adapter_name.include?('postgresql')
+          @records_count = @records.distinct.count(Arel.sql("ROW(#{pk_columns})"))
         else
-          # For PostgreSQL/MySQL: use DISTINCT with multiple columns
-          pk_columns = association_class.primary_key.map do |pk|
-            "#{association_class.table_name}.#{pk}"
-          end.join(', ')
-
           @records_count = @records.distinct.count(Arel.sql(pk_columns))
         end
       else
@@ -94,7 +94,7 @@ module ForestLiana
     end
 
     def prepare_query
-      parent_record = ForestLiana::Utils::CompositePrimaryKeyHelper.find_record(get_resource(), @resource, @params[:id])
+      parent_record = find_record(get_resource(), @resource, @params[:id])
       association = parent_record.send(@params[:association_name])
       @records = optimize_record_loading(association, @search_query_builder.perform(association))
     end

data/app/services/forest_liana/record_findable.rb

@@ -0,0 +1,27 @@
+module ForestLiana
+  module RecordFindable
+    private
+
+    def find_record(scope, resource, id)
+      primary_key = resource.primary_key
+
+      if primary_key.is_a?(Array)
+        id_values = parse_composite_id(id)
+        conditions = primary_key.zip(id_values).to_h
+        scope.find_by(conditions)
+      else
+        scope.find(id)
+      end
+    end
+
+    def parse_composite_id(id)
+      return id if id.is_a?(Array)
+
+      if id.to_s.start_with?('[') && id.to_s.end_with?(']')
+        JSON.parse(id.to_s)
+      else
+        raise ForestLiana::Errors::HTTP422Error.new("Composite primary key ID must be in format [value1,value2], received: #{id}")
+      end
+    end
+  end
+end

data/app/services/forest_liana/resource_getter.rb

@@ -14,7 +14,7 @@ module ForestLiana
     def perform
       records = optimize_record_loading(@resource, get_resource())
       scoped_records = ForestLiana::ScopeManager.apply_scopes_on_records(records, @user, @collection_name, @params[:timezone])
-      @record = ForestLiana::Utils::CompositePrimaryKeyHelper.find_record(scoped_records, @resource, @params[:id])
+      @record = find_record(scoped_records, @resource, @params[:id])
     end
   end
 end

data/app/services/forest_liana/resource_updater.rb

@@ -1,5 +1,7 @@
 module ForestLiana
   class ResourceUpdater
+    include ForestLiana::RecordFindable
+
     attr_accessor :record
     attr_accessor :errors
 
@@ -14,7 +16,7 @@ module ForestLiana
       begin
         collection_name = ForestLiana.name_for(@resource)
         scoped_records = ForestLiana::ScopeManager.apply_scopes_on_records(@resource, @user, collection_name, @params[:timezone])
-        @record = scoped_records.find(@params[:id])
+        @record = find_record(scoped_records, @resource, @params[:id])
 
         if has_strong_parameter
           @record.update(resource_params)

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "9.17.1"
+  VERSION = "9.17.2"
 end

data/spec/services/forest_liana/composite_primary_keys_spec.rb

@@ -0,0 +1,223 @@
+require 'rails_helper'
+
+module ForestLiana
+  describe 'Composite Primary Keys Support' do
+    let(:rendering_id) { 13 }
+    let(:user) { { 'id' => '1', 'rendering_id' => rendering_id } }
+    let(:scopes) { { 'scopes' => {}, 'team' => { 'id' => '1', 'name' => 'Operations' } } }
+
+    before do
+      ForestLiana::ScopeManager.invalidate_scope_cache(rendering_id)
+      allow(ForestLiana::ScopeManager).to receive(:fetch_scopes).and_return(scopes)
+    end
+
+    describe RecordFindable do
+      # Create a test class that includes the module to test private methods
+      let(:test_class) do
+        Class.new do
+          include ForestLiana::RecordFindable
+          # Expose private methods for testing
+          public :find_record, :parse_composite_id
+        end
+      end
+
+      let(:helper) { test_class.new }
+
+      describe '#parse_composite_id' do
+        it 'correctly parses composite ID in JSON format' do
+          expect(helper.parse_composite_id('[1,2]')).to eq([1, 2])
+          expect(helper.parse_composite_id('[10,20]')).to eq([10, 20])
+          expect(helper.parse_composite_id('["a","b"]')).to eq(['a', 'b'])
+        end
+
+        it 'returns array as-is when already an array' do
+          expect(helper.parse_composite_id([1, 2])).to eq([1, 2])
+        end
+
+        it 'raises error for invalid composite ID format' do
+          expect {
+            helper.parse_composite_id('invalid')
+          }.to raise_error(ForestLiana::Errors::HTTP422Error)
+        end
+      end
+
+      describe '#find_record' do
+        it 'finds record using composite key conditions' do
+          mock_resource = double('Resource', primary_key: [:user_id, :island_id])
+          mock_scoped_records = double('ScopedRecords')
+          mock_record = double('Record')
+
+          allow(mock_scoped_records).to receive(:find_by)
+            .with({ user_id: 1, island_id: 2 })
+            .and_return(mock_record)
+
+          result = helper.find_record(mock_scoped_records, mock_resource, '[1,2]')
+
+          expect(result).to eq(mock_record)
+          expect(mock_scoped_records).to have_received(:find_by).with({ user_id: 1, island_id: 2 })
+        end
+
+        it 'falls back to standard find for simple primary key' do
+          mock_resource = double('Resource', primary_key: 'id')
+          mock_scoped_records = double('ScopedRecords')
+          mock_record = double('Record')
+
+          allow(mock_scoped_records).to receive(:find).with(123).and_return(mock_record)
+
+          result = helper.find_record(mock_scoped_records, mock_resource, 123)
+
+          expect(result).to eq(mock_record)
+          expect(mock_scoped_records).to have_received(:find).with(123)
+        end
+      end
+    end
+
+    describe HasManyGetter do
+      describe '#count with composite primary key' do
+        let(:composite_association_class) do
+          mock_class = double('CompositeModel')
+          allow(mock_class).to receive(:primary_key).and_return([:user_id, :island_id])
+          allow(mock_class).to receive(:table_name).and_return('user_islands')
+          allow(mock_class).to receive(:connection).and_return(double('Connection', adapter_name: adapter_name))
+          mock_class
+        end
+
+        let(:mock_records) { double('Records') }
+
+        before do
+          allow(mock_records).to receive(:distinct).and_return(mock_records)
+          allow(mock_records).to receive(:count).and_return(5)
+        end
+
+        context 'with PostgreSQL adapter' do
+          let(:adapter_name) { 'PostgreSQL' }
+
+          it 'uses ROW() syntax for COUNT DISTINCT' do
+            getter = HasManyGetter.allocate
+            getter.instance_variable_set(:@records, mock_records)
+
+            allow(getter).to receive(:model_association).and_return(composite_association_class)
+
+            getter.count
+
+            expect(mock_records).to have_received(:count) do |arg|
+              expect(arg.to_s).to include('ROW(')
+              expect(arg.to_s).to include('user_islands.user_id')
+              expect(arg.to_s).to include('user_islands.island_id')
+            end
+          end
+        end
+
+        context 'with MySQL adapter' do
+          let(:adapter_name) { 'Mysql2' }
+
+          it 'uses standard multi-column syntax for COUNT DISTINCT' do
+            getter = HasManyGetter.allocate
+            getter.instance_variable_set(:@records, mock_records)
+
+            allow(getter).to receive(:model_association).and_return(composite_association_class)
+
+            getter.count
+
+            expect(mock_records).to have_received(:count) do |arg|
+              expect(arg.to_s).not_to include('ROW(')
+              expect(arg.to_s).to include('user_islands.user_id, user_islands.island_id')
+            end
+          end
+        end
+
+        context 'with SQLite adapter' do
+          let(:adapter_name) { 'SQLite' }
+
+          it 'uses concatenation syntax for COUNT DISTINCT' do
+            getter = HasManyGetter.allocate
+            getter.instance_variable_set(:@records, mock_records)
+
+            allow(getter).to receive(:model_association).and_return(composite_association_class)
+
+            getter.count
+
+            expect(mock_records).to have_received(:count) do |arg|
+              expect(arg.to_s).to include("||")
+              expect(arg.to_s).to include("'|'")
+            end
+          end
+        end
+      end
+    end
+
+    describe BelongsToUpdater do
+      describe 'with composite primary key parent' do
+        it 'uses find_record to find the parent record' do
+          composite_model = double('CompositeModel')
+          association = double('Association', name: :user, klass: User)
+          mock_record = double('Record', save: true)
+          allow(mock_record).to receive(:user=)
+
+          params = { id: '[1,2]', 'data' => { id: '5', type: 'User' } }
+
+          updater = described_class.new(composite_model, association, params)
+          allow(updater).to receive(:find_record).and_return(mock_record)
+          allow(User).to receive(:find).and_return(double('User'))
+          allow(SchemaUtils).to receive(:polymorphic?).and_return(false)
+
+          updater.perform
+
+          expect(updater).to have_received(:find_record)
+            .with(composite_model, composite_model, '[1,2]')
+        end
+      end
+    end
+
+    describe HasManyAssociator do
+      describe 'with composite primary key parent' do
+        it 'uses find_record to find the parent record' do
+          composite_model = double('CompositeModel')
+          association = double('Association', name: :trees, klass: Tree)
+          mock_record = double('Record')
+          mock_associated_records = double('AssociatedRecords')
+
+          allow(mock_record).to receive(:send).with(:trees).and_return(mock_associated_records)
+          allow(mock_associated_records).to receive(:<<)
+
+          params = { id: '[1,2]', 'data' => [{ id: '5' }] }
+
+          associator = described_class.new(composite_model, association, params)
+          allow(associator).to receive(:find_record).and_return(mock_record)
+          allow(Tree).to receive(:find).and_return(double('Tree'))
+
+          associator.perform
+
+          expect(associator).to have_received(:find_record)
+            .with(composite_model, composite_model, '[1,2]')
+        end
+      end
+    end
+
+    describe HasManyDissociator do
+      describe 'with composite primary key parent' do
+        it 'uses find_record to find the parent record' do
+          composite_model = double('CompositeModel')
+          association = double('Association', name: :trees, klass: Tree, macro: :has_many)
+          mock_record = double('Record')
+          mock_associated_records = double('AssociatedRecords')
+
+          allow(mock_record).to receive(:send).with(:trees).and_return(mock_associated_records)
+          allow(mock_associated_records).to receive(:delete)
+
+          params = { id: '[1,2]', 'data' => [{ id: '5' }], delete: 'false' }
+          forest_user = user
+
+          dissociator = described_class.new(composite_model, association, params, forest_user)
+          allow(dissociator).to receive(:find_record).and_return(mock_record)
+          allow(Tree).to receive(:find).and_return(double('Tree'))
+
+          dissociator.perform
+
+          expect(dissociator).to have_received(:find_record)
+            .with(composite_model, composite_model, '[1,2]')
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 9.17.1
+  version: 9.17.2
 platform: ruby
 authors:
 - Sandro Munda
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-01-13 00:00:00.000000000 Z
+date: 2026-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -311,6 +311,7 @@ files:
 - app/services/forest_liana/operator_date_interval_parser.rb
 - app/services/forest_liana/pie_stat_getter.rb
 - app/services/forest_liana/query_stat_getter.rb
+- app/services/forest_liana/record_findable.rb
 - app/services/forest_liana/resource_creator.rb
 - app/services/forest_liana/resource_getter.rb
 - app/services/forest_liana/resource_updater.rb
@@ -334,7 +335,6 @@ files:
 - app/services/forest_liana/stripe_subscriptions_getter.rb
 - app/services/forest_liana/token.rb
 - app/services/forest_liana/utils/beta_schema_utils.rb
-- app/services/forest_liana/utils/composite_primary_key_helper.rb
 - app/services/forest_liana/utils/context_variables.rb
 - app/services/forest_liana/utils/context_variables_injector.rb
 - app/services/forest_liana/value_stat_getter.rb
@@ -452,6 +452,7 @@ files:
 - spec/services/forest_liana/ability/permission/smart_action_checker_spec.rb
 - spec/services/forest_liana/ability/permission_spec.rb
 - spec/services/forest_liana/apimap_sorter_spec.rb
+- spec/services/forest_liana/composite_primary_keys_spec.rb
 - spec/services/forest_liana/filters_parser_spec.rb
 - spec/services/forest_liana/forest_api_requester_spec.rb
 - spec/services/forest_liana/has_many_getter_spec.rb
@@ -761,6 +762,7 @@ test_files:
 - spec/services/forest_liana/ability/permission/smart_action_checker_spec.rb
 - spec/services/forest_liana/ability/permission_spec.rb
 - spec/services/forest_liana/apimap_sorter_spec.rb
+- spec/services/forest_liana/composite_primary_keys_spec.rb
 - spec/services/forest_liana/filters_parser_spec.rb
 - spec/services/forest_liana/forest_api_requester_spec.rb
 - spec/services/forest_liana/has_many_getter_spec.rb

data/app/services/forest_liana/utils/composite_primary_key_helper.rb

@@ -1,27 +0,0 @@
-module ForestLiana
-  module Utils
-    module CompositePrimaryKeyHelper
-      def self.find_record(scoped_records, resource, id)
-        primary_key = resource.primary_key
-
-        if primary_key.is_a?(Array)
-          id_values = parse_composite_id(id)
-          conditions = primary_key.zip(id_values).to_h
-          scoped_records.find_by(conditions)
-        else
-          scoped_records.find(id)
-        end
-      end
-
-      def self.parse_composite_id(id)
-        return id if id.is_a?(Array)
-
-        if id.to_s.start_with?('[') && id.to_s.end_with?(']')
-          JSON.parse(id.to_s)
-        else
-          raise ForestLiana::Errors::HTTP422Error.new("Composite primary key ID must be in format [value1,value2], received: #{id}")
-        end
-      end
-    end
-  end
-end