make bulk user creation from admin works as a transaction

3 files changed, 40 insertions, 13 deletions

diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index c6a562a61..722e8ff6b 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -276,7 +276,13 @@ defmodule Pleroma.User do
   @doc "Inserts provided changeset, performs post-registration actions (confirmation email sending etc.)"
   def register(%Ecto.Changeset{} = changeset) do
     with {:ok, user} <- Repo.insert(changeset),
-         {:ok, user} <- autofollow_users(user),
+         {:ok, user} <- post_register_action(user) do
+      {:ok, user}
+    end
+  end
+
+  def post_register_action(%User{} = user) do
+    with {:ok, user} <- autofollow_users(user),
          {:ok, user} <- set_cache(user),
          {:ok, _} <- Pleroma.User.WelcomeMessage.post_welcome_message_to_user(user),
          {:ok, _} <- try_send_confirmation_email(user) do
diff --git a/lib/pleroma/web/admin_api/admin_api_controller.ex b/lib/pleroma/web/admin_api/admin_api_controller.ex
index 6048ed35b..60fd4e571 100644
--- a/lib/pleroma/web/admin_api/admin_api_controller.ex
+++ b/lib/pleroma/web/admin_api/admin_api_controller.ex
@@ -47,7 +47,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
   end
 
   def users_create(conn, %{"users" => users}) do
-    result =
+    changesets =
       Enum.map(users, fn %{"nickname" => nickname, "email" => email, "password" => password} ->
         user_data = %{
           nickname: nickname,
@@ -58,19 +58,40 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
           bio: "."
         }
 
-        changeset = User.register_changeset(%User{}, user_data, need_confirmation: false)
+        User.register_changeset(%User{}, user_data, need_confirmation: false)
+      end)
+      |> Enum.reduce(Ecto.Multi.new(), fn changeset, multi ->
+        Ecto.Multi.insert(multi, Ecto.UUID.generate(), changeset)
+      end)
 
-        case User.register(changeset) do
-          {:ok, user} ->
-            AccountView.render("created.json", %{user: user})
+    case Pleroma.Repo.transaction(changesets) do
+      {:ok, users} ->
+        res =
+          users
+          |> Map.values()
+          |> Enum.map(fn user ->
+            {:ok, user} = User.post_register_action(user)
+            user
+          end)
+          |> Enum.map(&AccountView.render("created.json", %{user: &1}))
 
-          {:error, changeset} ->
-            AccountView.render("create-error.json", %{changeset: changeset})
-        end
-      end)
+        conn
+        |> json(res)
 
-    conn
-    |> json(result)
+      {:error, id, changeset, _} ->
+        res =
+          Enum.map(changesets.operations, fn
+            {current_id, {:changeset, _current_changeset, _}} when current_id == id ->
+              AccountView.render("create-error.json", %{changeset: changeset})
+
+            {_, {:changeset, current_changeset, _}} ->
+              AccountView.render("create-error.json", %{changeset: current_changeset})
+          end)
+
+        conn
+        |> put_status(:conflict)
+        |> json(res)
+    end
   end
 
   def user_show(conn, %{"nickname" => nickname}) do
diff --git a/lib/pleroma/web/admin_api/views/account_view.ex b/lib/pleroma/web/admin_api/views/account_view.ex
index e1825c5f1..cccdeff7e 100644
--- a/lib/pleroma/web/admin_api/views/account_view.ex
+++ b/lib/pleroma/web/admin_api/views/account_view.ex
@@ -48,7 +48,7 @@ defmodule Pleroma.Web.AdminAPI.AccountView do
   def render("created.json", %{user: user}) do
     %{
       type: "success",
-      code: 201,
+      code: 200,
       data: %{
         nickname: user.nickname,
         email: user.email