forest_liana 1.3.13 → 1.3.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dda2efc4c742ed3cd6fb62658fea5a35e04c16e8
-  data.tar.gz: 9d7915caa2864c57dd2cf23a4f0221284ed0a2e3
+  metadata.gz: 9fec685427c5d1e79f304f7f38820ed656f7c46c
+  data.tar.gz: 876e3e4c683f864ddf234e8e97e3906116b3bbd6
 SHA512:
-  metadata.gz: deadf1eee8452d8dc83ee95ebccabf65381fc54d8bc882551159bcd1ecf981a597cddaec590b6386b2f8d52591ccfa3bcc2282101e86bde5b1b0f66f8a01d2db
-  data.tar.gz: f8e5ce65f436eb67e0770dc2d0f101df796c5249430142c6ef47ed619ded0d91db5df64b031715ccf13fb7b8f7a2f389c9871280a898fdd0978df815af5db142
+  metadata.gz: 154ad6d095ec785ee483ea2262348dea4fdb5456c950602a834dea5c5c3af974f21b48909e95cb69ec610b9fb71b57fa83193f1bd4913d272547ec5f0d930178
+  data.tar.gz: b700add97404c94f21b2de45e3f64c261a86cf545189508f3f74ad3ddacb68aafd78c8c69af85825a508c6689c147ae3c3670011a61f082364afcecea6923026

data/app/services/forest_liana/operator_date_interval_parser.rb

@@ -0,0 +1,58 @@
+module ForestLiana
+  class OperatorDateIntervalParser
+    PERIODS = {
+      yesterday: { duration: 1, period: 'day' },
+      lastWeek: { duration: 1, period: 'week' },
+      last2Weeks: { duration: 2, period: 'week' },
+      lastMonth: { duration: 1, period: 'month' },
+      last3Months: { duration: 3, period: 'month' },
+      lastYear: { duration: 1, period: 'year' }
+    }
+
+    PERIODS_LAST_X_DAYS = /^last(\d+)days$/
+
+    def initialize(value)
+      @value = value
+    end
+
+    def is_interval_date_value
+      return true if PERIODS[@value.to_sym]
+
+      match = PERIODS_LAST_X_DAYS.match(@value)
+      return true if match && match[1]
+
+      false
+    end
+
+    def get_interval_date_filter
+      return nil unless is_interval_date_value()
+
+      match = PERIODS_LAST_X_DAYS.match(@value)
+      return ">= #{Integer(match[1]).day.ago}" if match && match[1]
+
+      duration = PERIODS[@value.to_sym][:duration]
+      period = PERIODS[@value.to_sym][:period]
+
+      from = duration.send(period).ago.send("beginning_of_#{period}")
+      to = 1.send(period).ago.send("end_of_#{period}")
+      "BETWEEN '#{from}' AND '#{to}'"
+    end
+
+    def get_interval_date_filter_for_previous_interval
+      return nil unless is_interval_date_value()
+
+      match = PERIODS_LAST_X_DAYS.match(@value)
+      if match && match[1]
+        return "BETWEEN #{Integer(match[1] * 2).day.ago}" +
+          " AND #{Integer(match[1]).day.ago}"
+      end
+
+      duration = PERIODS[@value.to_sym][:duration]
+      period = PERIODS[@value.to_sym][:period]
+
+      from = (duration * 2).send(period).ago.send("beginning_of_#{period}")
+      to = (1 + duration).send(period).ago.send("end_of_#{period}")
+      "BETWEEN '#{from}' AND '#{to}'"
+    end
+  end
+end

data/app/services/forest_liana/operator_value_parser.rb

@@ -30,38 +30,12 @@ module ForestLiana
     end
 
     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_name} >= ?",
-          Integer(match[1]).day.ago)
-      end
+      field_name = self.get_field_name(field, resource)
 
-      case value
-      when 'yesterday'
-        query = query.where("#{field_name} BETWEEN " +
-          "'#{1.day.ago.beginning_of_day}' AND '#{1.day.ago.end_of_day}'")
-      when 'lastWeek'
-        query = query.where("#{field_name} BETWEEN " +
-          "'#{1.week.ago.beginning_of_week}' AND '#{1.week.ago.end_of_week}'")
-      when 'last2Weeks'
-        query = query.where("#{field_name} BETWEEN " +
-          "'#{2.week.ago.beginning_of_week}' AND '#{1.week.ago.end_of_week}'")
-      when 'lastMonth'
-        query = query.where("#{field_name} BETWEEN " +
-          "'#{1.month.ago.beginning_of_month}' AND '#{1.month.ago.end_of_month}'")
-      when 'last3Months'
-        query = query.where("#{field_name} BETWEEN " +
-          "'#{3.month.ago.beginning_of_month}' AND '#{1.month.ago.end_of_month}'")
-      when 'lastYear'
-        query = query.where("#{field_name} BETWEEN " +
-          "'#{1.year.ago.beginning_of_year}' AND '#{1.year.ago.end_of_year}'")
+      operator_date_interval_parser = OperatorDateIntervalParser.new(value)
+      if operator_date_interval_parser.is_interval_date_value()
+        filter = operator_date_interval_parser.get_interval_date_filter()
+        query = query.where("#{field_name} #{filter}")
       else
         where = "#{field_name} #{operator}"
         where += " '#{value}'" if value
@@ -69,5 +43,14 @@ module ForestLiana
       end
     end
 
+    def self.get_field_name(field, resource)
+      if field.split(':').size < 2
+        "\"#{resource.table_name}\".\"#{field}\""
+      else
+        association = field.split(':')[0].pluralize
+        "\"#{association}\".\"#{field.split(':')[1]}\""
+      end
+    end
+
   end
 end

data/app/services/forest_liana/search_query_builder.rb

@@ -51,7 +51,7 @@ module ForestLiana
     def filter_param
       if @params[:filter]
         @params[:filter].each do |field, values|
-          next if has_many_association?(field)
+          next if association?(field)
           values.split(',').each do |value|
             operator, value = OperatorValueParser.parse(value)
             @records = OperatorValueParser.add_where(@records, field, operator,
@@ -141,12 +141,18 @@ module ForestLiana
 
       operator, value = OperatorValueParser.parse(value)
 
-      where = "#{association.table_name}.#{subfield} #{operator}"
-      where += " '#{value}'" if value
-
       @records = @records
         .joins(field.to_sym)
-        .where(where)
+
+      operator_date_interval_parser = OperatorDateIntervalParser.new(value)
+      if operator_date_interval_parser.is_interval_date_value()
+        filter = operator_date_interval_parser.get_interval_date_filter()
+        @records = @records.where("#{association.table_name}.#{subfield} #{filter}")
+      else
+        where = "#{association.table_name}.#{subfield} #{operator}"
+        where += " '#{value}'" if value
+        @records = @records.where(where)
+      end
     end
 
     def belongs_to_filter

data/app/services/forest_liana/value_stat_getter.rb

@@ -9,15 +9,35 @@ module ForestLiana
 
     def perform
       return if @params[:aggregate].blank?
-      value = @resource
+      valueCurrent = @resource
+      valuePrevious = @resource
 
       @params[:filters].try(:each) do |filter|
         operator, filter_value = OperatorValueParser.parse(filter[:value])
-        value = OperatorValueParser.add_where(value, filter[:field], operator,
-                                              filter_value, @resource)
+        valueCurrent = OperatorValueParser.add_where(valueCurrent,
+          filter[:field], operator, filter_value, @resource)
       end
 
-      @record = Model::Stat.new(value: count(value))
+      filter_date_interval = false
+      @params[:filters].try(:each) do |filter|
+        operator, filter_value = OperatorValueParser.parse(filter[:value])
+        operator_date_interval_parser = OperatorDateIntervalParser.new(filter_value)
+        if operator_date_interval_parser.is_interval_date_value()
+          field_name = OperatorValueParser.get_field_name(filter[:field], @resource)
+          filter = operator_date_interval_parser
+            .get_interval_date_filter_for_previous_interval()
+          valuePrevious = valuePrevious.where("#{field_name} #{filter}")
+          filter_date_interval = true
+        else
+          valuePrevious = OperatorValueParser.add_where(valuePrevious,
+            filter[:field], operator, filter_value, @resource)
+        end
+      end
+
+      @record = Model::Stat.new(value: {
+        countCurrent: count(valueCurrent),
+        countPrevious: filter_date_interval ? count(valuePrevious) : nil
+      })
     end
 
     private

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "1.3.13"
+  VERSION = "1.3.14"
 end

data/test/services/forest_liana/resources_getter_test.rb

@@ -141,5 +141,20 @@ module ForestLiana
       assert count = 1
       assert records.first.id == 5
     end
+
+    test 'Filter equal on an updated_at field of an associated collection' do
+      getter = ResourcesGetter.new(Tree, {
+        page: { size: 10, number: 1 },
+        filter: {
+          'owner:updated_at' => 'Sat Jul 02 2016 11:52:00 GMT-0400 (EDT)',
+        }
+      })
+      getter.perform
+      records = getter.records
+      count = getter.count
+
+      assert records.count == 0
+      assert count = 0
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 1.3.13
+  version: 1.3.14
 platform: ruby
 authors:
 - Sandro Munda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-07 00:00:00.000000000 Z
+date: 2016-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -165,6 +165,7 @@ files:
 - app/services/forest_liana/intercom_attributes_getter.rb
 - app/services/forest_liana/intercom_conversations_getter.rb
 - app/services/forest_liana/line_stat_getter.rb
+- app/services/forest_liana/operator_date_interval_parser.rb
 - app/services/forest_liana/operator_value_parser.rb
 - app/services/forest_liana/pie_stat_getter.rb
 - app/services/forest_liana/resource_creator.rb