Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Better changeset error handling #195

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft
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
4 changes: 2 additions & 2 deletions lib/pow_assent/ecto/user_identities/context.ex
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ defmodule PowAssent.Ecto.UserIdentities.Context do
end

defp user_identity_bound_different_user_error({:error, %{errors: errors} = changeset}) do
case unique_constraint_error?(errors, :uid_provider) do
case unique_constraint_error?(errors, :uid) do
true -> {:error, {:bound_to_different_user, changeset}}
false -> {:error, changeset}
end
Expand Down Expand Up @@ -214,7 +214,7 @@ defmodule PowAssent.Ecto.UserIdentities.Context do
end

defp user_user_identity_bound_different_user_error({:error, %{changes: %{user_identities: [%{errors: errors}]}} = changeset}) do
case unique_constraint_error?(errors, :uid_provider) do
case unique_constraint_error?(errors, :uid) do
true -> {:error, {:bound_to_different_user, changeset}}
false -> {:error, changeset}
end
Expand Down
2 changes: 1 addition & 1 deletion lib/pow_assent/ecto/user_identities/schema.ex
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ defmodule PowAssent.Ecto.UserIdentities.Schema do
|> Changeset.cast(params, [:provider, :uid, :user_id])
|> Changeset.validate_required([:provider, :uid])
|> Changeset.assoc_constraint(:user)
|> Changeset.unique_constraint(:uid_provider, name: :user_identities_uid_provider_index)
|> Changeset.unique_constraint([:uid, :provider], match: :suffix)
end

@spec raise_no_user_error :: no_return
Expand Down
2 changes: 1 addition & 1 deletion test/pow_assent/ecto/schema_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ defmodule PowAssent.Ecto.SchemaTest do
|> Repo.insert()

assert [user_identity] = changeset.changes.user_identities
assert user_identity.errors[:uid_provider] == {"has already been taken", [constraint: :unique, constraint_name: "user_identities_uid_provider_index"]}
assert user_identity.errors[:uid] == {"has already been taken", [constraint: :unique, constraint_name: "user_identities_uid_provider_index"]}
end

test "uses case insensitive value for user id" do
Expand Down
2 changes: 1 addition & 1 deletion test/pow_assent/ecto/user_identities/schema_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ defmodule PowAssent.Ecto.UserIdentities.SchemaTest do
|> UserIdentity.changeset(@valid_params)
|> Repo.insert()

assert changeset.errors[:uid_provider] == {"has already been taken", [constraint: :unique, constraint_name: "user_identities_uid_provider_index"]}
assert changeset.errors[:uid] == {"has already been taken", [constraint: :unique, constraint_name: "user_identities_uid_provider_index"]}
end
end
end
4 changes: 2 additions & 2 deletions test/support/repo_mock.ex
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ defmodule PowAssent.Test.RepoMock do
@spec insert(%{action: any, valid?: boolean}, any) ::
{:error, %{action: :insert, valid?: false}} | {:ok, %{id: 1}}
def insert(%{changes: %{provider: "test_provider", uid: "identity_taken"}} = changeset, _opts) do
changeset = Ecto.Changeset.add_error(changeset, :uid_provider, "has already been taken", constraint: :unique, constraint_name: "user_identities_uid_provider_index")
changeset = Ecto.Changeset.add_error(changeset, :uid, "has already been taken", constraint: :unique, constraint_name: "user_identities_uid_provider_index")

{:error, %{changeset | action: :insert}}
end
Expand All @@ -27,7 +27,7 @@ defmodule PowAssent.Test.RepoMock do
{:error, %{changeset | action: :insert}}
end
def insert(%{valid?: true, changes: %{user_identities: [%{changes: %{provider: "test_provider", uid: "identity_taken"}} = user_identity_changeset]}} = changeset, _opts) do
user_identity_changeset = Ecto.Changeset.add_error(user_identity_changeset, :uid_provider, "has already been taken", constraint: :unique, constraint_name: "user_identities_uid_provider_index")
user_identity_changeset = Ecto.Changeset.add_error(user_identity_changeset, :uid, "has already been taken", constraint: :unique, constraint_name: "user_identities_uid_provider_index")
user_identity_changeset = %{user_identity_changeset | action: :insert}
changeset = Ecto.Changeset.put_change(changeset, :user_identities, [user_identity_changeset])

Expand Down