diff --git a/app/services/filter_service.rb b/app/services/filter_service.rb index 25f118d48..f2ee79ab9 100644 --- a/app/services/filter_service.rb +++ b/app/services/filter_service.rb @@ -99,7 +99,7 @@ class FilterService def days_before_filter_query(query_hash, current_index) date = Time.zone.today - query_hash['values'][0].to_i.days - updated_query_hash = query_hash.with_indifferent_access.merge( + updated_query_hash = query_hash.to_h.with_indifferent_access.merge( values: [date.strftime], filter_operator: 'is_less_than' ) diff --git a/spec/services/conversations/filter_service_spec.rb b/spec/services/conversations/filter_service_spec.rb index 2e449bee8..924b9a8b8 100644 --- a/spec/services/conversations/filter_service_spec.rb +++ b/spec/services/conversations/filter_service_spec.rb @@ -639,6 +639,23 @@ describe Conversations::FilterService do result = filter_service.new(params, user_1, account).perform expect(result[:conversations].length).to eq expected_count end + + it 'filter by last_activity_at days_before when payload is ActionController::Parameters' do + params[:payload] = [ + ActionController::Parameters.new( + attribute_key: 'last_activity_at', + filter_operator: 'days_before', + values: [3], + query_operator: nil, + custom_attribute_type: '' + ).permit! + ] + + expected_count = account.conversations.where('last_activity_at < ?', (Time.zone.today - 3.days)).count + + result = filter_service.new(params, user_1, account).perform + expect(result[:conversations].length).to eq expected_count + end end end end