Refactor account creation by extracting into Accounts context

Author: begedin

lib/code_corps/accounts/accounts.ex

@@ -22,6 +22,21 @@ defmodule CodeCorps.Accounts do
 
   import Ecto.Query
 
+  @doc ~S"""
+  Creates a `CodeCorps.User` account when such a request is made from the client
+  application.
+
+  If an `invite_id` attribute is provided in the request, treats the process as
+  claiming the specified invite.
+  """
+  @spec create(map) :: {:ok, User.t} | {:error, Changeset.t} | {:error, :invite_not_found}
+  def create(%{"invite_id" => _} = params) do
+    params |> Accounts.UserInvites.claim_invite()
+  end
+  def create(%{} = params) do
+    %User{} |> User.registration_changeset(params) |> Repo.insert()
+  end
+
   @doc ~S"""
   Creates a user record using attributes from a GitHub payload.
   """
@@ -189,7 +204,4 @@ defmodule CodeCorps.Accounts do
 
   @spec create_invite(map) :: {:ok, UserInvite.t} | {:error, Changeset.t}
   defdelegate create_invite(params), to: Accounts.UserInvites
-
-  @spec claim_invite(map) :: {:ok, User.t}
-  defdelegate claim_invite(map), to: Accounts.UserInvites
 end

lib/code_corps_web/controllers/user_controller.ex

@@ -36,18 +36,11 @@ defmodule CodeCorpsWeb.UserController do
   end
 
   @spec create(Conn.t, map) :: Conn.t
-  def create(%Conn{} = conn, %{"invite_id" => _} = params) do
-    with {:ok, %User{} = user} <- Accounts.claim_invite(params),
-         user <- preload(user)
-    do
-      conn |> put_status(:created) |> render("show.json-api", data: user)
-    end
-  end
   def create(%Conn{} = conn, %{} = params) do
-    with {:ok, %User{} = user} <- %User{} |> User.registration_changeset(params) |> Repo.insert(),
-         user <- preload(user)
-    do
-      conn |> put_status(:created) |> render("show.json-api", data: user)
+    with {:ok, %User{} = user} <- params |> Accounts.create() do
+      conn
+      |> put_status(:created)
+      |> render("show.json-api", data: user |> preload())
     end
   end
 

test/lib/code_corps/accounts/accounts_test.exs

@@ -15,6 +15,72 @@ defmodule CodeCorps.AccountsTest do
 
   alias Ecto.Changeset
 
+  describe "create/1" do
+    @valid_user_params %{
+      "email" => "[email protected]",
+      "password" => "somepassword",
+      "username" => "testuser"
+    }
+
+    test "creates user" do
+      {:ok, %User{} = user} =
+        @valid_user_params
+        |> Accounts.create()
+
+      assert Repo.get(User, user.id)
+    end
+
+    test "returns changeset if validation errors" do
+      {:error, %Changeset{} = changeset} =
+        @valid_user_params
+        |> Map.delete("email")
+        |> Accounts.create()
+
+      refute changeset.valid?
+    end
+
+    test "claims invite if id providedf" do
+      invite = insert(:user_invite, invitee: nil, project: nil)
+
+      {:ok, %User{} = user} =
+        @valid_user_params
+        |> Map.put("invite_id", invite.id)
+        |> Accounts.create()
+
+      assert Repo.get(User, user.id)
+    end
+
+    test "associates invite with user" do
+      invite = insert(:user_invite, invitee: nil, project: nil)
+
+      {:ok, %User{} = user} =
+        @valid_user_params
+        |> Map.put("invite_id", invite.id)
+        |> Accounts.create()
+
+      assert Repo.one(UserInvite).invitee_id == user.id
+    end
+
+    test "creates project membership if project provided with invite" do
+      project = insert(:project)
+      invite = insert(:user_invite, invitee: nil, project: project, role: "admin")
+
+      {:ok, %User{} = user} =
+        @valid_user_params
+        |> Map.put("invite_id", invite.id)
+        |> Accounts.create()
+
+      assert Repo.get_by(ProjectUser, user_id: user.id, project_id: project.id, role: "admin")
+    end
+
+    test "returns :invite_not_found if bad invite id provided" do
+      assert {:error, :invite_not_found} =
+        @valid_user_params
+        |> Map.put("invite_id", -1)
+        |> Accounts.create()
+    end
+  end
+
   describe "create_from_github/1" do
     test "creates proper user from provided payload" do
       {:ok, %User{} = user} =
@@ -268,53 +334,4 @@ defmodule CodeCorps.AccountsTest do
       assert changeset.errors[:email]
     end
   end
-
-  describe "claim_invite/1" do
-    @valid_user_params %{
-      "email" => "[email protected]",
-      "password" => "somepassword",
-      "username" => "testuser"
-    }
-
-    test "creates user" do
-      invite = insert(:user_invite, invitee: nil, project: nil)
-
-      {:ok, %User{} = user} =
-        @valid_user_params
-        |> Map.put("invite_id", invite.id)
-        |> Accounts.claim_invite()
-
-      assert Repo.get(User, user.id)
-    end
-
-    test "associates invite with user" do
-      invite = insert(:user_invite, invitee: nil, project: nil)
-
-      {:ok, %User{} = user} =
-        @valid_user_params
-        |> Map.put("invite_id", invite.id)
-        |> Accounts.claim_invite()
-
-      assert Repo.one(UserInvite).invitee_id == user.id
-    end
-
-    test "creates project membership if project provided" do
-      project = insert(:project)
-      invite = insert(:user_invite, invitee: nil, project: project, role: "admin")
-
-      {:ok, %User{} = user} =
-        @valid_user_params
-        |> Map.put("invite_id", invite.id)
-        |> Accounts.claim_invite()
-
-      assert Repo.get_by(ProjectUser, user_id: user.id, project_id: project.id, role: "admin")
-    end
-
-    test "returns :invite_not_found if bad id provided" do
-      assert {:error, :invite_not_found} =
-        @valid_user_params
-        |> Map.put("invite_id", -1)
-        |> Accounts.claim_invite()
-    end
-  end
 end