Add backend to list an user's pictures

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
Thomas Citharel 2020-11-23 10:38:01 +01:00
parent 846f7b71f3
commit 6a1cd42d2c
No known key found for this signature in database
GPG Key ID: A061B9DDE0CA0773
5 changed files with 62 additions and 2 deletions

View File

@ -525,6 +525,28 @@ defmodule Mobilizon.GraphQL.Resolvers.User do
end end
end end
def user_medias(%User{id: user_id}, %{page: page, limit: limit}, %{
context: %{current_user: %User{id: logged_in_user_id}}
})
when user_id == logged_in_user_id do
%{elements: elements, total: total} = Mobilizon.Media.pictures_for_user(user_id, page, limit)
{:ok,
%{
elements:
Enum.map(elements, fn element ->
%{
name: element.file.name,
url: element.file.url,
id: element.id,
content_type: element.file.content_type,
size: element.file.size
}
end),
total: total
}}
end
@spec update_user_login_information(User.t(), map()) :: @spec update_user_login_information(User.t(), map()) ::
{:ok, User.t()} | {:error, Ecto.Changeset.t()} {:ok, User.t()} | {:error, Ecto.Changeset.t()}
defp update_user_login_information( defp update_user_login_information(

View File

@ -16,6 +16,14 @@ defmodule Mobilizon.GraphQL.Schema.PictureType do
field(:size, :integer, description: "The picture's size") field(:size, :integer, description: "The picture's size")
end end
@desc """
A paginated list of pictures
"""
object :paginated_picture_list do
field(:elements, list_of(:picture), description: "The list of pictures")
field(:total, :integer, description: "The total number of pictures in the list")
end
@desc "An attached picture or a link to a picture" @desc "An attached picture or a link to a picture"
input_object :picture_input do input_object :picture_input do
# Either a full picture object # Either a full picture object

View File

@ -26,7 +26,7 @@ defmodule Mobilizon.GraphQL.Schema.PostType do
) )
field(:picture, :picture, field(:picture, :picture,
description: "The event's picture", description: "The posts's picture",
resolve: &Picture.picture/3 resolve: &Picture.picture/3
) )
end end

View File

@ -110,6 +110,16 @@ defmodule Mobilizon.GraphQL.Schema.UserType do
field(:current_sign_in_ip, :string, field(:current_sign_in_ip, :string,
description: "The IP adress the user's currently signed-in with" description: "The IP adress the user's currently signed-in with"
) )
field(:media, :paginated_picture_list, description: "The user's media objects") do
arg(:page, :integer,
default_value: 1,
description: "The page in the paginated user media list"
)
arg(:limit, :integer, default_value: 10, description: "The limit of user media per page")
resolve(&User.user_medias/3)
end
end end
@desc "The list of roles an user can have" @desc "The list of roles an user can have"

View File

@ -7,8 +7,10 @@ defmodule Mobilizon.Media do
alias Ecto.Multi alias Ecto.Multi
alias Mobilizon.Actors.Actor
alias Mobilizon.Media.{File, Picture} alias Mobilizon.Media.{File, Picture}
alias Mobilizon.Storage.Repo alias Mobilizon.Storage.{Page, Repo}
alias Mobilizon.Users.User
alias Mobilizon.Web.Upload alias Mobilizon.Web.Upload
@ -35,6 +37,16 @@ defmodule Mobilizon.Media do
|> Repo.one() |> Repo.one()
end end
@doc """
List the paginated picture for user
"""
@spec pictures_for_user(integer | String.t(), integer | nil, integer | nil) :: Page.t()
def pictures_for_user(user_id, page, limit) do
user_id
|> pictures_for_user_query()
|> Page.build_page(page, limit)
end
@doc """ @doc """
Creates a picture. Creates a picture.
""" """
@ -84,4 +96,12 @@ defmodule Mobilizon.Media do
where: fragment("? @> ?", p.file, ~s|{"url": "#{url}"}|) where: fragment("? @> ?", p.file, ~s|{"url": "#{url}"}|)
) )
end end
@spec pictures_for_user_query(integer() | String.t()) :: Ecto.Query.t()
defp pictures_for_user_query(user_id) do
Picture
|> join(:inner, [p], a in Actor, on: p.actor_id == a.id)
|> join(:inner, [_p, a], u in User, on: a.user_id == u.id)
|> where([_p, _a, u], u.id == ^user_id)
end
end end