forest_liana 1.6.6 → 1.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce8dc1b8cf30b7f5734362bcd69b549d990a2b71
-  data.tar.gz: 5aca5a5e19a92349d6503a0f8b3b72b3cbc40ab6
+  metadata.gz: d3ab65c63baf517449b0ed94f94501eccb02ca04
+  data.tar.gz: cfb8b403dca15cfd028a17e84985b89c917b0b30
 SHA512:
-  metadata.gz: 3e7c2b6a3afbe0c786ac13efa22874e400cedbe85f8e9fb7ff076d83335f49db441239effcf598b705b37320a72057d7b0f6ac697f51b3040f335b209774239c
-  data.tar.gz: 1567b0fe318660845cf31b843eaafe32ab09d79ab061cd526cfeb3e863900a35f273e23c9bd4d3addf8eca1c83ca8537bbc1b99a9ad5c6134f855daedc8f577e
+  metadata.gz: c970daa8351080491fef6556219048a6e4256cd16ffad5866a8341065f13385434b1e13d3c36cd6de16bb8a6f50f2527351a092253f3a3e5ef9d64f7a53f8cb1
+  data.tar.gz: fc769a2bcdc0465fd5a6470d2590b7548818626a928f29653fb446087beb5440d6f1f8c05bf2aace5962f7db4193a79ad77692afbb12f1c4b2214295db96b0bf

data/app/services/forest_liana/pie_stat_getter.rb

@@ -54,18 +54,16 @@ module ForestLiana
     end
 
     def order
+      order = 'DESC'
+
       # 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"
+        field = includes.size == 0 ? 'all' : 'id'
       end
+      "#{@params[:aggregate].downcase}_#{field} #{order}"
     end
 
   end

data/app/services/forest_liana/search_query_builder.rb

@@ -215,9 +215,6 @@ module ForestLiana
 
       operator, value = OperatorValueParser.parse(value)
 
-      @records = @records
-        .joins(field.to_sym)
-
       operator_date_interval_parser = OperatorDateIntervalParser.new(value,
         @params[:timezone])
       if operator_date_interval_parser.is_interval_date_value()

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "1.6.6"
+  VERSION = "1.6.7"
 end