Return "total" optionally

This commit is contained in:
Maxim Filippov 2019-09-03 13:58:27 +03:00
parent a4c5f71e93
commit b15cfd80ef
10 changed files with 36 additions and 41 deletions

View file

@ -19,7 +19,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Mastodon API: Unsubscribe followers when they unfollow a user - Mastodon API: Unsubscribe followers when they unfollow a user
- AdminAPI: Add "godmode" while fetching user statuses (i.e. admin can see private statuses) - AdminAPI: Add "godmode" while fetching user statuses (i.e. admin can see private statuses)
- Improve digest email template - Improve digest email template
Pagination: return `total` alongside with `items` when paginating Pagination: (optional) return `total` alongside with `items` when paginating
### Fixed ### Fixed
- Following from Osada - Following from Osada

View file

@ -27,7 +27,6 @@ defmodule Pleroma.Activity.Search do
|> maybe_restrict_local(user) |> maybe_restrict_local(user)
|> maybe_restrict_author(author) |> maybe_restrict_author(author)
|> Pagination.fetch_paginated(%{"offset" => offset, "limit" => limit}, :offset) |> Pagination.fetch_paginated(%{"offset" => offset, "limit" => limit}, :offset)
|> Map.get(:items)
|> maybe_fetch(user, search_query) |> maybe_fetch(user, search_query)
end end

View file

@ -67,7 +67,6 @@ defmodule Pleroma.Conversation.Participation do
preload: [conversation: [:users]] preload: [conversation: [:users]]
) )
|> Pleroma.Pagination.fetch_paginated(params) |> Pleroma.Pagination.fetch_paginated(params)
|> Map.get(:items)
end end
def for_user_and_conversation(user, conversation) do def for_user_and_conversation(user, conversation) do

View file

@ -75,7 +75,6 @@ defmodule Pleroma.Notification do
user user
|> for_user_query(opts) |> for_user_query(opts)
|> Pagination.fetch_paginated(opts) |> Pagination.fetch_paginated(opts)
|> Map.get(:items)
end end
@doc """ @doc """

View file

@ -16,31 +16,39 @@ defmodule Pleroma.Pagination do
def fetch_paginated(query, params, type \\ :keyset) def fetch_paginated(query, params, type \\ :keyset)
def fetch_paginated(query, params, :keyset) do def fetch_paginated(query, %{"total" => true} = params, :keyset) do
options = cast_params(params)
total = Repo.aggregate(query, :count, :id) total = Repo.aggregate(query, :count, :id)
%{ %{
total: total, total: total,
items: items: fetch_paginated(query, Map.drop(params, ["total"]), :keyset)
query }
|> paginate(options, :keyset) end
|> Repo.all()
|> enforce_order(options) def fetch_paginated(query, params, :keyset) do
options = cast_params(params)
query
|> paginate(options, :keyset)
|> Repo.all()
|> enforce_order(options)
end
def fetch_paginated(query, %{"total" => true} = params, :offset) do
total = Repo.aggregate(query, :count, :id)
%{
total: total,
items: fetch_paginated(query, Map.drop(params, ["total"]), :offset)
} }
end end
def fetch_paginated(query, params, :offset) do def fetch_paginated(query, params, :offset) do
options = cast_params(params) options = cast_params(params)
total = Repo.aggregate(query, :count, :id)
%{ query
total: total, |> paginate(options, :offset)
items: |> Repo.all()
query
|> paginate(options, :offset)
|> Repo.all()
}
end end
def paginate(query, options, method \\ :keyset) def paginate(query, options, method \\ :keyset)

View file

@ -34,7 +34,6 @@ defmodule Pleroma.User.Search do
query_string query_string
|> search_query(for_user, following) |> search_query(for_user, following)
|> Pagination.fetch_paginated(%{"offset" => offset, "limit" => result_limit}, :offset) |> Pagination.fetch_paginated(%{"offset" => offset, "limit" => result_limit}, :offset)
|> Map.get(:items)
end) end)
results results

View file

@ -556,7 +556,6 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
q q
|> restrict_unlisted() |> restrict_unlisted()
|> Pagination.fetch_paginated(opts) |> Pagination.fetch_paginated(opts)
|> Map.get(:items)
|> Enum.reverse() |> Enum.reverse()
end end
@ -954,7 +953,6 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
fetch_activities_query(recipients ++ list_memberships, opts) fetch_activities_query(recipients ++ list_memberships, opts)
|> Pagination.fetch_paginated(opts) |> Pagination.fetch_paginated(opts)
|> Map.get(:items)
|> Enum.reverse() |> Enum.reverse()
|> maybe_update_cc(list_memberships, opts["user"]) |> maybe_update_cc(list_memberships, opts["user"])
end end
@ -989,7 +987,6 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
fetch_activities_query([], opts) fetch_activities_query([], opts)
|> fetch_activities_bounded_query(recipients, recipients_with_public) |> fetch_activities_bounded_query(recipients, recipients_with_public)
|> Pagination.fetch_paginated(opts) |> Pagination.fetch_paginated(opts)
|> Map.get(:items)
|> Enum.reverse() |> Enum.reverse()
end end

View file

@ -420,7 +420,6 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
[user.ap_id] [user.ap_id]
|> ActivityPub.fetch_activities_query(params) |> ActivityPub.fetch_activities_query(params)
|> Pagination.fetch_paginated(params) |> Pagination.fetch_paginated(params)
|> Map.get(:items)
conn conn
|> add_link_headers(:dm_timeline, activities) |> add_link_headers(:dm_timeline, activities)
@ -1195,7 +1194,6 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
bookmarks = bookmarks =
Bookmark.for_user_query(user.id) Bookmark.for_user_query(user.id)
|> Pagination.fetch_paginated(params) |> Pagination.fetch_paginated(params)
|> Map.get(:items)
activities = activities =
bookmarks bookmarks

View file

@ -45,14 +45,12 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPI do
user user
|> User.get_followers_query() |> User.get_followers_query()
|> Pagination.fetch_paginated(params) |> Pagination.fetch_paginated(params)
|> Map.get(:items)
end end
def get_friends(user, params \\ %{}) do def get_friends(user, params \\ %{}) do
user user
|> User.get_friends_query() |> User.get_friends_query()
|> Pagination.fetch_paginated(params) |> Pagination.fetch_paginated(params)
|> Map.get(:items)
end end
def get_notifications(user, params \\ %{}) do def get_notifications(user, params \\ %{}) do
@ -62,14 +60,12 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPI do
|> Notification.for_user_query(options) |> Notification.for_user_query(options)
|> restrict(:exclude_types, options) |> restrict(:exclude_types, options)
|> Pagination.fetch_paginated(params) |> Pagination.fetch_paginated(params)
|> Map.get(:items)
end end
def get_scheduled_activities(user, params \\ %{}) do def get_scheduled_activities(user, params \\ %{}) do
user user
|> ScheduledActivity.for_user_query() |> ScheduledActivity.for_user_query()
|> Pagination.fetch_paginated(params) |> Pagination.fetch_paginated(params)
|> Map.get(:items)
end end
defp cast_params(params) do defp cast_params(params) do

View file

@ -19,7 +19,9 @@ defmodule Pleroma.PaginationTest do
test "paginates by min_id", %{notes: notes} do test "paginates by min_id", %{notes: notes} do
id = Enum.at(notes, 2).id |> Integer.to_string() id = Enum.at(notes, 2).id |> Integer.to_string()
%{total: total, items: paginated} = Pagination.fetch_paginated(Object, %{"min_id" => id})
%{total: total, items: paginated} =
Pagination.fetch_paginated(Object, %{"min_id" => id, "total" => true})
assert length(paginated) == 2 assert length(paginated) == 2
assert total == 5 assert total == 5
@ -27,7 +29,9 @@ defmodule Pleroma.PaginationTest do
test "paginates by since_id", %{notes: notes} do test "paginates by since_id", %{notes: notes} do
id = Enum.at(notes, 2).id |> Integer.to_string() id = Enum.at(notes, 2).id |> Integer.to_string()
%{total: total, items: paginated} = Pagination.fetch_paginated(Object, %{"since_id" => id})
%{total: total, items: paginated} =
Pagination.fetch_paginated(Object, %{"since_id" => id, "total" => true})
assert length(paginated) == 2 assert length(paginated) == 2
assert total == 5 assert total == 5
@ -35,7 +39,9 @@ defmodule Pleroma.PaginationTest do
test "paginates by max_id", %{notes: notes} do test "paginates by max_id", %{notes: notes} do
id = Enum.at(notes, 1).id |> Integer.to_string() id = Enum.at(notes, 1).id |> Integer.to_string()
%{total: total, items: paginated} = Pagination.fetch_paginated(Object, %{"max_id" => id})
%{total: total, items: paginated} =
Pagination.fetch_paginated(Object, %{"max_id" => id, "total" => true})
assert length(paginated) == 1 assert length(paginated) == 1
assert total == 5 assert total == 5
@ -44,11 +50,9 @@ defmodule Pleroma.PaginationTest do
test "paginates by min_id & limit", %{notes: notes} do test "paginates by min_id & limit", %{notes: notes} do
id = Enum.at(notes, 2).id |> Integer.to_string() id = Enum.at(notes, 2).id |> Integer.to_string()
%{total: total, items: paginated} = paginated = Pagination.fetch_paginated(Object, %{"min_id" => id, "limit" => 1})
Pagination.fetch_paginated(Object, %{"min_id" => id, "limit" => 1})
assert length(paginated) == 1 assert length(paginated) == 1
assert total == 5
end end
end end
@ -60,19 +64,15 @@ defmodule Pleroma.PaginationTest do
end end
test "paginates by limit" do test "paginates by limit" do
%{total: total, items: paginated} = paginated = Pagination.fetch_paginated(Object, %{"limit" => 2}, :offset)
Pagination.fetch_paginated(Object, %{"limit" => 2}, :offset)
assert length(paginated) == 2 assert length(paginated) == 2
assert total == 5
end end
test "paginates by limit & offset" do test "paginates by limit & offset" do
%{total: total, items: paginated} = paginated = Pagination.fetch_paginated(Object, %{"limit" => 2, "offset" => 4}, :offset)
Pagination.fetch_paginated(Object, %{"limit" => 2, "offset" => 4}, :offset)
assert length(paginated) == 1 assert length(paginated) == 1
assert total == 5
end end
end end
end end