Fix deserialization of polymorphic relationships (#2200)

Dennis Stumm · bf4 · commit 4d7c2457d736 · 2017-10-07T17:03:38.000-05:00
* Classify the relationship type for polymorphic associations
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,7 @@ Features:
 Fixes:
 
 - [#2022](https://github.com/rails-api/active_model_serializers/pull/2022) Mutation of ActiveModelSerializers::Model now changes the attributes. Originally in [#1984](https://github.com/rails-api/active_model_serializers/pull/1984). (@bf4)
+- [#2200](https://github.com/rails-api/active_model_serializers/pull/2200) Fix deserialization of polymorphic relationships. (@dennis95stumm)
 
 Misc:
 
diff --git a/lib/active_model_serializers/adapter/json_api/deserialization.rb b/lib/active_model_serializers/adapter/json_api/deserialization.rb
@@ -189,7 +189,7 @@ def parse_relationship(assoc_name, assoc_data, options)
 
           polymorphic = (options[:polymorphic] || []).include?(assoc_name.to_sym)
           if polymorphic
-            hash["#{prefix_key}_type".to_sym] = assoc_data.present? ? assoc_data['type'] : nil
+            hash["#{prefix_key}_type".to_sym] = assoc_data.present? ? assoc_data['type'].classify : nil
           end
 
           hash
diff --git a/test/action_controller/json_api/deserialization_test.rb b/test/action_controller/json_api/deserialization_test.rb
@@ -45,7 +45,7 @@ def test_deserialization_of_relationship_only_object
           response = JSON.parse(@response.body)
           expected = {
             'restriction_for_id' => '67',
-            'restriction_for_type' => 'discounts',
+            'restriction_for_type' => 'Discount',
             'restricted_to_id' => nil,
             'restricted_to_type' => nil
           }
diff --git a/test/adapter/json_api/parse_test.rb b/test/adapter/json_api/parse_test.rb
@@ -125,7 +125,7 @@ def test_polymorphic
               src: 'http://example.com/images/productivity.png',
               author_id: nil,
               photographer_id: '9',
-              photographer_type: 'people',
+              photographer_type: 'Person',
               comment_ids: %w(1 2)
             }
             assert_equal(expected, parsed_hash)

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ def test_deserialization_of_relationship_only_object`
`45`	`45`	`response = JSON.parse(@response.body)`
`46`	`46`	`expected = {`
`47`	`47`	`'restriction_for_id' => '67',`
`48`		`- 'restriction_for_type' => 'discounts',`
	`48`	`+ 'restriction_for_type' => 'Discount',`
`49`	`49`	`'restricted_to_id' => nil,`
`50`	`50`	`'restricted_to_type' => nil`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ def test_polymorphic`
`125`	`125`	`src: 'http://example.com/images/productivity.png',`
`126`	`126`	`author_id: nil,`
`127`	`127`	`photographer_id: '9',`
`128`		`- photographer_type: 'people',`
	`128`	`+ photographer_type: 'Person',`
`129`	`129`	`comment_ids: %w(1 2)`
`130`	`130`	`}`
`131`	`131`	`assert_equal(expected, parsed_hash)`