Update tests and test data

Author: lgebhardt

test/controllers/controller_test.rb

@@ -245,7 +245,7 @@ def test_index_filter_with_empty_result
     assert_equal 0, json_response['data'].size
   end
 
-  def test_index_filter_by_id
+  def test_index_filter_by_single_id
     assert_cacheable_get :index, params: {filter: {id: '1'}}
     assert_response :success
     assert json_response['data'].is_a?(Array)
@@ -266,7 +266,7 @@ def test_index_filter_with_hash_values
     assert_equal 1, json_response['data'].size
   end
 
-  def test_index_filter_by_ids
+  def test_index_filter_by_array_of_ids
     assert_cacheable_get :index, params: {filter: {ids: '1,2'}}
     assert_response :success
     assert json_response['data'].is_a?(Array)
@@ -2050,14 +2050,14 @@ class PicturesControllerTest < ActionController::TestCase
   def test_pictures_index
     assert_cacheable_get :index
     assert_response :success
-    assert_equal 7, json_response['data'].size
+    assert_equal 8, json_response['data'].size
   end
 
   def test_pictures_index_with_polymorphic_include_one_level
-    assert_cacheable_get :index, params: {include: 'imageable'}
+    get :index, params: {include: 'imageable'}
     assert_response :success
-    assert_equal 7, json_response['data'].try(:size)
-    assert_equal 4, json_response['included'].try(:size)
+    assert_equal 8, json_response['data'].try(:size)
+    assert_equal 5, json_response['included'].try(:size)
   end
 
   def test_update_relationship_to_one_polymorphic
@@ -2075,14 +2075,14 @@ class DocumentsControllerTest < ActionController::TestCase
   def test_documents_index
     assert_cacheable_get :index
     assert_response :success
-    assert_equal 4, json_response['data'].size
+    assert_equal 5, json_response['data'].size
   end
 
   def test_documents_index_with_polymorphic_include_one_level
     assert_cacheable_get :index, params: {include: 'pictures'}
     assert_response :success
-    assert_equal 4, json_response['data'].size
-    assert_equal 5, json_response['included'].size
+    assert_equal 5, json_response['data'].size
+    assert_equal 6, json_response['included'].size
   end
 end
 
@@ -3877,9 +3877,6 @@ def test_complex_includes_two_level
     assert_equal 'things', json_response['included'][1]['type']
     assert_equal '10001', json_response['included'][1]['relationships']['user']['data']['id']
     assert_nil json_response['included'][1]['relationships']['things']['data']
-
-    assert_equal '10001', json_response['included'][2]['id']
-    assert_equal 'users', json_response['included'][2]['type']
   end
 
   def test_complex_includes_things_nested_things
@@ -3916,9 +3913,6 @@ def test_complex_includes_nested_things_secondary_users
     assert_equal 'things', json_response['included'][1]['type']
     assert_equal '10001',  json_response['included'][1]['relationships']['user']['data']['id']
     assert_equal '10',  json_response['included'][1]['relationships']['things']['data'][0]['id']
-
-    assert_equal '10001', json_response['included'][2]['id']
-    assert_equal 'users', json_response['included'][2]['type']
   end
 end
 
@@ -3945,49 +3939,6 @@ def test_fields_with_delegated_attribute
   end
 end
 
-class WidgetsControllerTest < ActionController::TestCase
-  def teardown
-    Widget.delete_all
-    Indicator.delete_all
-    Agency.delete_all
-  end
-
-  def test_fetch_widgets_sort_by_agency_name
-    agency_1 = Agency.create! name: 'beta'
-    agency_2 = Agency.create! name: 'alpha'
-    indicator_1 = Indicator.create! name: 'bar', agency: agency_1
-    indicator_2 = Indicator.create! name: 'foo', agency: agency_2
-    Widget.create! name: 'bar', indicator: indicator_1
-    widget = Widget.create! name: 'foo', indicator: indicator_2
-    assert_cacheable_get :index, params: {sort: 'indicator.agency.name'}
-    assert_response :success
-    assert_equal widget.id.to_s, json_response['data'].first['id']
-  end
-end
-
-class IndicatorsControllerTest < ActionController::TestCase
-  def teardown
-    Widget.delete_all
-    Indicator.delete_all
-    Agency.delete_all
-  end
-
-  def test_fetch_indicators_sort_by_widgets_name
-    agency = Agency.create! name: 'test'
-    indicator_1 = Indicator.create! name: 'bar', agency: agency
-    indicator_2 = Indicator.create! name: 'foo', agency: agency
-    Widget.create! name: 'omega', indicator: indicator_1
-    Widget.create! name: 'beta', indicator: indicator_1
-    Widget.create! name: 'alpha', indicator: indicator_2
-    Widget.create! name: 'zeta', indicator: indicator_2
-    assert_cacheable_get :index, params: {sort: 'widgets.name'}
-    assert_response :success
-    assert_equal indicator_2.id.to_s, json_response['data'].first['id']
-    assert_equal 2, json_response['data'].size
-  end
-
-end
-
 class RobotsControllerTest < ActionController::TestCase
 
   def teardown
@@ -4017,5 +3968,4 @@ def test_fetch_robots_with_sort_by_version
     assert_response 400
     assert_equal 'version is not a valid sort criteria for robots', json_response['errors'].first['detail']
   end
-
 end

test/fixtures/active_record.rb

@@ -334,6 +334,26 @@
     t.string :name
   end
 
+  create_table :painters, force: true do |t|
+    t.string :name
+
+    t.timestamps null: false
+  end
+
+  create_table :paintings, force: true do |t|
+    t.string :title
+    t.string :category
+    t.belongs_to :painter
+
+    t.timestamps null: false
+  end
+
+  create_table :collectors, force: true do |t|
+    t.string :name
+    t.belongs_to :painting
+  end
+
+  # special cases
   create_table :storages, force: true do |t|
     t.string :token, null: false
     t.string :name
@@ -433,6 +453,11 @@ class Person < ActiveRecord::Base
   has_one :author_detail
 
   has_and_belongs_to_many :books, join_table: :book_authors
+  has_and_belongs_to_many :not_banned_books, -> {
+    merge(Book.not_banned)
+  },
+                          class_name: 'Book',
+                          join_table: :book_authors
 
   has_many :even_posts, -> { where('posts.id % 2 = 0') }, class_name: 'Post', foreign_key: 'author_id'
   has_many :odd_posts, -> { where('posts.id % 2 = 1') }, class_name: 'Post', foreign_key: 'author_id'
@@ -619,14 +644,18 @@ class Book < ActiveRecord::Base
   has_many :approved_book_comments, -> { where(approved: true) }, class_name: "BookComment"
 
   has_and_belongs_to_many :authors, join_table: :book_authors, class_name: "Person"
+
+  scope :not_banned, -> {
+    where(banned: false)
+  }
 end
 
 class BookComment < ActiveRecord::Base
   belongs_to :author, class_name: 'Person', foreign_key: 'author_id'
   belongs_to :book
 
   def self.for_user(current_user)
-    records = self
+    records = self.all
     # Hide the unapproved comments from people who are not book admins
     unless current_user && current_user.book_admin
       records = records.where(approved: true)
@@ -688,8 +717,8 @@ class Category < ActiveRecord::Base
 class Picture < ActiveRecord::Base
   belongs_to :imageable, polymorphic: true
 
-  # belongs_to :document, -> { where( pictures: { imageable_type: 'Document' } ).includes( :pictures ) }, foreign_key: 'imageable_id'
-  # belongs_to :product, -> { where( pictures: { imageable_type: 'Product' } ).includes( :pictures ) }, foreign_key: 'imageable_id'
+  belongs_to :document, -> { where( pictures: { imageable_type: 'Document' } ).eager_load( :pictures ) }, foreign_key: 'imageable_id'
+  belongs_to :product, -> { where( pictures: { imageable_type: 'Product' } ).eager_load( :pictures ) }, foreign_key: 'imageable_id'
 end
 
 class Vehicle < ActiveRecord::Base
@@ -797,6 +826,19 @@ class Widget < ActiveRecord::Base
 class Robot < ActiveRecord::Base
 end
 
+class Painter < ActiveRecord::Base
+  has_many :paintings
+end
+
+class Painting < ActiveRecord::Base
+  belongs_to :painter
+  has_many :collectors
+end
+
+class Collector < ActiveRecord::Base
+  belongs_to :painting
+end
+
 ### CONTROLLERS
 class SessionsController < ActionController::Base
   include JSONAPI::ActsAsResourceController
@@ -1014,6 +1056,9 @@ class ExpenseEntriesController < JSONAPI::ResourceController
 
     class IsoCurrenciesController < JSONAPI::ResourceController
     end
+
+    class PaintersController < JSONAPI::ResourceController
+    end
   end
 
   module V6
@@ -1349,6 +1394,11 @@ def title=(title)
       records.where(title: values.first['title'])
     }
 
+  filter 'tags.name'
+
+  filter 'comments.author.name'
+  filter 'comments.tags.name'
+
   def self.updatable_fields(context)
     super(context) - [:author, :subject]
   end
@@ -1508,7 +1558,7 @@ class CraterResource < JSONAPI::Resource
 
   filter :description, apply: -> (records, value, options) {
     fail "context not set" unless options[:context][:current_user] != nil && options[:context][:current_user] == $test_user
-    records.where(concat_table_field(options[:table_alias], :description) => value)
+    records.where(concat_table_field(options[:related_alias], :description) => value)
   }
 
   def self.verify_key(key, context = nil)
@@ -1545,7 +1595,16 @@ class CategoryResource < JSONAPI::Resource
 class PictureResource < JSONAPI::Resource
   attribute :name
   has_one :imageable, polymorphic: true 
-  # has_one :imageable, polymorphic: true, polymorphic_relations: [:document, :product]
+
+  filter 'imageable.name', perform_joins: true, apply: -> (records, value, options) {
+    joins = options[:joins]
+    relationship = _relationship(:imageable)
+    or_parts = relationship.polymorphic_relations.collect do |relation|
+      table_alias = joins["imageable[#{relation}]"][:alias]
+      "#{concat_table_field(table_alias, "name")} = '#{value.first}'"
+    end
+    records.where(or_parts.join(' OR '))
+  }
 end
 
 class DocumentResource < JSONAPI::Resource
@@ -1744,33 +1803,15 @@ class AuthorResource < JSONAPI::Resource
       model_name 'Person'
       attributes :name
 
-      has_many :books, inverse_relationship: :authors,
-               custom_methods: {
-                 apply_join: -> (options) {
-                   relationship = options[:relationship]
-                   relation_name = relationship.relation_name(options[:options])
-
-                   records = options[:records].joins(relation_name).references(relation_name)
-
-                   unless options[:context][:current_user].try(:book_admin)
-                     records = records.where("#{relation_name}.banned" => false)
-                   end
-                   records
-                 }
-               }
+      has_many :books, inverse_relationship: :authors, relation_name: -> (options) {
+        if options[:context][:current_user].try(:book_admin)
+          :books
+        else
+          :not_banned_books
+        end
+      }
 
       has_many :book_comments
-
-      def records_for(rel_name)
-        records = _model.public_send(rel_name)
-        if rel_name == :books
-          # Hide indirect access to banned books unless current user is a book admin
-          unless context[:current_user].try(:book_admin)
-            records = records.where(banned: false)
-          end
-        end
-        return records
-      end
     end
 
     class BookResource < JSONAPI::Resource
@@ -1804,6 +1845,7 @@ class BookResource < JSONAPI::Resource
                   :book_comments
                 end
 
+                # Using an inner join here, which is different than the new default left_join
                 return records.joins(relation).references(relation).where('book_comments.id' => value)
               }
 
@@ -1944,6 +1986,36 @@ class AuthorDetailResource < JSONAPI::Resource
       attributes :author_stuff
     end
 
+    class PaintingResource < JSONAPI::Resource
+      model_name 'Painting'
+      attributes :title, :category #, :collector_roster
+      has_one :painter
+      has_many :collectors
+
+      filter :title
+      filter :category
+      filter :collectors
+
+      def collector_roster
+        collectors.map(&:name)
+      end
+    end
+
+    class CollectorResource < JSONAPI::Resource
+      attributes :name
+      has_one :painting
+    end
+
+    class PainterResource < JSONAPI::Resource
+      model_name 'Painter'
+      attributes :name
+      has_many :paintings
+
+      filter :name, apply: lambda { |records, value, options|
+        records.where('name LIKE ?', value)
+      }
+    end
+
     class PersonResource < PersonResource; end
     class PostResource < PostResource; end
     class TagResource < TagResource; end
@@ -2262,23 +2334,18 @@ def show
 module Api
   class BoxResource < JSONAPI::Resource
     has_many :things
+
+    filter 'things.things.name'
+    filter 'things.name'
   end
 
   class ThingResource < JSONAPI::Resource
     has_one :box
     has_one :user
 
-    has_many :things,
-             custom_methods: {
-                 apply_join: -> (options) {
-                   table_alias = "aliased_#{options[:table_alias]}"
-                   options[:table_alias] = table_alias
-
-                   join_stmt = "LEFT OUTER JOIN related_things related_things_#{table_alias} ON related_things_#{table_alias}.from_id = things.id LEFT OUTER JOIN things \"#{table_alias}\" ON \"#{table_alias}\".id = related_things_#{table_alias}.to_id"
+    has_many :things
 
-                   return options[:records].joins(join_stmt)
-                 }
-             }
+    filter 'things.things.name'
   end
 
   class UserResource < JSONAPI::Resource

test/fixtures/boxes.yml

@@ -1,2 +1,5 @@
 box_100:
   id: 100
+
+box_102:
+  id: 102