Chapril/mobilizon.chapril.org-mobilizon
Chapril/mobilizon.chapril.org-mobilizon
25
0
Fork 0
Code Issues Pull Requests Releases Activity

Order actor organized events by begins_on

Browse Source 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
Thomas Citharel 2021-05-12 18:22:20 +02:00
parent 4ad67e1efc
commit 80f951680f
No known key found for this signature in database
GPG Key ID: A061B9DDE0CA0773
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/mobilizon/events/events.ex
View File

@ -421,7 +421,7 @@ defmodule Mobilizon.Events do
@spec list_organized_events_for_actor(Actor.t(), integer | nil, integer | nil) :: Page.t() @spec list_organized_events_for_actor(Actor.t(), integer | nil, integer | nil) :: Page.t()
def list_organized_events_for_actor(%Actor{id: actor_id}, page \\ nil, limit \\ nil) do def list_organized_events_for_actor(%Actor{id: actor_id}, page \\ nil, limit \\ nil) do
actor_id actor_id
|> event_for_actor_query() |> event_for_actor_query(desc: :begins_on)
|> preload_for_event() |> preload_for_event()
|> Page.build_page(page, limit) |> Page.build_page(page, limit)
end end
@ -1264,12 +1264,10 @@ defmodule Mobilizon.Events do
end end
@spec event_for_actor_query(integer | String.t()) :: Ecto.Query.t() @spec event_for_actor_query(integer | String.t()) :: Ecto.Query.t()
defp event_for_actor_query(actor_id) do defp event_for_actor_query(actor_id, order_by \\ [desc: :id]) do
from( Event
e in Event, |> where([e], e.organizer_actor_id == ^actor_id)
where: e.organizer_actor_id == ^actor_id, |> order_by([e], ^order_by)
order_by: [desc: :id]
)
end end
@spec event_for_group_query(integer | String.t()) :: Ecto.Query.t() @spec event_for_group_query(integer | String.t()) :: Ecto.Query.t()