Bugfix

Author: mathieuprog

lib/polymorphic_embed.ex

@@ -221,8 +221,13 @@ defmodule PolymorphicEmbed do
           _ -> false
         end)
 
-      Ecto.Changeset.put_change(changeset, field, embeds)
-      |> Map.put(:valid?, !any_invalid?)
+      changeset = Ecto.Changeset.put_change(changeset, field, embeds)
+
+      if any_invalid? do
+        Map.put(changeset, :valid?, false)
+      else
+        changeset
+      end
     end
   end
 

test/polymorphic_embed_test.exs

@@ -73,6 +73,36 @@ defmodule PolymorphicEmbedTest do
     end
   end
 
+  test "validations before casting polymorphic embed still work" do
+    for polymorphic? <- [false, true] do
+      reminder_module = get_module(Reminder, polymorphic?)
+
+      sms_reminder_attrs = %{
+        text: "This is an SMS reminder #{polymorphic?}",
+        contexts: [
+          %{
+            __type__: "location",
+            address: "Foo St."
+          },
+          %{
+            __type__: "location",
+            address: "Bar St."
+          }
+        ]
+      }
+
+      insert_result =
+        struct(reminder_module)
+        |> reminder_module.changeset(sms_reminder_attrs)
+        |> Repo.insert()
+
+      assert {:error, changeset} = insert_result
+
+      assert changeset.errors == [date: {"can't be blank", [validation: :required]}]
+      refute changeset.valid?
+    end
+  end
+
   test "invalid values" do
     for polymorphic? <- [false, true] do
       reminder_module = get_module(Reminder, polymorphic?)

test/support/models/not_polymorphic/reminder.ex

@@ -17,9 +17,9 @@ defmodule PolymorphicEmbed.Regular.Reminder do
   def changeset(struct, values) do
     struct
     |> cast(values, [:date, :text])
+    |> validate_required(:date)
     |> cast_embed(:channel)
     |> cast_embed(:contexts)
-    |> validate_required(:date)
   end
 
   def custom_changeset(struct, values) do

test/support/models/polymorphic/reminder.ex

@@ -35,9 +35,9 @@ defmodule PolymorphicEmbed.Reminder do
   def changeset(struct, values) do
     struct
     |> cast(values, [:date, :text])
+    |> validate_required(:date)
     |> cast_polymorphic_embed(:channel)
     |> cast_polymorphic_embed(:contexts)
-    |> validate_required(:date)
   end
 
   def custom_changeset(struct, values) do