Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions apps/blunt/lib/blunt/message/changeset.ex
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,11 @@ defmodule Blunt.Message.Changeset do

changeset =
embeds
|> Enum.reduce(changeset, &Changeset.cast_embed(&2, &1, with: embed_changeset))
|> Changeset.validate_required(required_fields)
|> Enum.reduce(
changeset,
&Changeset.cast_embed(&2, &1, with: embed_changeset, required: &1 in required_fields)
)
|> Changeset.validate_required(required_fields -- embeds)
|> run_built_in_validations(message_module)
|> message_module.handle_validate(opts)

Expand Down
22 changes: 22 additions & 0 deletions apps/blunt/test/blunt/message/changeset_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,28 @@ defmodule Blunt.Message.ChangesetTest do
assert true = Keyword.get(opts, :test_option)
end

describe "embedded field" do
defmodule EmbedsManyCommand do
use Blunt.Command
field :one, EmbeddedMessage
field :many, {:array, EmbeddedMessage}
field :optionals, {:array, EmbeddedMessage}, required: false
end

test "passes required option to cast_embed/3 not validate_required/3" do
refute ExUnit.CaptureIO.capture_io(:stderr, fn ->
assert {:ok, %EmbedsManyCommand{one: %EmbeddedMessage{}, many: [%EmbeddedMessage{}, %EmbeddedMessage{}]}} =
EmbedsManyCommand.new(%{one: %{}, many: [%{}, %{}]})
end) =~
~r/attempting to validate embed_many field :many/
end

test "errors when blank" do
assert {:error, %{many: ["can't be blank"], one: ["can't be blank"]}} =
EmbedsManyCommand.new(%{one: nil, many: [], optionals: [%{}]})
end
end

describe "autogenerated id field" do
defmodule WithAutoId do
use Blunt.Command
Expand Down