Merge pull request #1186 from hatchloyalty/pr-fix-inconsistent-filter-application

Fix inconsistent type of filters

Author: lgebhardt

lib/jsonapi/processor.rb

@@ -197,7 +197,7 @@ def show_related_resources
           (paginator && paginator.class.requires_record_count) ||
           (JSONAPI.configuration.top_level_meta_include_page_count))
         related_resource_records = source_resource.public_send("records_for_" + relationship_type)
-        records = resource_klass.filter_records(filters, {},
+        records = resource_klass.filter_records(verified_filters, {},
                                                 related_resource_records)
 
         record_count = resource_klass.count_records(records)

test/controllers/controller_test.rb

@@ -2734,6 +2734,26 @@ def meta(options)
   end
 end
 
+class Api::V2::BooksControllerTest < ActionController::TestCase
+  def test_get_related_resources_with_filters
+    $test_user = Person.find(5)
+    original_config = JSONAPI.configuration.dup
+    JSONAPI.configuration.top_level_meta_include_record_count = true
+    JSONAPI.configuration.json_key_format = :dasherized_key
+    assert_cacheable_get :get_related_resources,
+                         params: {
+                           author_id: '1',
+                           relationship: 'books',
+                           source: 'api/v2/authors',
+                           filter: { fiction: 'true' }
+                         }
+    assert_response :success
+    assert_equal 1, json_response['meta']['record-count']
+  ensure
+    JSONAPI.configuration = original_config
+  end
+end
+
 class BreedsControllerTest < ActionController::TestCase
   # Note: Breed names go through the TitleValueFormatter
 

test/fixtures/active_record.rb

@@ -141,6 +141,7 @@
     t.string :title
     t.string :isbn
     t.boolean :banned, default: false
+    t.boolean :fiction, default: false
     t.timestamps null: false
   end
 
@@ -1494,10 +1495,11 @@ module V2
     class PreferencesResource < PreferencesResource; end
     class PersonResource < PersonResource; end
     class PostResource < PostResource; end
+    class AuthorResource < AuthorResource; end
 
     class BookResource < JSONAPI::Resource
       attribute "title"
-      attributes :isbn, :banned
+      attributes :isbn, :banned, :fiction
 
       paginator :offset
 
@@ -1518,6 +1520,7 @@ class BookResource < JSONAPI::Resource
 
       filters :book_comments
       filter :banned, apply: :apply_filter_banned
+      filter :fiction, apply: :apply_filter_fiction
 
       class << self
         def books
@@ -1550,6 +1553,9 @@ def apply_filter_banned(records, value, options)
           end
         end
 
+        def apply_filter_fiction(records, value, _options)
+          records.where('books.fiction = ?', value[0] == 'true')
+        end
       end
     end
 

test/fixtures/book_authors.yml

@@ -9,3 +9,7 @@ book_author_2_1:
 book_author_2_2:
   book_id: 2
   person_id: 2
+
+book_author_601_1:
+  book_id: 601
+  person_id: 1

test/fixtures/books.yml

@@ -4,4 +4,5 @@ book_<%= book_num %>:
   title: Book <%= book_num %>
   isbn: 12345-<%= book_num %>-6789
   banned: <%= book_num > 600 && book_num < 700 %>
+  fiction: <%= book_num > 600 && book_num < 700 %>
 <% end %>

test/test_helper.rb

@@ -292,6 +292,7 @@ class CatResource < JSONAPI::Resource
 
       jsonapi_resource :preferences, except: [:create, :destroy]
 
+      jsonapi_resources :authors
       jsonapi_resources :books
       jsonapi_resources :book_comments
     end