Improve dashboard

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

lib/mobilizon/discussions/discussions.ex

@@ -283,16 +283,24 @@ defmodule Mobilizon.Discussions do
   end
 
   @doc """
-  Counts local comments.
+  Counts local comments under events
   """
-  @spec count_local_comments :: integer
-  def count_local_comments, do: Repo.one(count_local_comments_query())
+  @spec count_local_comments_under_events :: integer
+  def count_local_comments_under_events do
+    count_local_comments_query()
+    |> filter_comments_under_events()
+    |> Repo.one()
+  end
 
   @doc """
   Counts all comments.
   """
-  @spec count_comments :: integer
-  def count_comments, do: Repo.one(count_comments_query())
+  @spec count_comments_under_events :: integer
+  def count_comments_under_events do
+    count_comments_query()
+    |> filter_comments_under_events()
+    |> Repo.one()
+  end
 
   def get_discussion(discussion_id) do
     Discussion
@@ -423,11 +431,8 @@ defmodule Mobilizon.Discussions do
 
   @spec count_local_comments_query :: Ecto.Query.t()
   defp count_local_comments_query do
-    from(
-      c in Comment,
-      select: count(c.id),
-      where: c.local == ^true and c.visibility in ^@public_visibility
-    )
+    count_comments_query()
+    |> where([c], local: true)
   end
 
   @spec count_comments_query :: Ecto.Query.t()
@@ -439,6 +444,10 @@ defmodule Mobilizon.Discussions do
     )
   end
 
+  defp filter_comments_under_events(query) do
+    where(query, [c], is_nil(c.discussion_id) and not is_nil(c.event_id))
+  end
+
   @spec preload_for_comment(Ecto.Query.t()) :: Ecto.Query.t()
   defp preload_for_comment(query), do: preload(query, ^@comment_preloads)
 end

lib/mobilizon/events/events.ex

@@ -798,6 +798,15 @@ defmodule Mobilizon.Events do
 
   @moderator_roles [:moderator, :administrator, :creator]
 
+  @doc """
+  Returns the number of participations for all local events
+  """
+  @spec count_confirmed_participants_for_local_events :: integer()
+  def count_confirmed_participants_for_local_events do
+    count_confirmed_participants_for_local_events_query()
+    |> Repo.one()
+  end
+
   @doc """
   Returns the list of participants for an event.
   Default behaviour is to not return :not_approved or :not_confirmed participants
@@ -1548,6 +1557,14 @@ defmodule Mobilizon.Events do
     from(s in Session, where: s.track_id == ^track_id)
   end
 
+  @spec count_confirmed_participants_for_local_events_query :: Ecto.Query.t()
+  defp count_confirmed_participants_for_local_events_query do
+    Participant
+    |> join(:inner, [p], e in Event, on: p.event_id == e.id)
+    |> where([p, e], e.local and p.role not in [^:not_approved, ^:not_confirmed, ^:rejected])
+    |> select([p], count(p.id))
+  end
+
   @spec list_participants_for_event_query(String.t()) :: Ecto.Query.t()
   defp list_participants_for_event_query(event_id) do
     from(