forest_liana 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28f4946f83a3b1531e42b8ff2e2bb3c8f971a027
-  data.tar.gz: ab96ce677c9860afeffe490934b22d24cf66dc04
+  metadata.gz: 9847fca87fc1e7caff49a8aaf899a23c33169314
+  data.tar.gz: bf383e4e3b8fcc4be34a368018bdd8ab43e1bb0c
 SHA512:
-  metadata.gz: 20eb0265bc729dba9340de52f8de78b8d9a39ad930ea5226e6388197d8b253f19543011a35ba06214877012dc11a253fb70e00a486558320abdc206db97329d2
-  data.tar.gz: feb2cda4aaf0be455c7370aa2088cc3f3891c3cca990fdaa7a9a14f621888c31d9ba3779b6d8e6963ea676a54d98f23887efbc6a67e0a928ab5d59bbcddde4af
+  metadata.gz: 812421ddef29e95a562c928d610b3dfb148a7b9526ce69e88586d89c6b10a3569f9d32ea8cc8243ae1d4e67056ee406c770ed8b5a6fbf00e06a6dbd0ba01a1ea
+  data.tar.gz: bec80b2cb5b6524af1b6c2ddcbdd7a132910c85b25f9a6f06ca0455165c106c46b9cecc9c7c4dba37f4945dabc805bf8208109f89d7c3c96e38e360b3456865d

data/app/services/forest_liana/line_stat_getter.rb

@@ -1,15 +1,14 @@
 module ForestLiana
-  class LineStatGetter
+  class LineStatGetter < StatGetter
     attr_accessor :record
 
     def initialize(resource, params)
-      @resource = resource
-      @params = params
+      super(resource, params)
       @populates = {}
     end
 
     def perform
-      value = @resource.unscoped
+      value = @resource.unscoped.eager_load(includes)
 
       if @params[:filterType] && @params[:filters]
         conditions = []
@@ -24,7 +23,7 @@ module ForestLiana
         value = value.where(conditions.join(filter_operator))
       end
 
-      value = value.send(time_range, @params[:group_by_date_field])
+      value = value.send(time_range, group_by_date_field)
       value = value.group(group_by_field || :id) if group_by_field
 
       value = value.send(@params[:aggregate].downcase, @params[:aggregate_field])
@@ -52,6 +51,10 @@ module ForestLiana
 
     private
 
+    def group_by_date_field
+      "#{@resource.table_name}.#{@params[:group_by_date_field]}"
+    end
+
     def group_by_field
       field_name = @params[:group_by_field]
       association = @resource.reflect_on_association(field_name) if field_name

data/app/services/forest_liana/operator_date_interval_parser.rb

@@ -7,17 +7,17 @@ module ForestLiana
       lastMonth: { duration: 1, period: 'month' }, # TODO: Remove once new filter protocol is live
       last3Months: { duration: 3, period: 'month' }, # TODO: Remove once new filter protocol is live
       lastYear: { duration: 1, period: 'year' }, # TODO: Remove once new filter protocol is live
-      $yesterday => { duration: 1, period: 'day' },
-      $previousWeek => { duration: 1, period: 'week' },
-      $previousMonth => { duration: 1, period: 'month' },
-      $previousQuarter => { duration: 3, period: 'month',
+      :$yesterday => { duration: 1, period: 'day' },
+      :$previousWeek => { duration: 1, period: 'week' },
+      :$previousMonth => { duration: 1, period: 'month' },
+      :$previousQuarter => { duration: 3, period: 'month',
                             period_of_time: 'quarter' },
-      $previousYear => { duration: 1, period: 'year' },
-      $weekToDate => { duration: 1, period: 'week', to_date: true },
-      $monthToDate => { duration: 1, period: 'month', to_date: true },
-      $quarterToDate => { duration: 3, period: 'month',
+      :$previousYear => { duration: 1, period: 'year' },
+      :$weekToDate => { duration: 1, period: 'week', to_date: true },
+      :$monthToDate => { duration: 1, period: 'month', to_date: true },
+      :$quarterToDate => { duration: 3, period: 'month',
                           period_of_time: 'quarter', to_date: true },
-      $yearToDate => { duration: 1, period: 'year', to_date: true }
+      :$yearToDate => { duration: 1, period: 'year', to_date: true }
     }
 
     PERIODS_FROM_NOW = 'fromNow' # TODO: Remove once new filter protocol is live

data/app/services/forest_liana/pie_stat_getter.rb

@@ -1,12 +1,7 @@
 module ForestLiana
-  class PieStatGetter
+  class PieStatGetter < StatGetter
     attr_accessor :record
 
-    def initialize(resource, params)
-      @resource = resource
-      @params = params
-    end
-
     def perform
       if @params[:group_by_field]
         value = @resource
@@ -23,18 +18,12 @@ module ForestLiana
           end
         end
 
-        # NOTICE: The generated alias for a count is "count_all", for a sum the
-        #         alias looks like "sum_#{aggregate_field}"
-        field = 'all'
-        if @params[:aggregate].downcase == 'sum'
-          field = @params[:aggregate_field].downcase
-        end
-
         value = value
           .unscoped
+          .eager_load(includes)
           .where(conditions.join(filter_operator))
-          .group(@params[:group_by_field])
-          .order("#{@params[:aggregate].downcase}_#{field} DESC")
+          .group("#{@resource.table_name}.#{@params[:group_by_field]}")
+          .order(order)
           .send(@params[:aggregate].downcase, @params[:aggregate_field])
           .map do |k, v|
             # NOTICE: Display the enum name instead of a integer if "enum" type
@@ -50,5 +39,20 @@ module ForestLiana
       end
     end
 
+    def order
+      # NOTICE: The generated alias for a count is "count_all", for a sum the
+      #         alias looks like "sum_#{aggregate_field}"
+      field = 'all'
+      if @params[:aggregate].downcase == 'sum'
+        field = @params[:aggregate_field].downcase
+      end
+
+      if includes.size == 0
+        "#{@params[:aggregate].downcase}_#{field} DESC"
+      else
+        "#{@params[:aggregate].downcase}_id DESC"
+      end
+    end
+
   end
 end

data/app/services/forest_liana/stat_getter.rb

@@ -0,0 +1,18 @@
+module ForestLiana
+  class StatGetter
+    attr_accessor :record
+
+    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)
+    end
+  end
+end

data/app/services/forest_liana/value_stat_getter.rb

@@ -1,16 +1,11 @@
 module ForestLiana
-  class ValueStatGetter
+  class ValueStatGetter < StatGetter
     attr_accessor :record
 
-    def initialize(resource, params)
-      @resource = resource
-      @params = params
-    end
-
     def perform
       return if @params[:aggregate].blank?
-      valueCurrent = @resource.unscoped
-      valuePrevious = @resource.unscoped
+      valueCurrent = @resource.unscoped.eager_load(includes)
+      valuePrevious = @resource.unscoped.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 = "1.4.2"
+  VERSION = "1.4.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - Sandro Munda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-15 00:00:00.000000000 Z
+date: 2016-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -179,6 +179,7 @@ files:
 - app/services/forest_liana/schema_adapter.rb
 - app/services/forest_liana/schema_utils.rb
 - app/services/forest_liana/search_query_builder.rb
+- app/services/forest_liana/stat_getter.rb
 - app/services/forest_liana/stripe_bank_accounts_getter.rb
 - app/services/forest_liana/stripe_cards_getter.rb
 - app/services/forest_liana/stripe_invoices_getter.rb