forest_liana 3.0.0.pre.beta.6 → 3.0.0.pre.beta.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1dafbedcb356fe7b3c787da79c40e7550f952863
-  data.tar.gz: 4708a4f20eb7ab73b8c47f1a228fc50537abfc7c
+  metadata.gz: dc42f7cf5b68fc7d00df278839bb4d43f78a2356
+  data.tar.gz: c16e1f5d465917736a6c271be80a901c02430957
 SHA512:
-  metadata.gz: 142d9d3c080fbe34d66efee030a30bf2025192a26a98a1963e71c6063954785853eb679309d7e1935ffd60b6521548149ca86af0bdce59a237f35a47b6a98511
-  data.tar.gz: 0ff08167180f955e62b27a20648ac76f684f4bf2035be815b2d9a5d0b96047d65d8bfc8eb31e64df1074827f1f23fa14462a38c200f0fcc20c0484d1ea950346
+  metadata.gz: a15a4d4944f550e2f485b77dc4d4ecb48ded22042bf0523f01a0fc4e7977cc1aee7590647f804fc5a25bbae2163c3f198ac2fdc7665445de46ed0498cb213860
+  data.tar.gz: 3386847ab59536d942d296d775265f0f95e73e95943e16e3836f5152d9f3f0dc4ef810a9dbc7b900b43bb38bba137c14effdcedbf6789077804ffa7cbcaa8d54

data/app/services/forest_liana/base_getter.rb

@@ -14,7 +14,7 @@ module ForestLiana
     end
 
     def includes_for_serialization
-      includes_initial = includes
+      includes_initial = @includes
       includes_for_smart_belongs_to = @collection.fields_smart_belongs_to.map { |field| field[:field] }
 
       if @field_names_requested
@@ -23,5 +23,13 @@ module ForestLiana
 
       includes_initial.concat(includes_for_smart_belongs_to).map(&:to_s)
     end
+
+    private
+
+    def compute_includes
+      @includes = SchemaUtils.one_associations(@resource)
+        .select { |association| SchemaUtils.model_included?(association.klass) }
+        .map(&:name)
+    end
   end
 end

data/app/services/forest_liana/has_many_getter.rb

@@ -10,8 +10,9 @@ module ForestLiana
       @collection_name = ForestLiana.name_for(model_association)
       @field_names_requested = field_names_requested
       @collection = get_collection(@collection_name)
-      includes_symbols = includes.map { |include| include.to_sym }
-      @search_query_builder = SearchQueryBuilder.new(@params, includes_symbols, @collection)
+      compute_includes()
+      includes_symbols = @includes.map { |include| include.to_sym }
+      @search_query_builder = SearchQueryBuilder.new(@params, includes_symbols, {}, @collection)
 
       prepare_query()
     end
@@ -29,8 +30,18 @@ module ForestLiana
       @search_query_builder.perform(@records)
     end
 
-    def includes
-      @association.klass
+    def query_for_batch
+      @records
+    end
+
+    def records
+      @records.limit(limit).offset(offset)
+    end
+
+    private
+
+    def compute_includes
+      @includes = @association.klass
         .reflect_on_all_associations
         .select do |association|
           inclusion = !association.options[:polymorphic] &&
@@ -46,16 +57,6 @@ module ForestLiana
         .map { |association| association.name.to_s }
     end
 
-    def query_for_batch
-      @records
-    end
-
-    def records
-      @records.limit(limit).offset(offset)
-    end
-
-    private
-
     def field_names_requested
       return nil unless @params[:fields] && @params[:fields][@collection_name]
       @params[:fields][@collection_name].split(',')
@@ -74,7 +75,7 @@ module ForestLiana
       @records = get_resource()
         .find(@params[:id])
         .send(@params[:association_name])
-        .eager_load(includes)
+        .eager_load(@includes)
     end
 
     def offset

data/app/services/forest_liana/leaderboard_stat_getter.rb

@@ -1,9 +1,10 @@
 module ForestLiana
   class LeaderboardStatGetter < StatGetter
     def initialize(resource, params)
-      super(resource, params)
-
+      @resource = resource
+      @params = params
       @model_relationship =  @resource.reflect_on_association(@params[:relationship_field]).klass
+      compute_includes()
       @label_field = @params[:label_field]
       @aggregate = @params[:aggregate].downcase
       @aggregate_field = @params[:aggregate_field]
@@ -13,7 +14,7 @@ module ForestLiana
 
     def perform
       result = @model_relationship
-        .joins(includes)
+        .joins(@includes)
         .group(@groub_by)
         .order(order)
         .limit(@limit)
@@ -23,8 +24,8 @@ module ForestLiana
       @record = Model::Stat.new(value: result)
     end
 
-    def includes
-      SchemaUtils.one_associations(@model_relationship)
+    def compute_includes
+      @includes = SchemaUtils.one_associations(@model_relationship)
         .select { |association| SchemaUtils.model_included?(association.klass) }
         .map(&:name)
     end

data/app/services/forest_liana/line_stat_getter.rb

@@ -20,7 +20,7 @@ module ForestLiana
     end
 
     def perform
-      value = get_resource().eager_load(includes)
+      value = get_resource().eager_load(@includes)
 
       if @params[:filterType] && @params[:filters]
         conditions = []

data/app/services/forest_liana/pie_stat_getter.rb

@@ -19,7 +19,7 @@ module ForestLiana
         end
 
         result = get_resource()
-          .eager_load(includes)
+          .eager_load(@includes)
           .where(conditions.join(filter_operator))
           .group(group_by_field)
           .order(order)
@@ -62,7 +62,7 @@ module ForestLiana
       if @params[:aggregate].downcase == 'sum'
         field = @params[:aggregate_field].downcase
       else
-        field = Rails::VERSION::MAJOR >= 5 || includes.size > 0 ? 'id' : 'all'
+        field = Rails::VERSION::MAJOR >= 5 || @includes.size > 0 ? 'id' : 'all'
       end
       "#{@params[:aggregate].downcase}_#{field} #{order}"
     end

data/app/services/forest_liana/resource_getter.rb

@@ -7,17 +7,11 @@ module ForestLiana
       @params = params
       @collection_name = ForestLiana.name_for(@resource)
       @collection = get_collection(@collection_name)
+      compute_includes()
     end
 
     def perform
-      @record = get_resource().eager_load(includes).find(@params[:id])
+      @record = get_resource().eager_load(@includes).find(@params[:id])
     end
-
-    def includes
-      SchemaUtils.one_associations(@resource)
-        .select { |association| SchemaUtils.model_included?(association.klass) }
-        .map(&:name)
-    end
-
   end
 end

data/app/services/forest_liana/resources_getter.rb

@@ -10,21 +10,23 @@ module ForestLiana
       @collection_name = ForestLiana.name_for(@resource)
       @collection = get_collection(@collection_name)
       @field_names_requested = field_names_requested
+      @tables_associated_to_relations_name = {}
       get_segment()
-      @search_query_builder = SearchQueryBuilder.new(@params, includes, @collection)
+      compute_includes()
+      @search_query_builder = SearchQueryBuilder.new(@params, @includes, @tables_associated_to_relations_name, @collection)
 
       prepare_query()
     end
 
     def perform
-      @records = @records.eager_load(includes)
+      @records = @records.eager_load(@includes)
       @records_sorted = sort_query
     end
 
     def count
-      # NOTICE: For performance reasons, do not eager load the data if there is
-      #         no search or filters on associations.
-      @records_count = @count_needs_includes ? @records.eager_load(includes).count : @records.count
+      # NOTICE: For performance reasons, do not eager load the data if there is  no search or
+      #         filters on associations.
+      @records_count = @count_needs_includes ? @records.eager_load(@includes).count : @records.count
     end
 
     def query_for_batch
@@ -35,10 +37,18 @@ module ForestLiana
       @records_sorted.offset(offset).limit(limit).to_a
     end
 
-    def includes
-      includes = SchemaUtils.one_associations(@resource)
+    def compute_includes
+      associations_has_one = SchemaUtils.one_associations(@resource)
         .select { |association| SchemaUtils.model_included?(association.klass) }
-        .map(&:name)
+
+      includes = associations_has_one.each do |association|
+        if @tables_associated_to_relations_name[association.table_name].nil?
+          @tables_associated_to_relations_name[association.table_name] = []
+        end
+        @tables_associated_to_relations_name[association.table_name] << association.name
+      end
+
+      includes = associations_has_one.map(&:name)
       includes_for_smart_search = []
 
       if @collection && @collection.search_fields
@@ -54,9 +64,9 @@ module ForestLiana
       end
 
       if @field_names_requested
-        (includes & @field_names_requested).concat(includes_for_smart_search)
+        @includes = (includes & @field_names_requested).concat(includes_for_smart_search)
       else
-        includes
+        @includes = includes
       end
     end
 

data/app/services/forest_liana/search_query_builder.rb

@@ -4,12 +4,13 @@ module ForestLiana
 
     attr_reader :fields_searched
 
-    def initialize(params, includes, collection)
+    def initialize(params, includes, tables_associated_to_relations_name, collection)
       @params = params
       @includes = includes
       @collection = collection
       @fields_searched = []
       @search = @params[:search]
+      @tables_associated_to_relations_name = tables_associated_to_relations_name
     end
 
     def perform(resource)
@@ -273,12 +274,22 @@ module ForestLiana
       association_name_pluralized = association_name.pluralize
 
       if [association_name, association_name_pluralized].include? association.table_name
-        # NOTICE: Default case. When the belongsTo association name and the referenced table name are identical.
+        # NOTICE: Default case. When the belongsTo association name and the referenced table name
+        #         are identical.
         association_name_for_condition = association.table_name
       else
-        # NOTICE: When the the belongsTo association name and the referenced table name are identical.
-        #         Format with the ActiveRecord query generator style.
-        association_name_for_condition = "#{association_name_pluralized}_#{@resource.table_name}"
+        # NOTICE: When the the belongsTo association name and the referenced table name are not
+        #         identical. Format with the ActiveRecord query generator style.
+        relations_on_this_table = @tables_associated_to_relations_name[association.table_name]
+        has_several_associations_to_the_table_and_is_not_first_one =
+          !relations_on_this_table.nil? && relations_on_this_table.size > 1 &&
+          relations_on_this_table.find_index(association.name) > 0
+
+        if has_several_associations_to_the_table_and_is_not_first_one
+          association_name_for_condition = "#{association_name_pluralized}_#{@resource.table_name}"
+        else
+          association_name_for_condition = association.table_name
+        end
       end
 
       @records.where("#{association_name_for_condition}.#{subfield} #{filter}")

data/app/services/forest_liana/stat_getter.rb

@@ -5,14 +5,7 @@ module ForestLiana
     def initialize(resource, params)
       @resource = resource
       @params = params
-    end
-
-    private
-
-    def includes
-      SchemaUtils.one_associations(@resource)
-        .select { |association| SchemaUtils.model_included?(association.klass) }
-        .map(&:name)
+      compute_includes()
     end
   end
 end

data/app/services/forest_liana/value_stat_getter.rb

@@ -4,8 +4,8 @@ module ForestLiana
 
     def perform
       return if @params[:aggregate].blank?
-      valueCurrent = get_resource().eager_load(includes)
-      valuePrevious = get_resource().eager_load(includes)
+      valueCurrent = get_resource().eager_load(@includes)
+      valuePrevious = get_resource().eager_load(@includes)
       filter_date_interval = false
 
       if @params[:filterType] && @params[:filters]

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "3.0.0-beta.6"
+  VERSION = "3.0.0-beta.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre.beta.6
+  version: 3.0.0.pre.beta.7
 platform: ruby
 authors:
 - Sandro Munda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-01 00:00:00.000000000 Z
+date: 2019-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails