fix regression in 0.9.5 server error when using filter with dot in name and custom applier

Closes gh-1215

Author: senid231

lib/jsonapi/request_parser.rb

@@ -251,34 +251,41 @@ def parse_filters(filters)
       end
 
       filters.each do |key, value|
-        filter_method, included_resource_name =
-          key.to_s.split('.').map { |k| unformat_key(k) }.reverse
 
-        if included_resource_name
-          relationship = resource_klass._relationship(included_resource_name || '')
+        unformatted_key = unformat_key(key)
+        if resource_klass._allowed_filter?(unformatted_key)
+          @filters[unformatted_key] = value
+        elsif unformatted_key.to_s.include?('.')
+          parse_relationship_filter(unformatted_key, value)
+        else
+          return @errors.concat(Exceptions::FilterNotAllowed.new(unformatted_key).errors)
+        end
+      end
+    end
 
-          unless relationship
-            return @errors.concat(Exceptions::FilterNotAllowed.new(filter_method).errors)
-          end
+    def parse_relationship_filter(key, value)
+      included_resource_name, filter_method = key.to_s.split('.')
+      filter_method = filter_method.to_sym if filter_method.present?
 
-          unless  relationship.resource_klass._allowed_filter?(filter_method)
-            return @errors.concat(Exceptions::FilterNotAllowed.new(filter_method).errors)
-          end
+      if included_resource_name
+        relationship = resource_klass._relationship(included_resource_name || '')
 
-          unless @include_directives&.include_config(relationship.name.to_sym).present?
-            return @errors.concat(Exceptions::FilterNotAllowed.new(filter_method).errors)
-          end
+        unless relationship
+          return @errors.concat(Exceptions::FilterNotAllowed.new(filter_method).errors)
+        end
 
-          verified_filter = relationship.resource_klass.verify_filters(filter_method => value)
-          @include_directives.merge_filter(relationship.name, verified_filter)
-          next
-        else
-          unless resource_klass._allowed_filter?(filter_method)
-            return @errors.concat(Exceptions::FilterNotAllowed.new(filter_method).errors)
-          end
+        unless  relationship.resource_klass._allowed_filter?(filter_method)
+          return @errors.concat(Exceptions::FilterNotAllowed.new(filter_method).errors)
+        end
 
-          @filters[filter_method] = value
+        unless @include_directives.try(:include_config, relationship.name.to_sym).present?
+          return @errors.concat(Exceptions::FilterNotAllowed.new(filter_method).errors)
         end
+
+        verified_filter = relationship.resource_klass.verify_filters(filter_method => value)
+        @include_directives.merge_filter(relationship.name, verified_filter)
+      else
+        return @errors.concat(Exceptions::FilterNotAllowed.new(filter_method).errors)
       end
     end
 

test/controllers/controller_test.rb

@@ -2644,6 +2644,22 @@ def test_show_with_filters_and_no_included_resources
   end
 end
 
+class Api::V5::CollectorsControllerTest < ActionController::TestCase
+  def test_index_with_custom_filter_that_has_dot
+    get :index, params: {
+        filter: {
+            'name' => 'Alice',
+            'painting.title_equals': 'Helenka'
+        }
+    }
+
+    assert_response :success
+    assert_equal 1, json_response['data'].size
+    assert_equal '1', json_response['data'][0]['id']
+    refute json_response.key?('included')
+  end
+end
+
 class Api::V5::AuthorsControllerTest < ActionController::TestCase
   def test_get_person_as_author
     assert_cacheable_get :index, params: {filter: {id: '1'}}

test/fixtures/active_record.rb

@@ -899,6 +899,9 @@ class IsoCurrenciesController < JSONAPI::ResourceController
 
     class PaintersController < JSONAPI::ResourceController
     end
+
+    class CollectorsController < JSONAPI::ResourceController
+    end
   end
 
   module V6
@@ -1671,6 +1674,11 @@ def collector_roster
     class CollectorResource < JSONAPI::Resource
       attributes :name
       has_one :painting
+
+      filter :name
+      filter :'painting.title_equals', apply: -> (records, values, _opts) do
+        records.joins(:painting).where(paintings: { title: values })
+      end
     end
 
     class PainterResource < JSONAPI::Resource

test/test_helper.rb

@@ -330,6 +330,7 @@ class CatResource < JSONAPI::Resource
       jsonapi_resources :posts do
       end
       jsonapi_resources :painters
+      jsonapi_resources :collectors
       jsonapi_resources :authors
       jsonapi_resources :expense_entries
       jsonapi_resources :iso_currencies