Skip to content

fix(filters): get collection name with the right format #728

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 9, 2025
Merged

fix(filters): get collection name with the right format #728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/services/forest_liana/filters_parser.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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'],
Expand Down
2 changes: 1 addition & 1 deletion app/services/forest_liana/operator_date_interval_parser.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading