jsonapi-resources 0.4.2 → 0.4.3

data/lib/jsonapi/resource_serializer.rb

@@ -22,6 +22,7 @@ module JSONAPI
       @key_formatter = options.fetch(:key_formatter, JSONAPI.configuration.key_formatter)
       @route_formatter = options.fetch(:route_formatter, JSONAPI.configuration.route_formatter)
       @base_url = options.fetch(:base_url, '')
+      @scope_id = options[:scope_id]
     end
 
     # Converts a single resource, or an array of resources to a hash, conforming to the JSONAPI structure
@@ -45,7 +46,7 @@ module JSONAPI
         end
       end
 
-      primary_hash = {data: is_resource_collection ? primary_objects : primary_objects[0]}
+      primary_hash = { data: is_resource_collection ? primary_objects : primary_objects[0] }
 
       primary_hash[:included] = included_objects if included_objects.size > 0
       primary_hash
@@ -72,6 +73,7 @@ module JSONAPI
     end
 
     private
+
     # Process the primary source object(s). This will then serialize associated object recursively based on the
     # requested includes. Fields are controlled fields option for each resource type, such
     # as fields: { people: [:id, :email, :comments], posts: [:id, :title, :author], comments: [:id, :body, :post]}
@@ -100,7 +102,7 @@ module JSONAPI
       obj_hash = {}
 
       id_format = source.class._attribute_options(:id)[:format]
-      #protect against ids that were declared as an attribute, but did not have a format set.
+      # protect against ids that were declared as an attribute, but did not have a format set.
       id_format = 'id' if id_format == :default
       obj_hash['id'] = format_value(source.id, id_format)
 
@@ -115,7 +117,7 @@ module JSONAPI
       relationships = relationship_data(source, include_directives)
       obj_hash['relationships'] = relationships unless relationships.nil? || relationships.empty?
 
-      return obj_hash
+      obj_hash
     end
 
     def requested_fields(model)
@@ -125,9 +127,7 @@ module JSONAPI
     def attribute_hash(source)
       requested = requested_fields(source.class._type)
       fields = source.fetchable_fields & source.class._attributes.keys.to_a
-      unless requested.nil?
-        fields = requested & fields
-      end
+      fields = requested & fields unless requested.nil?
 
       fields.each_with_object({}) do |name, hash|
         format = source.class._attribute_options(name)[:format]
@@ -141,9 +141,7 @@ module JSONAPI
       associations = source.class._associations
       requested = requested_fields(source.class._type)
       fields = associations.keys
-      unless requested.nil?
-        fields = requested & fields
-      end
+      fields = requested & fields unless requested.nil?
 
       field_set = Set.new(fields)
 
@@ -172,6 +170,7 @@ module JSONAPI
               resource = source.send(name)
               if resource
                 id = resource.id
+                type = association.type_for_source(source)
                 associations_only = already_serialized?(type, id)
                 if include_linkage && !associations_only
                   add_included_object(type, id, object_hash(resource, ia))
@@ -208,7 +207,12 @@ module JSONAPI
     end
 
     def formatted_module_path_from_klass(klass)
-      klass.name =~ /::[^:]+\Z/ ? (@route_formatter.format($`).freeze.gsub('::', '/') + '/').downcase : ''
+      if klass.name =~ /::[^:]+\Z/
+        path = (@route_formatter.format($`).freeze.gsub('::', '/') + '/').downcase
+        @scope_id ? "#{path}#{@scope_id}/" : path
+      else
+        ''
+      end
     end
 
     def self_href(source)
@@ -217,7 +221,7 @@ module JSONAPI
 
     def already_serialized?(type, id)
       type = format_key(type)
-      return @included_objects.key?(type) && @included_objects[type].key?(id)
+      @included_objects.key?(type) && @included_objects[type].key?(id)
     end
 
     def format_route(route)
@@ -235,8 +239,9 @@ module JSONAPI
     def has_one_linkage(source, association)
       linkage = {}
       linkage_id = foreign_key_value(source, association)
+
       if linkage_id
-        linkage[:type] = format_key(association.type)
+        linkage[:type] = format_key(association.type_for_source(source))
         linkage[:id] = linkage_id
       else
         linkage = nil
@@ -246,9 +251,10 @@ module JSONAPI
 
     def has_many_linkage(source, association)
       linkage = []
-      linkage_ids = foreign_key_value(source, association)
-      linkage_ids.each do |linkage_id|
-        linkage.append({type: format_key(association.type), id: linkage_id})
+      linkage_types_and_values = foreign_key_types_and_values(source, association)
+
+      linkage_types_and_values.each do |type, value|
+        linkage.append({type: format_key(type), id: value})
       end
       linkage
     end
@@ -279,15 +285,24 @@ module JSONAPI
       end
     end
 
-    # Extracts the foreign key value for an association.
+    # Extracts the foreign key value for a has_one association.
     def foreign_key_value(source, association)
       foreign_key = association.foreign_key
       value = source.send(foreign_key)
+      IdValueFormatter.format(value)
+    end
 
+    def foreign_key_types_and_values(source, association)
       if association.is_a?(JSONAPI::Association::HasMany)
-        value.map { |value| IdValueFormatter.format(value) }
-      elsif association.is_a?(JSONAPI::Association::HasOne)
-        IdValueFormatter.format(value)
+        if association.polymorphic?
+          source.model.send(association.name).pluck(:type, :id).map do |type, id|
+            [type.pluralize, IdValueFormatter.format(id)]
+          end
+        else
+          source.send(association.foreign_key).map do |value|
+            [association.type, IdValueFormatter.format(value)]
+          end
+        end
       end
     end
 
@@ -301,16 +316,12 @@ module JSONAPI
     def add_included_object(type, id, object_hash, primary = false)
       type = format_key(type)
 
-      unless @included_objects.key?(type)
-        @included_objects[type] = {}
-      end
+      @included_objects[type] = {} unless @included_objects.key?(type)
 
       if already_serialized?(type, id)
-        if primary
-          set_primary(type, id)
-        end
+        set_primary(type, id) if primary
       else
-        @included_objects[type].store(id, {primary: primary, object_hash: object_hash})
+        @included_objects[type].store(id, primary: primary, object_hash: object_hash)
       end
     end
 

data/lib/jsonapi/resources/version.rb

@@ -1,5 +1,5 @@
 module JSONAPI
   module Resources
-    VERSION = "0.4.2"
+    VERSION = '0.4.3'
   end
-end
+end

data/lib/jsonapi/response_document.rb

@@ -36,7 +36,8 @@ module JSONAPI
         fields: @options[:fields],
         base_url: @options.fetch(:base_url, ''),
         key_formatter: @key_formatter,
-        route_formatter: @options.fetch(:route_formatter, JSONAPI.configuration.route_formatter)
+        route_formatter: @options.fetch(:route_formatter, JSONAPI.configuration.route_formatter),
+        scope_id: @options[:scope_id]
       )
     end
 
@@ -50,7 +51,7 @@ module JSONAPI
       @operation_results.results.each do |result|
         meta.merge!(result.meta)
 
-        if JSONAPI.configuration.top_level_meta_include_record_count
+        if JSONAPI.configuration.top_level_meta_include_record_count && result.respond_to?(:record_count)
           meta[JSONAPI.configuration.top_level_meta_record_count_key] = result.record_count
         end
       end
@@ -90,7 +91,7 @@ module JSONAPI
 
     def results_to_hash
       if @operation_results.has_errors?
-        {errors: @operation_results.all_errors}
+        { errors: @operation_results.all_errors }
       else
         if @operation_results.results.length == 1
           result = @operation_results.results[0]
@@ -123,4 +124,4 @@ module JSONAPI
       end
     end
   end
-end
+end

data/lib/jsonapi/routing_ext.rb

@@ -1,7 +1,6 @@
 module ActionDispatch
   module Routing
     class Mapper
-
       Resource.class_eval do
         def unformat_route(route)
           JSONAPI.configuration.route_formatter.unformat(route.to_s)
@@ -17,7 +16,7 @@ module ActionDispatch
           JSONAPI.configuration.route_formatter.format(route.to_s)
         end
 
-        def jsonapi_resource(*resources, &block)
+        def jsonapi_resource(*resources, &_block)
           @resource_type = resources.first
           res = JSONAPI::Resource.resource_for(resource_type_with_module_prefix(@resource_type))
 
@@ -57,7 +56,7 @@ module ActionDispatch
           end
         end
 
-        def jsonapi_resources(*resources, &block)
+        def jsonapi_resources(*resources, &_block)
           @resource_type = resources.first
           res = JSONAPI::Resource.resource_for(resource_type_with_module_prefix(@resource_type))
 
@@ -67,9 +66,10 @@ module ActionDispatch
 
           options[:param] = :id
 
-          options[:path] = format_route(@resource_type)
+          options[:path] = format_route(options[:path] || @resource_type)
 
           if options[:except]
+            options[:except] = Array(options[:except])
             options[:except] << :new unless options[:except].include?(:new) || options[:except].include?('new')
             options[:except] << :edit unless options[:except].include?(:edit) || options[:except].include?('edit')
           else
@@ -92,7 +92,7 @@ module ActionDispatch
           if only = options[:only]
             Array(only).map(&:to_sym)
           elsif except = options[:except]
-            default_methods - except
+            default_methods - Array(except)
           else
             default_methods
           end
@@ -110,17 +110,17 @@ module ActionDispatch
 
           if methods.include?(:show)
             match "relationships/#{formatted_association_name}", controller: options[:controller],
-                  action: 'show_association', association: link_type.to_s, via: [:get]
+                                                                 action: 'show_association', association: link_type.to_s, via: [:get]
           end
 
           if methods.include?(:update)
             match "relationships/#{formatted_association_name}", controller: options[:controller],
-                  action: 'update_association', association: link_type.to_s, via: [:put, :patch]
+                                                                 action: 'update_association', association: link_type.to_s, via: [:put, :patch]
           end
 
           if methods.include?(:destroy)
             match "relationships/#{formatted_association_name}", controller: options[:controller],
-                  action: 'destroy_association', association: link_type.to_s, via: [:delete]
+                                                                 action: 'destroy_association', association: link_type.to_s, via: [:delete]
           end
         end
 
@@ -136,22 +136,22 @@ module ActionDispatch
 
           if methods.include?(:show)
             match "relationships/#{formatted_association_name}", controller: options[:controller],
-                   action: 'show_association', association: link_type.to_s, via: [:get]
+                                                                 action: 'show_association', association: link_type.to_s, via: [:get]
           end
 
           if methods.include?(:create)
             match "relationships/#{formatted_association_name}", controller: options[:controller],
-                  action: 'create_association', association: link_type.to_s, via: [:post]
+                                                                 action: 'create_association', association: link_type.to_s, via: [:post]
           end
 
           if methods.include?(:update)
             match "relationships/#{formatted_association_name}", controller: options[:controller],
-                  action: 'update_association', association: link_type.to_s, via: [:put, :patch]
+                                                                 action: 'update_association', association: link_type.to_s, via: [:put, :patch]
           end
 
           if methods.include?(:destroy)
             match "relationships/#{formatted_association_name}/:keys", controller: options[:controller],
-                  action: 'destroy_association', association: link_type.to_s, via: [:delete]
+                                                                       action: 'destroy_association', association: link_type.to_s, via: [:delete]
           end
         end
 
@@ -163,13 +163,17 @@ module ActionDispatch
           association = source._associations[association_name]
 
           formatted_association_name = format_route(association.name)
-          related_resource = JSONAPI::Resource.resource_for(resource_type_with_module_prefix(association.class_name.underscore.pluralize))
-          options[:controller] ||= related_resource._type.to_s
 
+          if association.polymorphic?
+            options[:controller] ||= association.class_name.underscore.pluralize
+          else
+            related_resource = JSONAPI::Resource.resource_for(resource_type_with_module_prefix(association.class_name.underscore.pluralize))
+            options[:controller] ||= related_resource._type.to_s
+          end
 
           match "#{formatted_association_name}", controller: options[:controller],
-                association: association.name, source: resource_type_with_module_prefix(source._type),
-                action: 'get_related_resource', via: [:get]
+                                                 association: association.name, source: resource_type_with_module_prefix(source._type),
+                                                 action: 'get_related_resource', via: [:get]
         end
 
         def jsonapi_related_resources(*association)
@@ -184,14 +188,15 @@ module ActionDispatch
           options[:controller] ||= related_resource._type.to_s
 
           match "#{formatted_association_name}", controller: options[:controller],
-                association: association.name, source: resource_type_with_module_prefix(source._type),
-                action: 'get_related_resources', via: [:get]
+                                                 association: association.name, source: resource_type_with_module_prefix(source._type),
+                                                 action: 'get_related_resources', via: [:get]
         end
 
         private
+
         def resource_type_with_module_prefix(resource = nil)
           resource_name = resource || @scope[:jsonapi_resource]
-          [@scope[:module], resource_name].compact.collect(&:to_s).join("/")
+          [@scope[:module], resource_name].compact.collect(&:to_s).join('/')
         end
       end
     end

data/test/controllers/controller_test.rb

@@ -54,19 +54,19 @@ class PostsControllerTest < ActionController::TestCase
   end
 
   def test_index_include_one_level_query_count
-    query_count = count_queries do
+    count_queries do
       get :index, {include: 'author'}
     end
     assert_response :success
-    assert_equal 2, query_count
+    assert_query_count(2)
   end
 
   def test_index_include_two_levels_query_count
-    query_count = count_queries do
+    count_queries do
       get :index, {include: 'author,author.comments'}
     end
     assert_response :success
-    assert_equal 3, query_count
+    assert_query_count(3)
   end
 
   def test_index_filter_by_ids_and_fields
@@ -76,10 +76,10 @@ class PostsControllerTest < ActionController::TestCase
 
     # type, id, links, attributes, relationships
     assert_equal 5, json_response['data'][0].size
-    assert json_response['data'][0].has_key?('type')
-    assert json_response['data'][0].has_key?('id')
-    assert json_response['data'][0]['attributes'].has_key?('title')
-    assert json_response['data'][0].has_key?('links')
+    assert json_response['data'][0].key?('type')
+    assert json_response['data'][0].key?('id')
+    assert json_response['data'][0]['attributes'].key?('title')
+    assert json_response['data'][0].key?('links')
   end
 
   def test_index_filter_by_ids_and_fields_specify_type
@@ -89,10 +89,10 @@ class PostsControllerTest < ActionController::TestCase
 
     # type, id, links, attributes, relationships
     assert_equal 5, json_response['data'][0].size
-    assert json_response['data'][0].has_key?('type')
-    assert json_response['data'][0].has_key?('id')
-    assert json_response['data'][0]['attributes'].has_key?('title')
-    assert json_response['data'][0].has_key?('links')
+    assert json_response['data'][0].key?('type')
+    assert json_response['data'][0].key?('id')
+    assert json_response['data'][0]['attributes'].key?('title')
+    assert json_response['data'][0].key?('links')
   end
 
   def test_index_filter_by_ids_and_fields_specify_unrelated_type
@@ -108,13 +108,16 @@ class PostsControllerTest < ActionController::TestCase
 
     # type, id, links, relationships
     assert_equal 4, json_response['data'][0].size
-    assert json_response['data'][0].has_key?('type')
-    assert json_response['data'][0].has_key?('id')
-    assert json_response['data'][0]['relationships'].has_key?('author')
+    assert json_response['data'][0].key?('type')
+    assert json_response['data'][0].key?('id')
+    assert json_response['data'][0]['relationships'].key?('author')
   end
 
   def test_filter_association_single
-    get :index, {filter: {tags: '5,1'}}
+    count_queries do
+      get :index, {filter: {tags: '5,1'}}
+    end
+    assert_query_count(1)
     assert_response :success
     assert_equal 3, json_response['data'].size
     assert_match /New post/, response.body
@@ -123,7 +126,10 @@ class PostsControllerTest < ActionController::TestCase
   end
 
   def test_filter_associations_multiple
-    get :index, {filter: {tags: '5,1', comments: '3'}}
+    count_queries do
+      get :index, {filter: {tags: '5,1', comments: '3'}}
+    end
+    assert_query_count(1)
     assert_response :success
     assert_equal 1, json_response['data'].size
     assert_match /JR Solves your serialization woes!/, response.body
@@ -227,6 +233,15 @@ class PostsControllerTest < ActionController::TestCase
     assert_nil json_response['included']
   end
 
+  def test_show_does_not_include_records_count_in_meta
+    JSONAPI.configuration.top_level_meta_include_record_count = true
+    get :show, { id: Post.first.id }
+    assert_response :success
+    assert_equal json_response['meta'], nil
+  ensure
+    JSONAPI.configuration.top_level_meta_include_record_count = false
+  end
+
   def test_show_single_with_includes
     get :show, {id: '1', include: 'comments'}
     assert_response :success
@@ -317,7 +332,7 @@ class PostsControllerTest < ActionController::TestCase
          }
 
     assert_response :unprocessable_entity
-    # Todo: check if this validation is working
+    # TODO: check if this validation is working
     assert_match /author - can't be blank/, response.body
   end
 
@@ -621,6 +636,28 @@ class PostsControllerTest < ActionController::TestCase
                           json_response['data']['relationships']['tags']['data'])
   end
 
+  def test_update_with_internal_server_error
+    set_content_type_header!
+    post_object = Post.find(3)
+    title = post_object.title
+
+    put :update,
+        {
+          id: 3,
+          data: {
+            id: '3',
+            type: 'posts',
+            attributes: {
+              title: 'BOOM'
+            }
+          }
+        }
+
+    assert_response 500
+    post_object = Post.find(3)
+    assert_equal title, post_object.title
+  end
+
   def test_update_remove_links
     set_content_type_header!
     put :update,
@@ -1518,7 +1555,7 @@ class ExpenseEntriesControllerTest < ActionController::TestCase
     get :show, {id: 1, include: 'isoCurrency,employee', 'fields' => {'expenseEntries' => 'transactionDate'}}
     assert_response :success
     assert json_response['data'].is_a?(Hash)
-    assert json_response['data']['attributes'].has_key?('transactionDate')
+    assert json_response['data']['attributes'].key?('transactionDate')
     assert_equal 2, json_response['included'].size
   end
 
@@ -1527,7 +1564,7 @@ class ExpenseEntriesControllerTest < ActionController::TestCase
                                                                      'isoCurrencies' => 'id,name'}}
     assert_response :success
     assert json_response['data'].is_a?(Hash)
-    assert json_response['data']['attributes'].has_key?('transactionDate')
+    assert json_response['data']['attributes'].key?('transactionDate')
     assert_equal 2, json_response['included'].size
   end
 
@@ -1863,7 +1900,7 @@ class PeopleControllerTest < ActionController::TestCase
   def test_get_related_resource
     JSONAPI.configuration.json_key_format = :dasherized_key
     JSONAPI.configuration.route_format = :underscored_key
-    get :get_related_resource, {post_id: '2', association: 'author', :source=>'posts'}
+    get :get_related_resource, {post_id: '2', association: 'author', source:'posts'}
     assert_response :success
     assert_hash_equals(
       {
@@ -1907,7 +1944,13 @@ class PeopleControllerTest < ActionController::TestCase
                "related" => "http://test.host/people/1/hair_cut"
              },
              "data" => nil
-            }
+           },
+           vehicles: {
+             links: {
+               self: "http://test.host/people/1/relationships/vehicles",
+               related: "http://test.host/people/1/vehicles"
+             }
+           }
          }
         }
       },
@@ -1916,7 +1959,7 @@ class PeopleControllerTest < ActionController::TestCase
   end
 
   def test_get_related_resource_nil
-    get :get_related_resource, {post_id: '17', association: 'author', :source=>'posts'}
+    get :get_related_resource, {post_id: '17', association: 'author', source:'posts'}
     assert_response :success
     assert_hash_equals json_response,
                        {
@@ -2133,6 +2176,7 @@ end
 class Api::V2::BooksControllerTest < ActionController::TestCase
   def setup
     JSONAPI.configuration.json_key_format = :dasherized_key
+    $test_user = Person.find(1)
   end
 
   def after_teardown
@@ -2155,7 +2199,7 @@ class Api::V2::BooksControllerTest < ActionController::TestCase
     JSONAPI.configuration.top_level_meta_include_record_count = false
 
     assert_response :success
-    assert_equal 1000, json_response['meta']['record-count']
+    assert_equal 901, json_response['meta']['record-count']
     assert_equal 10, json_response['data'].size
     assert_equal 'Book 0', json_response['data'][0]['attributes']['title']
   end
@@ -2170,7 +2214,7 @@ class Api::V2::BooksControllerTest < ActionController::TestCase
     JSONAPI.configuration.top_level_meta_record_count_key = :record_count
 
     assert_response :success
-    assert_equal 1000, json_response['meta']['total-records']
+    assert_equal 901, json_response['meta']['total-records']
     assert_equal 10, json_response['data'].size
     assert_equal 'Book 0', json_response['data'][0]['attributes']['title']
   end
@@ -2178,25 +2222,25 @@ class Api::V2::BooksControllerTest < ActionController::TestCase
   def test_books_offset_pagination_no_params_includes_query_count_one_level
     Api::V2::BookResource.paginator :offset
 
-    query_count = count_queries do
+    count_queries do
       get :index, {include: 'book-comments'}
     end
     assert_response :success
     assert_equal 10, json_response['data'].size
     assert_equal 'Book 0', json_response['data'][0]['attributes']['title']
-    assert_equal 3, query_count
+    assert_query_count(3)
   end
 
   def test_books_offset_pagination_no_params_includes_query_count_two_levels
     Api::V2::BookResource.paginator :offset
 
-    query_count = count_queries do
+    count_queries do
       get :index, {include: 'book-comments,book-comments.author'}
     end
     assert_response :success
     assert_equal 10, json_response['data'].size
     assert_equal 'Book 0', json_response['data'][0]['attributes']['title']
-    assert_equal 4, query_count
+    assert_query_count(4)
   end
 
   def test_books_offset_pagination
@@ -2315,6 +2359,192 @@ class Api::V2::BooksControllerTest < ActionController::TestCase
     assert_equal 10, json_response['data'].size
     assert_equal 'Book 20', json_response['data'][0]['attributes']['title']
   end
+
+  def test_books_included_paged
+    Api::V2::BookResource.paginator :offset
+
+    count_queries do
+      get :index, {filter: {id: '0'}, include: 'book-comments'}
+    end
+    assert_response :success
+    assert_equal 1, json_response['data'].size
+    assert_equal 'Book 0', json_response['data'][0]['attributes']['title']
+    assert_query_count(3)
+  end
+
+  def test_books_banned_non_book_admin
+    $test_user = Person.find(1)
+    Api::V2::BookResource.paginator :offset
+    count_queries do
+      JSONAPI.configuration.top_level_meta_include_record_count = true
+      get :index, {page: {offset: 50, limit: 12}}
+      JSONAPI.configuration.top_level_meta_include_record_count = false
+    end
+    assert_response :success
+    assert_equal 12, json_response['data'].size
+    assert_equal 'Book 50', json_response['data'][0]['attributes']['title']
+    assert_equal 901, json_response['meta']['record-count']
+    assert_query_count(2)
+  end
+
+  def test_books_banned_non_book_admin_includes_switched
+    $test_user = Person.find(1)
+    Api::V2::BookResource.paginator :offset
+    count_queries do
+      JSONAPI.configuration.top_level_meta_include_record_count = true
+      get :index, {page: {offset: 0, limit: 12}, include: 'book-comments'}
+      JSONAPI.configuration.top_level_meta_include_record_count = false
+    end
+
+    assert_response :success
+    assert_equal 12, json_response['data'].size
+    assert_equal 130, json_response['included'].size
+    assert_equal 'Book 0', json_response['data'][0]['attributes']['title']
+    assert_equal 26, json_response['data'][0]['relationships']['book-comments']['data'].size
+    assert_equal 'book-comments', json_response['included'][0]['type']
+    assert_equal 901, json_response['meta']['record-count']
+    assert_query_count(3)
+  end
+
+  def test_books_banned_non_book_admin_includes_nested_includes
+    $test_user = Person.find(1)
+    Api::V2::BookResource.paginator :offset
+    count_queries do
+      JSONAPI.configuration.top_level_meta_include_record_count = true
+      get :index, {page: {offset: 0, limit: 12}, include: 'book-comments.author'}
+      JSONAPI.configuration.top_level_meta_include_record_count = false
+    end
+    assert_response :success
+    assert_equal 12, json_response['data'].size
+    assert_equal 131, json_response['included'].size
+    assert_equal 'Book 0', json_response['data'][0]['attributes']['title']
+    assert_equal 901, json_response['meta']['record-count']
+    assert_query_count(4)
+  end
+
+  def test_books_banned_admin
+    $test_user = Person.find(5)
+    Api::V2::BookResource.paginator :offset
+    query_count = count_queries do
+      JSONAPI.configuration.top_level_meta_include_record_count = true
+      get :index, {page: {offset: 50, limit: 12}, filter: {banned: 'true'}}
+      JSONAPI.configuration.top_level_meta_include_record_count = false
+    end
+    assert_response :success
+    assert_equal 12, json_response['data'].size
+    assert_equal 'Book 651', json_response['data'][0]['attributes']['title']
+    assert_equal 99, json_response['meta']['record-count']
+    assert_query_count(2)
+  end
+
+  def test_books_not_banned_admin
+    $test_user = Person.find(5)
+    Api::V2::BookResource.paginator :offset
+    count_queries do
+      JSONAPI.configuration.top_level_meta_include_record_count = true
+      get :index, {page: {offset: 50, limit: 12}, filter: {banned: 'false'}}
+      JSONAPI.configuration.top_level_meta_include_record_count = false
+    end
+    assert_response :success
+    assert_equal 12, json_response['data'].size
+    assert_equal 'Book 50', json_response['data'][0]['attributes']['title']
+    assert_equal 901, json_response['meta']['record-count']
+    assert_query_count(2)
+  end
+
+  def test_books_banned_non_book_admin_overlapped
+    $test_user = Person.find(1)
+    Api::V2::BookResource.paginator :offset
+    count_queries do
+      JSONAPI.configuration.top_level_meta_include_record_count = true
+      get :index, {page: {offset: 590, limit: 20}}
+      JSONAPI.configuration.top_level_meta_include_record_count = false
+    end
+    assert_response :success
+    assert_equal 20, json_response['data'].size
+    assert_equal 'Book 590', json_response['data'][0]['attributes']['title']
+    assert_equal 901, json_response['meta']['record-count']
+    assert_query_count(2)
+  end
+
+  def test_books_included_exclude_unapproved
+    $test_user = Person.find(1)
+    Api::V2::BookResource.paginator :none
+
+    count_queries do
+      get :index, {filter: {id: '0,1,2,3,4'}, include: 'book-comments'}
+    end
+    assert_response :success
+    assert_equal 5, json_response['data'].size
+    assert_equal 'Book 0', json_response['data'][0]['attributes']['title']
+    assert_equal 130, json_response['included'].size
+    assert_equal 26, json_response['data'][0]['relationships']['book-comments']['data'].size
+    assert_query_count(2)
+  end
+
+  def test_books_included_all_comments_for_admin
+    $test_user = Person.find(5)
+    Api::V2::BookResource.paginator :none
+
+    get :index, {filter: {id: '0,1,2,3,4'}, include: 'book-comments'}
+    assert_response :success
+    assert_equal 5, json_response['data'].size
+    assert_equal 'Book 0', json_response['data'][0]['attributes']['title']
+    assert_equal 255, json_response['included'].size
+    assert_equal 51, json_response['data'][0]['relationships']['book-comments']['data'].size
+  end
+
+  def test_books_filter_by_book_comment_id_limited_user
+    $test_user = Person.find(1)
+    get :index, {filter: {book_comments: '0,52' }}
+    assert_response :success
+    assert_equal 1, json_response['data'].size
+  end
+
+  def test_books_filter_by_book_comment_id_admin_user
+    $test_user = Person.find(5)
+    get :index, {filter: {book_comments: '0,52' }}
+    assert_response :success
+    assert_equal 2, json_response['data'].size
+  end
+end
+
+class Api::V2::BookCommentsControllerTest < ActionController::TestCase
+  def setup
+    JSONAPI.configuration.json_key_format = :dasherized_key
+    Api::V2::BookCommentResource.paginator :none
+    $test_user = Person.find(1)
+  end
+
+  def test_book_comments_all_for_admin
+    $test_user = Person.find(5)
+    count_queries do
+      get :index
+    end
+    assert_response :success
+    assert_equal 255, json_response['data'].size
+    assert_query_count(1)
+  end
+
+  def test_book_comments_unapproved_context_based
+    $test_user = Person.find(5)
+    count_queries do
+      get :index, {filter: {approved: 'false'}}
+    end
+    assert_response :success
+    assert_equal 125, json_response['data'].size
+    assert_query_count(1)
+  end
+
+  def test_book_comments_exclude_unapproved_context_based
+    $test_user = Person.find(1)
+    count_queries do
+      get :index
+    end
+    assert_response :success
+    assert_equal 130, json_response['data'].size
+    assert_query_count(1)
+  end
 end
 
 class Api::V4::BooksControllerTest < ActionController::TestCase
@@ -2329,7 +2559,7 @@ class Api::V4::BooksControllerTest < ActionController::TestCase
     assert_response :success
     assert_equal 12, json_response['data'].size
     assert_equal 'Book 50', json_response['data'][0]['attributes']['title']
-    assert_equal 1000, json_response['meta']['totalRecords']
+    assert_equal 901, json_response['meta']['totalRecords']
     JSONAPI.configuration.operations_processor = :active_record
   end
 
@@ -2397,4 +2627,4 @@ class Api::V1::PlanetsControllerTest < ActionController::TestCase
     assert_response :unprocessable_entity
     assert_match /Save failed or was cancelled/, json_response['errors'][0]['detail']
   end
-end
+end