Merge pull request #1106 from cerebris/pr/1061

Adds tests for 1061

Author: lgebhardt

jsonapi-resources.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.5'
   spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'minitest'
+  spec.add_development_dependency 'minitest', '~> 5.10', '!= 5.10.2'
   spec.add_development_dependency 'minitest-spec-rails'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'pry'

lib/jsonapi/active_relation_resource_finder.rb

@@ -423,7 +423,12 @@ def _build_joins(associations)
         joins = []
 
         associations.inject do |prev, current|
-          joins << "LEFT JOIN #{current.table_name} AS #{current.name}_sorting ON #{current.name}_sorting.id = #{prev.table_name}.#{current.foreign_key}"
+          if current.has_one?
+            joins << "LEFT JOIN #{current.table_name} AS #{current.name}_sorting ON #{current.name}_sorting.#{current.foreign_key} = #{prev.table_name}.id"
+          else
+            joins << "LEFT JOIN #{current.table_name} AS #{current.name}_sorting ON #{current.name}_sorting.id = #{prev.table_name}.#{current.foreign_key}"
+          end
+
           current
         end
         joins.join("\n")

test/fixtures/active_record.rb

@@ -903,6 +903,9 @@ class IsoCurrenciesController < JSONAPI::ResourceController
   end
 
   module V6
+    class AuthorsController < JSONAPI::ResourceController
+    end
+
     class PostsController < JSONAPI::ResourceController
     end
 
@@ -1753,6 +1756,10 @@ def self.find_records(filters, options = {})
       def fetchable_fields
         super - [:email]
       end
+
+      def self.sortable_fields(context)
+        super(context) + [:"author_detail.author_stuff"]
+      end
     end
 
     class AuthorDetailResource < JSONAPI::Resource
@@ -1772,6 +1779,23 @@ class EmployeeResource < EmployeeResource; end
 
 module Api
   module V6
+    class AuthorDetailResource < JSONAPI::Resource
+      attributes :author_stuff
+    end
+
+    class AuthorResource < JSONAPI::Resource
+      attributes :name, :email
+      model_name 'Person'
+      relationship :posts, to: :many
+      relationship :author_detail, to: :one, foreign_key_on: :related
+
+      filter :name
+
+      def self.sortable_fields(context)
+        super(context) + [:"author_detail.author_stuff"]
+      end
+    end
+
     class PersonResource < PersonResource; end
     class TagResource < TagResource; end
 

test/integration/requests/request_test.rb

@@ -1100,6 +1100,26 @@ def test_sort_parameter_openquoted
     assert_jsonapi_response 400
   end
 
+  def test_sort_primary_attribute
+    get '/api/v6/authors?sort=name', headers: { 'Accept' => JSONAPI::MEDIA_TYPE }
+    assert_jsonapi_response 200
+    assert_equal '1002', json_response['data'][0]['id']
+
+    get '/api/v6/authors?sort=-name', headers: { 'Accept' => JSONAPI::MEDIA_TYPE }
+    assert_jsonapi_response 200
+    assert_equal '1005', json_response['data'][0]['id']
+  end
+
+  def test_sort_included_attribute
+    get '/api/v6/authors?sort=author_detail.author_stuff', headers: { 'Accept' => JSONAPI::MEDIA_TYPE }
+    assert_jsonapi_response 200
+    assert_equal '1000', json_response['data'][0]['id']
+
+    get '/api/v6/authors?sort=-author_detail.author_stuff', headers: { 'Accept' => JSONAPI::MEDIA_TYPE }
+    assert_jsonapi_response 200
+    assert_equal '1002', json_response['data'][0]['id']
+  end
+
   def test_include_parameter_quoted
     get '/api/v2/posts?include=%22author%22', headers: { 'Accept' => JSONAPI::MEDIA_TYPE }
     assert_jsonapi_response 200

test/test_helper.rb

@@ -354,6 +354,7 @@ class CatResource < JSONAPI::Resource
 
     JSONAPI.configuration.route_format = :dasherized_route
     namespace :v6 do
+      jsonapi_resources :authors
       jsonapi_resources :posts
       jsonapi_resources :sections
       jsonapi_resources :customers

test/unit/resource/resource_test.rb

@@ -360,12 +360,15 @@ def test_lookup_association_chain
   end
 
   def test_build_joins
-    model_names = %w(person posts parent_post author)
+    model_names = %w(person posts parent_post author author_detail)
     associations = PostResource._lookup_association_chain(model_names)
     result = PostResource.send(:_build_joins, associations)
 
-    assert_equal "LEFT JOIN posts AS parent_post_sorting ON parent_post_sorting.id = posts.parent_post_id
-LEFT JOIN people AS author_sorting ON author_sorting.id = posts.author_id", result
+    sql = "LEFT JOIN posts AS parent_post_sorting ON parent_post_sorting.parent_post_id = posts.id
+LEFT JOIN people AS author_sorting ON author_sorting.id = posts.author_id
+LEFT JOIN author_details AS author_detail_sorting ON author_detail_sorting.person_id = people.id"
+
+    assert_equal sql, result
   end
 
   # ToDo: Implement relationship pagination