forest_liana 3.0.7 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68c604c785dc5716cc0d25fc8455229f17f3527f
-  data.tar.gz: e465903c0cca6fb01b29afb9fb364992e3b94571
+  metadata.gz: aa10ea49b5d651340708ab73c554511cd70338c3
+  data.tar.gz: acb4a3b7f02ea2032edfe4522ffcb5c05e0ae8c1
 SHA512:
-  metadata.gz: bd8e47833cb78385383c663d29d8ec7d45e459f06d5edbc2ac4423ce8243dd2d5ca197cea469beef25e03e79a6004853e5b1ef709e80df074d2465edb0bbd057
-  data.tar.gz: 86d71299a258e38f083e67aa3fbfba77d5a87cf49922f0ff1665a2b1164351dd470b8b7feeae34f148faa36cfd0503a41630e460ecfa10fe09722a164386fea0
+  metadata.gz: 4c1bea91f48f1d78e93ef4ab74ed177d84193c82bc48cd632272d0dfd5e64c75d8c7031f5190c7edbdc3d9027c8a35b5eddd23a6f1b425d07c459d282a9ab9b8
+  data.tar.gz: c26d013d000f2c7c3eb4e9a40e086f9664e77bc426f56b106fe8c878b618421d17ed9e242c200b9ed33c25ba7fa35a8213527270c43708e7e0a72ec4b05fcd66

data/app/services/forest_liana/search_query_builder.rb

@@ -17,9 +17,8 @@ module ForestLiana
       @tables_associated_to_relations_name =
         ForestLiana::QueryHelper.get_tables_associated_to_relations_name(@resource)
       @records = search_param
-      @records = filter_param
       @records = has_many_filter
-      @records = belongs_to_filter
+      @records = belongs_to_and_params_filter
 
       if @search
         ForestLiana.schema_for_resource(@resource).fields.each do |field|
@@ -37,6 +36,11 @@ module ForestLiana
       @records
     end
 
+    def belongs_to_and_params_filter
+      conditions = filter_param + belongs_to_filter
+      @records.where(conditions.join(" #{@params[:filterType]} ".upcase))
+    end
+
     def format_column_name(table_name, column_name)
       ForestLiana::AdapterHelper.format_column_name(table_name, column_name)
     end
@@ -151,8 +155,9 @@ module ForestLiana
     end
 
     def filter_param
+      conditions = []
+
       if @params[:filterType] && @params[:filter]
-        conditions = []
 
         @params[:filter].each do |field, values|
           # ActsAsTaggable
@@ -174,12 +179,9 @@ module ForestLiana
             end
           end
         end
-
-        operator = " #{@params[:filterType]} ".upcase
-        @records = @records.where(conditions.join(operator))
       end
 
-      @records
+      conditions
     end
 
     def association?(field)
@@ -257,23 +259,20 @@ module ForestLiana
       [:belongs_to, :has_one].include?(association.try(:macro))
     end
 
-    def belongs_to_subfield_filter(field, value)
-      condition = OperatorValueParser.get_has_one_condition(@resource, field, value, @params[:timezone])
-      @records.where(condition) if condition
-    end
-
     def belongs_to_filter
+      conditions = []
+
       if @params[:filter]
         @params[:filter].each do |field, values|
           next unless belongs_to_association?(field)
 
           values.split(',').each do |value|
-            @records = belongs_to_subfield_filter(field, value)
+            conditions << OperatorValueParser.get_has_one_condition(@resource, field, value, @params[:timezone])
           end
         end
       end
 
-      @records
+      conditions
     end
 
     private

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "3.0.7"
+  VERSION = "3.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 3.0.7
+  version: 3.1.0
 platform: ruby
 authors:
 - Sandro Munda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-20 00:00:00.000000000 Z
+date: 2019-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails