Merge pull request #204 from richmolj/master

Ensure multiple filters work with legacy syntax

Author: richmolj

lib/graphiti/query.rb

@@ -126,10 +126,13 @@ def filters
             name = name.to_sym
 
             if legacy_nested?(name)
-              filter_name = value.keys.first.to_sym
-              filter_value = value.values.first
-              if @resource.get_attr!(filter_name, :filterable, request: true)
-                hash[filter_name] = filter_value
+              value.keys.each do |key|
+                filter_name = key.to_sym
+                filter_value = value[key]
+
+                if @resource.get_attr!(filter_name, :filterable, request: true)
+                  hash[filter_name] = filter_value
+                end
               end
             elsif nested?(name)
               name = name.to_s.split(".").last.to_sym

lib/graphiti/version.rb

@@ -1,3 +1,3 @@
 module Graphiti
-  VERSION = "1.2.14"
+  VERSION = "1.2.15"
 end

spec/query_spec.rb

@@ -265,6 +265,17 @@
           expect(hash).to eq(expected)
         end
 
+        context 'with multiple filters' do
+          before do
+            params[:filter][:positions][:id] = 4
+          end
+
+          it 'keeps both filters' do
+            expect(hash[:include][:positions][:filter])
+              .to eq(title: 'bar', id: 4)
+          end
+        end
+
         context "with stringified keys" do
           before do
             params.deep_stringify_keys!