refactor: integrate approval ui review changes

lib/membership/join_request/changes/approve_request.ex

@@ -8,12 +8,14 @@ defmodule Mv.Membership.JoinRequest.Changes.ApproveRequest do
   """
   use Ash.Resource.Change
 
+  alias Mv.Membership.JoinRequest.Changes.Helpers
+
   @spec change(Ash.Changeset.t(), keyword(), Ash.Resource.Change.context()) :: Ash.Changeset.t()
   def change(changeset, _opts, context) do
     current_status = Ash.Changeset.get_data(changeset, :status)
 
     if current_status == :submitted do
-      reviewed_by_id = actor_id(context.actor)
+      reviewed_by_id = Helpers.actor_id(context.actor)
 
       changeset
       |> Ash.Changeset.force_change_attribute(:status, :approved)
@@ -26,12 +28,4 @@ defmodule Mv.Membership.JoinRequest.Changes.ApproveRequest do
       )
     end
   end
-
-  defp actor_id(nil), do: nil
-
-  defp actor_id(actor) when is_map(actor) do
-    Map.get(actor, :id) || Map.get(actor, "id")
-  end
-
-  defp actor_id(_), do: nil
 end

lib/membership/join_request/changes/helpers.ex

@@ -0,0 +1,19 @@
+defmodule Mv.Membership.JoinRequest.Changes.Helpers do
+  @moduledoc """
+  Shared helpers for JoinRequest change modules (e.g. ApproveRequest, RejectRequest).
+  """
+
+  @doc """
+  Extracts the actor's user id from the Ash change context.
+
+  Supports both atom and string keys for compatibility with different actor representations.
+  """
+  @spec actor_id(term()) :: String.t() | nil
+  def actor_id(nil), do: nil
+
+  def actor_id(actor) when is_map(actor) do
+    Map.get(actor, :id) || Map.get(actor, "id")
+  end
+
+  def actor_id(_), do: nil
+end

lib/membership/join_request/changes/reject_request.ex

@@ -7,12 +7,14 @@ defmodule Mv.Membership.JoinRequest.Changes.RejectRequest do
   """
   use Ash.Resource.Change
 
+  alias Mv.Membership.JoinRequest.Changes.Helpers
+
   @spec change(Ash.Changeset.t(), keyword(), Ash.Resource.Change.context()) :: Ash.Changeset.t()
   def change(changeset, _opts, context) do
     current_status = Ash.Changeset.get_data(changeset, :status)
 
     if current_status == :submitted do
-      reviewed_by_id = actor_id(context.actor)
+      reviewed_by_id = Helpers.actor_id(context.actor)
 
       changeset
       |> Ash.Changeset.force_change_attribute(:status, :rejected)
@@ -25,12 +27,4 @@ defmodule Mv.Membership.JoinRequest.Changes.RejectRequest do
       )
     end
   end
-
-  defp actor_id(nil), do: nil
-
-  defp actor_id(actor) when is_map(actor) do
-    Map.get(actor, :id) || Map.get(actor, "id")
-  end
-
-  defp actor_id(_), do: nil
 end

lib/membership/membership.ex

@@ -456,6 +456,20 @@ defmodule Mv.Membership do
     end
   end
 
+  @doc """
+  Returns whether the public join form is enabled in global settings.
+
+  Used by the web layer (JoinRequest LiveViews, Layouts, plugs) to decide whether
+  to show join-related UI and to gate access to join request pages.
+  """
+  @spec join_form_enabled?() :: boolean()
+  def join_form_enabled? do
+    case get_settings() do
+      {:ok, %{join_form_enabled: true}} -> true
+      _ -> false
+    end
+  end
+
   @doc """
   Returns the allowlist of fields configured for the public join form.
 
@@ -585,8 +599,15 @@ defmodule Mv.Membership do
     query = JoinRequest |> Ash.Query.filter(expr(status == :submitted))
 
     case Ash.count(query, actor: actor, domain: __MODULE__) do
-      {:ok, count} when is_integer(count) and count >= 0 -> count
-      _ -> 0
+      {:ok, count} when is_integer(count) and count >= 0 ->
+        count
+
+      {:error, error} ->
+        Logger.debug("count_submitted_join_requests failed: #{inspect(error)}")
+        0
+
+      _ ->
+        0
     end
   end
 
@@ -604,7 +625,13 @@ defmodule Mv.Membership do
   @spec get_join_request(String.t(), keyword()) :: {:ok, JoinRequest.t() | nil} | {:error, term()}
   def get_join_request(id, opts \\ []) do
     actor = Keyword.get(opts, :actor)
-    Ash.get(JoinRequest, id, actor: actor, load: [:reviewed_by_user], domain: __MODULE__)
+
+    Ash.get(JoinRequest, id,
+      actor: actor,
+      load: [:reviewed_by_user],
+      not_found_error?: false,
+      domain: __MODULE__
+    )
   end
 
   @doc """
@@ -625,13 +652,22 @@ defmodule Mv.Membership do
   def approve_join_request(id, opts \\ []) do
     actor = Keyword.get(opts, :actor)
 
-    with {:ok, request} <- Ash.get(JoinRequest, id, actor: actor, domain: __MODULE__),
-         {:ok, approved} <-
-           request
-           |> Ash.Changeset.for_update(:approve, %{}, actor: actor, domain: __MODULE__)
-           |> Ash.update(actor: actor, domain: __MODULE__),
-         {:ok, _member} <- promote_to_member(approved, actor) do
-      {:ok, approved}
+    result =
+      Ash.transact(JoinRequest, fn ->
+        with {:ok, request} <- Ash.get(JoinRequest, id, actor: actor, domain: __MODULE__),
+             {:ok, approved} <-
+               request
+               |> Ash.Changeset.for_update(:approve, %{}, actor: actor, domain: __MODULE__)
+               |> Ash.update(actor: actor, domain: __MODULE__),
+             {:ok, _member} <- promote_to_member(approved, actor) do
+          {:ok, approved}
+        end
+      end)
+
+    # Ash.transact returns {:ok, callback_result}; flatten so callers get {:ok, request} | {:error, term()}
+    case result do
+      {:ok, inner} -> inner
+      {:error, _} = err -> err
     end
   end
 
@@ -661,6 +697,7 @@ defmodule Mv.Membership do
 
   # Builds Member attrs + custom_field_values from a JoinRequest and creates the Member.
   @uuid_pattern ~r/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i
+  # Evaluated at compile time so we do not resolve member_fields() on every reduce step.
   @member_field_strings Mv.Constants.member_fields() |> Enum.map(&Atom.to_string/1)
 
   defp promote_to_member(%JoinRequest{} = request, actor) do