Make merge_accounts/2 accept IDs, usernames, emails or User structs

asciinema · May 2, 2024 · fbaf139 · fbaf139
1 parent c1e9634
commit fbaf139
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/lib/asciinema.ex b/lib/asciinema.ex
@@ -31,6 +31,9 @@ defmodule Asciinema do
   defdelegate verify_login_token(token), to: Accounts
 
   def merge_accounts(src_user, dst_user) do
+    src_user = Accounts.find_user(src_user)
+    dst_user = Accounts.find_user(dst_user)
+
     Repo.transact(fn ->
       Recordings.reassign_asciicasts(src_user.id, dst_user.id)
       Streaming.reassign_live_streams(src_user.id, dst_user.id)

diff --git a/lib/asciinema/accounts.ex b/lib/asciinema/accounts.ex
@@ -20,6 +20,16 @@ defmodule Asciinema.Accounts do
 
   def get_user(id), do: Repo.get(User, id)
 
+  def find_user(%User{} = user), do: user
+
+  def find_user(id) when is_integer(id), do: get_user(id)
+
+  def find_user(id) when is_binary(id) do
+    {_, user} = lookup_user(id)
+
+    user
+  end
+
   def find_user_by_username(username) do
     Repo.one(
       from(u in User,