forest_liana 9.11.3 → 9.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dcd40a6f023ba4a2a7eddd15891ac11743dea8fee0df3378c42e604afbfe8c7e
-  data.tar.gz: 61ceac08bd477c79ea3d6284114b6a9a08f2514758378f4f7a96c3845efd4f8f
+  metadata.gz: a205f59494a1a151c8bb1a5be912905bf7f1c9242136ae63de22f0372f7268bf
+  data.tar.gz: ddba735dde964ffe46c0dc2907edd065e707a3d63d8283f25b2155c903d3eeb5
 SHA512:
-  metadata.gz: e09c8a0a86cee9b238e35057b0e29e5b842fcf0a2a1380a57fb10bf00c9c2cf6cb5cf16bb9908d72fc4219966efa910742de673e5d0f9cd6696bbd83724d4f67
-  data.tar.gz: 24ecaa8c8a9442ec3c677bb71f47dbf8a120cba326732f202264869d1a3188265a30caa14054ffbd13c218deb6b13294ef997f60d83f0f347faccbc60d32bc98
+  metadata.gz: eaaf6fbca9592c4853bcdfa2ec6c5983ee0f468fd62d36aab03cf55dc865a7ae7195c079b8d05a185c174a81cadb834f87e7ff85c69f489336a58ceb65c76559
+  data.tar.gz: 3f2dc59f88da2c969f8cf865809232d0b58988cf1f395d59837b2df0d3ef094854274e82eca82c3432d8672d9a1c760dc0204c86347cbdff3ae5304b5f555323

data/app/services/forest_liana/resources_getter.rb

@@ -30,7 +30,20 @@ module ForestLiana
     end
 
     def perform
-      @records = optimize_record_loading(@resource, @records)
+      polymorphic_association, preload_loads = analyze_associations(@resource)
+      includes = @includes.uniq - polymorphic_association - preload_loads
+      has_smart_fields =  @params[:fields][@collection_name].split(',').any? do |field|
+        ForestLiana::SchemaHelper.is_smart_field?(@resource, field)
+      end
+
+      if includes.empty? || has_smart_fields
+        @records = optimize_record_loading(@resource, @records)
+      else
+        select = compute_select_fields
+        @records = optimize_record_loading(@resource, @records).references(includes).select(*select)
+      end
+
+      @records
     end
 
     def count
@@ -210,5 +223,45 @@ module ForestLiana
     def pagination?
       @params[:page]&.dig(:number)
     end
+
+    def compute_select_fields
+      select = ['_forest_admin_eager_load']
+      @params[:fields][@collection_name].split(',').each do |path|
+        association = get_one_association(path)
+        if association
+          while association.options[:through]
+            association = get_one_association(association.options[:through])
+          end
+
+          if SchemaUtils.polymorphic?(association)
+            select << "#{@resource.table_name}.#{association.foreign_type}"
+          end
+          select << "#{@resource.table_name}.#{association.foreign_key}"
+        end
+
+        if @params[:fields].key?(path)
+          association = get_one_association(path)
+          table_name = association.table_name
+
+          @params[:fields][path].split(',').each do |association_path|
+            if ForestLiana::SchemaHelper.is_smart_field?(association.klass, association_path)
+              association.klass.attribute_names.each { |attribute| select << "#{table_name}.#{attribute}" }
+            else
+              select << "#{table_name}.#{association_path}"
+            end
+          end
+        else
+          select << "#{@resource.table_name}.#{path}"
+        end
+      end
+
+      select.uniq
+    end
+
+    def get_one_association(name)
+      ForestLiana::QueryHelper.get_one_associations(@resource)
+        .select { |association| association.name == name.to_sym }
+        .first
+    end
   end
 end

data/lib/forest_liana/active_record_override.rb

@@ -0,0 +1,65 @@
+module ForestLiana
+  module ActiveRecordOverride
+    module Associations
+      require 'active_record/associations/join_dependency'
+      module JoinDependency
+        def apply_column_aliases(relation)
+          if !(@join_root_alias = relation.select_values.empty?) &&
+            relation.select_values.first.to_s == '_forest_admin_eager_load'
+
+            relation.select_values.shift
+            used_cols = {}
+            # Find and expand out all column names being used in select(...)
+            new_select_values = relation.select_values.map(&:to_s).each_with_object([]) do |col, select|
+              unless col.include?(' ') # Pass it through if it's some expression (No chance for a simple column reference)
+                col = if (col_parts = col.split('.')).length == 1
+                  [col]
+                else
+                  [col_parts[0..-2].join('.'), col_parts.last]
+                end
+                used_cols[col] = nil
+              end
+              select << col
+            end
+
+            if new_select_values.present?
+              relation.select_values = new_select_values
+            else
+              relation.select_values.clear
+            end
+
+            @aliases ||= ActiveRecord::Associations::JoinDependency::Aliases.new(join_root.each_with_index.map do |join_part, i|
+              join_alias = join_part.table&.table_alias || join_part.table_name
+              keys = [join_part.base_klass.primary_key] # Always include the primary key
+
+              # # %%% Optional to include all foreign keys:
+              # keys.concat(join_part.base_klass.reflect_on_all_associations.select { |a| a.belongs_to? }.map(&:foreign_key))
+              # Add foreign keys out to referenced tables that we belongs_to
+              join_part.children.each { |child| keys << child.reflection.foreign_key if child.reflection.belongs_to? }
+
+              # Add the foreign key that got us here -- "the train we rode in on" -- if we arrived from
+              # a has_many or has_one:
+              if join_part.is_a?(ActiveRecord::Associations::JoinDependency::JoinAssociation) &&
+                !join_part.reflection.belongs_to?
+                keys << join_part.reflection.foreign_key
+              end
+              keys = keys.compact # In case we're using composite_primary_keys
+              j = 0
+              columns = join_part.column_names.each_with_object([]) do |column_name, s|
+                # Include columns chosen in select(...) as well as the PK and any relevant FKs
+                if used_cols.keys.find { |c| (c.length == 1 || c.first == join_alias) && c.last == column_name } ||
+                  keys.find { |c| c == column_name }
+                  s << ActiveRecord::Associations::JoinDependency::Aliases::Column.new(column_name, "t#{i}_r#{j}")
+                end
+                j += 1
+              end
+              ActiveRecord::Associations::JoinDependency::Aliases::Table.new(join_part, columns)
+            end)
+            relation.select_values.clear
+          end
+          relation._select!(-> { aliases.columns })
+        end
+      end
+    end
+  end
+end

data/lib/forest_liana/engine.rb

@@ -7,6 +7,7 @@ require 'jwt'
 require 'bcrypt'
 require_relative 'bootstrapper'
 require_relative 'collection'
+require_relative 'active_record_override'
 
 module Rack
   class Cors
@@ -90,6 +91,12 @@ module ForestLiana
       end
     end
 
+    initializer 'forest_liana.override_active_record_dependency' do
+      ActiveSupport.on_load(:active_record) do
+        ActiveRecord::Associations::JoinDependency.prepend(ForestLiana::ActiveRecordOverride::Associations::JoinDependency)
+      end
+    end
+
     config.after_initialize do |app|
       if error
         FOREST_REPORTER.report error

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "9.11.3"
+  VERSION = "9.12.1"
 end

data/spec/dummy/app/models/tree.rb

@@ -7,4 +7,6 @@ class Tree < ActiveRecord::Base
     class_name: 'Island',
     inverse_of: :eponymous_tree,
     optional: true
+
+  has_one :location, through: :island
 end

data/spec/helpers/forest_liana/query_helper_spec.rb

@@ -37,6 +37,7 @@ module ForestLiana
             { name: :cutter, klass: User },
             { name: :island, klass: Island },
             { name: :eponymous_island, klass: Island },
+            { name: :location, klass: Location },
           ]
         end
 
@@ -52,13 +53,17 @@ module ForestLiana
 
     describe 'get_one_association_names_symbol' do
       it 'should return the one-one associations names as symbols' do
-        expect(QueryHelper.get_one_association_names_symbol(Tree)).to eq([:owner, :cutter, :island, :eponymous_island])
+        expect(QueryHelper.get_one_association_names_symbol(Tree)).to eq(
+          [:owner, :cutter, :island, :eponymous_island, :location]
+        )
       end
     end
 
     describe 'get_one_association_names_string' do
       it 'should return the one-one associations names as strings' do
-        expect(QueryHelper.get_one_association_names_string(Tree)).to eq(['owner', 'cutter', 'island', 'eponymous_island'])
+        expect(QueryHelper.get_one_association_names_string(Tree)).to eq(
+          ['owner', 'cutter', 'island', 'eponymous_island', 'location']
+        )
       end
     end
 
@@ -71,12 +76,12 @@ module ForestLiana
         end
       end
 
-      context 'on a model having 2 belongsTo associations' do
+      context 'on a model having 3 belongsTo/hasOne associations' do
         tables_associated_to_relations_name =
           QueryHelper.get_tables_associated_to_relations_name(Tree)
 
         it 'should return the one-one associations' do
-          expect(tables_associated_to_relations_name.keys.length).to eq(2)
+          expect(tables_associated_to_relations_name.keys.length).to eq(3)
         end
 
         it 'should return relationships having a name different than the targeted model' do

data/spec/requests/resources_spec.rb

@@ -4,7 +4,9 @@ describe 'Requesting Tree resources', :type => :request  do
   let(:scope_filters) { {'scopes' => {}, 'team' => {'id' => '1', 'name' => 'Operations'}} }
   before do
     user = User.create(name: 'Michel')
-    Tree.create(name: 'Lemon Tree', owner: user, cutter: user)
+    tree = Tree.create(name: 'Lemon Tree', owner: user, cutter: user)
+    island = Island.create(name: 'Lemon Island', trees: [tree])
+    Location.create(coordinates: '1,2', island: island)
 
     Rails.cache.write('forest.users', {'1' => { 'id' => 1, 'roleId' => 1, 'rendering_id' => '1' }})
     Rails.cache.write('forest.has_permission', true)
@@ -32,6 +34,8 @@ describe 'Requesting Tree resources', :type => :request  do
   after do
     User.destroy_all
     Tree.destroy_all
+    Island.destroy_all
+    Location.destroy_all
   end
 
   token = JWT.encode({
@@ -54,7 +58,7 @@ describe 'Requesting Tree resources', :type => :request  do
   describe 'index' do
     describe 'without any filter' do
       params = {
-        fields: { 'Tree' => 'id,name' },
+        fields: { 'Tree' => 'id,name,location' },
         page: { 'number' => '1', 'size' => '10' },
         searchExtended: '0',
         sort: '-id',
@@ -98,7 +102,8 @@ describe 'Requesting Tree resources', :type => :request  do
 
       it 'should respond the tree data' do
         get '/forest/Tree', params: params, headers: headers
-        expect(JSON.parse(response.body)).to eq({
+        
+        expect(JSON.parse(response.body)).to include({
           "data" => [{
             "type" => "Tree",
             "id" => "1",
@@ -108,9 +113,30 @@ describe 'Requesting Tree resources', :type => :request  do
             },
             "links" => {
               "self" => "/forest/tree/1"
+            },
+            "relationships" => {
+              "location" => {
+                "data" => { "id" => "1", "type" => "Location" },
+                "links" => { "related" => {} }
+              }
             }
           }],
-          "included" => []
+          "included" => [{
+            "type" => "Location",
+            "id" => "1",
+            "attributes" => include(
+              "id" => 1,
+              "created_at" => nil,
+              "updated_at" => nil,
+              "coordinates" => nil
+            ),
+            "links" => { "self" => "/forest/location/1" },
+            "relationships" => {
+              "island" => {
+                "links" => { "related" => {} }
+              }
+            }
+          }]
         })
       end
     end

data/spec/services/forest_liana/resources_getter_spec.rb

@@ -4,7 +4,7 @@ module ForestLiana
     let(:pageSize) { 10 }
     let(:pageNumber) { 1 }
     let(:sort) { 'id' }
-    let(:fields) {}
+    let(:fields) { { resource.name => 'id' } }
     let(:filters) {}
     let(:scopes) { {'scopes' => {}, 'team' => {'id' => '1', 'name' => 'Operations'}} }
     let(:rendering_id) { 13 }
@@ -190,6 +190,7 @@ module ForestLiana
 
     describe 'when on a model having a reserved SQL word as name' do
       let(:resource) { Reference }
+      let(:fields) { { resource.name => 'id' } }
 
       it 'should get the ressource properly' do
         getter.perform
@@ -219,6 +220,7 @@ module ForestLiana
 
     describe 'when sorting by a belongs_to association' do
       let(:resource) { Tree }
+      let(:fields) { { resource.name => 'id' } }
       let(:sort) { 'owner.name' }
 
       it 'should get only the expected records' do
@@ -288,6 +290,22 @@ module ForestLiana
       end
     end
 
+    describe 'when getting a has_one through association' do
+      let(:resource) { Tree }
+      let(:fields) { { 'Tree' => 'id,location' } }
+
+      it 'should get the expected records, including the foreign_key for the direct association' do
+        getter.perform
+        records = getter.records
+        count = getter.count
+
+        expect(records.count).to eq Tree.count
+        expect(count).to eq Tree.count
+        expect(records.map(&:id)).to match_array(Tree.pluck(:id))
+        expect(records.map(&:island_id)).to match_array(Tree.pluck(:island_id))
+      end
+    end
+
     describe 'when filtering on an ambiguous field' do
       let(:resource) { Tree }
       let(:pageSize) { 5 }
@@ -501,7 +519,7 @@ module ForestLiana
     describe 'when scopes are defined' do
       let(:resource) { Island }
       let(:pageSize) { 15 }
-      let(:fields) { }
+      let(:fields) { { resource.name => 'id' } }
       let(:filters) { }
       let(:scopes) {
         {

data/spec/services/forest_liana/schema_adapter_spec.rb

@@ -61,7 +61,18 @@ module ForestLiana
           end
 
           expect(collection.fields.map { |field| field[:field].to_s}).to eq(
-            ["age", "created_at", "cutter", "eponymous_island", "id", "island", "name", "owner", "updated_at"]
+            [
+              "age",
+              "created_at",
+              "cutter",
+              "eponymous_island",
+              "id",
+              "island",
+              "location",
+              "name",
+              "owner",
+              "updated_at"
+            ]
           )
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 9.11.3
+  version: 9.12.1
 platform: ruby
 authors:
 - Sandro Munda
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-09 00:00:00.000000000 Z
+date: 2025-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -317,6 +317,7 @@ files:
 - config/routes.rb
 - config/routes/actions.rb
 - lib/forest_liana.rb
+- lib/forest_liana/active_record_override.rb
 - lib/forest_liana/base64_string_io.rb
 - lib/forest_liana/bootstrapper.rb
 - lib/forest_liana/collection.rb