Merge pull request #1033 from cerebris/relationship_filter

Rework apply_filter(s) to allow callables to be called for relationship filters

Author: dgeb

lib/jsonapi/active_record_accessor.rb

@@ -267,7 +267,15 @@ def apply_filter(records, filter, value, options = {})
           strategy.call(records, value, options)
         end
       else
-        records.where(filter => value)
+        if _resource_klass._relationships.include?(filter)
+          if _resource_klass._relationships[filter].belongs_to?
+            records.where(_resource_klass._relationships[filter].foreign_key => value)
+          else
+            records.where("#{_resource_klass._relationships[filter].table_name}.#{_resource_klass._relationships[filter].primary_key}" => value)
+          end
+        else
+          records.where(filter => value)
+        end
       end
     end
 
@@ -301,21 +309,16 @@ def apply_filters(records, filters, options = {})
 
       if filters
         filters.each do |filter, value|
-          if _resource_klass._relationships.include?(filter)
-            if _resource_klass._relationships[filter].belongs_to?
-              records = apply_filter(records, _resource_klass._relationships[filter].foreign_key, value, options)
-            else
-              required_includes.push(filter.to_s)
-              records = apply_filter(records, "#{_resource_klass._relationships[filter].table_name}.#{_resource_klass._relationships[filter].primary_key}", value, options)
-            end
-          else
-            records = apply_filter(records, filter, value, options)
+          if _resource_klass._relationships.include?(filter) && !_resource_klass._relationships[filter].belongs_to?
+            required_includes.push(filter.to_s)
           end
+
+          records = apply_filter(records, filter, value, options)
         end
       end
 
       if required_includes.any?
-        records = apply_includes(records, options.merge(include_directives: IncludeDirectives.new(_resource_klass, required_includes, force_eager_load: true)))
+        options.merge!(include_directives: IncludeDirectives.new(_resource_klass, required_includes, force_eager_load: true))
       end
 
       records

test/fixtures/active_record.rb

@@ -1488,7 +1488,11 @@ class BookResource < JSONAPI::Resource
 
       has_many :aliased_comments, class_name: 'BookComments', relation_name: :approved_book_comments
 
-      filters :book_comments
+      filter :book_comments,
+              apply: ->(records, value, options) {
+                return records.where('book_comments.id' => value)
+              }
+
       filter :banned, apply: :apply_filter_banned
 
       class << self