From a6f6f402af6fb4780026e69a484f08861a9dd4e6 Mon Sep 17 00:00:00 2001 From: Simon Date: Tue, 5 May 2026 17:01:10 +0200 Subject: [PATCH 01/11] test: add tests for custom field labels --- test/mv_web/live/join_live_test.exs | 28 ++++++++ .../live/join_request_live/show_test.exs | 71 +++++++++++++++++++ 2 files changed, 99 insertions(+) create mode 100644 test/mv_web/live/join_request_live/show_test.exs diff --git a/test/mv_web/live/join_live_test.exs b/test/mv_web/live/join_live_test.exs index 4772e48..383b413 100644 --- a/test/mv_web/live/join_live_test.exs +++ b/test/mv_web/live/join_live_test.exs @@ -135,6 +135,34 @@ defmodule MvWeb.JoinLiveTest do end end + describe "join field labels" do + @tag role: :unauthenticated + test "renders custom field name as label for custom field IDs", %{conn: conn} do + {:ok, settings} = Membership.get_settings() + system_actor = Mv.Helpers.SystemActor.get_system_actor() + + {:ok, custom_field} = + Membership.create_custom_field( + %{ + name: "Preferred Pronouns", + value_type: :string + }, + actor: system_actor + ) + + {:ok, _} = + Membership.update_settings(settings, %{ + join_form_enabled: true, + join_form_field_ids: ["email", custom_field.id], + join_form_field_required: %{"email" => true, custom_field.id => false} + }) + + {:ok, view, _html} = live(conn, "/join") + + assert has_element?(view, "label[for='join-field-#{custom_field.id}'] .label-text", custom_field.name) + end + end + defp enable_join_form(enabled) do {:ok, settings} = Membership.get_settings() {:ok, _} = Membership.update_settings(settings, %{join_form_enabled: enabled}) diff --git a/test/mv_web/live/join_request_live/show_test.exs b/test/mv_web/live/join_request_live/show_test.exs new file mode 100644 index 0000000..35e87dc --- /dev/null +++ b/test/mv_web/live/join_request_live/show_test.exs @@ -0,0 +1,71 @@ +defmodule MvWeb.JoinRequestLive.ShowTest do + @moduledoc """ + Tests for join request detail view label rendering. + + Focus: applicant data labels for custom fields should use custom field names, + not raw UUIDs. + """ + use MvWeb.ConnCase, async: false + + import Phoenix.LiveViewTest + + alias Mv.Fixtures + alias Mv.Membership + + setup do + {:ok, settings} = Membership.get_settings() + + saved = %{ + join_form_enabled: settings.join_form_enabled, + join_form_field_ids: settings.join_form_field_ids, + join_form_field_required: settings.join_form_field_required + } + + on_exit(fn -> + {:ok, current_settings} = Membership.get_settings() + + Membership.update_settings(current_settings, %{ + join_form_enabled: saved.join_form_enabled, + join_form_field_ids: saved.join_form_field_ids || [], + join_form_field_required: saved.join_form_field_required || %{} + }) + end) + + :ok + end + + describe "custom field labels in applicant data" do + @tag role: :normal_user + test "renders custom field name instead of custom field UUID", %{conn: conn} do + system_actor = Mv.Helpers.SystemActor.get_system_actor() + {:ok, settings} = Membership.get_settings() + + {:ok, custom_field} = + Membership.create_custom_field( + %{ + name: "Emergency contact", + value_type: :string + }, + actor: system_actor + ) + + {:ok, _} = + Membership.update_settings(settings, %{ + join_form_enabled: true, + join_form_field_ids: ["email", custom_field.id], + join_form_field_required: %{"email" => true, custom_field.id => false} + }) + + join_request = + Fixtures.submitted_join_request_fixture(%{ + form_data: %{custom_field.id => "Alice Example"} + }) + + {:ok, view, _html} = live(conn, "/join_requests/#{join_request.id}") + + assert has_element?(view, "span", "#{custom_field.name}:") + assert has_element?(view, "span", "Alice Example") + refute has_element?(view, "span", "#{custom_field.id}:") + end + end +end -- 2.47.2 From 0a7bbc7fa6d135c8fb1b6230098aa16524d1113c Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 6 May 2026 11:05:28 +0200 Subject: [PATCH 02/11] fix: labels for custom fields in join requests --- lib/mv_web/components/layouts.ex | 2 +- lib/mv_web/live/join_live.ex | 31 +++++++++++- lib/mv_web/live/join_request_live/show.ex | 61 +++++++++++++++++++---- test/mv_web/live/join_live_test.exs | 6 ++- 4 files changed, 88 insertions(+), 12 deletions(-) diff --git a/lib/mv_web/components/layouts.ex b/lib/mv_web/components/layouts.ex index 54f589d..9aff23c 100644 --- a/lib/mv_web/components/layouts.ex +++ b/lib/mv_web/components/layouts.ex @@ -138,7 +138,7 @@ defmodule MvWeb.Layouts do # Single get_settings() for layout; derive club_name and join_form_enabled to avoid duplicate query. %{club_name: club_name, join_form_enabled: join_form_enabled} = get_layout_settings() - # TODO: unprocessed count runs on every page load when join form enabled; consider + # NOTE: Unprocessed count runs on every page load when join form is enabled; consider # loading only on navigation or caching briefly if performance becomes an issue. unprocessed_join_requests_count = get_unprocessed_join_requests_count(assigns.current_user, join_form_enabled) diff --git a/lib/mv_web/live/join_live.ex b/lib/mv_web/live/join_live.ex index 3b8db05..d3d66f0 100644 --- a/lib/mv_web/live/join_live.ex +++ b/lib/mv_web/live/join_live.ex @@ -216,19 +216,48 @@ defmodule MvWeb.JoinLive do defp build_join_fields_with_labels(allowlist) do member_field_strings = Mv.Constants.member_fields() |> Enum.map(&Atom.to_string/1) + custom_field_name_by_id = custom_field_name_map(allowlist, member_field_strings) Enum.map(allowlist, fn %{id: id, required: required} -> label = if id in member_field_strings do MemberFields.label(String.to_existing_atom(id)) else - gettext("Field") + Map.get(custom_field_name_by_id, id, gettext("Field")) end %{id: id, label: label, required: required} end) end + defp custom_field_name_map(allowlist, member_field_strings) do + custom_field_ids = + allowlist + |> Enum.map(& &1.id) + |> Enum.reject(&(&1 in member_field_strings)) + + case custom_field_ids do + [] -> + %{} + + ids -> + Mv.Membership.CustomField + |> Ash.Query.select([:id, :name]) + |> Ash.read(domain: Mv.Membership, authorize?: false) + |> case do + {:ok, fields} -> + allowed_ids = MapSet.new(ids) + + fields + |> Enum.filter(&MapSet.member?(allowed_ids, &1.id)) + |> Map.new(&{&1.id, &1.name}) + + {:error, _} -> + %{} + end + end + end + defp initial_form_params(join_fields) do join_fields |> Enum.map(fn f -> {f.id, ""} end) diff --git a/lib/mv_web/live/join_request_live/show.ex b/lib/mv_web/live/join_request_live/show.ex index 304cb6a..2aab87d 100644 --- a/lib/mv_web/live/join_request_live/show.ex +++ b/lib/mv_web/live/join_request_live/show.ex @@ -31,6 +31,7 @@ defmodule MvWeb.JoinRequestLive.Show do {:ok, socket |> assign(:join_request, nil) + |> assign(:custom_field_name_by_id, %{}) |> assign(:join_form_field_ids, []) |> Layouts.assign_page_title(gettext("Join request"))} else @@ -53,9 +54,13 @@ defmodule MvWeb.JoinRequestLive.Show do {:ok, request} -> field_ids = Membership.get_join_form_allowlist() |> Enum.map(& &1.id) + custom_field_name_by_id = + custom_field_name_map(field_ids ++ Map.keys(request.form_data || %{}), actor) + {:noreply, socket |> assign(:join_request, request) + |> assign(:custom_field_name_by_id, custom_field_name_by_id) |> assign(:join_form_field_ids, field_ids) |> Layouts.assign_page_title(gettext("Join request – %{email}", email: request.email))} @@ -132,7 +137,12 @@ defmodule MvWeb.JoinRequestLive.Show do

{gettext("Applicant data")}

- <%= for {label, value} <- applicant_data_rows(@join_request, @join_form_field_ids || []) do %> + <%= for {label, value} <- + applicant_data_rows( + @join_request, + @join_form_field_ids || [], + @custom_field_name_by_id || %{} + ) do %> <.field_row label={label} value={value} empty_text={gettext("Not specified")} /> <% end %>
@@ -230,7 +240,7 @@ defmodule MvWeb.JoinRequestLive.Show do # Builds a single list of {label, display_value} for all applicant-provided data in join form # order. Typed fields (email, first_name, last_name) and form_data are merged; legacy # form_data keys (not in current join form config) are appended at the end. - defp applicant_data_rows(join_request, ordered_field_ids) do + defp applicant_data_rows(join_request, ordered_field_ids, custom_field_name_by_id) do member_field_strings = Constants.member_fields() |> Enum.map(&Atom.to_string/1) form_data = join_request.form_data || %{} @@ -244,7 +254,7 @@ defmodule MvWeb.JoinRequestLive.Show do ordered_field_ids |> Enum.map(fn key -> value = Map.get(typed, key) || Map.get(form_data, key) - label = field_key_to_label(key, member_field_strings) + label = field_key_to_label(key, member_field_strings, custom_field_name_by_id) {label, format_applicant_value(value)} end) @@ -258,7 +268,7 @@ defmodule MvWeb.JoinRequestLive.Show do legacy_entries = Enum.map(legacy_keys, fn key -> - label = field_key_to_label(key, member_field_strings) + label = field_key_to_label(key, member_field_strings, custom_field_name_by_id) {label, format_applicant_value(form_data[key])} end) @@ -299,11 +309,44 @@ defmodule MvWeb.JoinRequestLive.Show do defp format_applicant_value_simple(raw, _value) when is_integer(raw), do: to_string(raw) defp format_applicant_value_simple(_raw, value), do: to_string(value) - defp field_key_to_label(key, member_field_strings) when is_binary(key) do - if key in member_field_strings, - do: MemberFieldsTranslations.label(String.to_existing_atom(key)), - else: key + defp field_key_to_label(key, member_field_strings, custom_field_name_by_id) + when is_binary(key) do + if key in member_field_strings do + MemberFieldsTranslations.label(String.to_existing_atom(key)) + else + Map.get(custom_field_name_by_id, key, key) + end end - defp field_key_to_label(key, _), do: to_string(key) + defp field_key_to_label(key, _, _), do: to_string(key) + + defp custom_field_name_map(field_keys, actor) do + member_field_strings = Constants.member_fields() |> Enum.map(&Atom.to_string/1) + + custom_field_ids = + field_keys + |> Enum.uniq() + |> Enum.reject(&(&1 in member_field_strings)) + + case custom_field_ids do + [] -> + %{} + + ids -> + Mv.Membership.CustomField + |> Ash.Query.select([:id, :name]) + |> Ash.read(actor: actor, domain: Mv.Membership) + |> case do + {:ok, fields} -> + allowed_ids = MapSet.new(ids) + + fields + |> Enum.filter(&MapSet.member?(allowed_ids, &1.id)) + |> Map.new(&{&1.id, &1.name}) + + {:error, _} -> + %{} + end + end + end end diff --git a/test/mv_web/live/join_live_test.exs b/test/mv_web/live/join_live_test.exs index 383b413..273e786 100644 --- a/test/mv_web/live/join_live_test.exs +++ b/test/mv_web/live/join_live_test.exs @@ -159,7 +159,11 @@ defmodule MvWeb.JoinLiveTest do {:ok, view, _html} = live(conn, "/join") - assert has_element?(view, "label[for='join-field-#{custom_field.id}'] .label-text", custom_field.name) + assert has_element?( + view, + "label[for='join-field-#{custom_field.id}'] .label-text", + custom_field.name + ) end end -- 2.47.2 From 95b666f04f77e9e1253974352d55f782421a617a Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 6 May 2026 11:14:09 +0200 Subject: [PATCH 03/11] test: verify that join view respects custom field types --- test/mv_web/live/join_live_test.exs | 123 ++++++++++++++++++++++++++++ 1 file changed, 123 insertions(+) diff --git a/test/mv_web/live/join_live_test.exs b/test/mv_web/live/join_live_test.exs index 273e786..20cd5cf 100644 --- a/test/mv_web/live/join_live_test.exs +++ b/test/mv_web/live/join_live_test.exs @@ -167,6 +167,120 @@ defmodule MvWeb.JoinLiveTest do end end + describe "join field input types" do + @tag role: :unauthenticated + test "renders boolean custom field as checkbox input", %{conn: conn} do + system_actor = Mv.Helpers.SystemActor.get_system_actor() + {:ok, settings} = Membership.get_settings() + + {:ok, boolean_field} = + Membership.create_custom_field( + %{ + name: "Subscribe to newsletter", + value_type: :boolean + }, + actor: system_actor + ) + + {:ok, _} = + Membership.update_settings(settings, %{ + join_form_enabled: true, + join_form_field_ids: ["email", boolean_field.id], + join_form_field_required: %{"email" => true, boolean_field.id => false} + }) + + {:ok, view, _html} = live(conn, "/join") + + assert has_element?(view, "#join-form") + assert has_element?(view, "input#join-field-#{boolean_field.id}[name='#{boolean_field.id}']") + assert has_element?(view, "input#join-field-#{boolean_field.id}[type='checkbox']") + refute has_element?(view, "input#join-field-#{boolean_field.id}[type='text']") + end + + @tag role: :unauthenticated + test "renders typed custom fields with matching HTML input types", %{conn: conn} do + system_actor = Mv.Helpers.SystemActor.get_system_actor() + {:ok, settings} = Membership.get_settings() + + {:ok, integer_field} = + Membership.create_custom_field(%{name: "Lucky number", value_type: :integer}, actor: system_actor) + + {:ok, date_field} = + Membership.create_custom_field(%{name: "Birth date", value_type: :date}, actor: system_actor) + + {:ok, email_field} = + Membership.create_custom_field(%{name: "Secondary email", value_type: :email}, actor: system_actor) + + {:ok, _} = + Membership.update_settings(settings, %{ + join_form_enabled: true, + join_form_field_ids: ["email", integer_field.id, date_field.id, email_field.id], + join_form_field_required: %{ + "email" => true, + integer_field.id => false, + date_field.id => false, + email_field.id => false + } + }) + + {:ok, view, _html} = live(conn, "/join") + + assert has_element?(view, "input#join-field-#{integer_field.id}[type='number']") + assert has_element?(view, "input#join-field-#{date_field.id}[type='date']") + assert has_element?(view, "input#join-field-#{email_field.id}[type='email']") + end + end + + describe "submit join form with typed custom fields" do + setup do + reset_rate_limiter() + :ok + end + + @tag role: :unauthenticated + test "persists checked boolean custom field and ignores non-allowlisted field", %{conn: conn} do + system_actor = Mv.Helpers.SystemActor.get_system_actor() + {:ok, settings} = Membership.get_settings() + + {:ok, boolean_field} = + Membership.create_custom_field( + %{ + name: "Receive announcements", + value_type: :boolean + }, + actor: system_actor + ) + + {:ok, _} = + Membership.update_settings(settings, %{ + join_form_enabled: true, + join_form_field_ids: ["email", boolean_field.id], + join_form_field_required: %{"email" => true, boolean_field.id => false} + }) + + count_before = count_join_requests() + {:ok, view, _html} = live(conn, "/join") + + view + |> element("#join-form") + |> render_submit(%{ + "email" => "typed#{System.unique_integer([:positive])}@example.com", + "website" => "", + boolean_field.id => "on", + "not_allowlisted" => "should-not-be-persisted" + }) + + Process.sleep(400) + + assert count_join_requests() == count_before + 1 + assert view |> element("[data-testid='join-success-message']") |> has_element?() + + form_data = latest_join_request_form_data() + assert Map.get(form_data, boolean_field.id) == "on" + refute Map.has_key?(form_data, "not_allowlisted") + end + end + defp enable_join_form(enabled) do {:ok, settings} = Membership.get_settings() {:ok, _} = Membership.update_settings(settings, %{join_form_enabled: enabled}) @@ -189,6 +303,15 @@ defmodule MvWeb.JoinLiveTest do Repo.one(from j in "join_requests", select: count(j.id)) || 0 end + defp latest_join_request_form_data do + Repo.one( + from j in "join_requests", + order_by: [desc: j.inserted_at], + limit: 1, + select: j.form_data + ) || %{} + end + defp reset_rate_limiter do :ets.delete_all_objects(MvWeb.JoinRateLimit) rescue -- 2.47.2 From 6327ea00ebe0cb1488f30fd3bfb37f55b14a7f69 Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 6 May 2026 11:37:40 +0200 Subject: [PATCH 04/11] feat: respect field types in join requests --- lib/mv_web/live/join_live.ex | 110 +++++++++++++++++++++------- test/mv_web/live/join_live_test.exs | 36 ++++++++- 2 files changed, 115 insertions(+), 31 deletions(-) diff --git a/lib/mv_web/live/join_live.ex b/lib/mv_web/live/join_live.ex index d3d66f0..430a6fe 100644 --- a/lib/mv_web/live/join_live.ex +++ b/lib/mv_web/live/join_live.ex @@ -5,6 +5,7 @@ defmodule MvWeb.JoinLive do """ use MvWeb, :live_view + alias Ash.Resource.Info alias Mv.Membership alias MvWeb.JoinRateLimit alias MvWeb.Translations.MemberFields @@ -54,10 +55,6 @@ defmodule MvWeb.JoinLive do {gettext("Become a member")} -

- {gettext("Please enter your details for the membership application here.")} -

- <%= if @submitted do %>

@@ -67,6 +64,9 @@ defmodule MvWeb.JoinLive do

<% else %> +

+ {gettext("Please enter your details for the membership application here.")} +

<.form for={@form} id="join-form" @@ -80,18 +80,31 @@ defmodule MvWeb.JoinLive do <% end %> <%= for field <- @join_fields do %> -
+
- + <%= if field.input_type == "checkbox" do %> + + <% else %> + + <% end %>
<% end %> @@ -216,21 +229,27 @@ defmodule MvWeb.JoinLive do defp build_join_fields_with_labels(allowlist) do member_field_strings = Mv.Constants.member_fields() |> Enum.map(&Atom.to_string/1) - custom_field_name_by_id = custom_field_name_map(allowlist, member_field_strings) + custom_field_by_id = custom_field_map(allowlist, member_field_strings) Enum.map(allowlist, fn %{id: id, required: required} -> - label = - if id in member_field_strings do - MemberFields.label(String.to_existing_atom(id)) - else - Map.get(custom_field_name_by_id, id, gettext("Field")) - end - - %{id: id, label: label, required: required} + build_join_field(id, required, member_field_strings, custom_field_by_id) end) end - defp custom_field_name_map(allowlist, member_field_strings) do + defp build_join_field(id, required, member_field_strings, custom_field_by_id) do + if id in member_field_strings do + label = MemberFields.label(String.to_existing_atom(id)) + %{id: id, label: label, required: required, input_type: member_field_input_type(id)} + else + custom_field = Map.get(custom_field_by_id, id) + label = if custom_field, do: custom_field.name, else: gettext("Field") + input_type = custom_field_input_type(custom_field && custom_field.value_type) + + %{id: id, label: label, required: required, input_type: input_type} + end + end + + defp custom_field_map(allowlist, member_field_strings) do custom_field_ids = allowlist |> Enum.map(& &1.id) @@ -242,7 +261,7 @@ defmodule MvWeb.JoinLive do ids -> Mv.Membership.CustomField - |> Ash.Query.select([:id, :name]) + |> Ash.Query.select([:id, :name, :value_type]) |> Ash.read(domain: Mv.Membership, authorize?: false) |> case do {:ok, fields} -> @@ -250,7 +269,7 @@ defmodule MvWeb.JoinLive do fields |> Enum.filter(&MapSet.member?(allowed_ids, &1.id)) - |> Map.new(&{&1.id, &1.name}) + |> Map.new(&{&1.id, &1}) {:error, _} -> %{} @@ -265,8 +284,45 @@ defmodule MvWeb.JoinLive do |> Map.put(@honeypot_field, "") end - defp input_type("email"), do: "email" - defp input_type(_), do: "text" + defp member_field_input_type("email"), do: "email" + + defp member_field_input_type(field_id) when is_binary(field_id) do + case member_field_atom(field_id) do + nil -> + "text" + + field_atom -> + Mv.Membership.Member + |> Info.attribute(field_atom) + |> attribute_to_input_type() + end + end + + defp member_field_input_type(_), do: "text" + + defp member_field_atom(field_id) when is_binary(field_id) do + Mv.Constants.member_fields() + |> Enum.find(&(Atom.to_string(&1) == field_id)) + end + + defp custom_field_input_type(type), do: attribute_to_input_type(%{type: type}) + + defp attribute_to_input_type(%{type: type}) when type in [:date, Ash.Type.Date], do: "date" + + defp attribute_to_input_type(%{type: type}) when type in [:integer, Ash.Type.Integer], + do: "number" + + defp attribute_to_input_type(%{type: type}) when type in [:boolean, Ash.Type.Boolean], + do: "checkbox" + + defp attribute_to_input_type(%{type: type}) when type in [:email, Mv.Membership.Email], + do: "email" + + defp attribute_to_input_type(%{type: _}), do: "text" + defp attribute_to_input_type(nil), do: "text" + + defp checkbox_checked?(value) when value in [true, "true", "on", "1"], do: true + defp checkbox_checked?(_), do: false defp build_submit_attrs(params, join_fields) do allowlist_ids = MapSet.new(Enum.map(join_fields, & &1.id)) diff --git a/test/mv_web/live/join_live_test.exs b/test/mv_web/live/join_live_test.exs index 20cd5cf..7bac60f 100644 --- a/test/mv_web/live/join_live_test.exs +++ b/test/mv_web/live/join_live_test.exs @@ -192,7 +192,12 @@ defmodule MvWeb.JoinLiveTest do {:ok, view, _html} = live(conn, "/join") assert has_element?(view, "#join-form") - assert has_element?(view, "input#join-field-#{boolean_field.id}[name='#{boolean_field.id}']") + + assert has_element?( + view, + "input#join-field-#{boolean_field.id}[name='#{boolean_field.id}']" + ) + assert has_element?(view, "input#join-field-#{boolean_field.id}[type='checkbox']") refute has_element?(view, "input#join-field-#{boolean_field.id}[type='text']") end @@ -203,13 +208,19 @@ defmodule MvWeb.JoinLiveTest do {:ok, settings} = Membership.get_settings() {:ok, integer_field} = - Membership.create_custom_field(%{name: "Lucky number", value_type: :integer}, actor: system_actor) + Membership.create_custom_field(%{name: "Lucky number", value_type: :integer}, + actor: system_actor + ) {:ok, date_field} = - Membership.create_custom_field(%{name: "Birth date", value_type: :date}, actor: system_actor) + Membership.create_custom_field(%{name: "Birth date", value_type: :date}, + actor: system_actor + ) {:ok, email_field} = - Membership.create_custom_field(%{name: "Secondary email", value_type: :email}, actor: system_actor) + Membership.create_custom_field(%{name: "Secondary email", value_type: :email}, + actor: system_actor + ) {:ok, _} = Membership.update_settings(settings, %{ @@ -229,6 +240,23 @@ defmodule MvWeb.JoinLiveTest do assert has_element?(view, "input#join-field-#{date_field.id}[type='date']") assert has_element?(view, "input#join-field-#{email_field.id}[type='email']") end + + @tag role: :unauthenticated + test "renders standard date member fields with date input type", %{conn: conn} do + {:ok, settings} = Membership.get_settings() + + {:ok, _} = + Membership.update_settings(settings, %{ + join_form_enabled: true, + join_form_field_ids: ["email", "join_date"], + join_form_field_required: %{"email" => true, "join_date" => false} + }) + + {:ok, view, _html} = live(conn, "/join") + + assert has_element?(view, "input#join-field-join_date[type='date']") + refute has_element?(view, "input#join-field-join_date[type='text']") + end end describe "submit join form with typed custom fields" do -- 2.47.2 From 15e9a52bc9ca53964263e5755c5d83b03c05eb8c Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 6 May 2026 11:52:48 +0200 Subject: [PATCH 05/11] fix: wrap field labels in join request view --- lib/mv_web/live/join_request_live/show.ex | 10 +++++----- test/mv_web/live/join_request_live/show_test.exs | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/mv_web/live/join_request_live/show.ex b/lib/mv_web/live/join_request_live/show.ex index 2aab87d..cdc6521 100644 --- a/lib/mv_web/live/join_request_live/show.ex +++ b/lib/mv_web/live/join_request_live/show.ex @@ -222,9 +222,9 @@ defmodule MvWeb.JoinRequestLive.Show do defp field_row(assigns) do ~H""" -
- {@label}: - +
+
{@label}:
+
<%= if @value && @value != "" do %> {@value} <% else %> @@ -232,8 +232,8 @@ defmodule MvWeb.JoinRequestLive.Show do {@empty_text || gettext("Not specified")} <% end %> - -
+ + """ end diff --git a/test/mv_web/live/join_request_live/show_test.exs b/test/mv_web/live/join_request_live/show_test.exs index 35e87dc..5497d22 100644 --- a/test/mv_web/live/join_request_live/show_test.exs +++ b/test/mv_web/live/join_request_live/show_test.exs @@ -63,9 +63,9 @@ defmodule MvWeb.JoinRequestLive.ShowTest do {:ok, view, _html} = live(conn, "/join_requests/#{join_request.id}") - assert has_element?(view, "span", "#{custom_field.name}:") - assert has_element?(view, "span", "Alice Example") - refute has_element?(view, "span", "#{custom_field.id}:") + assert has_element?(view, "dt", "#{custom_field.name}:") + assert has_element?(view, "dd", "Alice Example") + refute has_element?(view, "dt", "#{custom_field.id}:") end end end -- 2.47.2 From 0159d5352a2d936a8c8d1e2504f2235d3555bbb5 Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 6 May 2026 12:02:58 +0200 Subject: [PATCH 06/11] fix: joinrequest field formats --- lib/mv_web/live/join_request_live/show.ex | 43 ++++++++++++--- .../live/join_request_live/show_test.exs | 53 +++++++++++++++++++ 2 files changed, 89 insertions(+), 7 deletions(-) diff --git a/lib/mv_web/live/join_request_live/show.ex b/lib/mv_web/live/join_request_live/show.ex index cdc6521..644dbbe 100644 --- a/lib/mv_web/live/join_request_live/show.ex +++ b/lib/mv_web/live/join_request_live/show.ex @@ -156,14 +156,16 @@ defmodule MvWeb.JoinRequestLive.Show do label={gettext("Submitted at")} value={DateFormatter.format_datetime(@join_request.submitted_at, @browser_timezone)} /> -
- {gettext("Status")}: - +
+
+ {gettext("Status")}: +
+
<.badge variant={JoinRequestHelpers.status_badge_variant(@join_request.status)}> {JoinRequestHelpers.format_status(@join_request.status)} - -
+ + <%= if @join_request.status in [:approved, :rejected] do %> <%= if @join_request.approved_at do %> <.field_row @@ -285,11 +287,38 @@ defmodule MvWeb.JoinRequestLive.Show do defp format_applicant_value(value) when is_boolean(value), do: if(value, do: gettext("Yes"), else: gettext("No")) - defp format_applicant_value(value) when is_binary(value) or is_number(value), - do: to_string(value) + defp format_applicant_value(value) when is_binary(value), + do: format_binary_applicant_value(value) + + defp format_applicant_value(value) when is_number(value), do: to_string(value) defp format_applicant_value(value), do: to_string(value) + defp format_binary_applicant_value(value) do + trimmed_value = String.trim(value) + + cond do + trimmed_value == "" -> + nil + + String.downcase(trimmed_value) in ["on", "true", "1"] -> + gettext("Yes") + + String.downcase(trimmed_value) in ["off", "false", "0"] -> + gettext("No") + + true -> + format_iso_date_string(trimmed_value) + end + end + + defp format_iso_date_string(value) do + case Date.from_iso8601(value) do + {:ok, date} -> DateFormatter.format_date(date) + _ -> value + end + end + defp format_applicant_value_from_map(value) do raw = Map.get(value, "_union_value") || Map.get(value, "value") type = Map.get(value, "_union_type") || Map.get(value, "type") diff --git a/test/mv_web/live/join_request_live/show_test.exs b/test/mv_web/live/join_request_live/show_test.exs index 5497d22..40d5d5d 100644 --- a/test/mv_web/live/join_request_live/show_test.exs +++ b/test/mv_web/live/join_request_live/show_test.exs @@ -11,6 +11,7 @@ defmodule MvWeb.JoinRequestLive.ShowTest do alias Mv.Fixtures alias Mv.Membership + alias MvWeb.Helpers.DateFormatter setup do {:ok, settings} = Membership.get_settings() @@ -67,5 +68,57 @@ defmodule MvWeb.JoinRequestLive.ShowTest do assert has_element?(view, "dd", "Alice Example") refute has_element?(view, "dt", "#{custom_field.id}:") end + + @tag role: :normal_user + test "formats boolean/date values and renders status in aligned row", %{conn: conn} do + system_actor = Mv.Helpers.SystemActor.get_system_actor() + {:ok, settings} = Membership.get_settings() + + {:ok, boolean_field} = + Membership.create_custom_field( + %{ + name: "Privacy accepted", + value_type: :boolean + }, + actor: system_actor + ) + + {:ok, date_field} = + Membership.create_custom_field( + %{ + name: "Birth date", + value_type: :date + }, + actor: system_actor + ) + + {:ok, _} = + Membership.update_settings(settings, %{ + join_form_enabled: true, + join_form_field_ids: ["email", boolean_field.id, date_field.id], + join_form_field_required: %{ + "email" => true, + boolean_field.id => false, + date_field.id => false + } + }) + + join_request = + Fixtures.submitted_join_request_fixture(%{ + form_data: %{ + boolean_field.id => "on", + date_field.id => "2000-01-12" + } + }) + + {:ok, view, _html} = live(conn, "/join_requests/#{join_request.id}") + + assert has_element?(view, "dt", "Privacy accepted:") + assert has_element?(view, "dd", "Yes") + assert has_element?(view, "dt", "Birth date:") + assert has_element?(view, "dd", DateFormatter.format_date(~D[2000-01-12])) + assert has_element?(view, "dt", "Status:") + assert has_element?(view, "dd", "Submitted") + end end end -- 2.47.2 From d0d7d38c03ddaff2c5daf7c5a53a01df220e9f20 Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 6 May 2026 12:14:22 +0200 Subject: [PATCH 07/11] feat: add open button to join link in settings --- lib/mv_web/live/global_settings_live.ex | 10 ++++++++++ priv/gettext/de/LC_MESSAGES/default.po | 8 +++++++- priv/gettext/default.pot | 6 ++++++ priv/gettext/en/LC_MESSAGES/default.po | 6 ++++++ test/mv_web/live/global_settings_live_test.exs | 15 +++++++++++++++ 5 files changed, 44 insertions(+), 1 deletion(-) diff --git a/lib/mv_web/live/global_settings_live.ex b/lib/mv_web/live/global_settings_live.ex index cb57631..b6f232b 100644 --- a/lib/mv_web/live/global_settings_live.ex +++ b/lib/mv_web/live/global_settings_live.ex @@ -186,6 +186,16 @@ defmodule MvWeb.GlobalSettingsLive do <.icon name="hero-clipboard-document" class="size-4" /> {gettext("Copy")} + <.link + href={@join_url} + target="_blank" + rel="noopener noreferrer" + class="btn btn-secondary btn-sm" + aria-label={gettext("Open join page URL in a new tab")} + > + <.icon name="hero-arrow-top-right-on-square" class="size-4" /> + {gettext("Open")} +
diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po index 383fb1c..432fd33 100644 --- a/priv/gettext/de/LC_MESSAGES/default.po +++ b/priv/gettext/de/LC_MESSAGES/default.po @@ -2396,10 +2396,11 @@ msgstr "Nur Administrator*innen oder die verknüpfte*n Benutzer*in(nen) können msgid "Only possible if no members are assigned to this type." msgstr "Nur möglich, wenn diesem Typ keine Mitglieder zugewiesen sind." +#: lib/mv_web/live/global_settings_live.ex #: lib/mv_web/live/member_live/show/membership_fees_component.ex #, elixir-autogen, elixir-format msgid "Open" -msgstr "Offen" +msgstr "Öffnen" #: lib/mv_web/live/member_live/index.html.heex #, elixir-autogen, elixir-format @@ -3905,3 +3906,8 @@ msgstr "Nur OIDC-Anmeldung ist aktiv. Diese Option ist deaktiviert." #, elixir-autogen, elixir-format msgid "Only sign-in via Single Sign-On (SSO) is allowed." msgstr "Nur Anmeldung per Single Sign-On (SSO) ist erlaubt." + +#: lib/mv_web/live/global_settings_live.ex +#, elixir-autogen, elixir-format +msgid "Open join page URL in a new tab" +msgstr "" diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot index 3e2eb5d..5039253 100644 --- a/priv/gettext/default.pot +++ b/priv/gettext/default.pot @@ -2397,6 +2397,7 @@ msgstr "" msgid "Only possible if no members are assigned to this type." msgstr "" +#: lib/mv_web/live/global_settings_live.ex #: lib/mv_web/live/member_live/show/membership_fees_component.ex #, elixir-autogen, elixir-format msgid "Open" @@ -3905,3 +3906,8 @@ msgstr "" #, elixir-autogen, elixir-format msgid "Only sign-in via Single Sign-On (SSO) is allowed." msgstr "" + +#: lib/mv_web/live/global_settings_live.ex +#, elixir-autogen, elixir-format +msgid "Open join page URL in a new tab" +msgstr "" diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po index 21314a5..b63ce04 100644 --- a/priv/gettext/en/LC_MESSAGES/default.po +++ b/priv/gettext/en/LC_MESSAGES/default.po @@ -2397,6 +2397,7 @@ msgstr "" msgid "Only possible if no members are assigned to this type." msgstr "" +#: lib/mv_web/live/global_settings_live.ex #: lib/mv_web/live/member_live/show/membership_fees_component.ex #, elixir-autogen, elixir-format msgid "Open" @@ -3905,3 +3906,8 @@ msgstr "" #, elixir-autogen, elixir-format msgid "Only sign-in via Single Sign-On (SSO) is allowed." msgstr "" + +#: lib/mv_web/live/global_settings_live.ex +#, elixir-autogen, elixir-format +msgid "Open join page URL in a new tab" +msgstr "" diff --git a/test/mv_web/live/global_settings_live_test.exs b/test/mv_web/live/global_settings_live_test.exs index 92da11b..2edaf74 100644 --- a/test/mv_web/live/global_settings_live_test.exs +++ b/test/mv_web/live/global_settings_live_test.exs @@ -64,6 +64,21 @@ defmodule MvWeb.GlobalSettingsLiveTest do assert html =~ "must be present" end + + test "shows open button for join page URL in same row as copy", %{conn: conn} do + {:ok, settings} = Membership.get_settings() + {:ok, _} = Membership.update_settings(settings, %{join_form_enabled: true}) + + {:ok, view, _html} = live(conn, ~p"/settings") + + assert has_element?(view, "#copy-join-url-btn") + + assert has_element?( + view, + "a[href][target=\"_blank\"][rel=\"noopener noreferrer\"]", + "Open" + ) + end end describe "SMTP / E-Mail section" do -- 2.47.2 From 104d945dd1fd38daf5f4d2f65951b42ceb61f804 Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 6 May 2026 12:26:10 +0200 Subject: [PATCH 08/11] chore: update change notes --- CHANGELOG.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cd65692..c17ea39 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,8 +7,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Changed +- **Join request display and settings workflow** – Improved join request rendering and related settings behavior in one cohesive update: + - Join request fields now respect their configured field types in the details view. + - Custom field labels in join request views were standardized. + - Join request field formatting was corrected for more consistent output. + - Join link settings now include a direct "Open" action in addition to copy/share workflows. + ### Fixed - **Runtime ENV handling** – Empty or invalid environment variables (e.g. `SMTP_PORT=`, `PORT=`, `POOL_SIZE=`, `DATABASE_PORT=`) no longer cause `ArgumentError` at boot. Instead raises clear errors for required vars set but empty (e.g. DATABASE_HOST, PHX_HOST/DOMAIN, SECRET_KEY_BASE). +- **PostgreSQL 18 Docker volume path** – Corrected the database volume path to match PostgreSQL 18 expectations. + +### Dependency updates +- Mix dependencies were updated. +- Renovate Docker image was updated to `v43.165`. +- Rauthy Docker image was updated to `v0.35.1`. +- `just` was updated to `v1.50.0`. ## [1.1.1] - 2026-03-16 -- 2.47.2 From cc1df449c6fb55ee27d90934d99fc567e24080a6 Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 6 May 2026 13:54:22 +0200 Subject: [PATCH 09/11] refactor: fix review blockers --- lib/mv/membership/custom_field_lookup.ex | 56 +++++ lib/mv_web/live/global_settings_live.ex | 2 +- lib/mv_web/live/join_live.ex | 45 ++-- lib/mv_web/live/join_request_live/show.ex | 198 +++++++++--------- .../show/membership_fees_component.ex | 2 +- priv/gettext/de/LC_MESSAGES/default.po | 18 +- priv/gettext/default.pot | 18 +- priv/gettext/en/LC_MESSAGES/default.po | 18 +- test/mv_web/live/join_live_test.exs | 57 +++-- 9 files changed, 253 insertions(+), 161 deletions(-) create mode 100644 lib/mv/membership/custom_field_lookup.ex diff --git a/lib/mv/membership/custom_field_lookup.ex b/lib/mv/membership/custom_field_lookup.ex new file mode 100644 index 0000000..9d9b9f3 --- /dev/null +++ b/lib/mv/membership/custom_field_lookup.ex @@ -0,0 +1,56 @@ +defmodule Mv.Membership.CustomFieldLookup do + @moduledoc """ + Shared helper for loading custom fields by ID. + """ + + alias Mv.Constants + alias Mv.Membership + + @spec fetch_map_by_ids([String.t()], keyword()) :: map() + def fetch_map_by_ids(field_ids, opts \\ []) when is_list(field_ids) do + member_field_strings = Constants.member_fields() |> Enum.map(&Atom.to_string/1) + + custom_field_ids = + field_ids + |> Enum.uniq() + |> Enum.reject(&(&1 in member_field_strings)) + + if custom_field_ids == [] do + %{} + else + select = Keyword.get(opts, :select, [:id, :name, :value_type]) + + query = + Membership.CustomField + |> Ash.Query.select(select) + + read_opts = + [domain: Membership] + |> maybe_put_actor(opts) + |> maybe_put_authorize(opts) + + case Ash.read(query, read_opts) do + {:ok, fields} -> + allowed_ids = MapSet.new(custom_field_ids) + fields |> Enum.filter(&MapSet.member?(allowed_ids, &1.id)) |> Map.new(&{&1.id, &1}) + + {:error, _} -> + %{} + end + end + end + + defp maybe_put_actor(opts, read_opts) do + case Keyword.fetch(read_opts, :actor) do + {:ok, actor} -> Keyword.put(opts, :actor, actor) + :error -> opts + end + end + + defp maybe_put_authorize(opts, read_opts) do + case Keyword.fetch(read_opts, :authorize?) do + {:ok, authorize?} -> Keyword.put(opts, :authorize?, authorize?) + :error -> opts + end + end +end diff --git a/lib/mv_web/live/global_settings_live.ex b/lib/mv_web/live/global_settings_live.ex index b6f232b..492c813 100644 --- a/lib/mv_web/live/global_settings_live.ex +++ b/lib/mv_web/live/global_settings_live.ex @@ -194,7 +194,7 @@ defmodule MvWeb.GlobalSettingsLive do aria-label={gettext("Open join page URL in a new tab")} > <.icon name="hero-arrow-top-right-on-square" class="size-4" /> - {gettext("Open")} + {pgettext("action", "Open")} diff --git a/lib/mv_web/live/join_live.ex b/lib/mv_web/live/join_live.ex index 430a6fe..e3bc444 100644 --- a/lib/mv_web/live/join_live.ex +++ b/lib/mv_web/live/join_live.ex @@ -6,6 +6,7 @@ defmodule MvWeb.JoinLive do use MvWeb, :live_view alias Ash.Resource.Info + alias Mv.Membership.CustomFieldLookup alias Mv.Membership alias MvWeb.JoinRateLimit alias MvWeb.Translations.MemberFields @@ -87,6 +88,7 @@ defmodule MvWeb.JoinLive do {field.label}{if field.required, do: " *"} <%= if field.input_type == "checkbox" do %> + Enum.map(& &1.id) - |> Enum.reject(&(&1 in member_field_strings)) - - case custom_field_ids do - [] -> - %{} - - ids -> - Mv.Membership.CustomField - |> Ash.Query.select([:id, :name, :value_type]) - |> Ash.read(domain: Mv.Membership, authorize?: false) - |> case do - {:ok, fields} -> - allowed_ids = MapSet.new(ids) - - fields - |> Enum.filter(&MapSet.member?(allowed_ids, &1.id)) - |> Map.new(&{&1.id, &1}) - - {:error, _} -> - %{} - end - end + defp custom_field_map(allowlist, _member_field_strings) do + allowlist + |> Enum.map(& &1.id) + |> CustomFieldLookup.fetch_map_by_ids(authorize?: false, select: [:id, :name, :value_type]) end defp initial_form_params(join_fields) do @@ -342,9 +322,12 @@ defmodule MvWeb.JoinLive do } form_data = - params - |> Enum.filter(fn {key, _} -> key in allowlist_ids and key not in typed end) - |> Map.new(fn {k, v} -> {k, String.trim(to_string(v))} end) + join_fields + |> Enum.filter(&(&1.id not in typed)) + |> Map.new(fn field -> + {field.id, normalize_join_field_value(params[field.id], field.input_type)} + end) + |> Map.take(MapSet.to_list(allowlist_ids)) attrs = %{attrs | form_data: form_data} {:ok, attrs} @@ -356,6 +339,10 @@ defmodule MvWeb.JoinLive do if is_binary(v), do: String.trim(v), else: nil end + defp normalize_join_field_value(raw, _input_type) when is_binary(raw), do: String.trim(raw) + defp normalize_join_field_value(_raw, "checkbox"), do: "off" + defp normalize_join_field_value(_raw, _input_type), do: "" + # Prefer X-Forwarded-For / X-Real-IP when behind a reverse proxy; fall back to peer_data. # Uses :inet.ntoa/1 for correct IPv4 and IPv6 string representation. defp client_ip_from_socket(socket) do diff --git a/lib/mv_web/live/join_request_live/show.ex b/lib/mv_web/live/join_request_live/show.ex index 644dbbe..d634f53 100644 --- a/lib/mv_web/live/join_request_live/show.ex +++ b/lib/mv_web/live/join_request_live/show.ex @@ -21,6 +21,7 @@ defmodule MvWeb.JoinRequestLive.Show do alias Mv.Constants alias Mv.Membership + alias Mv.Membership.CustomFieldLookup alias MvWeb.Helpers.DateFormatter alias MvWeb.JoinRequestLive.Helpers, as: JoinRequestHelpers alias MvWeb.Translations.MemberFields, as: MemberFieldsTranslations @@ -31,7 +32,7 @@ defmodule MvWeb.JoinRequestLive.Show do {:ok, socket |> assign(:join_request, nil) - |> assign(:custom_field_name_by_id, %{}) + |> assign(:custom_field_by_id, %{}) |> assign(:join_form_field_ids, []) |> Layouts.assign_page_title(gettext("Join request"))} else @@ -54,13 +55,16 @@ defmodule MvWeb.JoinRequestLive.Show do {:ok, request} -> field_ids = Membership.get_join_form_allowlist() |> Enum.map(& &1.id) - custom_field_name_by_id = - custom_field_name_map(field_ids ++ Map.keys(request.form_data || %{}), actor) + custom_field_by_id = + CustomFieldLookup.fetch_map_by_ids(field_ids ++ Map.keys(request.form_data || %{}), + actor: actor, + select: [:id, :name, :value_type] + ) {:noreply, socket |> assign(:join_request, request) - |> assign(:custom_field_name_by_id, custom_field_name_by_id) + |> assign(:custom_field_by_id, custom_field_by_id) |> assign(:join_form_field_ids, field_ids) |> Layouts.assign_page_title(gettext("Join request – %{email}", email: request.email))} @@ -136,59 +140,58 @@ defmodule MvWeb.JoinRequestLive.Show do <%!-- Single block: all applicant-provided data in join form order --%>

{gettext("Applicant data")}

-
- <%= for {label, value} <- +
+
+ <%= for {label, value} <- applicant_data_rows( @join_request, @join_form_field_ids || [], - @custom_field_name_by_id || %{} + @custom_field_by_id || %{} ) do %> - <.field_row label={label} value={value} empty_text={gettext("Not specified")} /> - <% end %> + <.field_row label={label} value={value} empty_text={gettext("Not specified")} /> + <% end %> +
<%!-- Status and review (submitted_at, status; if decided: approved/rejected at, reviewed by) --%>

{gettext("Status and review")}

-
- <.field_row - label={gettext("Submitted at")} - value={DateFormatter.format_datetime(@join_request.submitted_at, @browser_timezone)} - /> +
-
- {gettext("Status")}: -
-
+ <.field_row + label={gettext("Submitted at")} + value={DateFormatter.format_datetime(@join_request.submitted_at, @browser_timezone)} + /> + <.field_row label={gettext("Status")}> <.badge variant={JoinRequestHelpers.status_badge_variant(@join_request.status)}> {JoinRequestHelpers.format_status(@join_request.status)} -
+ + <%= if @join_request.status in [:approved, :rejected] do %> + <%= if @join_request.approved_at do %> + <.field_row + label={gettext("Approved at")} + value={ + DateFormatter.format_datetime(@join_request.approved_at, @browser_timezone) + } + /> + <% end %> + <%= if @join_request.rejected_at do %> + <.field_row + label={gettext("Rejected at")} + value={ + DateFormatter.format_datetime(@join_request.rejected_at, @browser_timezone) + } + /> + <% end %> + <.field_row + label={gettext("Review by")} + value={JoinRequestHelpers.reviewer_display(@join_request)} + empty_text="-" + /> + <% end %>
- <%= if @join_request.status in [:approved, :rejected] do %> - <%= if @join_request.approved_at do %> - <.field_row - label={gettext("Approved at")} - value={ - DateFormatter.format_datetime(@join_request.approved_at, @browser_timezone) - } - /> - <% end %> - <%= if @join_request.rejected_at do %> - <.field_row - label={gettext("Rejected at")} - value={ - DateFormatter.format_datetime(@join_request.rejected_at, @browser_timezone) - } - /> - <% end %> - <.field_row - label={gettext("Review by")} - value={JoinRequestHelpers.reviewer_display(@join_request)} - empty_text="-" - /> - <% end %>
@@ -221,28 +224,30 @@ defmodule MvWeb.JoinRequestLive.Show do attr :label, :string, required: true attr :value, :any, default: nil attr :empty_text, :string, default: nil + slot :inner_block defp field_row(assigns) do ~H""" -
-
{@label}:
-
- <%= if @value && @value != "" do %> +
{@label}:
+
+ <%= cond do %> + <% @inner_block != [] -> %> + {render_slot(@inner_block)} + <% @value && @value != "" -> %> {@value} - <% else %> + <% true -> %> {@empty_text || gettext("Not specified")} - <% end %> -
-
+ <% end %> + """ end # Builds a single list of {label, display_value} for all applicant-provided data in join form # order. Typed fields (email, first_name, last_name) and form_data are merged; legacy # form_data keys (not in current join form config) are appended at the end. - defp applicant_data_rows(join_request, ordered_field_ids, custom_field_name_by_id) do + defp applicant_data_rows(join_request, ordered_field_ids, custom_field_by_id) do member_field_strings = Constants.member_fields() |> Enum.map(&Atom.to_string/1) form_data = join_request.form_data || %{} @@ -256,8 +261,9 @@ defmodule MvWeb.JoinRequestLive.Show do ordered_field_ids |> Enum.map(fn key -> value = Map.get(typed, key) || Map.get(form_data, key) - label = field_key_to_label(key, member_field_strings, custom_field_name_by_id) - {label, format_applicant_value(value)} + label = field_key_to_label(key, member_field_strings, custom_field_by_id) + value_type = field_key_to_value_type(key, member_field_strings, custom_field_by_id) + {label, format_applicant_value(value, value_type)} end) legacy_keys = @@ -270,31 +276,32 @@ defmodule MvWeb.JoinRequestLive.Show do legacy_entries = Enum.map(legacy_keys, fn key -> - label = field_key_to_label(key, member_field_strings, custom_field_name_by_id) - {label, format_applicant_value(form_data[key])} + label = field_key_to_label(key, member_field_strings, custom_field_by_id) + value_type = field_key_to_value_type(key, member_field_strings, custom_field_by_id) + {label, format_applicant_value(form_data[key], value_type)} end) in_order ++ legacy_entries end - defp format_applicant_value(nil), do: nil - defp format_applicant_value(""), do: nil - defp format_applicant_value(%Date{} = date), do: DateFormatter.format_date(date) + defp format_applicant_value(nil, _type), do: nil + defp format_applicant_value("", _type), do: nil + defp format_applicant_value(%Date{} = date, _type), do: DateFormatter.format_date(date) - defp format_applicant_value(value) when is_map(value), - do: format_applicant_value_from_map(value) + defp format_applicant_value(value, type) when is_map(value), + do: format_applicant_value_from_map(value, type) - defp format_applicant_value(value) when is_boolean(value), + defp format_applicant_value(value, _type) when is_boolean(value), do: if(value, do: gettext("Yes"), else: gettext("No")) - defp format_applicant_value(value) when is_binary(value), - do: format_binary_applicant_value(value) + defp format_applicant_value(value, type) when is_binary(value), + do: format_binary_applicant_value(value, type) - defp format_applicant_value(value) when is_number(value), do: to_string(value) + defp format_applicant_value(value, _type) when is_number(value), do: to_string(value) - defp format_applicant_value(value), do: to_string(value) + defp format_applicant_value(value, _type), do: to_string(value) - defp format_binary_applicant_value(value) do + defp format_binary_applicant_value(value, type) do trimmed_value = String.trim(value) cond do @@ -307,8 +314,11 @@ defmodule MvWeb.JoinRequestLive.Show do String.downcase(trimmed_value) in ["off", "false", "0"] -> gettext("No") - true -> + type in [:date, Ash.Type.Date] -> format_iso_date_string(trimmed_value) + + true -> + trimmed_value end end @@ -319,12 +329,13 @@ defmodule MvWeb.JoinRequestLive.Show do end end - defp format_applicant_value_from_map(value) do + defp format_applicant_value_from_map(value, fallback_type) do raw = Map.get(value, "_union_value") || Map.get(value, "value") type = Map.get(value, "_union_type") || Map.get(value, "type") + effective_type = type || fallback_type - if raw && type in ["date", :date] do - format_applicant_value(raw) + if raw && effective_type in ["date", :date, Ash.Type.Date] do + format_applicant_value(raw, :date) else format_applicant_value_simple(raw, value) end @@ -338,44 +349,39 @@ defmodule MvWeb.JoinRequestLive.Show do defp format_applicant_value_simple(raw, _value) when is_integer(raw), do: to_string(raw) defp format_applicant_value_simple(_raw, value), do: to_string(value) - defp field_key_to_label(key, member_field_strings, custom_field_name_by_id) + defp field_key_to_label(key, member_field_strings, custom_field_by_id) when is_binary(key) do if key in member_field_strings do MemberFieldsTranslations.label(String.to_existing_atom(key)) else - Map.get(custom_field_name_by_id, key, key) + case Map.get(custom_field_by_id, key) do + %{name: name} -> name + _ -> key + end end end defp field_key_to_label(key, _, _), do: to_string(key) - defp custom_field_name_map(field_keys, actor) do - member_field_strings = Constants.member_fields() |> Enum.map(&Atom.to_string/1) + defp field_key_to_value_type("email", _member_field_strings, _custom_field_by_id), do: :string - custom_field_ids = - field_keys - |> Enum.uniq() - |> Enum.reject(&(&1 in member_field_strings)) + defp field_key_to_value_type("first_name", _member_field_strings, _custom_field_by_id), + do: :string - case custom_field_ids do - [] -> - %{} + defp field_key_to_value_type("last_name", _member_field_strings, _custom_field_by_id), + do: :string - ids -> - Mv.Membership.CustomField - |> Ash.Query.select([:id, :name]) - |> Ash.read(actor: actor, domain: Mv.Membership) - |> case do - {:ok, fields} -> - allowed_ids = MapSet.new(ids) - - fields - |> Enum.filter(&MapSet.member?(allowed_ids, &1.id)) - |> Map.new(&{&1.id, &1.name}) - - {:error, _} -> - %{} - end + defp field_key_to_value_type(key, member_field_strings, custom_field_by_id) + when is_binary(key) do + if key in member_field_strings do + :string + else + case Map.get(custom_field_by_id, key) do + %{value_type: value_type} -> value_type + _ -> nil + end end end + + defp field_key_to_value_type(_key, _member_field_strings, _custom_field_by_id), do: nil end diff --git a/lib/mv_web/live/member_live/show/membership_fees_component.ex b/lib/mv_web/live/member_live/show/membership_fees_component.ex index 370d4aa..e8ddff4 100644 --- a/lib/mv_web/live/member_live/show/membership_fees_component.ex +++ b/lib/mv_web/live/member_live/show/membership_fees_component.ex @@ -1291,7 +1291,7 @@ defmodule MvWeb.MemberLive.Show.MembershipFeesComponent do defp translate_receipt_status("paid"), do: gettext("Paid") defp translate_receipt_status("unpaid"), do: gettext("Unpaid") defp translate_receipt_status("suspended"), do: gettext("Suspended") - defp translate_receipt_status("open"), do: gettext("Open") + defp translate_receipt_status("open"), do: pgettext("status", "Open") defp translate_receipt_status("cancelled"), do: gettext("Cancelled") defp translate_receipt_status("draft"), do: gettext("Draft") defp translate_receipt_status("incompleted"), do: gettext("Incomplete") diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po index 432fd33..4b047fd 100644 --- a/priv/gettext/de/LC_MESSAGES/default.po +++ b/priv/gettext/de/LC_MESSAGES/default.po @@ -2396,12 +2396,6 @@ msgstr "Nur Administrator*innen oder die verknüpfte*n Benutzer*in(nen) können msgid "Only possible if no members are assigned to this type." msgstr "Nur möglich, wenn diesem Typ keine Mitglieder zugewiesen sind." -#: lib/mv_web/live/global_settings_live.ex -#: lib/mv_web/live/member_live/show/membership_fees_component.ex -#, elixir-autogen, elixir-format -msgid "Open" -msgstr "Öffnen" - #: lib/mv_web/live/member_live/index.html.heex #, elixir-autogen, elixir-format msgid "Open email program with BCC recipients" @@ -3911,3 +3905,15 @@ msgstr "Nur Anmeldung per Single Sign-On (SSO) ist erlaubt." #, elixir-autogen, elixir-format msgid "Open join page URL in a new tab" msgstr "" + +#: lib/mv_web/live/global_settings_live.ex +#, elixir-autogen, elixir-format +msgctxt "action" +msgid "Open" +msgstr "Öffnen" + +#: lib/mv_web/live/member_live/show/membership_fees_component.ex +#, elixir-autogen, elixir-format +msgctxt "status" +msgid "Open" +msgstr "Offen" diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot index 5039253..bd94594 100644 --- a/priv/gettext/default.pot +++ b/priv/gettext/default.pot @@ -2397,12 +2397,6 @@ msgstr "" msgid "Only possible if no members are assigned to this type." msgstr "" -#: lib/mv_web/live/global_settings_live.ex -#: lib/mv_web/live/member_live/show/membership_fees_component.ex -#, elixir-autogen, elixir-format -msgid "Open" -msgstr "" - #: lib/mv_web/live/member_live/index.html.heex #, elixir-autogen, elixir-format msgid "Open email program with BCC recipients" @@ -3911,3 +3905,15 @@ msgstr "" #, elixir-autogen, elixir-format msgid "Open join page URL in a new tab" msgstr "" + +#: lib/mv_web/live/global_settings_live.ex +#, elixir-autogen, elixir-format +msgctxt "action" +msgid "Open" +msgstr "" + +#: lib/mv_web/live/member_live/show/membership_fees_component.ex +#, elixir-autogen, elixir-format +msgctxt "status" +msgid "Open" +msgstr "" diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po index b63ce04..40a321e 100644 --- a/priv/gettext/en/LC_MESSAGES/default.po +++ b/priv/gettext/en/LC_MESSAGES/default.po @@ -2397,12 +2397,6 @@ msgstr "" msgid "Only possible if no members are assigned to this type." msgstr "" -#: lib/mv_web/live/global_settings_live.ex -#: lib/mv_web/live/member_live/show/membership_fees_component.ex -#, elixir-autogen, elixir-format -msgid "Open" -msgstr "" - #: lib/mv_web/live/member_live/index.html.heex #, elixir-autogen, elixir-format msgid "Open email program with BCC recipients" @@ -3911,3 +3905,15 @@ msgstr "" #, elixir-autogen, elixir-format msgid "Open join page URL in a new tab" msgstr "" + +#: lib/mv_web/live/global_settings_live.ex +#, elixir-autogen, elixir-format +msgctxt "action" +msgid "Open" +msgstr "Open" + +#: lib/mv_web/live/member_live/show/membership_fees_component.ex +#, elixir-autogen, elixir-format +msgctxt "status" +msgid "Open" +msgstr "Open" diff --git a/test/mv_web/live/join_live_test.exs b/test/mv_web/live/join_live_test.exs index 7bac60f..d0efee9 100644 --- a/test/mv_web/live/join_live_test.exs +++ b/test/mv_web/live/join_live_test.exs @@ -12,10 +12,9 @@ defmodule MvWeb.JoinLiveTest do # async: false → shared sandbox; all processes (including LiveView) share the DB connection. use MvWeb.ConnCase, async: false import Phoenix.LiveViewTest - import Ecto.Query alias Mv.Membership - alias Mv.Repo + alias Mv.Membership.JoinRequest describe "GET /join" do @tag role: :unauthenticated @@ -55,11 +54,12 @@ defmodule MvWeb.JoinLiveTest do }) |> render_submit() - # Anti-enumeration delay is applied in LiveView via send_after (100–300 ms); wait for success UI. - Process.sleep(400) + assert_eventually(fn -> count_join_requests() == count_before + 1 end) + + assert_eventually(fn -> + view |> element("[data-testid='join-success-message']") |> has_element?() + end) - assert count_join_requests() == count_before + 1 - assert view |> element("[data-testid='join-success-message']") |> has_element?() assert render(view) =~ "saved your details" assert render(view) =~ "click the link" end @@ -298,10 +298,11 @@ defmodule MvWeb.JoinLiveTest do "not_allowlisted" => "should-not-be-persisted" }) - Process.sleep(400) + assert_eventually(fn -> count_join_requests() == count_before + 1 end) - assert count_join_requests() == count_before + 1 - assert view |> element("[data-testid='join-success-message']") |> has_element?() + assert_eventually(fn -> + view |> element("[data-testid='join-success-message']") |> has_element?() + end) form_data = latest_join_request_form_data() assert Map.get(form_data, boolean_field.id) == "on" @@ -328,16 +329,40 @@ defmodule MvWeb.JoinLiveTest do end defp count_join_requests do - Repo.one(from j in "join_requests", select: count(j.id)) || 0 + case Ash.count(JoinRequest, domain: Membership, authorize?: false) do + {:ok, count} -> count + _ -> 0 + end end defp latest_join_request_form_data do - Repo.one( - from j in "join_requests", - order_by: [desc: j.inserted_at], - limit: 1, - select: j.form_data - ) || %{} + query = + JoinRequest + |> Ash.Query.sort(inserted_at: :desc) + |> Ash.Query.limit(1) + + case Ash.read(query, domain: Membership, authorize?: false) do + {:ok, [request]} -> request.form_data || %{} + _ -> %{} + end + end + + defp assert_eventually(fun, timeout_ms \\ 1500) when is_function(fun, 0) do + deadline = System.monotonic_time(:millisecond) + timeout_ms + do_assert_eventually(fun, deadline) + end + + defp do_assert_eventually(fun, deadline) do + if fun.() do + true + else + if System.monotonic_time(:millisecond) < deadline do + Process.sleep(25) + do_assert_eventually(fun, deadline) + else + assert fun.() + end + end end defp reset_rate_limiter do -- 2.47.2 From f8e1d399645a70c263588cffb5f2e52f3c598d33 Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 6 May 2026 14:11:29 +0200 Subject: [PATCH 10/11] refactor: fix review issues --- lib/mv_web/live/global_settings_live.ex | 4 +- lib/mv_web/live/join_live.ex | 59 ++++++++++++++----------- priv/gettext/de/LC_MESSAGES/default.po | 10 ++--- priv/gettext/default.pot | 10 ++--- priv/gettext/en/LC_MESSAGES/default.po | 10 ++--- 5 files changed, 49 insertions(+), 44 deletions(-) diff --git a/lib/mv_web/live/global_settings_live.ex b/lib/mv_web/live/global_settings_live.ex index 492c813..43851db 100644 --- a/lib/mv_web/live/global_settings_live.ex +++ b/lib/mv_web/live/global_settings_live.ex @@ -191,10 +191,10 @@ defmodule MvWeb.GlobalSettingsLive do target="_blank" rel="noopener noreferrer" class="btn btn-secondary btn-sm" - aria-label={gettext("Open join page URL in a new tab")} > - <.icon name="hero-arrow-top-right-on-square" class="size-4" /> + <.icon name="hero-arrow-top-right-on-square" class="size-4" aria-hidden="true" /> {pgettext("action", "Open")} + {gettext("join page URL in a new tab")}
diff --git a/lib/mv_web/live/join_live.ex b/lib/mv_web/live/join_live.ex index e3bc444..ba0e476 100644 --- a/lib/mv_web/live/join_live.ex +++ b/lib/mv_web/live/join_live.ex @@ -6,8 +6,8 @@ defmodule MvWeb.JoinLive do use MvWeb, :live_view alias Ash.Resource.Info - alias Mv.Membership.CustomFieldLookup alias Mv.Membership + alias Mv.Membership.CustomFieldLookup alias MvWeb.JoinRateLimit alias MvWeb.Translations.MemberFields @@ -81,14 +81,12 @@ defmodule MvWeb.JoinLive do <% end %> <%= for field <- @join_fields do %> -
- - <%= if field.input_type == "checkbox" do %> - + <%= if field.input_type == "checkbox" do %> + + + <% else %> +
+ - <% end %> -
+
+ <% end %> <% end %> <%!-- @@ -274,7 +282,8 @@ defmodule MvWeb.JoinLive do field_atom -> Mv.Membership.Member |> Info.attribute(field_atom) - |> attribute_to_input_type() + |> Map.get(:type) + |> input_type_for() end end @@ -285,21 +294,17 @@ defmodule MvWeb.JoinLive do |> Enum.find(&(Atom.to_string(&1) == field_id)) end - defp custom_field_input_type(type), do: attribute_to_input_type(%{type: type}) + defp custom_field_input_type(type), do: input_type_for(type) - defp attribute_to_input_type(%{type: type}) when type in [:date, Ash.Type.Date], do: "date" - - defp attribute_to_input_type(%{type: type}) when type in [:integer, Ash.Type.Integer], - do: "number" - - defp attribute_to_input_type(%{type: type}) when type in [:boolean, Ash.Type.Boolean], - do: "checkbox" - - defp attribute_to_input_type(%{type: type}) when type in [:email, Mv.Membership.Email], - do: "email" - - defp attribute_to_input_type(%{type: _}), do: "text" - defp attribute_to_input_type(nil), do: "text" + defp input_type_for(:date), do: "date" + defp input_type_for(Ash.Type.Date), do: "date" + defp input_type_for(:integer), do: "number" + defp input_type_for(Ash.Type.Integer), do: "number" + defp input_type_for(:boolean), do: "checkbox" + defp input_type_for(Ash.Type.Boolean), do: "checkbox" + defp input_type_for(:email), do: "email" + defp input_type_for(Mv.Membership.Email), do: "email" + defp input_type_for(_), do: "text" defp checkbox_checked?(value) when value in [true, "true", "on", "1"], do: true defp checkbox_checked?(_), do: false diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po index 4b047fd..52270cc 100644 --- a/priv/gettext/de/LC_MESSAGES/default.po +++ b/priv/gettext/de/LC_MESSAGES/default.po @@ -3901,11 +3901,6 @@ msgstr "Nur OIDC-Anmeldung ist aktiv. Diese Option ist deaktiviert." msgid "Only sign-in via Single Sign-On (SSO) is allowed." msgstr "Nur Anmeldung per Single Sign-On (SSO) ist erlaubt." -#: lib/mv_web/live/global_settings_live.ex -#, elixir-autogen, elixir-format -msgid "Open join page URL in a new tab" -msgstr "" - #: lib/mv_web/live/global_settings_live.ex #, elixir-autogen, elixir-format msgctxt "action" @@ -3917,3 +3912,8 @@ msgstr "Öffnen" msgctxt "status" msgid "Open" msgstr "Offen" + +#: lib/mv_web/live/global_settings_live.ex +#, elixir-autogen, elixir-format +msgid "join page URL in a new tab" +msgstr "Beitrittslink in einem neuen Tab" diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot index bd94594..5d48691 100644 --- a/priv/gettext/default.pot +++ b/priv/gettext/default.pot @@ -3901,11 +3901,6 @@ msgstr "" msgid "Only sign-in via Single Sign-On (SSO) is allowed." msgstr "" -#: lib/mv_web/live/global_settings_live.ex -#, elixir-autogen, elixir-format -msgid "Open join page URL in a new tab" -msgstr "" - #: lib/mv_web/live/global_settings_live.ex #, elixir-autogen, elixir-format msgctxt "action" @@ -3917,3 +3912,8 @@ msgstr "" msgctxt "status" msgid "Open" msgstr "" + +#: lib/mv_web/live/global_settings_live.ex +#, elixir-autogen, elixir-format +msgid "join page URL in a new tab" +msgstr "" diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po index 40a321e..ec6f305 100644 --- a/priv/gettext/en/LC_MESSAGES/default.po +++ b/priv/gettext/en/LC_MESSAGES/default.po @@ -3901,11 +3901,6 @@ msgstr "" msgid "Only sign-in via Single Sign-On (SSO) is allowed." msgstr "" -#: lib/mv_web/live/global_settings_live.ex -#, elixir-autogen, elixir-format -msgid "Open join page URL in a new tab" -msgstr "" - #: lib/mv_web/live/global_settings_live.ex #, elixir-autogen, elixir-format msgctxt "action" @@ -3917,3 +3912,8 @@ msgstr "Open" msgctxt "status" msgid "Open" msgstr "Open" + +#: lib/mv_web/live/global_settings_live.ex +#, elixir-autogen, elixir-format +msgid "join page URL in a new tab" +msgstr "join page URL in a new tab" -- 2.47.2 From a62fceaf280f8b99b1049ec0ee8d1b0b5a566a97 Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 6 May 2026 14:29:00 +0200 Subject: [PATCH 11/11] test: fix flaky test --- .../member_groups_relationship_test.exs | 64 +++++++++++++------ 1 file changed, 46 insertions(+), 18 deletions(-) diff --git a/test/membership/member_groups_relationship_test.exs b/test/membership/member_groups_relationship_test.exs index a72c8bc..5ecddbd 100644 --- a/test/membership/member_groups_relationship_test.exs +++ b/test/membership/member_groups_relationship_test.exs @@ -16,9 +16,13 @@ defmodule Mv.Membership.MemberGroupsRelationshipTest do describe "Relationships" do test "member has many_to_many groups relationship (load with preloading)", %{actor: actor} do - {:ok, member} = Membership.create_member(%{email: "test@test.com"}, actor: actor) - {:ok, group1} = Membership.create_group(%{name: "Group One"}, actor: actor) - {:ok, group2} = Membership.create_group(%{name: "Group Two"}, actor: actor) + {:ok, member} = Membership.create_member(%{email: unique_email("member")}, actor: actor) + + {:ok, group1} = + Membership.create_group(%{name: unique_group_name("Group One")}, actor: actor) + + {:ok, group2} = + Membership.create_group(%{name: unique_group_name("Group Two")}, actor: actor) {:ok, _mg1} = Membership.create_member_group(%{member_id: member.id, group_id: group1.id}, @@ -40,9 +44,11 @@ defmodule Mv.Membership.MemberGroupsRelationshipTest do end test "load multiple members with groups preloaded (N+1 prevention)", %{actor: actor} do - {:ok, member1} = Membership.create_member(%{email: "member1@test.com"}, actor: actor) - {:ok, member2} = Membership.create_member(%{email: "member2@test.com"}, actor: actor) - {:ok, group} = Membership.create_group(%{name: "Test Group"}, actor: actor) + {:ok, member1} = Membership.create_member(%{email: unique_email("member1")}, actor: actor) + {:ok, member2} = Membership.create_member(%{email: unique_email("member2")}, actor: actor) + + {:ok, group} = + Membership.create_group(%{name: unique_group_name("Test Group")}, actor: actor) {:ok, _mg1} = Membership.create_member_group(%{member_id: member1.id, group_id: group.id}, @@ -70,8 +76,10 @@ defmodule Mv.Membership.MemberGroupsRelationshipTest do describe "Member-Group Association Operations" do test "add member to group via Ash API", %{actor: actor} do - {:ok, member} = Membership.create_member(%{email: "test@test.com"}, actor: actor) - {:ok, group} = Membership.create_group(%{name: "Test Group"}, actor: actor) + {:ok, member} = Membership.create_member(%{email: unique_email("member")}, actor: actor) + + {:ok, group} = + Membership.create_group(%{name: unique_group_name("Test Group")}, actor: actor) assert {:ok, member_group} = Membership.create_member_group(%{member_id: member.id, group_id: group.id}, @@ -83,8 +91,10 @@ defmodule Mv.Membership.MemberGroupsRelationshipTest do end test "remove member from group via Ash API", %{actor: actor} do - {:ok, member} = Membership.create_member(%{email: "test@test.com"}, actor: actor) - {:ok, group} = Membership.create_group(%{name: "Test Group"}, actor: actor) + {:ok, member} = Membership.create_member(%{email: unique_email("member")}, actor: actor) + + {:ok, group} = + Membership.create_group(%{name: unique_group_name("Test Group")}, actor: actor) {:ok, member_group} = Membership.create_member_group(%{member_id: member.id, group_id: group.id}, @@ -107,10 +117,16 @@ defmodule Mv.Membership.MemberGroupsRelationshipTest do end test "add member to multiple groups in single operation", %{actor: actor} do - {:ok, member} = Membership.create_member(%{email: "test@test.com"}, actor: actor) - {:ok, group1} = Membership.create_group(%{name: "Group One"}, actor: actor) - {:ok, group2} = Membership.create_group(%{name: "Group Two"}, actor: actor) - {:ok, group3} = Membership.create_group(%{name: "Group Three"}, actor: actor) + {:ok, member} = Membership.create_member(%{email: unique_email("member")}, actor: actor) + + {:ok, group1} = + Membership.create_group(%{name: unique_group_name("Group One")}, actor: actor) + + {:ok, group2} = + Membership.create_group(%{name: unique_group_name("Group Two")}, actor: actor) + + {:ok, group3} = + Membership.create_group(%{name: unique_group_name("Group Three")}, actor: actor) # Add to all groups {:ok, _mg1} = @@ -138,8 +154,10 @@ defmodule Mv.Membership.MemberGroupsRelationshipTest do describe "Edge Cases" do test "adding member to same group twice fails (duplicate prevention)", %{actor: actor} do - {:ok, member} = Membership.create_member(%{email: "test@test.com"}, actor: actor) - {:ok, group} = Membership.create_group(%{name: "Test Group"}, actor: actor) + {:ok, member} = Membership.create_member(%{email: unique_email("member")}, actor: actor) + + {:ok, group} = + Membership.create_group(%{name: unique_group_name("Test Group")}, actor: actor) {:ok, _mg1} = Membership.create_member_group(%{member_id: member.id, group_id: group.id}, @@ -154,8 +172,10 @@ defmodule Mv.Membership.MemberGroupsRelationshipTest do end test "removing member from group they're not in (idempotent, no error)", %{actor: actor} do - {:ok, member} = Membership.create_member(%{email: "test@test.com"}, actor: actor) - {:ok, group} = Membership.create_group(%{name: "Test Group"}, actor: actor) + {:ok, member} = Membership.create_member(%{email: unique_email("member")}, actor: actor) + + {:ok, group} = + Membership.create_group(%{name: unique_group_name("Test Group")}, actor: actor) # Verify no association exists {:ok, nil} = @@ -194,4 +214,12 @@ defmodule Mv.Membership.MemberGroupsRelationshipTest do assert result == :ok || match?({:error, _}, result) end end + + defp unique_email(prefix) do + "#{prefix}-#{System.unique_integer([:positive])}@test.com" + end + + defp unique_group_name(prefix) do + "#{prefix} #{System.unique_integer([:positive])}" + end end -- 2.47.2