praxis 2.0.pre.16 → 2.0.pre.20

data/spec/praxis/extensions/attribute_filtering/active_record_filter_query_builder_spec.rb

@@ -1,12 +1,14 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
-require_relative '../support/spec_resources_active_model.rb'
+require_relative '../support/spec_resources_active_model'
 require 'praxis/extensions/attribute_filtering'
 require 'praxis/extensions/attribute_filtering/active_record_filter_query_builder'
 
 describe Praxis::Extensions::AttributeFiltering::ActiveRecordFilterQueryBuilder do
   let(:root_resource) { ActiveBookResource }
-  let(:filters_map) { root_resource.instance_variable_get(:@_filters_map)}
+  let(:filters_map) { root_resource.instance_variable_get(:@_filters_map) }
   let(:base_model) { root_resource.model }
   let(:base_query) { base_model }
   let(:instance) { described_class.new(query: base_query, model: base_model, filters_map: filters_map) }
@@ -28,7 +30,7 @@ describe Praxis::Extensions::AttributeFiltering::ActiveRecordFilterQueryBuilder
       # Strip blank at the beggining (and end) of every line
       # ...and recompose it by adding an extra space at the beginning of each one instead
       exp = expected_sql.split(/\n/).map do |line|
-        " " + line.strip
+        " #{line.strip}"
       end.join.strip
       expect(gen_sql).to eq(exp)
     end
@@ -44,7 +46,7 @@ describe Praxis::Extensions::AttributeFiltering::ActiveRecordFilterQueryBuilder
   end
   context 'generate' do
     subject { instance.generate(filters) }
-    let(:filters) { Praxis::Types::FilteringParams.load(filters_string)}
+    let(:filters) { Praxis::Types::FilteringParams.load(filters_string) }
 
     context 'with no filters' do
       let(:filters_string) { '' }
@@ -67,29 +69,29 @@ describe Praxis::Extensions::AttributeFiltering::ActiveRecordFilterQueryBuilder
           context 'but if it is a field that does not exist in the model' do
             let(:filters_string) { 'nonexisting=valuehere' }
             it 'it blows up with the right error' do
-              expect{subject}.to raise_error(/Filtering by nonexisting is not allowed/)
+              expect { subject }.to raise_error(/Filtering by nonexisting is not allowed/)
             end
           end
         end
         context 'that maps to a different name' do
-          let(:filters_string) { 'name=Book1'}
+          let(:filters_string) { 'name=Book1' }
           it_behaves_like 'subject_equivalent_to', ActiveBook.where(simple_name: 'Book1')
         end
         context 'that is mapped as a nested struct' do
-          let(:filters_string) { 'fake_nested.name=Book1'}
+          let(:filters_string) { 'fake_nested.name=Book1' }
           it_behaves_like 'subject_equivalent_to', ActiveBook.where(simple_name: 'Book1')
         end
         context 'passing multiple values' do
           context 'without fuzzy matching' do
             let(:filters_string) { 'category_uuid=deadbeef1,deadbeef2' }
-            it_behaves_like 'subject_equivalent_to', ActiveBook.where(category_uuid: ['deadbeef1','deadbeef2'])
+            it_behaves_like 'subject_equivalent_to', ActiveBook.where(category_uuid: %w[deadbeef1 deadbeef2])
           end
           context 'with fuzzy matching' do
             let(:filters_string) { 'category_uuid=*deadbeef1,deadbeef2*' }
             it 'is not supported' do
-              expect{
+              expect do
                 subject
-              }.to raise_error(
+              end.to raise_error(
                 Praxis::Extensions::AttributeFiltering::MultiMatchWithFuzzyNotAllowedByAdapter,
                 /Please use multiple OR clauses instead/
               )
@@ -100,7 +102,7 @@ describe Praxis::Extensions::AttributeFiltering::ActiveRecordFilterQueryBuilder
 
       context 'by a field or a related model' do
         context 'for a belongs_to association' do
-          let(:filters_string) { 'author.name=author2'}
+          let(:filters_string) { 'author.name=author2' }
           it_behaves_like 'subject_equivalent_to', ActiveBook.joins(:author).where('active_authors.name' => 'author2')
         end
         context 'for a has_many association' do
@@ -111,101 +113,143 @@ describe Praxis::Extensions::AttributeFiltering::ActiveRecordFilterQueryBuilder
           let(:filters_string) { 'tags.name=blue' }
           it_behaves_like 'subject_equivalent_to', ActiveBook.joins(:tags).where('active_tags.name' => 'blue')
         end
+
+        context 'by just an association filter condition' do
+          context 'for a belongs_to association with NO ROWS' do
+            let(:filters_string) { 'category!!' }
+            it_behaves_like 'subject_equivalent_to', ActiveBook.where.missing(:category)
+          end
+
+          context 'for a direct has_many association asking for missing rows' do
+            let(:filters_string) { 'primary_tags!!' }
+            it_behaves_like 'subject_equivalent_to',
+                            ActiveBook.where.missing(:primary_tags)
+          end
+          context 'for a direct has_many association asking for non-missing rows' do
+            let(:filters_string) { 'primary_tags!' }
+            it_behaves_like 'subject_equivalent_to',
+                            ActiveBook.left_outer_joins(:primary_tags).where.not('primary_tags.id' => nil)
+          end
+
+          context 'for a has_many through association with NO ROWS' do
+            let(:filters_string) { 'tags!!' }
+            it_behaves_like 'subject_equivalent_to', ActiveBook.where.missing(:tags)
+          end
+
+          context 'for a has_many through association with SOME ROWS' do
+            let(:filters_string) { 'tags!' }
+            it_behaves_like 'subject_equivalent_to', ActiveBook.left_outer_joins(:tags).where.not('tags.id' => nil)
+          end
+
+          context 'for a 3 levels deep has_many association with NO ROWS' do
+            let(:filters_string) { 'category.books.taggings!!' }
+            it_behaves_like 'subject_equivalent_to',
+                            ActiveBook.left_outer_joins(category: { books: :taggings }).where('category.books.taggings.id' => nil)
+          end
+
+          context 'for a 3 levels deep has_many association WITH SIME ROWS' do
+            let(:filters_string) { 'category.books.taggings!' }
+            it_behaves_like 'subject_equivalent_to',
+                            ActiveBook.left_outer_joins(category: { books: :taggings }).where.not('category.books.taggings.id' => nil)
+          end
+        end
       end
 
       # NOTE: apparently AR when conditions are build with strings in the where clauses (instead of names, etc)
       # it decides to parenthesize them, even when there's only 1 condition. Hence the silly parentization of
       # these SQL fragments here (and others)
       context 'by using all supported operators' do
+        # rubocop:disable Lint/ConstantDefinitionInBlock
         PREF = Praxis::Extensions::AttributeFiltering::ALIAS_TABLE_PREFIX
         COMMON_SQL_PREFIX = <<~SQL
-              SELECT "active_books".* FROM "active_books"
-              INNER JOIN
-                "active_authors" "#{PREF}/author" ON "#{PREF}/author"."id" = "active_books"."author_id"
-            SQL
+          SELECT "active_books".* FROM "active_books"
+          LEFT OUTER JOIN
+            "active_authors" "#{PREF}/author" ON "#{PREF}/author"."id" = "active_books"."author_id"
+        SQL
+        # rubocop:enable Lint/ConstantDefinitionInBlock
         context '=' do
-          let(:filters_string) { 'author.id=11'}
+          let(:filters_string) { 'author.id=11' }
           it_behaves_like 'subject_equivalent_to', ActiveBook.joins(:author).where('active_authors.id = 11')
           it_behaves_like 'subject_matches_sql', COMMON_SQL_PREFIX + <<~SQL
-              WHERE ("#{PREF}/author"."id" = 11)
-            SQL
+            WHERE ("#{PREF}/author"."id" IS NOT NULL) AND ("#{PREF}/author"."id" = 11)
+          SQL
         end
         context '= (with array)' do
-          let(:filters_string) { 'author.id=11,22'}
+          let(:filters_string) { 'author.id=11,22' }
           it_behaves_like 'subject_equivalent_to', ActiveBook.joins(:author).where('active_authors.id IN (11,22)')
           it_behaves_like 'subject_matches_sql', COMMON_SQL_PREFIX + <<~SQL
-              WHERE ("#{PREF}/author"."id" IN (11,22))
-            SQL
-        end      
+            WHERE ("#{PREF}/author"."id" IS NOT NULL) AND ("#{PREF}/author"."id" IN (11,22))
+          SQL
+        end
         context '!=' do
-          let(:filters_string) { 'author.id!=11'}
+          let(:filters_string) { 'author.id!=11' }
           it_behaves_like 'subject_equivalent_to', ActiveBook.joins(:author).where('active_authors.id <> 11')
           it_behaves_like 'subject_matches_sql', COMMON_SQL_PREFIX + <<~SQL
-              WHERE ("#{PREF}/author"."id" <> 11)
-            SQL
+            WHERE ("#{PREF}/author"."id" IS NOT NULL) AND ("#{PREF}/author"."id" <> 11)
+          SQL
         end
         context '!= (with array)' do
-          let(:filters_string) { 'author.id!=11,888'}
+          let(:filters_string) { 'author.id!=11,888' }
           it_behaves_like 'subject_equivalent_to', ActiveBook.joins(:author).where('active_authors.id NOT IN (11,888)')
           it_behaves_like 'subject_matches_sql', COMMON_SQL_PREFIX + <<~SQL
-              WHERE ("#{PREF}/author"."id" NOT IN (11,888))
-            SQL
+            WHERE ("#{PREF}/author"."id" IS NOT NULL) AND ("#{PREF}/author"."id" NOT IN (11,888))
+          SQL
         end
         context '>' do
-          let(:filters_string) { 'author.id>1'}
+          let(:filters_string) { 'author.id>1' }
           it_behaves_like 'subject_equivalent_to', ActiveBook.joins(:author).where('active_authors.id > 1')
           it_behaves_like 'subject_matches_sql', COMMON_SQL_PREFIX + <<~SQL
-              WHERE ("#{PREF}/author"."id" > 1)
-            SQL
+            WHERE ("#{PREF}/author"."id" IS NOT NULL) AND ("#{PREF}/author"."id" > 1)
+          SQL
         end
         context '<' do
-          let(:filters_string) { 'author.id<22'}
+          let(:filters_string) { 'author.id<22' }
           it_behaves_like 'subject_equivalent_to', ActiveBook.joins(:author).where('active_authors.id < 22')
           it_behaves_like 'subject_matches_sql', COMMON_SQL_PREFIX + <<~SQL
-              WHERE ("#{PREF}/author"."id" < 22)
-            SQL
+            WHERE ("#{PREF}/author"."id" IS NOT NULL) AND ("#{PREF}/author"."id" < 22)
+          SQL
         end
         context '>=' do
-          let(:filters_string) { 'author.id>=22'}
+          let(:filters_string) { 'author.id>=22' }
           it_behaves_like 'subject_equivalent_to', ActiveBook.joins(:author).where('active_authors.id >= 22')
           it_behaves_like 'subject_matches_sql', COMMON_SQL_PREFIX + <<~SQL
-              WHERE ("#{PREF}/author"."id" >= 22)
-            SQL
+            WHERE ("#{PREF}/author"."id" IS NOT NULL) AND ("#{PREF}/author"."id" >= 22)
+          SQL
         end
         context '<=' do
-          let(:filters_string) { 'author.id<=22'}
+          let(:filters_string) { 'author.id<=22' }
           it_behaves_like 'subject_equivalent_to', ActiveBook.joins(:author).where('active_authors.id <= 22')
           it_behaves_like 'subject_matches_sql', COMMON_SQL_PREFIX + <<~SQL
-              WHERE ("#{PREF}/author"."id" <= 22)
-            SQL
+            WHERE ("#{PREF}/author"."id" IS NOT NULL) AND ("#{PREF}/author"."id" <= 22)
+          SQL
         end
         context '!' do
-          let(:filters_string) { 'author.id!'}
+          let(:filters_string) { 'author.id!' }
           it_behaves_like 'subject_equivalent_to', ActiveBook.joins(:author).where('active_authors.id IS NOT NULL')
           it_behaves_like 'subject_matches_sql', COMMON_SQL_PREFIX + <<~SQL
-              WHERE ("#{PREF}/author"."id" IS NOT NULL)
-            SQL
+            WHERE ("#{PREF}/author"."id" IS NOT NULL) AND ("#{PREF}/author"."id" IS NOT NULL)
+          SQL
         end
         context '!!' do
-          let(:filters_string) { 'author.name!!'}
+          let(:filters_string) { 'author.name!!' }
           it_behaves_like 'subject_equivalent_to', ActiveBook.joins(:author).where('active_authors.name IS NULL')
           it_behaves_like 'subject_matches_sql', COMMON_SQL_PREFIX + <<~SQL
-              WHERE ("#{PREF}/author"."name" IS NULL)
-            SQL
-        end      
+            WHERE ("#{PREF}/author"."id" IS NOT NULL) AND ("#{PREF}/author"."name" IS NULL)
+          SQL
+        end
         context 'including LIKE fuzzy queries' do
           context 'LIKE' do
-            let(:filters_string) { 'author.name=author*'}
+            let(:filters_string) { 'author.name=author*' }
             it_behaves_like 'subject_equivalent_to', ActiveBook.joins(:author).where('active_authors.name LIKE "author%"')
             it_behaves_like 'subject_matches_sql', COMMON_SQL_PREFIX + <<~SQL
-              WHERE ("#{PREF}/author"."name" LIKE 'author%')
+              WHERE ("#{PREF}/author"."id" IS NOT NULL) AND ("#{PREF}/author"."name" LIKE 'author%')
             SQL
           end
           context 'NOT LIKE' do
-            let(:filters_string) { 'author.name!=foobar*'}
+            let(:filters_string) { 'author.name!=foobar*' }
             it_behaves_like 'subject_equivalent_to', ActiveBook.joins(:author).where('active_authors.name NOT LIKE "foobar%"')
             it_behaves_like 'subject_matches_sql', COMMON_SQL_PREFIX + <<~SQL
-              WHERE ("#{PREF}/author"."name" NOT LIKE 'foobar%')
+              WHERE ("#{PREF}/author"."id" IS NOT NULL) AND ("#{PREF}/author"."name" NOT LIKE 'foobar%')
             SQL
           end
         end
@@ -223,28 +267,28 @@ describe Praxis::Extensions::AttributeFiltering::ActiveRecordFilterQueryBuilder
         end
         context 'multiple conditions on a nested relationship' do
           let(:filters_string) { 'category.books.taggings.tag_id=1&category.books.taggings.label=primary' }
-          it_behaves_like 'subject_equivalent_to', 
-            ActiveBook.joins(category: { books: :taggings }).where('active_taggings.tag_id': 1).where('active_taggings.label': 'primary')
+          it_behaves_like 'subject_equivalent_to',
+                          ActiveBook.joins(category: { books: :taggings }).where('active_taggings.tag_id': 1).where('active_taggings.label': 'primary')
           it_behaves_like 'subject_matches_sql', <<~SQL
-              SELECT "active_books".* FROM "active_books"
-                INNER JOIN "active_categories" ON "active_categories"."uuid" = "active_books"."category_uuid"
-                INNER JOIN "active_books" "books_active_categories" ON "books_active_categories"."category_uuid" = "active_categories"."uuid"
-                INNER JOIN "active_taggings" "#{PREF}/category/books/taggings" ON "/category/books/taggings"."book_id" = "books_active_categories"."id"
-                WHERE ("#{PREF}/category/books/taggings"."tag_id" = 1)
-                AND ("#{PREF}/category/books/taggings"."label" = 'primary')
-            SQL
+            SELECT "active_books".* FROM "active_books"
+              LEFT OUTER JOIN "active_categories" ON "active_categories"."uuid" = "active_books"."category_uuid"
+              LEFT OUTER JOIN "active_books" "books_active_categories" ON "books_active_categories"."category_uuid" = "active_categories"."uuid"
+              LEFT OUTER JOIN "active_taggings" "#{PREF}/category/books/taggings" ON "/category/books/taggings"."book_id" = "books_active_categories"."id"
+              WHERE ("#{PREF}/category/books/taggings"."id" IS NOT NULL) AND ("#{PREF}/category/books/taggings"."tag_id" = 1)
+              AND ("#{PREF}/category/books/taggings"."label" = 'primary')
+          SQL
         end
         context 'that contain multiple joins to the same table' do
           let(:filters_string) { 'taggings.tag.taggings.tag_id=1' }
-          it_behaves_like 'subject_equivalent_to', 
-            ActiveBook.joins(taggings: {tag: :taggings}).where('taggings_active_tags.tag_id=1')
+          it_behaves_like 'subject_equivalent_to',
+                          ActiveBook.joins(taggings: { tag: :taggings }).where('taggings_active_tags.tag_id=1')
         end
       end
 
       context 'by multiple fields' do
         context 'adds the where clauses for the top model if fields belong to it' do
           let(:filters_string) { 'category_uuid=deadbeef1&name=Book1' }
-          it_behaves_like 'subject_equivalent_to', ActiveBook.where(category_uuid: 'deadbeef1',  simple_name: 'Book1')
+          it_behaves_like 'subject_equivalent_to', ActiveBook.where(category_uuid: 'deadbeef1', simple_name: 'Book1')
         end
         context 'adds multiple where clauses for same nested relationship join (instead of multiple joins with 1 clause each)' do
           let(:filters_string) { 'taggings.label=primary&taggings.tag_id=2' }
@@ -256,25 +300,24 @@ describe Praxis::Extensions::AttributeFiltering::ActiveRecordFilterQueryBuilder
         context 'when we have a join table condition that has the same field' do
           let(:filters_string) { 'name=Book1&category.books.name=Book3' }
           it_behaves_like 'subject_equivalent_to', ActiveBook.joins(category: :books)
-                                                    .where('simple_name': 'Book1')
-                                                    .where('books_active_categories.simple_name': 'Book3')
+                                                             .where('simple_name': 'Book1')
+                                                             .where('books_active_categories.simple_name': 'Book3')
           it_behaves_like 'subject_matches_sql', <<~SQL
-              SELECT "active_books".* FROM "active_books"
-                INNER JOIN "active_categories" ON "active_categories"."uuid" = "active_books"."category_uuid"
-                INNER JOIN "active_books" "#{PREF}/category/books" ON "#{PREF}/category/books"."category_uuid" = "active_categories"."uuid"    
-              WHERE ("active_books"."simple_name" = 'Book1')
-              AND ("#{PREF}/category/books"."simple_name" = 'Book3')
-            SQL
+            SELECT "active_books".* FROM "active_books"
+              LEFT OUTER JOIN "active_categories" ON "active_categories"."uuid" = "active_books"."category_uuid"
+              LEFT OUTER JOIN "active_books" "#{PREF}/category/books" ON "#{PREF}/category/books"."category_uuid" = "active_categories"."uuid"#{'    '}
+            WHERE ("active_books"."simple_name" = 'Book1')
+            AND ("#{PREF}/category/books"."id" IS NOT NULL) AND ("#{PREF}/category/books"."simple_name" = 'Book3')
+          SQL
         end
 
-        context 'it qualifis them even if there are no joined tables/conditions at all' do
-          let(:filters_string) { 'id=11'}
+        context 'it qualifies them even if there are no joined tables/conditions at all' do
+          let(:filters_string) { 'id=11' }
           it_behaves_like 'subject_matches_sql', <<~SQL
             SELECT "active_books".* FROM "active_books"
               WHERE ("active_books"."id" = 11)
-            SQL
+          SQL
         end
-
       end
     end
 
@@ -290,14 +333,14 @@ describe Praxis::Extensions::AttributeFiltering::ActiveRecordFilterQueryBuilder
       context 'adds multiple where clauses for same nested relationship join (instead of multiple joins with 1 clause each)' do
         let(:filters_string) { 'taggings.label=primary|taggings.tag_id=2' }
         it_behaves_like 'subject_equivalent_to', ActiveBook.joins(:taggings).where('active_taggings.label' => 'primary')
-                                                .or(ActiveBook.joins(:taggings).where('active_taggings.tag_id' => 2))        
+                                                           .or(ActiveBook.joins(:taggings).where('active_taggings.tag_id' => 2))
       end
     end
 
     context 'with combined AND and OR conditions' do
       let(:filters_string) { '(category_uuid=deadbeef1|category_uuid=deadbeef2)&(name=Book1|name=Book2)' }
       it_behaves_like 'subject_equivalent_to', ActiveBook.where(category_uuid: 'deadbeef1').or(ActiveBook.where(category_uuid: 'deadbeef2'))
-                                              .and(ActiveBook.where(simple_name: 'Book1').or(ActiveBook.where(simple_name: 'Book2')))
+                                                         .and(ActiveBook.where(simple_name: 'Book1').or(ActiveBook.where(simple_name: 'Book2')))
       it_behaves_like 'subject_matches_sql', <<~SQL
         SELECT "active_books".* FROM "active_books"
           WHERE ("active_books"."category_uuid" = 'deadbeef1' OR "active_books"."category_uuid" = 'deadbeef2')
@@ -307,47 +350,63 @@ describe Praxis::Extensions::AttributeFiltering::ActiveRecordFilterQueryBuilder
       context 'adds multiple where clauses for same nested relationship join (instead of multiple joins with 1 clause each)' do
         let(:filters_string) { 'taggings.label=primary|taggings.tag_id=2' }
         it_behaves_like 'subject_equivalent_to', ActiveBook.joins(:taggings).where('active_taggings.label' => 'primary')
-                                                .or(ActiveBook.joins(:taggings).where('active_taggings.tag_id' => 2))
+                                                           .or(ActiveBook.joins(:taggings).where('active_taggings.tag_id' => 2))
+        it_behaves_like 'subject_matches_sql', <<~SQL
+          SELECT "active_books".* FROM "active_books"
+            LEFT OUTER JOIN "active_taggings" "/taggings" ON "/taggings"."book_id" = "active_books"."id"
+            WHERE ("/taggings"."id" IS NOT NULL) AND ("/taggings"."label" = 'primary' OR "/taggings"."tag_id" = 2)
+        SQL
+      end
+
+      context 'works well with ORs at a parent table along with joined associations with no rows' do
+        let(:filters_string) { 'name=Book1005|category!!' }
+        it_behaves_like 'subject_equivalent_to', ActiveBook.where.missing(:category)
+                                                           .or(ActiveBook.where.missing(:category).where(simple_name: 'Book1005'))
         it_behaves_like 'subject_matches_sql', <<~SQL
           SELECT "active_books".* FROM "active_books"
-            INNER JOIN "active_taggings" "/taggings" ON "/taggings"."book_id" = "active_books"."id"
-            WHERE ("/taggings"."label" = 'primary' OR "/taggings"."tag_id" = 2)
+            LEFT OUTER JOIN "active_categories" "/category" ON "/category"."uuid" = "active_books"."category_uuid"
+            WHERE ("active_books"."simple_name" = 'Book1005' OR "/category"."uuid" IS NULL)
         SQL
       end
 
       context '3-deep AND and OR conditions' do
         let(:filters_string) { '(category.name=cat2|(taggings.label=primary&tags.name=red))&category_uuid=deadbeef1' }
-        it_behaves_like('subject_equivalent_to', Proc.new do
-          base=ActiveBook.joins(:category,:taggings,:tags)
+        it_behaves_like('subject_equivalent_to', proc do
+          base = ActiveBook.left_outer_joins(:category, :taggings, :tags)
 
-          and1_or1 = base.where('category.name': 'cat2')
+          and1_or1 = base.where('category.name': 'cat2').where.not('category.uuid': nil)
 
-          and1_or2_and1 = base.where('taggings.label': 'primary')
-          and1_or2_and2 = base.where('tags.name': 'red')
+          and1_or2_and1 = base.where('taggings.label': 'primary').where.not('taggings.id': nil)
+          and1_or2_and2 = base.where('tags.name': 'red').where.not('tags.id': nil)
           and1_or2 = and1_or2_and1.and(and1_or2_and2)
 
           and1 = and1_or1.or(and1_or2)
-          and2=base.where(category_uuid: 'deadbeef1')
+          and2 = base.where(category_uuid: 'deadbeef1')
 
-          query = and1.and(and2)
+          and1.and(and2)
         end)
 
         it_behaves_like 'subject_matches_sql', <<~SQL
-        SELECT "active_books".* FROM "active_books" 
-          INNER JOIN "active_categories" "/category" ON "/category"."uuid" = "active_books"."category_uuid" 
-          INNER JOIN "active_taggings" "/taggings" ON "/taggings"."book_id" = "active_books"."id" 
-          INNER JOIN "active_taggings" "taggings_active_books_join" ON "taggings_active_books_join"."book_id" = "active_books"."id" 
-          INNER JOIN "active_tags" "/tags" ON "/tags"."id" = "taggings_active_books_join"."tag_id"         
-          WHERE ("/category"."name" = 'cat2' OR ("/taggings"."label" = 'primary') AND ("/tags"."name" = 'red')) AND ("active_books"."category_uuid" = 'deadbeef1')
+          SELECT "active_books".* FROM "active_books"#{' '}
+            LEFT OUTER JOIN "active_categories" "/category" ON "/category"."uuid" = "active_books"."category_uuid"#{' '}
+            LEFT OUTER JOIN "active_taggings" "/taggings" ON "/taggings"."book_id" = "active_books"."id"#{' '}
+            LEFT OUTER JOIN "active_tags" "/tags" ON "/tags"."id" = "/taggings"."tag_id"#{'         '}
+            WHERE (("/category"."uuid" IS NOT NULL)
+                  AND ("/category"."name" = 'cat2')
+                    OR ("/taggings"."id" IS NOT NULL)
+                        AND ("/taggings"."label" = 'primary')
+                        AND ("/tags"."id" IS NOT NULL)
+                        AND ("/tags"."name" = 'red'))
+                  AND ("active_books"."category_uuid" = 'deadbeef1')#{' '}
         SQL
       end
     end
 
     context 'ActiveRecord continues to work as expected (with our patches)' do
       context 'using a deep join with repeated tables' do
-        subject{ ActiveBook.joins(taggings: {tag: :taggings}).where('taggings_active_tags.tag_id=1') }
+        subject { ActiveBook.joins(taggings: { tag: :taggings }).where('taggings_active_tags.tag_id=1') }
         it 'performs query' do
-          expect(subject.to_a).to_not be_empty 
+          expect(subject.to_a).to_not be_empty
         end
         it_behaves_like 'subject_matches_sql', <<~SQL
           SELECT "active_books".* FROM "active_books"
@@ -358,19 +417,19 @@ describe Praxis::Extensions::AttributeFiltering::ActiveRecordFilterQueryBuilder
         SQL
       end
       context 'a deep join with repeated tables with the root AND the join, along with :through joins as well' do
-        subject!{ ActiveBook.joins(tags: {books: {taggings: :book}}).where('books_active_taggings.simple_name="Book2"') }
+        subject! { ActiveBook.joins(tags: { books: { taggings: :book } }).where('books_active_taggings.simple_name="Book2"') }
         it 'performs query' do
-          expect(subject.to_a).to_not be_empty 
+          expect(subject.to_a).to_not be_empty
         end
         it_behaves_like 'subject_matches_sql', <<~SQL
-          SELECT "active_books".* FROM "active_books" 
+          SELECT "active_books".* FROM "active_books"#{' '}
                INNER JOIN "active_taggings" ON "active_taggings"."book_id" = "active_books"."id"
                INNER JOIN "active_tags" ON "active_tags"."id" = "active_taggings"."tag_id"
-               INNER JOIN "active_taggings" "taggings_active_tags_join" ON "taggings_active_tags_join"."tag_id" = "active_tags"."id" 
-               INNER JOIN "active_books" "books_active_tags" ON "books_active_tags"."id" = "taggings_active_tags_join"."book_id" 
-               INNER JOIN "active_taggings" "taggings_active_books" ON "taggings_active_books"."book_id" = "books_active_tags"."id" 
+               INNER JOIN "active_taggings" "taggings_active_tags_join" ON "taggings_active_tags_join"."tag_id" = "active_tags"."id"#{' '}
+               INNER JOIN "active_books" "books_active_tags" ON "books_active_tags"."id" = "taggings_active_tags_join"."book_id"#{' '}
+               INNER JOIN "active_taggings" "taggings_active_books" ON "taggings_active_books"."book_id" = "books_active_tags"."id"#{' '}
                INNER JOIN "active_books" "books_active_taggings" ON "books_active_taggings"."id" = "taggings_active_books"."book_id"
-               WHERE (books_active_taggings.simple_name="Book2")             
+               WHERE (books_active_taggings.simple_name="Book2")#{'             '}
         SQL
       end
     end
@@ -378,8 +437,8 @@ describe Praxis::Extensions::AttributeFiltering::ActiveRecordFilterQueryBuilder
     context 'respects scopes' do
       context 'for a has_many through association' do
         let(:filters_string) { 'primary_tags.name=blue' }
-        it_behaves_like 'subject_equivalent_to', 
-          ActiveBook.joins(:primary_tags).where('active_tags.name="blue"')
+        it_behaves_like 'subject_equivalent_to',
+                        ActiveBook.joins(:primary_tags).where('active_tags.name="blue"')
 
         it 'adds the association scope clause to the join' do
           inner_join_pieces = subject.to_sql.split('INNER')
@@ -391,12 +450,68 @@ describe Praxis::Extensions::AttributeFiltering::ActiveRecordFilterQueryBuilder
         # This is slightly incorrect in AR 6.1+ (since the picked aliases for active_taggings tables vary)
         # it_behaves_like 'subject_matches_sql', <<~SQL
         #   SELECT "active_books".* FROM "active_books"
-        #     INNER JOIN "active_taggings" ON "active_taggings"."label" = 'primary'
+        #     LEFT OUTER JOIN "active_taggings" ON "active_taggings"."label" = 'primary'
         #                 AND "active_taggings"."book_id" = "active_books"."id"
-        #     INNER JOIN "active_tags" "/primary_tags" ON "/primary_tags"."id" = "active_taggings"."tag_id"
+        #     LEFT OUTER JOIN "active_tags" "/primary_tags" ON "/primary_tags"."id" = "active_taggings"."tag_id"
         #     WHERE ("/primary_tags"."name" = 'blue')
         # SQL
       end
     end
   end
+
+  context '.valid_path?' do
+    it 'suceeds for reachable model columns' do
+      expect(described_class.valid_path?(ActiveBook, ['added_column'])).to be_truthy
+      expect(described_class.valid_path?(ActiveBook, %w[author books added_column])).to be_truthy
+      expect(described_class.valid_path?(ActiveBook, %w[author books simple_name])).to be_truthy
+    end
+    it 'suceeds for reachable leaf associations' do
+      expect(described_class.valid_path?(ActiveBook, ['author'])).to be_truthy
+      expect(described_class.valid_path?(ActiveBook, %w[author books])).to be_truthy
+    end
+    it 'returns false for invalid model columns' do
+      expect(described_class.valid_path?(ActiveBook, ['not_a_column'])).to be_falsy
+      expect(described_class.valid_path?(ActiveBook, %w[author books not_here])).to be_falsy
+      expect(described_class.valid_path?(ActiveBook, %w[author books name])).to be_falsy
+    end
+  end
+
+  context '_mapped_filter' do
+    let(:root_resource) { ActiveBookResource }
+    let(:filters_map) { root_resource.instance_variable_get(:@_filters_map) }
+
+    context 'for explicitly mapped values' do
+      %i[id name name_is_not author.name category.books.taggings.label]
+        .each do |name|
+        it "suceeds for #{name}" do
+          mapped_value = filters_map[name]
+          expect(mapped_value).to_not be_nil
+          expect(instance.send(:_mapped_filter, name)).to eq(mapped_value)
+        end
+      end
+    end
+
+    context 'for not mapped values' do
+      context 'that are valid model columns/associations paths' do
+        %i[added_column author.books.added_column author.books].each do |name|
+          it "returns (and caches) the same valid path for #{name}" do
+            expect(filters_map[name]).to be_nil
+            expect(instance.send(:_mapped_filter, name)).to eq(name)
+
+            expect(filters_map[name]).to eq(name)
+          end
+        end
+      end
+      context 'that are not model columns/associations paths' do
+        %i[not_a_column author.books.not_here].each do |name|
+          it "returns nil (and does not cache) for #{name}" do
+            expect(filters_map[name]).to be_nil
+            expect(instance.send(:_mapped_filter, name)).to eq(nil)
+
+            expect(filters_map[name]).to eq(nil)
+          end
+        end
+      end
+    end
+  end
 end

data/spec/praxis/extensions/attribute_filtering/filter_tree_node_spec.rb

@@ -1,18 +1,19 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 require 'praxis/extensions/attribute_filtering'
 
 describe Praxis::Extensions::AttributeFiltering::FilterTreeNode do
-
-  let(:dummy_object) { double("Fake NodeObject")}
+  let(:dummy_object) { double('Fake NodeObject') }
   let(:filters) do
     [
-      {name: 'one', op: '>', value: 1, node_object: dummy_object},
-      {name: 'one', op: '<', value: 10},
-      {name: 'rel1.a1', op: '=', value: 1},
-      {name: 'rel1.a2', op: '=', value: 2},
-      {name: 'rel1.rel2.b1', op: '=', value: 11},
-      {name: 'rel1.rel2.b2', op: '=', value: 12, node_object: dummy_object}
+      { name: 'one', op: '>', value: 1, node_object: dummy_object },
+      { name: 'one', op: '<', value: 10 },
+      { name: 'rel1.a1', op: '=', value: 1 },
+      { name: 'rel1.a2', op: '=', value: 2 },
+      { name: 'rel1.rel2.b1', op: '=', value: 11 },
+      { name: 'rel1.rel2.b2', op: '=', value: 12, node_object: dummy_object }
     ]
   end
   context 'initialization' do
@@ -20,10 +21,10 @@ describe Praxis::Extensions::AttributeFiltering::FilterTreeNode do
     it 'holds the top conditions and the child in a TreeNode' do
       expect(subject.path).to eq([])
       expect(subject.conditions.size).to eq(2)
-      expect(subject.conditions.map{|i| i.slice(:name,:op,:value)}).to eq([
-        {name: 'one', op: '>', value: 1},
-        {name: 'one', op: '<', value: 10},
-      ])
+      expect(subject.conditions.map { |i| i.slice(:name, :op, :value) }).to eq([
+                                                                                 { name: 'one', op: '>', value: 1 },
+                                                                                 { name: 'one', op: '<', value: 10 }
+                                                                               ])
       expect(subject.children.keys).to eq(['rel1'])
       expect(subject.children['rel1']).to be_kind_of(described_class)
     end
@@ -38,20 +39,20 @@ describe Praxis::Extensions::AttributeFiltering::FilterTreeNode do
       rel1 = subject.children['rel1']
       expect(rel1.path).to eq(['rel1'])
       expect(rel1.conditions.size).to eq(2)
-      expect(rel1.conditions.map{|i| i.slice(:name,:op,:value)}).to eq([
-        {name: 'a1', op: '=', value: 1},
-        {name: 'a2', op: '=', value: 2},
-      ])
+      expect(rel1.conditions.map { |i| i.slice(:name, :op, :value) }).to eq([
+                                                                              { name: 'a1', op: '=', value: 1 },
+                                                                              { name: 'a2', op: '=', value: 2 }
+                                                                            ])
       expect(rel1.children.keys).to eq(['rel2'])
       expect(rel1.children['rel2']).to be_kind_of(described_class)
 
       rel1rel2 = rel1.children['rel2']
-      expect(rel1rel2.path).to eq(['rel1','rel2'])
+      expect(rel1rel2.path).to eq(%w[rel1 rel2])
       expect(rel1rel2.conditions.size).to eq(2)
-      expect(rel1rel2.conditions.map{|i| i.slice(:name,:op,:value)}).to eq([
-        {name: 'b1', op: '=', value: 11},
-        {name: 'b2', op: '=', value: 12}  
-      ])      
+      expect(rel1rel2.conditions.map { |i| i.slice(:name, :op, :value) }).to eq([
+                                                                                  { name: 'b1', op: '=', value: 11 },
+                                                                                  { name: 'b2', op: '=', value: 12 }
+                                                                                ])
       expect(rel1rel2.children.keys).to be_empty
     end
   end