ChatController: Handle pagination.

This commit is contained in:
lain 2020-04-16 18:43:31 +02:00
parent e983f70884
commit f8c3ae7a62
4 changed files with 68 additions and 12 deletions

View File

@ -11,6 +11,7 @@ defmodule Pleroma.Web.PleromaAPI.ChatController do
alias Pleroma.Web.CommonAPI alias Pleroma.Web.CommonAPI
alias Pleroma.Web.PleromaAPI.ChatView alias Pleroma.Web.PleromaAPI.ChatView
alias Pleroma.Web.PleromaAPI.ChatMessageView alias Pleroma.Web.PleromaAPI.ChatMessageView
alias Pleroma.Pagination
import Ecto.Query import Ecto.Query
@ -35,7 +36,7 @@ def post_chat_message(%{assigns: %{user: %{id: user_id} = user}} = conn, %{
end end
end end
def messages(%{assigns: %{user: %{id: user_id} = user}} = conn, %{"id" => id}) do def messages(%{assigns: %{user: %{id: user_id} = user}} = conn, %{"id" => id} = params) do
with %Chat{} = chat <- Repo.get_by(Chat, id: id, user_id: user_id) do with %Chat{} = chat <- Repo.get_by(Chat, id: id, user_id: user_id) do
messages = messages =
from(o in Object, from(o in Object,
@ -54,10 +55,9 @@ def messages(%{assigns: %{user: %{id: user_id} = user}} = conn, %{"id" => id}) d
^chat.recipient, ^chat.recipient,
o.data, o.data,
^[user.ap_id] ^[user.ap_id]
), )
order_by: [desc: o.id]
) )
|> Repo.all() |> Pagination.fetch_paginated(params)
conn conn
|> put_view(ChatMessageView) |> put_view(ChatMessageView)
@ -65,13 +65,13 @@ def messages(%{assigns: %{user: %{id: user_id} = user}} = conn, %{"id" => id}) d
end end
end end
def index(%{assigns: %{user: %{id: user_id}}} = conn, _params) do def index(%{assigns: %{user: %{id: user_id}}} = conn, params) do
chats = chats =
from(c in Chat, from(c in Chat,
where: c.user_id == ^user_id, where: c.user_id == ^user_id,
order_by: [desc: c.updated_at] order_by: [desc: c.updated_at]
) )
|> Repo.all() |> Pagination.fetch_paginated(params)
conn conn
|> put_view(ChatView) |> put_view(ChatView)

View File

@ -15,9 +15,9 @@ def render(
} }
) do ) do
%{ %{
id: id, id: id |> to_string(),
content: chat_message["content"], content: chat_message["content"],
chat_id: chat_id, chat_id: chat_id |> to_string(),
actor: chat_message["actor"] actor: chat_message["actor"]
} }
end end

View File

@ -9,7 +9,7 @@ defmodule Pleroma.Web.PleromaAPI.ChatView do
def render("show.json", %{chat: %Chat{} = chat}) do def render("show.json", %{chat: %Chat{} = chat}) do
%{ %{
id: chat.id, id: chat.id |> to_string(),
recipient: chat.recipient, recipient: chat.recipient,
unread: chat.unread unread: chat.unread
} }

View File

@ -23,11 +23,38 @@ test "it posts a message to the chat", %{conn: conn} do
|> json_response(200) |> json_response(200)
assert result["content"] == "Hallo!!" assert result["content"] == "Hallo!!"
assert result["chat_id"] == chat.id assert result["chat_id"] == chat.id |> to_string()
end end
end end
describe "GET /api/v1/pleroma/chats/:id/messages" do describe "GET /api/v1/pleroma/chats/:id/messages" do
test "it paginates", %{conn: conn} do
user = insert(:user)
recipient = insert(:user)
Enum.each(1..30, fn _ ->
{:ok, _} = CommonAPI.post_chat_message(user, recipient, "hey")
end)
chat = Chat.get(user.id, recipient.ap_id)
result =
conn
|> assign(:user, user)
|> get("/api/v1/pleroma/chats/#{chat.id}/messages")
|> json_response(200)
assert length(result) == 20
result =
conn
|> assign(:user, user)
|> get("/api/v1/pleroma/chats/#{chat.id}/messages", %{"max_id" => List.last(result)["id"]})
|> json_response(200)
assert length(result) == 10
end
# TODO # TODO
# - Test the case where it's not the user's chat # - Test the case where it's not the user's chat
test "it returns the messages for a given chat", %{conn: conn} do test "it returns the messages for a given chat", %{conn: conn} do
@ -50,7 +77,7 @@ test "it returns the messages for a given chat", %{conn: conn} do
result result
|> Enum.each(fn message -> |> Enum.each(fn message ->
assert message["chat_id"] == chat.id assert message["chat_id"] == chat.id |> to_string()
end) end)
assert length(result) == 3 assert length(result) == 3
@ -73,6 +100,31 @@ test "it creates or returns a chat", %{conn: conn} do
end end
describe "GET /api/v1/pleroma/chats" do describe "GET /api/v1/pleroma/chats" do
test "it paginates", %{conn: conn} do
user = insert(:user)
Enum.each(1..30, fn _ ->
recipient = insert(:user)
{:ok, _} = Chat.get_or_create(user.id, recipient.ap_id)
end)
result =
conn
|> assign(:user, user)
|> get("/api/v1/pleroma/chats")
|> json_response(200)
assert length(result) == 20
result =
conn
|> assign(:user, user)
|> get("/api/v1/pleroma/chats", %{max_id: List.last(result)["id"]})
|> json_response(200)
assert length(result) == 10
end
test "it return a list of chats the current user is participating in, in descending order of updates", test "it return a list of chats the current user is participating in, in descending order of updates",
%{conn: conn} do %{conn: conn} do
user = insert(:user) user = insert(:user)
@ -98,7 +150,11 @@ test "it return a list of chats the current user is participating in, in descend
ids = Enum.map(result, & &1["id"]) ids = Enum.map(result, & &1["id"])
assert ids == [chat_2.id, chat_3.id, chat_1.id] assert ids == [
chat_2.id |> to_string(),
chat_3.id |> to_string(),
chat_1.id |> to_string()
]
end end
end end
end end