Commit 2ec8cf56 authored by Maxim Filippov's avatar Maxim Filippov 🌚
Browse files

Add pagination to search

parent f635b675
...@@ -547,11 +547,8 @@ def get_followers_query(%User{id: id, follower_address: follower_address}, nil) ...@@ -547,11 +547,8 @@ def get_followers_query(%User{id: id, follower_address: follower_address}, nil)
end end
def get_followers_query(user, page) do def get_followers_query(user, page) do
from( from(u in get_followers_query(user, nil))
u in get_followers_query(user, nil), |> paginate(page, 20)
limit: 20,
offset: ^((page - 1) * 20)
)
end end
def get_followers_query(user), do: get_followers_query(user, nil) def get_followers_query(user), do: get_followers_query(user, nil)
...@@ -577,11 +574,8 @@ def get_friends_query(%User{id: id, following: following}, nil) do ...@@ -577,11 +574,8 @@ def get_friends_query(%User{id: id, following: following}, nil) do
end end
def get_friends_query(user, page) do def get_friends_query(user, page) do
from( from(u in get_friends_query(user, nil))
u in get_friends_query(user, nil), |> paginate(page, 20)
limit: 20,
offset: ^((page - 1) * 20)
)
end end
def get_friends_query(user), do: get_friends_query(user, nil) def get_friends_query(user), do: get_friends_query(user, nil)
...@@ -755,47 +749,64 @@ def get_recipients_from_activity(%Activity{recipients: to}) do ...@@ -755,47 +749,64 @@ def get_recipients_from_activity(%Activity{recipients: to}) do
Repo.all(query) Repo.all(query)
end end
def search(term, options \\ %{}) do @spec search_for_admin(binary(), %{
# Strip the beginning @ off if there is a query admin: Pleroma.User.t(),
local: boolean(),
page: number(),
page_size: number()
}) :: {:ok, [Pleroma.User.t()], number()}
def search_for_admin(term, %{admin: admin, local: local, page: page, page_size: page_size}) do
term = String.trim_leading(term, "@") term = String.trim_leading(term, "@")
query = options[:query] || User
if options[:resolve], do: get_or_fetch(term) local_paginated_query =
User
|> maybe_local_user_query(local)
|> paginate(page, page_size)
fts_results = search_query = fts_search_subquery(term, local_paginated_query)
do_search(fts_search_subquery(term, query), options[:for_user], limit: options[:limit])
{:ok, trigram_results} = count =
Repo.transaction(fn -> term
Ecto.Adapters.SQL.query(Repo, "select set_limit(0.25)", []) |> fts_search_subquery()
|> maybe_local_user_query(local)
do_search(trigram_search_subquery(term, query), options[:for_user], limit: options[:limit]) |> Repo.aggregate(:count, :id)
end)
Enum.uniq_by(fts_results ++ trigram_results, & &1.id) {:ok, do_search(search_query, admin), count}
end end
def all(page, page_size) do @spec all_for_admin(number(), number()) :: {:ok, [Pleroma.User.t()], number()}
from( def all_for_admin(page, page_size) do
u in User, query = from(u in User, order_by: u.id)
limit: ^page_size,
offset: ^((page - 1) * page_size), paginated_query =
order_by: u.id query
) |> paginate(page, page_size)
|> Repo.all()
count =
query
|> Repo.aggregate(:count, :id)
{:ok, Repo.all(paginated_query), count}
end end
def count_all_except_one(user) do def search(query, resolve \\ false, for_user \\ nil) do
query = # Strip the beginning @ off if there is a query
from( query = String.trim_leading(query, "@")
u in User,
where: u.id != ^user.id if resolve, do: get_or_fetch(query)
)
fts_results = do_search(fts_search_subquery(query), for_user)
{:ok, trigram_results} =
Repo.transaction(fn ->
Ecto.Adapters.SQL.query(Repo, "select set_limit(0.25)", [])
do_search(trigram_search_subquery(query), for_user)
end)
Repo.aggregate(query, :count, :id) Enum.uniq_by(fts_results ++ trigram_results, & &1.id)
end end
defp do_search(subquery, for_user, options) do defp do_search(subquery, for_user, options \\ []) do
q = q =
from( from(
s in subquery(subquery), s in subquery(subquery),
...@@ -811,7 +822,7 @@ defp do_search(subquery, for_user, options) do ...@@ -811,7 +822,7 @@ defp do_search(subquery, for_user, options) do
boost_search_results(results, for_user) boost_search_results(results, for_user)
end end
defp fts_search_subquery(term, query) do defp fts_search_subquery(term, query \\ User) do
processed_query = processed_query =
term term
|> String.replace(~r/\W+/, " ") |> String.replace(~r/\W+/, " ")
...@@ -851,9 +862,9 @@ defp fts_search_subquery(term, query) do ...@@ -851,9 +862,9 @@ defp fts_search_subquery(term, query) do
) )
end end
defp trigram_search_subquery(term, query) do defp trigram_search_subquery(term) do
from( from(
u in query, u in User,
select_merge: %{ select_merge: %{
search_rank: search_rank:
fragment( fragment(
...@@ -1020,13 +1031,13 @@ def unblock_domain(user, domain) do ...@@ -1020,13 +1031,13 @@ def unblock_domain(user, domain) do
update_and_set_cache(cng) update_and_set_cache(cng)
end end
def maybe_local_user_query(local) do def maybe_local_user_query(query, local) do
if local, do: local_user_query(), else: User if local, do: local_user_query(query), else: query
end end
def local_user_query do def local_user_query(query \\ User) do
from( from(
u in User, u in query,
where: u.local == true, where: u.local == true,
where: not is_nil(u.nickname) where: not is_nil(u.nickname)
) )
...@@ -1318,4 +1329,11 @@ def all_superusers do ...@@ -1318,4 +1329,11 @@ def all_superusers do
) )
|> Repo.all() |> Repo.all()
end end
defp paginate(query, page, page_size) do
from(u in query,
limit: ^page_size,
offset: ^((page - 1) * page_size)
)
end
end end
...@@ -63,38 +63,40 @@ def untag_users(conn, %{"nicknames" => nicknames, "tags" => tags}) do ...@@ -63,38 +63,40 @@ def untag_users(conn, %{"nicknames" => nicknames, "tags" => tags}) do
do: json_response(conn, :no_content, "") do: json_response(conn, :no_content, "")
end end
def list_users(%{assigns: %{user: admin}} = conn, %{"page" => page_string}) do def list_users(conn, params) do
with {page, _} <- Integer.parse(page_string), {page, page_size} = page_params(params)
users <- User.all(page, @users_page_size),
count <- User.count_all_except_one(admin), with {:ok, users, count} <- User.all_for_admin(page, page_size),
do: do:
conn conn
|> json( |> json(
AccountView.render("index.json", AccountView.render("index.json",
users: users, users: users,
count: count, count: count,
page_size: @users_page_size page_size: page_size
) )
) )
end end
def search_users(%{assigns: %{user: admin}} = conn, %{"query" => term} = params) do def search_users(%{assigns: %{user: admin}} = conn, %{"query" => query} = params) do
users = {page, page_size} = page_params(params)
User.search(term,
query: User.maybe_local_user_query(params["local"] == "true"),
resolve: true,
for_user: admin,
limit: @users_page_size
)
conn with {:ok, users, count} <-
|> json( User.search_for_admin(query, %{
AccountView.render("index.json", admin: admin,
users: users, local: params["local"] == "true",
count: length(users), page: page,
page_size: @users_page_size page_size: page_size
) }),
) do:
conn
|> json(
AccountView.render("index.json",
users: users,
count: count,
page_size: page_size
)
)
end end
def right_add(conn, %{"permission_group" => permission_group, "nickname" => nickname}) def right_add(conn, %{"permission_group" => permission_group, "nickname" => nickname})
...@@ -240,4 +242,26 @@ def errors(conn, _) do ...@@ -240,4 +242,26 @@ def errors(conn, _) do
|> put_status(500) |> put_status(500)
|> json("Something went wrong") |> json("Something went wrong")
end end
defp page_params(params) do
{get_page(params["page"]), get_page_size(params["page_size"])}
end
defp get_page(page_string) when is_nil(page_string), do: 1
defp get_page(page_string) do
case Integer.parse(page_string) do
{page, _} -> page
:error -> 1
end
end
defp get_page_size(page_size_string) when is_nil(page_size_string), do: @users_page_size
defp get_page_size(page_size_string) do
case Integer.parse(page_size_string) do
{page_size, _} -> page_size
:error -> @users_page_size
end
end
end end
...@@ -342,7 +342,7 @@ test "renders users array for the first page" do ...@@ -342,7 +342,7 @@ test "renders users array for the first page" do
|> get("/api/pleroma/admin/users?page=1") |> get("/api/pleroma/admin/users?page=1")
assert json_response(conn, 200) == %{ assert json_response(conn, 200) == %{
"count" => 1, "count" => 2,
"page_size" => 50, "page_size" => 50,
"users" => [ "users" => [
%{ %{
...@@ -369,7 +369,7 @@ test "renders empty array for the second page" do ...@@ -369,7 +369,7 @@ test "renders empty array for the second page" do
|> get("/api/pleroma/admin/users?page=2") |> get("/api/pleroma/admin/users?page=2")
assert json_response(conn, 200) == %{ assert json_response(conn, 200) == %{
"count" => 1, "count" => 2,
"page_size" => 50, "page_size" => 50,
"users" => [] "users" => []
} }
...@@ -416,9 +416,49 @@ test "regular search" do ...@@ -416,9 +416,49 @@ test "regular search" do
} }
end end
test "only local users" do test "regular search with page size" do
admin = insert(:user, info: %{is_admin: true}) admin = insert(:user, info: %{is_admin: true})
user = insert(:user, nickname: "bob") user = insert(:user, nickname: "bob")
user2 = insert(:user, nickname: "bo")
conn =
build_conn()
|> assign(:user, admin)
|> get("/api/pleroma/admin/users/search?query=bo&page_size=1&page=1")
assert json_response(conn, 200) == %{
"count" => 2,
"page_size" => 1,
"users" => [
%{
"deactivated" => user.info.deactivated,
"id" => user.id,
"nickname" => user.nickname
}
]
}
conn =
build_conn()
|> assign(:user, admin)
|> get("/api/pleroma/admin/users/search?query=bo&page_size=1&page=2")
assert json_response(conn, 200) == %{
"count" => 2,
"page_size" => 1,
"users" => [
%{
"deactivated" => user2.info.deactivated,
"id" => user2.id,
"nickname" => user2.nickname
}
]
}
end
test "only local users" do
admin = insert(:user, info: %{is_admin: true}, nickname: "john")
user = insert(:user, nickname: "bob")
insert(:user, nickname: "bobb", local: false) insert(:user, nickname: "bobb", local: false)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment