feat: add user to member linking

lib/accounts/user.ex

@@ -69,7 +69,7 @@ defmodule Mv.Accounts.User do
     # Default actions for framework/tooling integration:
     # - :read   -> Standard read used across the app and by admin tooling.
     # - :destroy-> Standard delete used by admin tooling and maintenance tasks.
-    # 
+    #
     # NOTE: :create is INTENTIONALLY excluded from defaults!
     #       Using a default :create would bypass email-synchronization logic.
     #       Always use one of these explicit create actions instead:

lib/membership/member.ex

@@ -152,7 +152,8 @@ defmodule Mv.Membership.Member do
       prepare fn query, _ctx ->
         q = Ash.Query.get_argument(query, :query) || ""
 
-        # 0.2 as similarity threshold (recommended) - lower value can lead to more results but also to more unspecific results
+        # 0.2 as similarity threshold (recommended)
+        # Lower value can lead to more results but also to more unspecific results
         threshold = Ash.Query.get_argument(query, :similarity_threshold) || 0.2
 
         if is_binary(q) and String.trim(q) != "" do
@@ -187,8 +188,82 @@ defmodule Mv.Membership.Member do
         end
       end
     end
+
+    # Action to find members available for linking to a user account
+    # Returns only unlinked members (user_id == nil), limited to 10 results
+    #
+    # Special behavior for email matching:
+    # - When user_email AND search_query are both provided: filter by email (email takes precedence)
+    # - When only user_email provided: return all unlinked members (caller should use filter_by_email_match helper)
+    # - When only search_query provided: filter by search terms
+    read :available_for_linking do
+      argument :user_email, :string, allow_nil?: true
+      argument :search_query, :string, allow_nil?: true
+
+      prepare fn query, _ctx ->
+        user_email = Ash.Query.get_argument(query, :user_email)
+        search_query = Ash.Query.get_argument(query, :search_query)
+
+        # Start with base filter: only unlinked members
+        base_query = Ash.Query.filter(query, is_nil(user))
+
+        # Determine filtering strategy
+        # Priority: search_query (if present) > no filters
+        # user_email is used for POST-filtering via filter_by_email_match helper
+        if not is_nil(search_query) and String.trim(search_query) != "" do
+          # Search query present: Use fuzzy search (regardless of user_email)
+          trimmed = String.trim(search_query)
+
+          # Use same fuzzy search as :search action (PostgreSQL Trigram + FTS)
+          base_query
+          |> Ash.Query.filter(
+            expr(
+              # Full-text search
+              # Trigram similarity for names
+              # Exact substring match for email
+              fragment("search_vector @@ websearch_to_tsquery('simple', ?)", ^trimmed) or
+                fragment("search_vector @@ plainto_tsquery('simple', ?)", ^trimmed) or
+                fragment("? % first_name", ^trimmed) or
+                fragment("? % last_name", ^trimmed) or
+                fragment("word_similarity(?, first_name) > 0.2", ^trimmed) or
+                fragment("word_similarity(?, last_name) > 0.2", ^trimmed) or
+                fragment("similarity(first_name, ?) > 0.2", ^trimmed) or
+                fragment("similarity(last_name, ?) > 0.2", ^trimmed) or
+                contains(email, ^trimmed)
+            )
+          )
+          |> Ash.Query.limit(10)
+        else
+          # No search query: return all unlinked members
+          # Caller should use filter_by_email_match helper for email match logic
+          base_query
+          |> Ash.Query.limit(10)
+        end
+      end
+    end
   end
 
+  # Public helper function to apply email match logic after query execution
+  # This should be called after using :available_for_linking with user_email argument
+  #
+  # If a member with matching email exists, returns only that member
+  # Otherwise returns all members (no filtering)
+  def filter_by_email_match(members, user_email)
+      when is_list(members) and is_binary(user_email) do
+    # Check if any member matches the email
+    email_match = Enum.find(members, &(&1.email == user_email))
+
+    if email_match do
+      # Return only the email-matched member
+      [email_match]
+    else
+      # No email match, return all members
+      members
+    end
+  end
+
+  def filter_by_email_match(members, _user_email), do: members
+
   validations do
     # Required fields are covered by allow_nil? false
 

lib/mv/accounts/user/validations/email_not_used_by_other_member.ex

@@ -41,18 +41,37 @@ defmodule Mv.Accounts.User.Validations.EmailNotUsedByOtherMember do
     if should_validate? do
       case Ash.Changeset.fetch_change(changeset, :email) do
         {:ok, new_email} ->
-          check_email_uniqueness(new_email, member_id)
+          # Extract member_id from relationship changes for new links
+          member_id_to_exclude = get_member_id_from_changeset(changeset)
+          check_email_uniqueness(new_email, member_id_to_exclude)
 
         :error ->
           # No email change, get current email
           current_email = Ash.Changeset.get_attribute(changeset, :email)
-          check_email_uniqueness(current_email, member_id)
+          # Extract member_id from relationship changes for new links
+          member_id_to_exclude = get_member_id_from_changeset(changeset)
+          check_email_uniqueness(current_email, member_id_to_exclude)
       end
     else
       :ok
     end
   end
 
+  # Extract member_id from changeset, checking relationship changes first
+  # This is crucial for new links where member_id is in manage_relationship changes
+  defp get_member_id_from_changeset(changeset) do
+    # Try to get from relationships (for new links via manage_relationship)
+    case Map.get(changeset.relationships, :member) do
+      [{[%{id: id}], _opts}] when not is_nil(id) ->
+        # Found in relationships - this is a new link
+        id
+
+      _ ->
+        # Fall back to attribute (for existing links)
+        Ash.Changeset.get_attribute(changeset, :member_id)
+    end
+  end
+
   defp check_email_uniqueness(email, exclude_member_id) do
     query =
       Mv.Membership.Member

lib/mv_web/live/user_live/form.ex

@@ -120,6 +120,116 @@ defmodule MvWeb.UserLive.Form do
             <% end %>
           <% end %>
         </div>
+        
+    <!-- Member Linking Section -->
+        <div class="mt-6">
+          <h2 class="text-base font-semibold mb-3">{gettext("Linked Member")}</h2>
+
+          <%= if @user && @user.member && !@unlink_member do %>
+            <!-- Show linked member with unlink button -->
+            <div class="p-4 bg-green-50 border border-green-200 rounded-lg">
+              <div class="flex items-center justify-between">
+                <div>
+                  <p class="font-medium text-green-900">
+                    {@user.member.first_name} {@user.member.last_name}
+                  </p>
+                  <p class="text-sm text-green-700">{@user.member.email}</p>
+                </div>
+                <button
+                  type="button"
+                  phx-click="unlink_member"
+                  class="btn btn-sm btn-error"
+                >
+                  {gettext("Unlink Member")}
+                </button>
+              </div>
+            </div>
+          <% else %>
+            <%= if @unlink_member do %>
+              <!-- Show unlink pending message -->
+              <div class="p-4 bg-yellow-50 border border-yellow-200 rounded-lg">
+                <p class="text-sm text-yellow-800">
+                  <strong>{gettext("Unlinking scheduled")}:</strong> {gettext(
+                    "Member will be unlinked when you save. Cannot select new member until saved."
+                  )}
+                </p>
+              </div>
+            <% end %>
+            <!-- Show member search/selection for unlinked users -->
+            <div class="space-y-3">
+              <div class="relative">
+                <input
+                  type="text"
+                  id="member-search-input"
+                  role="combobox"
+                  phx-focus="show_member_dropdown"
+                  phx-change="search_members"
+                  phx-debounce="300"
+                  value={@member_search_query}
+                  placeholder={gettext("Search for a member to link...")}
+                  class="w-full input"
+                  name="member_search"
+                  disabled={@unlink_member}
+                  aria-label={gettext("Search for member to link")}
+                  aria-describedby={if @selected_member_name, do: "member-selected", else: nil}
+                  aria-autocomplete="list"
+                  aria-controls="member-dropdown"
+                  aria-expanded={to_string(@show_member_dropdown)}
+                  autocomplete="off"
+                />
+
+                <%= if length(@available_members) > 0 do %>
+                  <div
+                    id="member-dropdown"
+                    role="listbox"
+                    aria-label={gettext("Available members")}
+                    class={"absolute z-10 w-full mt-1 bg-base-100 border border-base-300 rounded-lg shadow-lg max-h-60 overflow-auto #{if !@show_member_dropdown, do: "hidden"}"}
+                    phx-click-away="hide_member_dropdown"
+                  >
+                    <%= for member <- @available_members do %>
+                      <div
+                        role="option"
+                        tabindex="0"
+                        aria-selected="false"
+                        phx-click="select_member"
+                        phx-value-id={member.id}
+                        data-member-id={member.id}
+                        class="px-4 py-3 hover:bg-base-200 cursor-pointer border-b border-base-300 last:border-b-0"
+                      >
+                        <p class="font-medium">{member.first_name} {member.last_name}</p>
+                        <p class="text-sm text-base-content/70">{member.email}</p>
+                      </div>
+                    <% end %>
+                  </div>
+                <% end %>
+              </div>
+
+              <%= if @user && @user.email && @available_members != [] && Enum.all?(@available_members, &(&1.email == to_string(@user.email))) do %>
+                <div class="p-3 bg-yellow-50 border border-yellow-200 rounded">
+                  <p class="text-sm text-yellow-800">
+                    <strong>{gettext("Note")}:</strong> {gettext(
+                      "A member with this email already exists. To link with a different member, please change one of the email addresses first."
+                    )}
+                  </p>
+                </div>
+              <% end %>
+
+              <%= if @selected_member_id && @selected_member_name do %>
+                <div
+                  id="member-selected"
+                  class="mt-2 p-3 bg-blue-50 border border-blue-200 rounded-lg"
+                >
+                  <p class="text-sm text-blue-800">
+                    <strong>{gettext("Selected")}:</strong> {@selected_member_name}
+                  </p>
+                  <p class="text-xs text-blue-600 mt-1">
+                    {gettext("Save to confirm linking.")}
+                  </p>
+                </div>
+              <% end %>
+            </div>
+          <% end %>
+        </div>
 
         <.button phx-disable-with={gettext("Saving...")} variant="primary">
           {gettext("Save User")}
@@ -135,7 +245,7 @@ defmodule MvWeb.UserLive.Form do
     user =
       case params["id"] do
         nil -> nil
-        id -> Ash.get!(Mv.Accounts.User, id, domain: Mv.Accounts)
+        id -> Ash.get!(Mv.Accounts.User, id, domain: Mv.Accounts, load: [:member])
       end
 
     action = if is_nil(user), do: gettext("New"), else: gettext("Edit")
@@ -147,6 +257,13 @@ defmodule MvWeb.UserLive.Form do
      |> assign(user: user)
      |> assign(:page_title, page_title)
      |> assign(:show_password_fields, false)
+     |> assign(:member_search_query, "")
+     |> assign(:available_members, [])
+     |> assign(:show_member_dropdown, false)
+     |> assign(:selected_member_id, nil)
+     |> assign(:selected_member_name, nil)
+     |> assign(:unlink_member, false)
+     |> load_initial_members()
      |> assign_form()}
   end
 
@@ -170,22 +287,102 @@ defmodule MvWeb.UserLive.Form do
   end
 
   def handle_event("save", %{"user" => user_params}, socket) do
+    # First save the user without member changes
     case AshPhoenix.Form.submit(socket.assigns.form, params: user_params) do
       {:ok, user} ->
-        notify_parent({:saved, user})
+        # Then handle member linking/unlinking as a separate step
+        result =
+          cond do
+            # Selected member ID takes precedence (new link)
+            socket.assigns.selected_member_id ->
+              Mv.Accounts.update_user(user, %{member: %{id: socket.assigns.selected_member_id}})
 
-        socket =
-          socket
-          |> put_flash(:info, "User #{socket.assigns.form.source.type}d successfully")
-          |> push_navigate(to: return_path(socket.assigns.return_to, user))
+            # Unlink flag is set
+            socket.assigns[:unlink_member] ->
+              Mv.Accounts.update_user(user, %{member: nil})
 
-        {:noreply, socket}
+            # No changes to member relationship
+            true ->
+              {:ok, user}
+          end
+
+        case result do
+          {:ok, updated_user} ->
+            notify_parent({:saved, updated_user})
+
+            socket =
+              socket
+              |> put_flash(:info, "User #{socket.assigns.form.source.type}d successfully")
+              |> push_navigate(to: return_path(socket.assigns.return_to, updated_user))
+
+            {:noreply, socket}
+
+          {:error, error} ->
+            # Show error from member linking/unlinking
+            {:noreply,
+             put_flash(socket, :error, "Failed to update member relationship: #{inspect(error)}")}
+        end
 
       {:error, form} ->
         {:noreply, assign(socket, form: form)}
     end
   end
 
+  def handle_event("show_member_dropdown", _params, socket) do
+    {:noreply, assign(socket, show_member_dropdown: true)}
+  end
+
+  def handle_event("hide_member_dropdown", _params, socket) do
+    {:noreply, assign(socket, show_member_dropdown: false)}
+  end
+
+  def handle_event("search_members", %{"member_search" => query}, socket) do
+    socket =
+      socket
+      |> assign(:member_search_query, query)
+      |> load_available_members(query)
+      |> assign(:show_member_dropdown, true)
+
+    {:noreply, socket}
+  end
+
+  def handle_event("select_member", %{"id" => member_id}, socket) do
+    # Find the selected member to get their name
+    selected_member = Enum.find(socket.assigns.available_members, &(&1.id == member_id))
+
+    member_name =
+      if selected_member,
+        do: "#{selected_member.first_name} #{selected_member.last_name}",
+        else: ""
+
+    # Store the selected member ID and name in socket state and clear unlink flag
+    socket =
+      socket
+      |> assign(:selected_member_id, member_id)
+      |> assign(:selected_member_name, member_name)
+      |> assign(:unlink_member, false)
+      |> assign(:show_member_dropdown, false)
+      |> assign(:member_search_query, member_name)
+      |> push_event("set-input-value", %{id: "member-search-input", value: member_name})
+
+    {:noreply, socket}
+  end
+
+  def handle_event("unlink_member", _params, socket) do
+    # Set flag to unlink member on save
+    # Clear all member selection state and keep dropdown hidden
+    socket =
+      socket
+      |> assign(:unlink_member, true)
+      |> assign(:selected_member_id, nil)
+      |> assign(:selected_member_name, nil)
+      |> assign(:member_search_query, "")
+      |> assign(:show_member_dropdown, false)
+      |> load_initial_members()
+
+    {:noreply, socket}
+  end
+
   defp notify_parent(msg), do: send(self(), {__MODULE__, msg})
 
   defp assign_form(%{assigns: %{user: user, show_password_fields: show_password_fields}} = socket) do
@@ -209,4 +406,53 @@ defmodule MvWeb.UserLive.Form do
 
   defp return_path("index", _user), do: ~p"/users"
   defp return_path("show", user), do: ~p"/users/#{user.id}"
+
+  # Load initial members when the form is loaded or member is unlinked
+  defp load_initial_members(socket) do
+    user = socket.assigns.user
+    user_email = if user, do: user.email, else: nil
+
+    members = load_members_for_linking(user_email, "")
+
+    # Dropdown should ALWAYS be hidden initially
+    # It will only show when user focuses the input field (show_member_dropdown event)
+    socket
+    |> assign(available_members: members)
+    |> assign(show_member_dropdown: false)
+  end
+
+  # Load members based on search query
+  defp load_available_members(socket, query) do
+    user = socket.assigns.user
+    user_email = if user, do: user.email, else: nil
+
+    members = load_members_for_linking(user_email, query)
+    assign(socket, available_members: members)
+  end
+
+  # Query available members using the Ash action
+  defp load_members_for_linking(user_email, search_query) do
+    user_email_str = if user_email, do: to_string(user_email), else: nil
+    search_query_str = if search_query && search_query != "", do: search_query, else: nil
+
+    query =
+      Mv.Membership.Member
+      |> Ash.Query.for_read(:available_for_linking, %{
+        user_email: user_email_str,
+        search_query: search_query_str
+      })
+
+    case Ash.read(query, domain: Mv.Membership) do
+      {:ok, members} ->
+        # Apply email match filter if user_email is provided
+        if user_email_str do
+          Mv.Membership.Member.filter_by_email_match(members, user_email_str)
+        else
+          members
+        end
+
+      {:error, _} ->
+        []
+    end
+  end
 end

lib/mv_web/live/user_live/index.ex

@@ -25,7 +25,7 @@ defmodule MvWeb.UserLive.Index do
 
   @impl true
   def mount(_params, _session, socket) do
-    users = Ash.read!(Mv.Accounts.User, domain: Mv.Accounts)
+    users = Ash.read!(Mv.Accounts.User, domain: Mv.Accounts, load: [:member])
     sorted = Enum.sort_by(users, & &1.email)
 
     {:ok,

lib/mv_web/live/user_live/index.html.heex

@@ -50,6 +50,13 @@
       {user.email}
     </:col>
     <:col :let={user} label={gettext("OIDC ID")}>{user.oidc_id}</:col>
+    <:col :let={user} label={gettext("Linked Member")}>
+      <%= if user.member do %>
+        {user.member.first_name} {user.member.last_name}
+      <% else %>
+        <span class="text-base-content/50">{gettext("No member linked")}</span>
+      <% end %>
+    </:col>
 
     <:action :let={user}>
       <div class="sr-only">