Skip to content

Commit

Permalink
Merge pull request #64 from maykonmichel/feature/#62
Browse files Browse the repository at this point in the history
feature/#62
  • Loading branch information
maykonmichel authored Mar 5, 2020
2 parents 52a3754 + f73e6df commit 7560348
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
1 change: 1 addition & 0 deletions lib/ez_coins_api_web/schema/user_type.ex
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ defmodule EzCoinsApiWeb.Schema.Types.UserType do
field(:avatar, :string)
field(:hired_at, :string)
field(:resigned_at, :string)
field(:is_admin, :boolean)
field(:wallet, :wallet_type, resolve: &UserResolver.wallet/3)
end

Expand Down
8 changes: 7 additions & 1 deletion test/ez_coins_api_web/user_resolver_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ defmodule EzCoinsApiWeb.UserResolverTest do
"name" => user.name,
"email" => user.email,
"hired_at" => "#{user.hired_at}",
"resigned_at" => user.resigned_at
"resigned_at" => user.resigned_at,
"is_admin" => user.is_admin
}
end

Expand All @@ -43,6 +44,7 @@ defmodule EzCoinsApiWeb.UserResolverTest do
email
hired_at
resigned_at
is_admin
}
}
"""
Expand Down Expand Up @@ -73,6 +75,7 @@ defmodule EzCoinsApiWeb.UserResolverTest do
email
hired_at
resigned_at
is_admin
}
}
"""
Expand Down Expand Up @@ -105,6 +108,7 @@ defmodule EzCoinsApiWeb.UserResolverTest do
email
hired_at
resigned_at
is_admin
}
}
"""
Expand Down Expand Up @@ -142,6 +146,7 @@ defmodule EzCoinsApiWeb.UserResolverTest do
email
hired_at
resigned_at
is_admin
}
}
"""
Expand Down Expand Up @@ -176,6 +181,7 @@ defmodule EzCoinsApiWeb.UserResolverTest do
email
hired_at
resigned_at
is_admin
}
}
"""
Expand Down

0 comments on commit 7560348

Please sign in to comment.