Refactoring of Actors context

lib/mobilizon_web/resolvers/group.ex

@@ -76,7 +76,7 @@ defmodule MobilizonWeb.Resolvers.Group do
       ) do
     with {:ok, %Actor{} = group} <- Actors.get_group_by_actor_id(group_id),
          {:is_owned, %Actor{}} <- User.owns_actor(user, actor_id),
-         {:ok, %Member{} = member} <- Member.get_member(actor_id, group.id),
+         {:ok, %Member{} = member} <- Actors.get_member(actor_id, group.id),
          {:is_admin, true} <- Member.is_administrator(member),
          group <- Actors.delete_group!(group) do
       {:ok, %{id: group.id}}
@@ -109,9 +109,9 @@ defmodule MobilizonWeb.Resolvers.Group do
       ) do
     with {:is_owned, %Actor{} = actor} <- User.owns_actor(user, actor_id),
          {:ok, %Actor{} = group} <- Actors.get_group_by_actor_id(group_id),
-         {:error, :member_not_found} <- Member.get_member(actor.id, group.id),
+         {:error, :member_not_found} <- Actors.get_member(actor.id, group.id),
          {:is_able_to_join, true} <- {:is_able_to_join, Member.can_be_joined(group)},
-         role <- Mobilizon.Actors.get_default_member_role(group),
+         role <- Member.get_default_member_role(group),
          {:ok, _} <- Actors.create_member(%{parent_id: group.id, actor_id: actor.id, role: role}) do
       {
         :ok,
@@ -149,7 +149,7 @@ defmodule MobilizonWeb.Resolvers.Group do
         %{context: %{current_user: user}}
       ) do
     with {:is_owned, %Actor{} = actor} <- User.owns_actor(user, actor_id),
-         {:ok, %Member{} = member} <- Member.get_member(actor.id, group_id),
+         {:ok, %Member{} = member} <- Actors.get_member(actor.id, group_id),
          {:only_administrator, false} <-
            {:only_administrator, check_that_member_is_not_last_administrator(group_id, actor_id)},
          {:ok, _} <-
@@ -176,7 +176,7 @@ defmodule MobilizonWeb.Resolvers.Group do
   # and that it's the actor requesting leaving the group we return true
   @spec check_that_member_is_not_last_administrator(integer(), integer()) :: boolean()
   defp check_that_member_is_not_last_administrator(group_id, actor_id) do
-    case Member.list_administrator_members_for_group(group_id) do
+    case Actors.list_administrator_members_for_group(group_id) do
       [%Member{actor: %Actor{id: member_actor_id}}] ->
         actor_id == member_actor_id
 

lib/mobilizon_web/resolvers/person.ex

@@ -2,12 +2,13 @@ defmodule MobilizonWeb.Resolvers.Person do
   @moduledoc """
   Handles the person-related GraphQL calls
   """
+
   alias Mobilizon.Actors
-  alias Mobilizon.Actors.{Actor, Member}
-  alias Mobilizon.Users.User
-  alias Mobilizon.Users
+  alias Mobilizon.Actors.Actor
   alias Mobilizon.Events
   alias Mobilizon.Service.ActivityPub
+  alias Mobilizon.Users
+  alias Mobilizon.Users.User
 
   @doc """
   Find a person
@@ -206,7 +207,7 @@ defmodule MobilizonWeb.Resolvers.Person do
   # We check that the actor is not the last administrator/creator of a group
   @spec last_admin_of_a_group?(integer()) :: boolean()
   defp last_admin_of_a_group?(actor_id) do
-    length(Member.list_group_id_where_last_administrator(actor_id)) > 0
+    length(Actors.list_group_id_where_last_administrator(actor_id)) > 0
   end
 
   @spec proxify_avatar(Actor.t()) :: Actor.t()

lib/mobilizon_web/resolvers/report.ex

@@ -91,7 +91,7 @@ defmodule MobilizonWeb.Resolvers.Report do
       when is_moderator(role) do
     with {:is_owned, %Actor{}} <- User.owns_actor(user, moderator_id),
          %Report{} = report <- Reports.get_report(report_id),
-         %Actor{} = moderator <- Actors.get_local_actor_with_everything(moderator_id),
+         %Actor{} = moderator <- Actors.get_local_actor_with_preload(moderator_id),
          {:ok, %Note{} = note} <-
            MobilizonWeb.API.Reports.create_report_note(report, moderator, content) do
       {:ok, note}
@@ -106,7 +106,7 @@ defmodule MobilizonWeb.Resolvers.Report do
       when is_moderator(role) do
     with {:is_owned, %Actor{}} <- User.owns_actor(user, moderator_id),
          %Note{} = note <- Reports.get_note(note_id),
-         %Actor{} = moderator <- Actors.get_local_actor_with_everything(moderator_id),
+         %Actor{} = moderator <- Actors.get_local_actor_with_preload(moderator_id),
          {:ok, %Note{} = note} <-
            MobilizonWeb.API.Reports.delete_report_note(note, moderator) do
       {:ok, %{id: note.id}}