forest_liana 1.3.10 → 1.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: abcf61ac2e539e94f9aa5039c5819921a48b688b
-  data.tar.gz: 7c053dd7579561fc685ba5af697bb15bf742f5b4
+  metadata.gz: 5499cb583c0ca2e7eb3a4b9596a76e5ca545842f
+  data.tar.gz: 3727b0e41710ee0f3a3b1a4962bc384d280aec84
 SHA512:
-  metadata.gz: 439361ffdf4942c8c86e199885f9046c5c3d149b9c63fda96b35d004bc72aeedb366a284ac460fd50be58e57ba27d1df4d93d3c0389c1c730ce2d0d53d0ec3a6
-  data.tar.gz: 526e26ad8daf48e7f71d659a824f23b5699b23cd858f947e399c76acb824cceec6a83ea9cd8fc55541e436bb213592bcb4736bf4420d9e690d24d884991da033
+  metadata.gz: a81248483a08e7dd28fbd49176057242d9e384520d0d4c018719551c6e21dc8c5b66b610ca0491a22d33e34d511b94445aa0584ae0b9e4ce4548020d3eef57cf
+  data.tar.gz: b7679fff43bb4058c006e61b9013dbb3facf914c9729249596e15b8237902497935da649cc3aa5dc20ec2e57609ff53d11129806f51f5b3a3802550602beb7f7

data/app/services/forest_liana/line_stat_getter.rb

@@ -14,7 +14,7 @@ module ForestLiana
       @params[:filters].try(:each) do |filter|
         operator, filter_value = OperatorValueParser.parse(filter[:value])
         value = OperatorValueParser.add_where(value, filter[:field], operator,
-                                              filter_value)
+                                              filter_value, @resource)
       end
 
       value = value.send(time_range, @params[:group_by_date_field])

data/app/services/forest_liana/operator_value_parser.rb

@@ -29,33 +29,41 @@ module ForestLiana
       [operator, value]
     end
 
-    def self.add_where(query, field, operator, value)
+    def self.add_where(query, field, operator, value, resource)
+      if field.split(':').size < 2
+        field_name = "\"#{resource.table_name}\".\"#{field}\""
+      else
+        association = field.split(':')[0].pluralize
+        field_name = "\"#{association}\".\"#{field.split(':')[1]}\""
+      end
+
       match = /^last(\d+)days$/.match(value)
       if match && match[1]
-        return query = query.where("#{field} >= ?", Integer(match[1]).day.ago)
+        return query = query.where("#{field_name} >= ?",
+          Integer(match[1]).day.ago)
       end
 
       case value
       when 'yesterday'
-        range = 1.day.ago.beginning_of_day..1.day.ago.end_of_day
-        query = query.where(created_at: range)
+        query = query.where("#{field_name} BETWEEN " +
+          "'#{1.day.ago.beginning_of_day}' AND '#{1.day.ago.end_of_day}'")
       when 'lastWeek'
-        range = 1.week.ago.beginning_of_week..1.week.ago.end_of_week
-        query = query.where(created_at: range)
+        query = query.where("#{field_name} BETWEEN " +
+          "'#{1.week.ago.beginning_of_week}' AND '#{1.week.ago.end_of_week}'")
       when 'last2Weeks'
-        range = 2.week.ago.beginning_of_week..1.week.ago.end_of_week
-        query = query.where(created_at: range)
+        query = query.where("#{field_name} BETWEEN " +
+          "'#{2.week.ago.beginning_of_week}' AND '#{1.week.ago.end_of_week}'")
       when 'lastMonth'
-        range = 1.month.ago.beginning_of_month..1.month.ago.end_of_month
-        query = query.where(created_at: range)
+        query = query.where("#{field_name} BETWEEN " +
+          "'#{1.month.ago.beginning_of_month}' AND '#{1.month.ago.end_of_month}'")
       when 'last3Months'
-        range = 3.month.ago.beginning_of_month..1.month.ago.end_of_month
-        query = query.where(created_at: range)
+        query = query.where("#{field_name} BETWEEN " +
+          "'#{3.month.ago.beginning_of_month}' AND '#{1.month.ago.end_of_month}'")
       when 'lastYear'
-        range = 1.year.ago.beginning_of_year..1.year.ago.end_of_year
-        query = query.where(created_at: range)
+        query = query.where("#{field_name} BETWEEN " +
+          "'#{1.year.ago.beginning_of_year}' AND '#{1.year.ago.end_of_year}'")
       else
-        where = "#{field} #{operator}"
+        where = "#{field_name} #{operator}"
         where += " '#{value}'" if value
         query = query.where(where)
       end

data/app/services/forest_liana/pie_stat_getter.rb

@@ -14,7 +14,7 @@ module ForestLiana
         @params[:filters].try(:each) do |filter|
           operator, filter_value = OperatorValueParser.parse(filter[:value])
           value = OperatorValueParser.add_where(value, filter[:field], operator,
-                                                filter_value)
+                                                filter_value, @resource)
         end
 
         # NOTICE: The generated alias for a count is "count_all", for a sum the

data/app/services/forest_liana/resources_getter.rb

@@ -35,37 +35,22 @@ module ForestLiana
           @records = @records.includes(ref) if association?(ref)
 
           field = detect_reference(field)
-          association = @resource.reflect_on_association(field.to_sym)
-          if [:has_many, :has_and_belongs_to_many].include?(
-            association.try(:macro))
-            @records = has_many_sort(association, order)
-          else
+          if field.index('.').nil?
             @records = @records
               .order("#{@resource.table_name}.#{field} #{order.upcase}")
+          else
+            @records = @records.order("#{field} #{order.upcase}")
           end
         end
       elsif @resource.column_names.include?('created_at')
         @records = @records.order("#{@resource.table_name}.created_at DESC")
       elsif @resource.column_names.include?('id')
         @records = @records.order("#{@resource.table_name}.id DESC")
-      else
-        @records
       end
 
       @records
     end
 
-    def has_many_sort(association, order)
-      @records
-        .select("#{@resource.table_name}.*,
-                COUNT(#{association.table_name}.id)
-                #{association.table_name}_has_many_count")
-        .joins(ArelHelpers.join_association(@resource, association.name,
-                                            Arel::Nodes::OuterJoin))
-        .group("#{@resource.table_name}.id")
-        .order("#{association.table_name}_has_many_count #{order.upcase}")
-    end
-
     def detect_sort_order(field)
       return (if field[0] == '-' then :desc else :asc end)
     end

data/app/services/forest_liana/search_query_builder.rb

@@ -51,11 +51,11 @@ module ForestLiana
     def filter_param
       if @params[:filter]
         @params[:filter].each do |field, values|
-          next if association?(field)
+          next if has_many_association?(field)
           values.split(',').each do |value|
             operator, value = OperatorValueParser.parse(value)
             @records = OperatorValueParser.add_where(@records, field, operator,
-                                                     value)
+                                                     value, @resource)
           end
         end
       end

data/app/services/forest_liana/value_stat_getter.rb

@@ -14,7 +14,7 @@ module ForestLiana
       @params[:filters].try(:each) do |filter|
         operator, filter_value = OperatorValueParser.parse(filter[:value])
         value = OperatorValueParser.add_where(value, filter[:field], operator,
-                                              filter_value)
+                                              filter_value, @resource)
       end
 
       @record = Model::Stat.new(value: count(value))

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "1.3.10"
+  VERSION = "1.3.11"
 end

data/test/dummy/app/models/owner.rb

@@ -0,0 +1,2 @@
+class Owner < ActiveRecord::Base
+end

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

@@ -0,0 +1,3 @@
+class Tree < ActiveRecord::Base
+  belongs_to :owner
+end

data/test/dummy/db/migrate/20160627172810_create_owner.rb

@@ -0,0 +1,7 @@
+class CreateOwner < ActiveRecord::Migration
+  def change
+    create_table :owners do |t|
+      t.string :name
+    end
+  end
+end

data/test/dummy/db/migrate/20160627172951_create_tree.rb

@@ -0,0 +1,8 @@
+class CreateTree < ActiveRecord::Migration
+  def change
+    create_table :trees do |t|
+      t.string :name
+      t.references :owner, index: true
+    end
+  end
+end

data/test/dummy/db/migrate/20160628173505_add_timestamps.rb

@@ -0,0 +1,8 @@
+class AddTimestamps < ActiveRecord::Migration
+  def change
+    add_column :owners, :created_at, :datetime
+    add_column :owners, :updated_at, :datetime
+    add_column :trees, :created_at, :datetime
+    add_column :trees, :updated_at, :datetime
+  end
+end

data/test/dummy/db/schema.rb

@@ -11,8 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150814081918) do
-
+ActiveRecord::Schema.define(version: 20160628173505) do
   create_table "belongs_to_class_name_fields", force: :cascade do |t|
     t.integer "foo_id"
   end
@@ -67,6 +66,12 @@ ActiveRecord::Schema.define(version: 20150814081918) do
     t.integer "field"
   end
 
+  create_table "owners", force: :cascade do |t|
+    t.string   "name"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
   create_table "polymorphic_fields", force: :cascade do |t|
     t.integer "has_one_field_id"
   end
@@ -77,4 +82,13 @@ ActiveRecord::Schema.define(version: 20150814081918) do
     t.string "field"
   end
 
+  create_table "trees", force: :cascade do |t|
+    t.string   "name"
+    t.integer  "owner_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "trees", ["owner_id"], name: "index_trees_on_owner_id"
+
 end