fix bug with DataToParams include processing expecting more 'data' keys than the spec calls for

Author: mattpolzin

lib/jsonapi/utils/data_to_params.ex

@@ -94,8 +94,8 @@ defmodule JSONAPI.Utils.DataToParams do
 
   defp process_included(%{"included" => included} = incoming) do
     included
-    |> Enum.reduce(incoming, fn %{"data" => %{"type" => type}} = params, acc ->
-      flattened = process(params)
+    |> Enum.reduce(incoming, fn %{"type" => type} = params, acc ->
+      flattened = process(%{"data" => params})
 
       case Map.has_key?(acc, type) do
         false -> Map.put(acc, type, [flattened])

test/utils/data_to_params_test.exs

@@ -106,13 +106,11 @@ defmodule JSONAPI.DataToParamsTest do
       },
       "included" => [
         %{
-          "data" => %{
-            "attributes" => %{
-              "name" => "Tara"
-            },
-            "id" => "234",
-            "type" => "friend"
-          }
+          "attributes" => %{
+            "name" => "Tara"
+          },
+          "id" => "234",
+          "type" => "friend"
         }
       ]
     }
@@ -144,42 +142,36 @@ defmodule JSONAPI.DataToParamsTest do
       },
       "included" => [
         %{
-          "data" => %{
-            "id" => "234",
-            "type" => "friend",
-            "attributes" => %{
-              "name" => "Tara"
-            },
-            "relationships" => %{
-              "baz" => %{
-                "data" => %{
-                  "id" => "2",
-                  "type" => "baz"
-                }
-              },
-              "boo" => %{
-                "data" => nil
+          "id" => "234",
+          "type" => "friend",
+          "attributes" => %{
+            "name" => "Tara"
+          },
+          "relationships" => %{
+            "baz" => %{
+              "data" => %{
+                "id" => "2",
+                "type" => "baz"
               }
+            },
+            "boo" => %{
+              "data" => nil
             }
           }
         },
         %{
-          "data" => %{
-            "attributes" => %{
-              "name" => "Wild Bill"
-            },
-            "id" => "0012",
-            "type" => "friend"
-          }
+          "attributes" => %{
+            "name" => "Wild Bill"
+          },
+          "id" => "0012",
+          "type" => "friend"
         },
         %{
-          "data" => %{
-            "attributes" => %{
-              "title" => "Sr"
-            },
-            "id" => "456",
-            "type" => "organization"
-          }
+          "attributes" => %{
+            "title" => "Sr"
+          },
+          "id" => "456",
+          "type" => "organization"
         }
       ]
     }