Fix oneOf/allOf/anyOf and schema module in Discriminator mapping

lib/open_api_spex/cast/discriminator.ex

@@ -40,7 +40,7 @@ defmodule OpenApiSpex.Cast.Discriminator do
   defp cast_discriminator(%_{value: value, schema: schema} = ctx) do
     {discriminator_property, mappings} = discriminator_details(schema)
 
-    case value["#{discriminator_property}"] || value[discriminator_property] do
+    case value["#{discriminator_property}"]  do
       v when v in ["", nil] ->
         error(:no_value_for_discriminator, ctx)
 

lib/open_api_spex/cast/utils.ex

@@ -6,22 +6,10 @@ defmodule OpenApiSpex.Cast.Utils do
   # Merge 2 maps considering as equal keys that are atom or string representation
   # of that atom. Atom keys takes precedence over string ones.
   def merge_maps(map1, map2) do
-    l1 = Enum.map(map1, fn {key, val} -> {to_string(key), key, val} end)
-    l2 = Enum.map(map2, fn {key, val} -> {to_string(key), key, val} end)
-
-    l1
-    |> Kernel.++(l2)
-    |> Enum.group_by(fn {ks, _, _} -> ks end, fn {_, k, v} -> {k, v} end)
-    |> Map.new(fn
-      {_ks, [{k, v}]} ->
-        {k, v}
-
-      {_ks, [{k1, v1}, {k2, v2}]} ->
-        cond do
-          is_atom(k2) -> {k2, v2}
-          is_atom(k1) -> {k1, v1}
-          true -> {k2, v2}
-        end
+    result = Map.merge(map1, map2)
+    Enum.reduce(result, result, fn
+      {k, _v}, result when is_atom(k) -> Map.delete(result, to_string(k))
+      _, result -> result
     end)
   end
 

test/cast/discriminator_test.exs

@@ -195,24 +195,6 @@ defmodule OpenApiSpex.CastDiscriminatorTest do
       assert expected == cast_cast(value: input_value, schema: discriminator_schema)
     end
 
-    test "nested, atom map success", %{schemas: %{dog: dog, cat: cat}} do
-      # "animal_type" is the discriminator and the keys need to be strings.
-      input_value = %{data: %{"#{@discriminator}": "Dog", breed: "Corgi", age: 1}}
-      # Nested schema to better simulate use with JSON API (real world)
-      discriminator_schema = %Schema{
-        title: "Nested Skemuh",
-        type: :object,
-        properties: %{
-          data: build_discriminator_schema([dog, cat], :anyOf, String.to_atom(@discriminator), nil)
-        }
-      }
-
-      # Note: We're expecting to getting atoms back, not strings
-      expected = {:ok, %{data: %{age: 1, breed: "Corgi", animal_type: "Dog"}}}
-
-      assert expected == cast_cast(value: input_value, schema: discriminator_schema)
-    end
-
     test "nested, with invalid property on discriminator schema", %{
       schemas: %{dog: dog, wolf: wolf}
     } do