Fix incorrect report count

This commit is contained in:
Maxim Filippov 2019-12-06 17:17:24 +09:00
parent 4453a9cb73
commit 08c89fd2b8
3 changed files with 11 additions and 4 deletions

View File

@ -35,7 +35,10 @@ def fetch_paginated(query, params, :keyset) do
end end
def fetch_paginated(query, %{"total" => true} = params, :offset) do def fetch_paginated(query, %{"total" => true} = params, :offset) do
total = Repo.aggregate(query, :count, :id) total =
query
|> Ecto.Query.exclude(:left_join)
|> Repo.aggregate(:count, :id)
%{ %{
total: total, total: total,

View File

@ -69,12 +69,13 @@ def render("index_notes.json", %{notes: notes}) when is_list(notes) do
def render("index_notes.json", _), do: [] def render("index_notes.json", _), do: []
def render("show_note.json", %{content: content, user_id: user_id}) do def render("show_note.json", %{content: content, user_id: user_id, inserted_at: inserted_at}) do
user = User.get_by_id(user_id) user = User.get_by_id(user_id)
%{ %{
content: content, content: content,
user: merge_account_views(user) user: merge_account_views(user),
created_at: inserted_at
} }
end end

View File

@ -2940,11 +2940,13 @@ test "it resend emails for two users", %{admin: admin} do
end end
test "it creates report note", %{admin_id: admin_id, report_id: report_id} do test "it creates report note", %{admin_id: admin_id, report_id: report_id} do
[note, _] = Repo.all(Pleroma.ReportNote)
assert %{ assert %{
activity_id: ^report_id, activity_id: ^report_id,
content: "this is disgusting!", content: "this is disgusting!",
user_id: ^admin_id user_id: ^admin_id
} = Repo.one(Pleroma.ReportNote) } = note
end end
test "it returns reports with notes", %{admin: admin} do test "it returns reports with notes", %{admin: admin} do
@ -2959,6 +2961,7 @@ test "it returns reports with notes", %{admin: admin} do
assert note["user"]["nickname"] == admin.nickname assert note["user"]["nickname"] == admin.nickname
assert note["content"] == "this is disgusting!" assert note["content"] == "this is disgusting!"
assert note["created_at"]
assert response["total"] == 1 assert response["total"] == 1
end end
end end