Merge branch 'master' into refactoring-based-on-credo-and-dialyzer

lib/mobilizon/addresses/address.ex

@@ -65,12 +65,8 @@ defmodule Mobilizon.Addresses.Address do
 
   @spec set_url(Ecto.Changeset.t()) :: Ecto.Changeset.t()
   defp set_url(%Ecto.Changeset{changes: changes} = changeset) do
-    url =
-      Map.get(
-        changes,
-        :url,
-        "#{MobilizonWeb.Endpoint.url()}/address/#{Ecto.UUID.generate()}"
-      )
+    uuid = Ecto.UUID.generate()
+    url = Map.get(changes, :url, "#{MobilizonWeb.Endpoint.url()}/address/#{uuid}")
 
     put_change(changeset, :url, url)
   end

lib/mobilizon/admin/action_log.ex

@@ -1,3 +1,11 @@
+import EctoEnum
+
+defenum(Mobilizon.Admin.ActionLogAction, [
+  "update",
+  "create",
+  "delete"
+])
+
 defmodule Mobilizon.Admin.ActionLog do
   @moduledoc """
   Represents an action log entity.
@@ -8,6 +16,7 @@ defmodule Mobilizon.Admin.ActionLog do
   import Ecto.Changeset
 
   alias Mobilizon.Actors.Actor
+  alias Mobilizon.Admin.ActionLogAction
 
   @type t :: %__MODULE__{
           action: String.t(),
@@ -17,12 +26,13 @@ defmodule Mobilizon.Admin.ActionLog do
           actor: Actor.t()
         }
 
-  @required_attrs [:action, :target_type, :target_id, :actor_id]
-  @optional_attrs [:changes]
-  @attrs @required_attrs ++ @optional_attrs
+  @required_attrs [:action, :target_type, :target_id, :changes, :actor_id]
+  @attrs @required_attrs
+
+  @timestamps_opts [type: :utc_datetime]
 
   schema "admin_action_logs" do
-    field(:action, :string)
+    field(:action, ActionLogAction)
     field(:target_type, :string)
     field(:target_id, :integer)
     field(:changes, :map)

lib/mobilizon/admin/admin.ex

@@ -30,6 +30,6 @@ defmodule Mobilizon.Admin do
 
   @spec list_action_logs_query :: Ecto.Query.t()
   defp list_action_logs_query do
-    from(r in ActionLog, preload: [:actor])
+    from(r in ActionLog, preload: [:actor], order_by: [desc: :id])
   end
 end

lib/mobilizon/events/event_options.ex

@@ -36,6 +36,7 @@ defmodule Mobilizon.Events.EventOptions do
   ]
 
   @primary_key false
+  @derive Jason.Encoder
   embedded_schema do
     field(:maximum_attendee_capacity, :integer)
     field(:remaining_attendee_capacity, :integer)

lib/mobilizon/events/events.ex

@@ -657,6 +657,28 @@ defmodule Mobilizon.Events do
     |> Repo.all()
   end
 
+  @doc """
+  Counts approved participants.
+  """
+  @spec count_approved_participants(integer | String.t()) :: integer
+  def count_approved_participants(event_id) do
+    event_id
+    |> count_participants_query()
+    |> filter_approved_role()
+    |> Repo.aggregate(:count, :id)
+  end
+
+  @doc """
+  Counts unapproved participants.
+  """
+  @spec count_unapproved_participants(integer | String.t()) :: integer
+  def count_unapproved_participants(event_id) do
+    event_id
+    |> count_participants_query()
+    |> filter_unapproved_role()
+    |> Repo.aggregate(:count, :id)
+  end
+
   @doc """
   Gets a single session.
   Raises `Ecto.NoResultsError` if the session does not exist.
@@ -1145,6 +1167,11 @@ defmodule Mobilizon.Events do
     from(p in Participant, where: p.actor_id == ^actor_id and p.role == ^:not_approved)
   end
 
+  @spec count_participants_query(integer) :: Ecto.Query.t()
+  defp count_participants_query(event_id) do
+    from(p in Participant, where: p.event_id == ^event_id)
+  end
+
   @spec event_participations_for_actor_query(integer) :: Ecto.Query.t()
   def event_participations_for_actor_query(actor_id) do
     from(
@@ -1244,11 +1271,18 @@ defmodule Mobilizon.Events do
     from(q in query, where: q.visibility == ^:public)
   end
 
-  @spec filter_role(Ecto.Query.t(), boolean) :: Ecto.Query.t()
-  defp filter_role(query, false) do
+  @spec filter_approved_role(Ecto.Query.t()) :: Ecto.Query.t()
+  defp filter_approved_role(query) do
     from(p in query, where: p.role != ^:not_approved)
   end
 
+  @spec filter_unapproved_role(Ecto.Query.t()) :: Ecto.Query.t()
+  defp filter_unapproved_role(query) do
+    from(p in query, where: p.role == ^:not_approved)
+  end
+
+  @spec filter_role(Ecto.Query.t(), boolean) :: Ecto.Query.t()
+  defp filter_role(query, false), do: filter_approved_role(query)
   defp filter_role(query, true), do: query
 
   @spec preload_for_event(Ecto.Query.t()) :: Ecto.Query.t()

lib/mobilizon/reports/note.ex

@@ -13,6 +13,8 @@ defmodule Mobilizon.Reports.Note do
   @required_attrs [:content, :moderator_id, :report_id]
   @attrs @required_attrs
 
+  @timestamps_opts [type: :utc_datetime]
+
   @type t :: %__MODULE__{
           content: String.t(),
           report: Report.t(),

lib/mobilizon/reports/report.ex

@@ -23,10 +23,12 @@ defmodule Mobilizon.Reports.Report do
           notes: [Note.t()]
         }
 
-  @required_attrs [:content, :uri, :reported_id, :reporter_id]
-  @optional_attrs [:status, :manager_id, :event_id]
+  @required_attrs [:uri, :reported_id, :reporter_id]
+  @optional_attrs [:content, :status, :manager_id, :event_id]
   @attrs @required_attrs ++ @optional_attrs
 
+  @timestamps_opts [type: :utc_datetime]
+
   @derive {Jason.Encoder, only: [:status, :uri]}
   schema "reports" do
     field(:content, :string)

lib/mobilizon/reports/reports.ex

@@ -76,14 +76,29 @@ defmodule Mobilizon.Reports do
   @doc """
   Returns the list of reports.
   """
-  @spec list_reports(integer | nil, integer | nil, atom, atom) :: [Report.t()]
-  def list_reports(page \\ nil, limit \\ nil, sort \\ :updated_at, direction \\ :asc) do
-    list_reports_query()
+  @spec list_reports(integer | nil, integer | nil, atom, atom, ReportStatus) :: [Report.t()]
+  def list_reports(
+        page \\ nil,
+        limit \\ nil,
+        sort \\ :updated_at,
+        direction \\ :asc,
+        status \\ :open
+      ) do
+    status
+    |> list_reports_query()
     |> Page.paginate(page, limit)
     |> sort(sort, direction)
     |> Repo.all()
   end
 
+  @doc """
+  Counts opened reports.
+  """
+  @spec count_opened_reports :: integer
+  def count_opened_reports do
+    Repo.aggregate(count_reports_query(), :count, :id)
+  end
+
   @doc """
   Gets a single note.
   """
@@ -131,14 +146,20 @@ defmodule Mobilizon.Reports do
     from(r in Report, where: r.uri == ^url)
   end
 
-  @spec list_reports_query :: Ecto.Query.t()
-  defp list_reports_query do
+  @spec list_reports_query(ReportStatus.t()) :: Ecto.Query.t()
+  defp list_reports_query(status) do
     from(
       r in Report,
-      preload: [:reported, :reporter, :manager, :event, :comments, :notes]
+      preload: [:reported, :reporter, :manager, :event, :comments, :notes],
+      where: r.status == ^status
     )
   end
 
+  @spec count_reports_query :: Ecto.Query.t()
+  defp count_reports_query do
+    from(r in Report, where: r.status == ^:open)
+  end
+
   @spec list_notes_for_report_query(integer | String.t()) :: Ecto.Query.t()
   defp list_notes_for_report_query(report_id) do
     from(