forest_liana 9.15.0 → 9.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69f9957e56557898df599dfc7d383b8245f0eaf547bee56d801ac0acf43c3d77
-  data.tar.gz: cd5168db93e82e7482d6d010a9920770702d0d8ac7449100af6abc8c40ad2319
+  metadata.gz: 1c700fa60cbdb6da1e131e2e041d7bec408052bf6ce50304e51f2e6f6525e8d8
+  data.tar.gz: fdc53e76cf29afabdd6b18ec6a3279bd0e9bec3b467e8f8b16cb6cbb7dda87aa
 SHA512:
-  metadata.gz: 156cf52eec6bbd2091083ce1e47866e5a236f9c5c45979ceef108052ce81189a92d20ed341338ed604781d333404f2e7d2c2277285b2917ad4f3aa4990a7b611
-  data.tar.gz: d51bc16fe943322f8b93ea09c0a37b5798a330b6fc2a48d8b115a8663e6508954d143d2539db464372b3857e4894443e1dec49f27af82f092d8e861965e4314f
+  metadata.gz: fe65c60f75a320f96e826dc7b93e25106d0958c62f1157212496ba57eef33e9be08776ab104200b2eb9d7e772fc1f2cae58f811f2033d57e2969e877cf3dbc64
+  data.tar.gz: bf3c7eb151213fb126ef896d040369c2a3c65500e8e2ecbd292c06cbb016939fc607e295db9fc719b09e428c52ad7f4462bee211f7f532794be0d4895ef2d50d

data/app/services/forest_liana/resources_getter.rb

@@ -168,7 +168,7 @@ module ForestLiana
         @includes = (includes & @field_names_requested).concat(includes_for_smart_search)
       else
         @includes = associations_has_one
-                      # Avoid eager loading has_one associations pointing to a different database as ORM can't join cross databases
+        # Avoid eager loading has_one associations pointing to a different database as ORM can't join cross databases
                       .reject { |association| separate_database?(@resource, association) }
                       .map(&:name)
       end
@@ -198,15 +198,29 @@ module ForestLiana
 
     def extract_associations_from_filter
       associations = []
-      @params[:filter]&.each do |field, _|
-        if field.include?(':')
+
+      filters = @params[:filters]
+      filters = JSON.parse(filters) if filters.is_a?(String)
+
+      conditions = []
+
+      if filters.is_a?(Hash) && filters.key?('conditions')
+        conditions = filters['conditions']
+      elsif filters.is_a?(Hash) && filters.key?('field')
+        conditions = [filters]
+      end
+
+      conditions.each do |condition|
+        field = condition['field']
+        if field&.include?(':')
           associations << field.split(':').first.to_sym
           @count_needs_includes = true
         end
       end
+
       @count_needs_includes = true if @params[:search]
 
-      associations
+      associations.uniq
     end
 
     def prepare_query
@@ -352,8 +366,8 @@ module ForestLiana
 
     def get_one_association(name)
       ForestLiana::QueryHelper.get_one_associations(@resource)
-        .select { |association| association.name == name.to_sym }
-        .first
+                              .select { |association| association.name == name.to_sym }
+                              .first
     end
   end
 end

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "9.15.0"
+  VERSION = "9.15.1"
 end

data/spec/services/forest_liana/resources_getter_spec.rb

@@ -38,7 +38,7 @@ module ForestLiana
       clean_database
 
       users = ['Michel', 'Robert', 'Vince', 'Sandro', 'Olesya', 'Romain', 'Valentin', 'Jason', 'Arnaud', 'Jeff', 'Steve', 'Marc', 'Xavier', 'Paul', 'Mickael', 'Mike', 'Maxime', 'Gertrude', 'Monique', 'Mia', 'Rachid', 'Edouard', 'Sacha', 'Caro', 'Amand', 'Nathan', 'Noémie', 'Robin', 'Gaelle', 'Isabelle']
-      .map { |name| User.create(name: name) }
+                .map { |name| User.create(name: name) }
 
       islands = [
         { :name => 'Skull', :updated_at => Time.now - 1.years },
@@ -309,18 +309,18 @@ module ForestLiana
     describe 'when filtering on an ambiguous field' do
       let(:resource) { Tree }
       let(:pageSize) { 5 }
-      let(:fields) { { 'Tree' => 'id' } }
+      let(:fields) { { 'Tree' => 'id,name', 'cutter' => 'id' } }
       let(:filters) { {
         aggregator: 'and',
         conditions: [{
-          field: 'created_at',
-          operator: 'after',
-          value: "#{Time.now - 6.year}",
-        }, {
-          field: 'cutter:name',
-          operator: 'equal',
-          value: 'Michel'
-        }]
+                       field: 'created_at',
+                       operator: 'after',
+                       value: "#{Time.now - 6.year}",
+                     }, {
+                       field: 'cutter:name',
+                       operator: 'equal',
+                       value: 'Michel'
+                     }]
       }.to_json }
 
       it 'should get only the expected records' do
@@ -332,7 +332,6 @@ module ForestLiana
         expect(count).to eq 1
         expect(records.first.id).to eq 3
         expect(records.first.name).to eq 'Apple Tree'
-        expect(records.first.cutter.name).to eq 'Michel'
       end
     end
 
@@ -379,7 +378,7 @@ module ForestLiana
     describe 'when sorting on an ambiguous field name with a filter' do
       let(:resource) { Tree }
       let(:sort) { '-name' }
-      let(:fields) { { 'Tree' => 'id' } }
+      let(:fields) { { 'Tree' => 'id,name' } }
       let(:filters) { {
         field: 'cutter:name',
         operator: 'equal',
@@ -417,7 +416,7 @@ module ForestLiana
 
     describe 'when filtering on an updated_at field of an associated collection' do
       let(:resource) { Tree }
-      let(:fields) { { 'Tree' => 'id' } }
+      let(:fields) { { 'Tree' => 'id,name' } }
       let(:filters) { {
         field: 'island:updated_at',
         operator: 'previous_year'
@@ -510,9 +509,9 @@ module ForestLiana
 
       it 'should raise the right error' do
         expect { getter }.to raise_error(
-          ForestLiana::Errors::NotImplementedMethodError,
-           "method filter on smart field 'alter_coordinates' not found"
-        )
+                               ForestLiana::Errors::NotImplementedMethodError,
+                               "method filter on smart field 'alter_coordinates' not found"
+                             )
       end
     end
 
@@ -555,10 +554,10 @@ module ForestLiana
         let(:filters) { {
           aggregator: 'and',
           conditions: [{
-            field: 'name',
-            operator: 'contains',
-            value: 'a',
-          }]
+                         field: 'name',
+                         operator: 'contains',
+                         value: 'a',
+                       }]
         }.to_json }
 
         it 'should get only the records matching the scope' do
@@ -592,6 +591,64 @@ module ForestLiana
         end
       end
 
+      describe '#extract_associations_from_filter' do
+        let(:resource) { Tree }
+
+        before { init_scopes }
+
+        context 'with a single filter as JSON string' do
+          let(:filters) {
+            {
+              field: 'island:updated_at',
+              operator: 'equal',
+              value: '2024-01-01'
+            }.to_json
+          }
+
+          it 'extracts the correct association' do
+            expect(getter.send(:extract_associations_from_filter)).to eq [:island]
+          end
+        end
+
+        context 'with grouped conditions as JSON string' do
+          let(:filters) {
+            {
+              aggregator: 'and',
+              conditions: [
+                { field: 'island:updated_at', operator: 'equal', value: '2024-01-01' },
+                { field: 'owner:name', operator: 'equal', value: 'Michel' },
+                { field: 'id', operator: 'present', value: nil }
+              ]
+            }.to_json
+          }
+
+          it 'extracts all unique associations' do
+            expect(getter.send(:extract_associations_from_filter)).to match_array [:island, :owner]
+          end
+        end
+
+        context 'when filters has no association field' do
+          let(:filters) {
+            {
+              field: 'id',
+              operator: 'equal',
+              value: 1
+            }.to_json
+          }
+
+          it 'returns an empty array' do
+            expect(getter.send(:extract_associations_from_filter)).to eq []
+          end
+        end
+
+        context 'when filters is nil' do
+          let(:filters) { nil }
+
+          it 'returns an empty array' do
+            expect(getter.send(:extract_associations_from_filter)).to eq []
+          end
+        end
+      end
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 9.15.0
+  version: 9.15.1
 platform: ruby
 authors:
 - Sandro Munda
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-17 00:00:00.000000000 Z
+date: 2025-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails