From 8e61a257ff0fbddc0423d9023132990f337f21e7 Mon Sep 17 00:00:00 2001 From: Nicolas Alexandre Date: Wed, 9 Apr 2025 10:29:14 +0200 Subject: [PATCH] fix(filters): get collection name with the right format --- app/services/forest_liana/filters_parser.rb | 4 ++-- app/services/forest_liana/operator_date_interval_parser.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/services/forest_liana/filters_parser.rb b/app/services/forest_liana/filters_parser.rb index 888cfcf6..a3d32f2f 100644 --- a/app/services/forest_liana/filters_parser.rb +++ b/app/services/forest_liana/filters_parser.rb @@ -84,7 +84,7 @@ def parse_condition_without_smart_field(condition) field_name = condition['field'] if @operator_date_parser.is_date_operator?(operator) - field_schema = SchemaUtils.find_column_schema_by_name(@resource.name, field_name) + 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 @@ -260,7 +260,7 @@ def parse_aggregation_on_previous_interval(node, previous_condition) def parse_previous_interval_condition(condition) raise_empty_condition_in_filter_error unless condition - field_schema = SchemaUtils.find_column_schema_by_name(@resource.name, condition['field']) + 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'], diff --git a/app/services/forest_liana/operator_date_interval_parser.rb b/app/services/forest_liana/operator_date_interval_parser.rb index 7fa22a3c..bb58cf3c 100644 --- a/app/services/forest_liana/operator_date_interval_parser.rb +++ b/app/services/forest_liana/operator_date_interval_parser.rb @@ -73,7 +73,7 @@ def to_client_timezone(date) def format_date(field_type, value) if field_type == 'Dateonly' - return value.strftime('%Y-%m-%d') + return (value + @timezone_offset.hours).strftime('%Y-%m-%d') end value