forest_liana 9.11.1 → 9.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c318a7cdb0df95b2c99dd1d6dbd13643728818a93f77a225bdbca8c7354e72b8
-  data.tar.gz: 1e05ceb874fa76f06b72e598a818148073fed218f8df00186c269c66348f3da6
+  metadata.gz: dcd40a6f023ba4a2a7eddd15891ac11743dea8fee0df3378c42e604afbfe8c7e
+  data.tar.gz: 61ceac08bd477c79ea3d6284114b6a9a08f2514758378f4f7a96c3845efd4f8f
 SHA512:
-  metadata.gz: 6e77cf3296e3ca39e97a1e6dd99170ec00067fd88d1a1e6f62ea1cfe62190fafc9db68fad47e5c930074bdbc274ab9720f78640c834206b60eb5eb769626f19e
-  data.tar.gz: fa437a85f396a81badaa8fd8b1a35a429e021185c141ed64628b8150a4ea2b685cf5cf60ba5b3e28d155ba4302d1bd23dd5bd5f67557704239ae21067de765f6
+  metadata.gz: e09c8a0a86cee9b238e35057b0e29e5b842fcf0a2a1380a57fb10bf00c9c2cf6cb5cf16bb9908d72fc4219966efa910742de673e5d0f9cd6696bbd83724d4f67
+  data.tar.gz: 24ecaa8c8a9442ec3c677bb71f47dbf8a120cba326732f202264869d1a3188265a30caa14054ffbd13c218deb6b13294ef997f60d83f0f347faccbc60d32bc98

data/app/services/forest_liana/filters_parser.rb

@@ -84,7 +84,8 @@ module ForestLiana
       field_name = condition['field']
 
       if @operator_date_parser.is_date_operator?(operator)
-        condition = @operator_date_parser.get_date_filter(operator, value)
+        field_schema = SchemaUtils.find_column_schema_by_name(ForestLiana.name_for(@resource), field_name)
+        condition = @operator_date_parser.get_date_filter(operator, value, field_schema)
         return "#{parse_field_name(field_name)} #{condition}"
       end
 
@@ -259,10 +260,12 @@ module ForestLiana
 
     def parse_previous_interval_condition(condition)
       raise_empty_condition_in_filter_error unless condition
+      field_schema = SchemaUtils.find_column_schema_by_name(ForestLiana.name_for(@resource), condition['field'])
 
       parsed_condition = @operator_date_parser.get_date_filter_for_previous_interval(
         condition['operator'],
-        condition['value']
+        condition['value'],
+        field_schema
       )
 
       "#{parse_field_name(condition['field'])} #{parsed_condition}"

data/app/services/forest_liana/operator_date_interval_parser.rb

@@ -70,7 +70,16 @@ module ForestLiana
       date - @timezone_offset.hours
     end
 
-    def get_date_filter(operator, value)
+
+    def format_date(field_type, value)
+      if field_type == 'Dateonly'
+        return (value + @timezone_offset.hours).strftime('%Y-%m-%d')
+      end
+
+      value
+    end
+
+    def get_date_filter(operator, value, field_schema)
       return nil unless is_date_operator? operator
 
       filter = case operator
@@ -79,18 +88,18 @@ module ForestLiana
         when OPERATOR_PAST
           "<= '#{Time.now}'"
         when OPERATOR_TODAY
-          "BETWEEN '#{to_client_timezone(Time.now.beginning_of_day)}' " +
-            "AND '#{to_client_timezone(Time.now.end_of_day)}'"
+          "BETWEEN '#{format_date(field_schema[:type], to_client_timezone(Time.now.beginning_of_day))}' " +
+            "AND '#{format_date(field_schema[:type], to_client_timezone(Time.now.end_of_day))}'"
         when OPERATOR_PREVIOUS_X_DAYS
           ensure_integer_value(value)
           "BETWEEN '" +
-            "#{to_client_timezone(Integer(value).day.ago.beginning_of_day)}'" +
-            " AND '#{to_client_timezone(1.day.ago.end_of_day)}'"
+            "#{format_date(field_schema[:type], to_client_timezone(Integer(value).day.ago.beginning_of_day))}'" +
+            " AND '#{format_date(field_schema[:type], to_client_timezone(1.day.ago.end_of_day))}'"
         when OPERATOR_PREVIOUS_X_DAYS_TO_DATE
           ensure_integer_value(value)
           "BETWEEN '" +
-            "#{to_client_timezone((Integer(value) - 1).day.ago.beginning_of_day)}'" +
-            " AND '#{Time.now}'"
+            "#{format_date(field_schema[:type], to_client_timezone((Integer(value) - 1).day.ago.beginning_of_day))}'" +
+            " AND '#{format_date(field_schema[:type], Time.now)}'"
         when OPERATOR_BEFORE_X_HOURS_AGO
           ensure_integer_value(value)
           "< '#{(Integer(value)).hour.ago}'"
@@ -109,35 +118,35 @@ module ForestLiana
       to_date = PERIODS[operator][:to_date]
 
       if to_date
-        from = to_client_timezone(Time.now.send("beginning_of_#{period_of_time}"))
-        to = Time.now
+        from = format_date(field_schema[:type], to_client_timezone(Time.now.send("beginning_of_#{period_of_time}")))
+        to = format_date(field_schema[:type], Time.now)
       else
-        from = to_client_timezone(duration.send(period).ago
-          .send("beginning_of_#{period_of_time}"))
-        to = to_client_timezone(duration.send(period).ago
-          .send("end_of_#{period_of_time}"))
+        from = format_date(field_schema[:type], to_client_timezone(duration.send(period).ago
+          .send("beginning_of_#{period_of_time}")))
+        to = format_date(field_schema[:type], to_client_timezone(duration.send(period).ago
+          .send("end_of_#{period_of_time}")))
       end
 
       "BETWEEN '#{from}' AND '#{to}'"
     end
 
-    def get_date_filter_for_previous_interval(operator, value)
+    def get_date_filter_for_previous_interval(operator, value, field_schema)
       return nil unless has_previous_interval? operator
 
       case operator
       when OPERATOR_TODAY
-        return "BETWEEN '#{to_client_timezone(1.day.ago.beginning_of_day)}' AND " +
-          "'#{to_client_timezone(1.day.ago.end_of_day)}'"
+        return "BETWEEN '#{format_date(field_schema[:type], to_client_timezone(1.day.ago.beginning_of_day))}' AND " +
+          "'#{format_date(field_schema[:type], to_client_timezone(1.day.ago.end_of_day))}'"
       when OPERATOR_PREVIOUS_X_DAYS
         ensure_integer_value(value)
         return "BETWEEN '" +
-          "#{to_client_timezone((Integer(value) * 2).day.ago.beginning_of_day)}'" +
-          " AND '#{to_client_timezone((Integer(value) + 1).day.ago.end_of_day)}'"
+          "#{format_date(field_schema[:type], to_client_timezone((Integer(value) * 2).day.ago.beginning_of_day))}'" +
+          " AND '#{format_date(field_schema[:type], to_client_timezone((Integer(value) + 1).day.ago.end_of_day))}'"
       when OPERATOR_PREVIOUS_X_DAYS_TO_DATE
         ensure_integer_value(value)
         return "BETWEEN '" +
-          "#{to_client_timezone(((Integer(value) * 2) - 1).day.ago.beginning_of_day)}'" +
-          " AND '#{to_client_timezone(Integer(value).day.ago)}'"
+          "#{format_date(field_schema[:type], to_client_timezone(((Integer(value) * 2) - 1).day.ago.beginning_of_day))}'" +
+          " AND '#{format_date(field_schema[:type], to_client_timezone(Integer(value).day.ago))}'"
       end
 
       duration = PERIODS[operator][:duration]
@@ -146,14 +155,14 @@ module ForestLiana
       to_date = PERIODS[operator][:to_date]
 
       if to_date
-        from = to_client_timezone((duration)
-          .send(period).ago.send("beginning_of_#{period_of_time}"))
-        to = to_client_timezone((duration).send(period).ago)
+        from = format_date(field_schema[:type], to_client_timezone((duration)
+          .send(period).ago.send("beginning_of_#{period_of_time}")))
+        to = format_date(field_schema[:type], to_client_timezone((duration).send(period).ago))
       else
-        from = to_client_timezone((duration * 2).send(period).ago
-          .send("beginning_of_#{period_of_time}"))
-        to = to_client_timezone((duration * 2).send(period).ago
-          .send("end_of_#{period_of_time}"))
+        from = format_date(field_schema[:type], to_client_timezone((duration * 2).send(period).ago
+          .send("beginning_of_#{period_of_time}")))
+        to = format_date(field_schema[:type], to_client_timezone((duration * 2).send(period).ago
+          .send("end_of_#{period_of_time}")))
       end
 
       "BETWEEN '#{from}' AND '#{to}'"

data/app/services/forest_liana/schema_utils.rb

@@ -49,6 +49,23 @@ module ForestLiana
       model_found
     end
 
+    def self.find_column_schema_by_name(collection_name, field_name)
+      schema = ForestLiana.apimap.find { |collection| collection.name == collection_name }
+      if field_name.include?(':')
+        relation, field_name = field_name.split(':')
+        relation_schema = schema.fields.find do |field|
+          field[:field].to_s == relation
+        end
+        foreign_collection_name, = relation_schema[:reference].split('.')
+
+        return find_column_schema_by_name(foreign_collection_name, field_name)
+      else
+        return schema.fields.find do |field|
+          field[:field].to_s == field_name
+        end
+      end
+    end
+
     def self.tables_names
       ActiveRecord::Base.connection.tables
     end

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "9.11.1"
+  VERSION = "9.11.3"
 end

data/test/services/forest_liana/operator_date_interval_parser_test.rb

@@ -3,12 +3,36 @@ module ForestLiana
     test 'OPERATOR_AFTER_X_HOURS_AGO and OPERATOR_BEFORE_X_HOURS_AGO should not take timezone into account' do
       # Setting a big timezone (GMT+10) on purpose, the timezone should not be applied on the result date
       operatorDateIntervalParser = OperatorDateIntervalParser.new('Australia/Sydney')
+      fake_field_schema = {
+        field: "foo",
+        type: "Dateonly",
+        is_filterable: true,
+        is_sortable: true,
+        is_read_only: false,
+        is_required: false,
+        is_virtual: false,
+        default_value: nil,
+        integration: nil,
+        reference: nil,
+        inverse_of: nil,
+        relationships: nil,
+        widget: nil,
+        validations: []
+      }
 
-      result = operatorDateIntervalParser.get_date_filter(OperatorDateIntervalParser::OPERATOR_AFTER_X_HOURS_AGO, 2)
+      result = operatorDateIntervalParser.get_date_filter(
+        OperatorDateIntervalParser::OPERATOR_AFTER_X_HOURS_AGO,
+        2,
+        fake_field_schema
+      )
       hourComputed = result.split('> ')[1].tr('\'', '').to_datetime.hour
       assert hourComputed == Time.now.utc.hour - 2
 
-      result = operatorDateIntervalParser.get_date_filter(OperatorDateIntervalParser::OPERATOR_BEFORE_X_HOURS_AGO, 2)
+      result = operatorDateIntervalParser.get_date_filter(
+        OperatorDateIntervalParser::OPERATOR_BEFORE_X_HOURS_AGO,
+        2,
+        fake_field_schema
+      )
       hourComputed = result.split('< ')[1].tr('\'', '').to_datetime.hour
       assert hourComputed == Time.now.utc.hour - 2
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 9.11.1
+  version: 9.11.3
 platform: ruby
 authors:
 - Sandro Munda
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-19 00:00:00.000000000 Z
+date: 2025-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails