refactor: review remarks

lib/membership/membership.ex

@@ -32,9 +32,7 @@ defmodule Mv.Membership do
   alias Mv.Helpers.SystemActor
   alias Mv.Membership.JoinRequest
   alias Mv.Membership.Member
-  alias MvWeb.Emails.JoinAlreadyMemberEmail
-  alias MvWeb.Emails.JoinAlreadyPendingEmail
-  alias MvWeb.Emails.JoinConfirmationEmail
+  alias Mv.Membership.SettingsCache
   require Logger
 
   admin do
@@ -118,10 +116,16 @@ defmodule Mv.Membership do
 
   """
   def get_settings do
-    # Try to get the first (and only) settings record
+    case Process.whereis(SettingsCache) do
+      nil -> get_settings_uncached()
+      _pid -> SettingsCache.get()
+    end
+  end
+
+  @doc false
+  def get_settings_uncached do
     case Ash.read_one(Mv.Membership.Setting, domain: __MODULE__) do
       {:ok, nil} ->
-        # No settings exist - create as fallback (should normally be created via seed script)
         default_club_name = System.get_env("ASSOCIATION_NAME") || "Club Name"
 
         Mv.Membership.Setting
@@ -162,9 +166,16 @@ defmodule Mv.Membership do
 
   """
   def update_settings(settings, attrs) do
-    settings
-    |> Ash.Changeset.for_update(:update, attrs)
-    |> Ash.update(domain: __MODULE__)
+    case settings
+         |> Ash.Changeset.for_update(:update, attrs)
+         |> Ash.update(domain: __MODULE__) do
+      {:ok, _updated} = result ->
+        SettingsCache.invalidate()
+        result
+
+      error ->
+        error
+    end
   end
 
   @doc """
@@ -228,11 +239,18 @@ defmodule Mv.Membership do
 
   """
   def update_member_field_visibility(settings, visibility_config) do
-    settings
-    |> Ash.Changeset.for_update(:update_member_field_visibility, %{
-      member_field_visibility: visibility_config
-    })
-    |> Ash.update(domain: __MODULE__)
+    case settings
+         |> Ash.Changeset.for_update(:update_member_field_visibility, %{
+           member_field_visibility: visibility_config
+         })
+         |> Ash.update(domain: __MODULE__) do
+      {:ok, _} = result ->
+        SettingsCache.invalidate()
+        result
+
+      error ->
+        error
+    end
   end
 
   @doc """
@@ -265,12 +283,19 @@ defmodule Mv.Membership do
         field: field,
         show_in_overview: show_in_overview
       ) do
-    settings
-    |> Ash.Changeset.new()
-    |> Ash.Changeset.set_argument(:field, field)
-    |> Ash.Changeset.set_argument(:show_in_overview, show_in_overview)
-    |> Ash.Changeset.for_update(:update_single_member_field_visibility, %{})
-    |> Ash.update(domain: __MODULE__)
+    case settings
+         |> Ash.Changeset.new()
+         |> Ash.Changeset.set_argument(:field, field)
+         |> Ash.Changeset.set_argument(:show_in_overview, show_in_overview)
+         |> Ash.Changeset.for_update(:update_single_member_field_visibility, %{})
+         |> Ash.update(domain: __MODULE__) do
+      {:ok, _} = result ->
+        SettingsCache.invalidate()
+        result
+
+      error ->
+        error
+    end
   end
 
   @doc """
@@ -304,13 +329,20 @@ defmodule Mv.Membership do
         show_in_overview: show_in_overview,
         required: required
       ) do
-    settings
-    |> Ash.Changeset.new()
-    |> Ash.Changeset.set_argument(:field, field)
-    |> Ash.Changeset.set_argument(:show_in_overview, show_in_overview)
-    |> Ash.Changeset.set_argument(:required, required)
-    |> Ash.Changeset.for_update(:update_single_member_field, %{})
-    |> Ash.update(domain: __MODULE__)
+    case settings
+         |> Ash.Changeset.new()
+         |> Ash.Changeset.set_argument(:field, field)
+         |> Ash.Changeset.set_argument(:show_in_overview, show_in_overview)
+         |> Ash.Changeset.set_argument(:required, required)
+         |> Ash.Changeset.for_update(:update_single_member_field, %{})
+         |> Ash.update(domain: __MODULE__) do
+      {:ok, _} = result ->
+        SettingsCache.invalidate()
+        result
+
+      error ->
+        error
+    end
   end
 
   @doc """
@@ -427,12 +459,12 @@ defmodule Mv.Membership do
 
   defp pending_join_request_with_email(_), do: nil
 
-  defp apply_anti_enumeration_delay do
-    Process.sleep(100 + :rand.uniform(200))
+  defp join_notifier do
+    Application.get_env(:mv, :join_notifier, MvWeb.JoinNotifierImpl)
   end
 
   defp send_already_member_and_return(email) do
-    case JoinAlreadyMemberEmail.send(email) do
+    case join_notifier().send_already_member(email) do
       {:ok, _} ->
         :ok
 
@@ -440,7 +472,7 @@ defmodule Mv.Membership do
         Logger.error("Join already-member email failed for #{email}: #{inspect(reason)}")
     end
 
-    apply_anti_enumeration_delay()
+    # Delay is applied by the caller (e.g. JoinLive) to avoid blocking the process.
     {:ok, :notified_already_member}
   end
 
@@ -461,7 +493,7 @@ defmodule Mv.Membership do
          })
          |> Ash.update(domain: __MODULE__, authorize?: false) do
       {:ok, _updated} ->
-        case JoinConfirmationEmail.send(email, new_token, resend: true) do
+        case join_notifier().send_confirmation(email, new_token, resend: true) do
           {:ok, _} ->
             :ok
 
@@ -469,7 +501,7 @@ defmodule Mv.Membership do
             Logger.error("Join resend confirmation email failed for #{email}: #{inspect(reason)}")
         end
 
-        apply_anti_enumeration_delay()
+        # Delay is applied by the caller (e.g. JoinLive) to avoid blocking the process.
         {:ok, :notified_already_pending}
 
       {:error, _} ->
@@ -479,7 +511,7 @@ defmodule Mv.Membership do
   end
 
   defp send_already_pending_and_return(email) do
-    case JoinAlreadyPendingEmail.send(email) do
+    case join_notifier().send_already_pending(email) do
       {:ok, _} ->
         :ok
 
@@ -487,7 +519,7 @@ defmodule Mv.Membership do
         Logger.error("Join already-pending email failed for #{email}: #{inspect(reason)}")
     end
 
-    apply_anti_enumeration_delay()
+    # Delay is applied by the caller (e.g. JoinLive) to avoid blocking the process.
     {:ok, :notified_already_pending}
   end
 
@@ -501,9 +533,9 @@ defmodule Mv.Membership do
            domain: __MODULE__
          ) do
       {:ok, request} ->
-        case JoinConfirmationEmail.send(request.email, token) do
+        case join_notifier().send_confirmation(request.email, token, []) do
           {:ok, _email} ->
-            apply_anti_enumeration_delay()
+            # Delay is applied by the caller (e.g. JoinLive) to avoid blocking the process.
             {:ok, request}
 
           {:error, reason} ->