Merge pull request #1171 from cerebris/fixup_1164

Fixup of #1164 - Eager load includes for related resources (#1163)

Author: dgeb

lib/jsonapi/relationship_builder.rb

@@ -60,6 +60,8 @@ def define_resource_relationship_accessor(type, relationship_name)
 
         resource_klass = relationship.resource_klass
 
+        records = resource_klass.apply_includes(records, options)
+
         filters = options.fetch(:filters, {})
         unless filters.nil? || filters.empty?
           records = resource_klass.apply_filters(records, filters, options)

test/controllers/controller_test.rb

@@ -3173,7 +3173,7 @@ def test_books_banned_non_book_admin_includes_nested_includes
     end
     assert_response :success
     assert_equal 12, json_response['data'].size
-    assert_equal 132, json_response['included'].size
+    assert_equal 135, json_response['included'].size
     assert_equal 'Book 0', json_response['data'][0]['attributes']['title']
     assert_equal 901, json_response['meta']['record-count']
   ensure

test/fixtures/active_record.rb

@@ -1465,6 +1465,8 @@ class BookResource < JSONAPI::Resource
       attribute "title"
       attributes :isbn, :banned
 
+      paginator :offset
+
       has_many "authors"
 
       has_many "book_comments", relation_name: -> (options = {}) {
@@ -1523,6 +1525,8 @@ class BookCommentResource < JSONAPI::Resource
       has_one :book
       has_one :author, class_name: 'Person'
 
+      paginator :offset
+
       filters :book
       filter :approved, apply: ->(records, value, options) {
         context = options[:context]

test/fixtures/book_comments.yml

@@ -4,7 +4,7 @@
 book_<%= book_num %>_comment_<%= comment_num %>:
   id: <%= comment_id %>
   body: This is comment <%= comment_num %> on book <%= book_num %>.
-  author_id: <%= book_num.even? ? comment_id % 2 : (comment_id % 2) + 2 %>
+  author_id: <%= (comment_id % 5) + 1 %>
   book_id: <%= book_num %>
   approved: <%= comment_num.even? %>
   <% comment_id = comment_id + 1 %>

test/integration/requests/request_test.rb

@@ -604,6 +604,33 @@ def test_pagination_empty_results
   #   assert_equal 'This is comment 18 on book 1.', json_response['data'][9]['attributes']['body']
   # end
 
+  def test_query_count_related_resources
+    # Expected Queries:
+    # * Fetch specified book record
+    # * Fetch book comment records associated with specified book
+    # * Select count of book comment records for pagination
+    Api::V2::BookCommentResource.paginator :offset
+    assert_query_count 3 do
+      get '/api/v2/books/1/book_comments?page[limit]=20'
+    end
+    assert_equal 20, json_response['data'].size
+  end
+
+  def test_query_count_related_resources_with_includes
+    # Expected Queries:
+    # * Fetch specified book record
+    # * Fetch book comment records associated with specified book
+    # * Fetch all author records the book comments to be returned
+    # * Select count of book comment records for pagination
+    Api::V2::BookCommentResource.paginator :offset
+
+    assert_query_count 4 do
+      get '/api/v2/books/1/book_comments?page[limit]=20&include=author'
+    end
+    assert_equal 20, json_response['data'].size
+    assert_equal 5, json_response['included'].size
+  end
+
 
   def test_flow_self
     assert_cacheable_jsonapi_get '/posts/1'