graphql-activerecord 0.12.1 → 0.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47f8e83319aae9878a416eff9f3064a853b5da90
-  data.tar.gz: 656cbb121487a505e7a2b6fe020276de5e0bae49
+  metadata.gz: 6c83f3a8016448bb97d1e15a2e4c3958ab631725
+  data.tar.gz: 0f4683f753d5a45a3b9c5d473cb3c2546dd833e7
 SHA512:
-  metadata.gz: d86830043d4611c1dcd65e389df5de4b24e33eaa83cf1db4fb896b2d792e8526d413ee63cb2a7a31002866321e345b5e0b17d16f1b499119b28550c4d858c1c7
-  data.tar.gz: f7a3021d4f63b117e5fe4f58e620a22256544396cbf5f9c980f1bcc41b12cefd5e143ddd9e859937bc3e1acaba36b7af70c00ec4e9bb7e66664e1e7e6153c9be
+  metadata.gz: f29777ba30b72b285a24fff31fc6e8354e7f85cef43d2355dc88b4e405e45284e044b1acc0a9cad0027e734b6eb93d00baed3129fa246649372656684549fd4e
+  data.tar.gz: 8add41735a53eb7ff17bb291a0f0c6f12a6e70dc2093515f2c8cf099fcdbb4702fcaaf2b081a211c98c54431fea87ba0123dceb22ce5114e468883514150aa05

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+# 0.12.2
+In mutators, the gem now supports updating nested models, where the `find_by` option specifies an ID field. This works similarly
+to input fields that accept ID values: it expects a global ID value to be provided, and uses your configured `model_from_id` proc
+to get the model's database ID.
+
 # 0.12.1
 Updates the gemspec to support Rails 5
 

data/README.md

@@ -374,8 +374,8 @@ nested :emergency_contacts, find_by: :priority, null_behavior: :set_null do
 end
 ```
 
-This causes the gem to automatically include `priority` as an input field. Unfortunately, the only field you _can't_ use is the
-`id` field, because the gem isn't smart enough to map global ID's to model ID's. (This will be supported eventually, though.)
+This causes the gem to automatically include `priority` as an input field. You could also manually specify the
+`priority` field if you wanted to override its name or type.
 
 Also, an important note is that the gem assumes that you are passing up _all_ of the associated models, and not just some of
 them. It will destroy extra models, or create missing models.

data/lib/graphql/models/mutation_field_map.rb

@@ -48,12 +48,15 @@ module GraphQL::Models
 
       detect_field_conflict(name)
 
-      fields.push({
+      # Delete the field, if it's already in the map
+      fields.reject! { |fd| fd[:attribute] == attribute }
+
+      fields << {
         name: name,
         attribute: attribute,
         type: type,
         required: required,
-      })
+      }
     end
 
     def proxy_to(association, &block)

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

@@ -51,7 +51,7 @@ module GraphQL::Models
       return [] if next_inputs.nil? && parent_map.leave_null_unchanged?
 
       changes = []
-      matches = match_inputs_to_models(parent_model, child_map, next_inputs, changes)
+      matches = match_inputs_to_models(parent_model, child_map, next_inputs, changes, context)
 
       matches.each do |match|
         next if match[:child_model].nil? && match[:child_inputs].nil?
@@ -70,7 +70,7 @@ module GraphQL::Models
       changes
     end
 
-    def self.match_inputs_to_models(model, child_map, next_inputs, changes)
+    def self.match_inputs_to_models(model, child_map, next_inputs, changes, context)
       if !child_map.has_many
         child_model = model.public_send(child_map.association)
 
@@ -104,7 +104,7 @@ module GraphQL::Models
         if find_by.empty?
           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)
+          return match_inputs_by_fields(model, child_map, next_inputs, changes, associated_models, find_by, context)
         end
       end
     end
@@ -134,7 +134,7 @@ module GraphQL::Models
       matches
     end
 
-    def self.match_inputs_by_fields(_model, child_map, next_inputs, changes, associated_models, find_by)
+    def self.match_inputs_by_fields(_model, child_map, next_inputs, changes, associated_models, find_by, context)
       # 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
@@ -145,8 +145,20 @@ module GraphQL::Models
       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]
+        attr_key = {}
+        key.each do |name, val|
+          # If the input is a Relay ID, convert it to the model's ordinary ID first. Note, this is
+          # less than optimal, because it has to fetch the model and then just get its id :(
+          field_def = find_by_defs.detect { |d| d[:name] == name }
+          if val && field_def[:type].unwrap == GraphQL::ID_TYPE
+            val = relay_id_to_model_id(val, context)
+            raise GraphQL::ExecutionError, "The value provided for #{field_def[:name]} does not refer to a valid model." unless val
+          end
+
+          attr_key[name_to_attr[name]] = val
+        end
+
+        [attr_key, inputs]
       end
 
       indexed_inputs = indexed_inputs.to_h
@@ -154,8 +166,6 @@ module GraphQL::Models
       # 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
-
       indexed_models.each do |key_attrs, child_model|
         inputs = indexed_inputs[key_attrs]
 
@@ -204,13 +214,10 @@ module GraphQL::Models
     def self.apply_field_value(model, field_def, value, context, changes)
       # Special case: If this is an ID field, get the ID from the target model
       if value.present? && field_def[:type].unwrap == GraphQL::ID_TYPE
-        target_model = GraphQL::Models.model_from_id.call(value, context)
-
-        unless target_model
+        value = relay_id_to_model_id(value, context)
+        unless value
           raise GraphQL::ExecutionError, "The value provided for #{field_def[:name]} does not refer to a valid model."
         end
-
-        value = target_model.id
       end
 
       unless model.public_send(field_def[:attribute]) == value
@@ -251,5 +258,10 @@ module GraphQL::Models
 
       values
     end
+
+    def self.relay_id_to_model_id(relay_id, context)
+      target_model = GraphQL::Models.model_from_id.call(relay_id, context)
+      target_model&.id
+    end
   end
 end

data/lib/graphql/models/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module GraphQL
   module Models
-    VERSION = "0.12.1"
+    VERSION = "0.12.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-activerecord
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.12.2
 platform: ruby
 authors:
 - Ryan Foster
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-17 00:00:00.000000000 Z
+date: 2017-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport