Skip to content

Commit 68455f8

Browse files
fix(filters): get collection name with the right format (#728)
1 parent 09bfae1 commit 68455f8

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

app/services/forest_liana/filters_parser.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ def parse_condition_without_smart_field(condition)
8484
field_name = condition['field']
8585

8686
if @operator_date_parser.is_date_operator?(operator)
87-
field_schema = SchemaUtils.find_column_schema_by_name(@resource.name, field_name)
87+
field_schema = SchemaUtils.find_column_schema_by_name(ForestLiana.name_for(@resource), field_name)
8888
condition = @operator_date_parser.get_date_filter(operator, value, field_schema)
8989
return "#{parse_field_name(field_name)} #{condition}"
9090
end
@@ -260,7 +260,7 @@ def parse_aggregation_on_previous_interval(node, previous_condition)
260260

261261
def parse_previous_interval_condition(condition)
262262
raise_empty_condition_in_filter_error unless condition
263-
field_schema = SchemaUtils.find_column_schema_by_name(@resource.name, condition['field'])
263+
field_schema = SchemaUtils.find_column_schema_by_name(ForestLiana.name_for(@resource), condition['field'])
264264

265265
parsed_condition = @operator_date_parser.get_date_filter_for_previous_interval(
266266
condition['operator'],

app/services/forest_liana/operator_date_interval_parser.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ def to_client_timezone(date)
7373

7474
def format_date(field_type, value)
7575
if field_type == 'Dateonly'
76-
return value.strftime('%Y-%m-%d')
76+
return (value + @timezone_offset.hours).strftime('%Y-%m-%d')
7777
end
7878

7979
value

0 commit comments

Comments
 (0)