graphql-activerecord 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bcecb2063effc41338f80d629d054c2c0e6c6881
-  data.tar.gz: 8d7d98648bbf801ef9d9ed4a88fde65c0728e22f
+  metadata.gz: 8e580775093b61f44e8c119e6cdba9c551877841
+  data.tar.gz: 6d8dfe863f25e8345e1724fcdf636c8d3237712b
 SHA512:
-  metadata.gz: e0f38f3e7fe6c173fbc2980b3117f9344232ca68bdd4f48758d06c337d482232a5019934ce75ae2eb38c7671ca275776c902ac34f22d78857a30db4119dde8b3
-  data.tar.gz: 86731a8685dc5a008cfbe03f7a898f99561cda12dc31614222c87cf823749e688dfe0c83c24351e1da42ca8fde92ce59f78dcd4a0e0f29b5fe3572b7553b9c66
+  metadata.gz: 20f0318b73f6a2ac455cbe6e00af3560920b2cbc68886d93ae4cf370dc10d6709388399cd63ec64858082b59f26aaae5011a0b9322c94c4d198b5d14f3e361ef
+  data.tar.gz: 49d36558ff541fdf34b060e627d67bd9af2173c8e8597d4784477801819e70b0e8b5a1c492a3850da6e3d9e5bc36f518746661679cbe61235729ac05a4d82e0b

data/lib/graphql/models/mutation_helpers/apply_changes.rb

@@ -85,14 +85,14 @@ module GraphQL::Models
         find_by = Array.wrap(child_map.find_by).map(&:to_s)
 
         if find_by.empty?
-          return match_inputs_by_position(model, child_map, next_inputs, changes, associated_models, find_by)
+          return match_inputs_by_position(model, child_map, next_inputs, changes, associated_models)
         else
           return match_inputs_by_fields(model, child_map, next_inputs, changes, associated_models, find_by)
         end
       end
     end
 
-    def self.match_inputs_by_position(model, child_map, next_inputs, changes, associated_models, find_by)
+    def self.match_inputs_by_position(model, child_map, next_inputs, changes, associated_models)
       count = [associated_models.length, next_inputs.length].max
 
       matches = []
@@ -118,20 +118,30 @@ module GraphQL::Models
     end
 
     def self.match_inputs_by_fields(model, child_map, next_inputs, changes, associated_models, find_by)
-      grouped_models = associated_models.group_by { |m| m.attributes.slice(*find_by) }
-      grouped_inputs = next_inputs.group_by { |ni| ni.to_h.slice(*find_by) }
+      # Convert the find_by into the field definitions, so that we properly unmap aliased fields
+      find_by_defs = find_by.map { |name| child_map.fields.detect { |f| f[:attribute].to_s == name.to_s } }
+      name_to_attr = find_by_defs.map { |f| [f[:name], f[:attribute].to_s] }.to_h
+
+      indexed_models = associated_models.index_by { |m| m.attributes.slice(*find_by) }
+
+      # Inputs are a little nasty, the keys have to be converted from camelCase back to snake_case
+      indexed_inputs = next_inputs.index_by { |ni| ni.to_h.slice(*name_to_attr.keys) }
+
+      indexed_inputs = indexed_inputs.map do |key, inputs|
+        key = key.map { |name, val| [name_to_attr[name], val] }.to_h
+        [key, inputs]
+      end
+
+      indexed_inputs = indexed_inputs.to_h
 
       # Match each model to its input. If there is no input for it, mark that the model should be destroyed.
       matches = []
 
       # TODO: Support for finding by an ID field, that needs to be untranslated from a Relay ID into a model ID
 
-      grouped_models.each do |key_attrs, vals|
-        child_model = vals[0]
+      indexed_models.each do |key_attrs, child_model|
+        inputs = indexed_inputs[key_attrs]
 
-        inputs = grouped_inputs[key_attrs]
-        inputs = inputs[0] if inputs
-                
         if inputs.nil?
           child_model.mark_for_destruction
           changes.push({ model_instance: child_model, action: :destroy })
@@ -141,10 +151,9 @@ module GraphQL::Models
       end
 
       # Build a new model for each input that doesn't have a model
-      grouped_inputs.each do |key_attrs, vals|
-        inputs = vals[0]
+      indexed_inputs.each do |key_attrs, inputs|
+        next if indexed_models.include?(key_attrs)
 
-        next if grouped_models.include?(key_attrs)
         child_model = associated_models.build
         changes.push({ model_instance: child_model, action: :create })
         matches.push({ child_model: child_model, child_inputs: inputs, input_path: next_inputs.index(inputs) })

data/lib/graphql/models/version.rb

@@ -1,5 +1,5 @@
 module GraphQL
   module Models
-    VERSION = "0.5.4"
+    VERSION = "0.5.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-activerecord
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - Ryan Foster
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-18 00:00:00.000000000 Z
+date: 2016-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql