Merge pull request #539 from DavidMikeSimon/fix-filter-to-non-default-table-name

Fix foreign filter lookups

Author: lgebhardt

lib/jsonapi/relationship.rb

@@ -25,6 +25,10 @@ def resource_klass
       @resource_klass = @parent_resource.resource_for(@class_name)
     end
 
+    def table_name
+      @table_name ||= resource_klass._table_name
+    end
+
     def relation_name(options)
       case @relation_name
         when Symbol
@@ -47,6 +51,10 @@ def type_for_source(source)
       end
     end
 
+    def belongs_to?
+      false
+    end
+
     class ToOne < Relationship
       attr_reader :foreign_key_on
 

lib/jsonapi/resource.rb

@@ -542,11 +542,11 @@ def apply_filters(records, filters, options = {})
         if filters
           filters.each do |filter, value|
             if _relationships.include?(filter)
-              if _relationships[filter].is_a?(JSONAPI::Relationship::ToMany)
-                required_includes.push(filter.to_s)
-                records = apply_filter(records, "#{filter}.#{_relationships[filter].primary_key}", value, options)
+              if _relationships[filter].belongs_to?
+                records = apply_filter(records, _relationships[filter].foreign_key, value, options)
               else
-                records = apply_filter(records, "#{_relationships[filter].foreign_key}", value, options)
+                required_includes.push(filter.to_s)
+                records = apply_filter(records, "#{_relationships[filter].table_name}.#{_relationships[filter].primary_key}", value, options)
               end
             else
               records = apply_filter(records, filter, value, options)
@@ -715,6 +715,10 @@ def _primary_key
         @_primary_key ||= _model_class.respond_to?(:primary_key) ? _model_class.primary_key : :id
       end
 
+      def _table_name
+        @_table_name ||= _model_class.respond_to?(:table_name) ? _model_class.table_name : _model_name.tableize
+      end
+
       def _as_parent_key
         @_as_parent_key ||= "#{_type.to_s.singularize}_id"
       end

test/fixtures/active_record.rb

@@ -368,8 +368,7 @@ class Crater < ActiveRecord::Base
 end
 
 class Preferences < ActiveRecord::Base
-  has_one :author, class_name: 'Person'
-  has_many :friends, class_name: 'Person'
+  has_one :author, class_name: 'Person', :inverse_of => 'preferences'
 end
 
 class Fact < ActiveRecord::Base
@@ -979,9 +978,6 @@ class EmployeeResource < JSONAPI::Resource
   model_name 'Person'
 end
 
-class FriendResource < JSONAPI::Resource
-end
-
 class BreedResource < JSONAPI::Resource
   attribute :name, format: :title
 
@@ -1053,8 +1049,7 @@ def self.verify_key(key, context = nil)
 class PreferencesResource < JSONAPI::Resource
   attribute :advanced_mode
 
-  has_one :author, foreign_key: :person_id
-  has_many :friends
+  has_one :author, :foreign_key_on => :related
 
   def self.find_by_key(key, options = {})
     new(Preferences.first, nil)
@@ -1164,7 +1159,6 @@ class MoonResource < MoonResource; end
     class CraterResource < CraterResource; end
     class PreferencesResource < PreferencesResource; end
     class EmployeeResource < EmployeeResource; end
-    class FriendResource < FriendResource; end
     class HairCutResource < HairCutResource; end
     class VehicleResource < VehicleResource; end
     class CarResource < CarResource; end

test/fixtures/comments.yml

@@ -18,4 +18,4 @@ post_2_thanks_man:
 
 rogue_comment:
   body: Rogue Comment Here
-  author_id: 3
+  author_id: 3

test/fixtures/preferences.yml

@@ -1,18 +1,14 @@
 a:
   id: 1
-  person_id:
   advanced_mode: false
 
 b:
   id: 2
-  person_id:
   advanced_mode: false
 c:
   id: 3
-  person_id:
   advanced_mode: false
 
 d:
   id: 4
-  person_id:
   advanced_mode: false

test/unit/resource/resource_test.rb

@@ -264,6 +264,26 @@ def test_createable_fields_delegates_to_creatable_fields_with_deprecation
     end
   end
 
+  def test_filter_on_to_many_relationship_id
+    posts = PostResource.find(:comments => 3)
+    assert_equal([2], posts.map(&:id))
+  end
+
+  def test_filter_on_aliased_to_many_relationship_id
+    # Comment 2 is approved
+    books = Api::V2::BookResource.find(:aliased_comments => 2)
+    assert_equal([0], books.map(&:id))
+
+    # However, comment 3 is non-approved, so it won't be accessible through this relationship
+    books = Api::V2::BookResource.find(:aliased_comments => 3)
+    assert_equal([], books.map(&:id))
+  end
+
+  def test_filter_on_has_one_relationship_id
+    people = PreferencesResource.find(:author => 1)
+    assert_equal([1], people.map(&:id))
+  end
+
   def test_to_many_relationship_filters
     post_resource = PostResource.new(Post.find(1), nil)
     comments = post_resource.comments

test/unit/serializer/serializer_test.rb

@@ -1638,12 +1638,6 @@ def test_serializer_booleans
                 self: '/preferences/1/relationships/author',
                 related: '/preferences/1/author'
               }
-            },
-            friends: {
-              links: {
-                self: '/preferences/1/relationships/friends',
-                related: '/preferences/1/friends'
-              }
             }
           }
         }