diff --git a/.drone.yml b/.drone.yml index cca4ca4..2c8d504 100644 --- a/.drone.yml +++ b/.drone.yml @@ -273,7 +273,7 @@ environment: steps: - name: renovate - image: renovate/renovate:42.95 + image: renovate/renovate:42.97 environment: RENOVATE_CONFIG_FILE: "renovate_backend_config.js" RENOVATE_TOKEN: diff --git a/CODE_GUIDELINES.md b/CODE_GUIDELINES.md index 565cbdd..cc58ca9 100644 --- a/CODE_GUIDELINES.md +++ b/CODE_GUIDELINES.md @@ -118,7 +118,8 @@ lib/ │ ├── mailer.ex # Email mailer │ ├── release.ex # Release tasks │ ├── repo.ex # Database repository -│ └── secrets.ex # Secret management +│ ├── secrets.ex # Secret management +│ └── statistics.ex # Reporting: member/cycle aggregates (counts, sums by year) ├── mv_web/ # Web interface layer │ ├── components/ # UI components │ │ ├── core_components.ex @@ -155,6 +156,7 @@ lib/ │ │ ├── import_export_live.ex # CSV import/export LiveView (mount/events/glue only) │ │ ├── import_export_live/ # Import/Export UI components │ │ │ └── components.ex # custom_fields_notice, template_links, import_form, progress, results +│ │ ├── statistics_live.ex # Statistics page (aggregates, year filter, joins/exits by year) │ │ └── contribution_type_live/ # Contribution types (mock-up) │ ├── auth_overrides.ex # AshAuthentication overrides │ ├── endpoint.ex # Phoenix endpoint diff --git a/docker-compose.yml b/docker-compose.yml index 626f353..6f3861f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -25,7 +25,7 @@ services: rauthy: container_name: rauthy-dev - image: ghcr.io/sebadob/rauthy:0.34.2 + image: ghcr.io/sebadob/rauthy:0.34.3 environment: - LOCAL_TEST=true - SMTP_URL=mailcrab diff --git a/docs/feature-roadmap.md b/docs/feature-roadmap.md index 7e28eea..3812598 100644 --- a/docs/feature-roadmap.md +++ b/docs/feature-roadmap.md @@ -291,10 +291,10 @@ #### 10. **Reporting & Analytics** 📊 **Current State:** -- ❌ No reporting features +- ✅ **Statistics page (MVP)** – `/statistics` with active/inactive member counts, joins/exits by year, cycle totals, open amount (2026-02-10) **Missing Features:** -- ❌ Member statistics dashboard +- ❌ Extended member statistics dashboard - ❌ Membership growth charts - ❌ Payment reports - ❌ Custom report builder diff --git a/docs/groups-architecture.md b/docs/groups-architecture.md index 735898c..27d9d18 100644 --- a/docs/groups-architecture.md +++ b/docs/groups-architecture.md @@ -314,9 +314,24 @@ lib/ - Display group name and description - List all members in group - Link to member detail pages +- Add members to group (via inline combobox with search/autocomplete) +- Remove members from group (via remove button per member) - Edit group button (navigates to `/groups/:slug/edit`) - Delete group button (with confirmation modal) +**Add Member Functionality:** +- "Add Member" button displayed above member table (only for users with `:update` permission) +- Opens inline add member area with member search/autocomplete (combobox) +- Search filters out members already in the group +- Selecting a member adds them to the group immediately +- Success/error flash messages provide feedback +- "Cancel" button closes the inline add member area without adding + +**Remove Member Functionality:** +- "Remove" button (icon button) for each member in table (only for users with `:update` permission) +- Clicking remove immediately removes member from group (no confirmation dialog) +- Success/error flash messages provide feedback + **Note:** Uses slug for routing to provide URL-friendly, readable group URLs (e.g., `/groups/board-members`). ### Group Form Pages @@ -754,6 +769,7 @@ Each functional unit can be implemented as a **separate issue**: - **Issue 4:** Groups in Member Detail (Unit 5) - **Issue 5:** Groups in Member Search (Unit 6) - **Issue 6:** Permissions (Unit 7) +- **Issue 7:** Add/Remove Members in Group Detail View **Alternative:** Issues 3 and 4 can be combined, as they both concern the display of groups. @@ -799,6 +815,27 @@ Each functional unit can be implemented as a **separate issue**: **Estimation:** 3-4h +### Phase 2a: Add/Remove Members in Group Detail View + +**Goal:** Enable adding and removing members from groups via UI + +**Tasks:** +1. Add "Add Member" button above member table in Group Detail View +2. Implement inline add member with search/autocomplete +3. Add "Remove" button for each member in table +4. Implement add/remove functionality with flash messages +5. Ensure proper authorization checks + +**Deliverables:** +- Members can be added to groups via UI +- Members can be removed from groups via UI +- Proper feedback via flash messages +- Authorization enforced + +**Estimation:** 2-3h + +**Note:** This phase extends Phase 2 and can be implemented as Issue 7 after Issue 2 is complete. + ### Phase 3: Member Overview Integration **Goal:** Display and filter groups in member overview @@ -865,9 +902,9 @@ Each functional unit can be implemented as a **separate issue**: **Estimation:** 1-2h -### Total Estimation: 13-18h +### Total Estimation: 15-21h -**Note:** This aligns with the issue estimation of 15h. +**Note:** This includes all 7 issues. The original MVP estimation was 13-15h, with Issue 7 adding 2-3h for the add/remove members functionality in the Group Detail View. --- @@ -960,6 +997,55 @@ Each functional unit can be implemented as a **separate issue**: - Only admins can manage groups - All users can view groups (if they can view members) +### Issue 7: Add/Remove Members in Group Detail View +**Type:** Frontend +**Estimation:** 2-3h +**Dependencies:** Issue 1 (Backend must be functional), Issue 2 (Group Detail View must exist) + +**Tasks:** +- Add "Add Member" button above member table in Group Detail View (`/groups/:slug`) +- Implement inline add member for member selection with search/autocomplete +- Add "Remove" button for each member in the member table +- Implement add member functionality (create MemberGroup association) +- Implement remove member functionality (destroy MemberGroup association) +- Add flash messages for success/error feedback +- Ensure proper authorization checks (only users with `:update` permission on Group can add/remove) +- Filter out members already in the group from search results +- Reload group data after add/remove operations + +**Acceptance Criteria:** +- "Add Member" button is visible above member table (only for users with `:update` permission) +- Clicking "Add Member" opens inline add member area with member search/autocomplete +- Search filters members and excludes those already in the group +- Selecting a member from search adds them to the group +- Success flash message is displayed when member is added +- Error flash message is displayed if member is already in group or other error occurs +- Each member row in the table has a "Remove" button (only visible for users with `:update` permission) +- Clicking "Remove" immediately removes the member from the group (no confirmation dialog) +- Success flash message is displayed when member is removed +- Group member list and member count update automatically after add/remove +- Inline add member area closes after successful member addition +- Authorization is enforced server-side in event handlers +- UI respects permission checks (buttons hidden for unauthorized users) + +**Technical Notes:** +- Reuse member search pattern from `UserLive.Form` (ComboBox hook with autocomplete) +- Use `Membership.create_member_group/1` for adding members +- Use `Membership.destroy_member_group/1` for removing members +- Filter search results to exclude members already in the group (check `group.members`) +- Reload group with `:members` and `:member_count` after operations +- Use inline combobox pattern (delete group uses a separate confirmation modal) +- Ensure accessibility: proper ARIA labels, keyboard navigation, focus management + +**UI/UX Details:** +- Inline add member section (no modal; combobox above member table) +- Search input placeholder: "Search for a member..." +- Search results show member name and email +- "Add" button in inline area (disabled until member selected) +- "Cancel" button to close inline add member area +- Remove button can be an icon button (trash icon) with tooltip +- Flash messages: "Member added successfully" / "Member removed successfully" / error messages + --- ## Testing Strategy diff --git a/docs/page-permission-route-coverage.md b/docs/page-permission-route-coverage.md index 9151a44..b8eafbd 100644 --- a/docs/page-permission-route-coverage.md +++ b/docs/page-permission-route-coverage.md @@ -26,6 +26,7 @@ This document lists all protected routes, which permission set may access them, | `/groups/new` | ✗ | ✗ | ✗ | ✓ | | `/groups/:slug` | ✗ | ✓ | ✓ | ✓ | | `/groups/:slug/edit` | ✗ | ✗ | ✗ | ✓ | +| `/statistics` | ✗ | ✓ | ✓ | ✓ | | `/admin/roles` | ✗ | ✗ | ✗ | ✓ | | `/admin/roles/new` | ✗ | ✗ | ✗ | ✓ | | `/admin/roles/:id` | ✗ | ✗ | ✗ | ✓ | diff --git a/docs/statistics-page-implementation-plan.md b/docs/statistics-page-implementation-plan.md new file mode 100644 index 0000000..2225ae9 --- /dev/null +++ b/docs/statistics-page-implementation-plan.md @@ -0,0 +1,163 @@ +# Statistics Page – Implementation Plan + +**Project:** Mila – Membership Management System +**Feature:** Statistics page at `/statistics` +**Scope:** MVP only (no export, no optional extensions) +**Last updated:** 2026-02-10 + +--- + +## Decisions (from clarification) + +| Topic | Decision | +|-------|----------| +| Route | `/statistics` | +| Navigation | Top-level menu (next to Members, Fee Types) | +| Permission | read_only, normal_user, admin (same as member list) | +| Charts | HTML/CSS and SVG only (no Contex, no Chart.js) | +| MVP scope | Minimal: active/inactive, joins/exits per year, contribution sums per year, open amount | +| Open amount | Total unpaid only (no overdue vs. not-yet-due split in MVP) | + +Excluded from this plan: Export (CSV/PDF), caching, month/quarter filters, “members per fee type”, “members per group”, and overdue split. + +--- + +## 1. Statistics module (`Mv.Statistics`) + +**Goal:** Central module for all statistics; LiveView only calls this API. Uses Ash reads with actor so policies apply. + +**Location:** `lib/mv/statistics.ex` (new). + +**Functions to implement:** + +| Function | Purpose | Data source | +|----------|---------|-------------| +| `active_member_count(opts)` | Count members with `exit_date == nil` | `Member` read with filter | +| `inactive_member_count(opts)` | Count members with `exit_date != nil` | `Member` read with filter | +| `joins_by_year(year, opts)` | Count members with `join_date` in given year | `Member` read, filter by year, count | +| `exits_by_year(year, opts)` | Count members with `exit_date` in given year | `Member` read, filter by year, count | +| `cycle_totals_by_year(year, opts)` | For cycles with `cycle_start` in year: total sum, and sums/counts by status (paid, unpaid, suspended) | `MembershipFeeCycle` read (filter by year via `cycle_start`), aggregate sum(amount) and count per status in Elixir or via Ash aggregates | +| `open_amount_total(opts)` | Sum of `amount` for all cycles with `status == :unpaid` | `MembershipFeeCycle` read with filter `status == :unpaid`, sum(amount) | + +All functions accept `opts` (keyword list) and pass `actor: opts[:actor]` (and `domain:` where needed) to Ash calls. No new resources; only read actions on existing `Member` and `MembershipFeeCycle`. + +**Implementation notes:** + +- Use `Ash.Query.filter(Member, expr(...))` for date filters; for “year”, filter `join_date >= first_day_of_year` and `join_date <= last_day_of_year` (same for `exit_date` and for `MembershipFeeCycle.cycle_start`). +- For `cycle_totals_by_year`: either multiple Ash reads (one per status) with sum aggregate, or one read of cycles in that year and `Enum.group_by(..., :status)` then sum amounts in Elixir. +- Use `Mv.MembershipFees.CalendarCycles` only if needed for interval (e.g. cycle_end); for “cycle in year” the `cycle_start` year is enough. + +**Tests:** Unit tests in `test/mv/statistics_test.exs` for each function (with fixtures: members with join_date/exit_date, cycles with cycle_start/amount/status). Use `Mv.Helpers.SystemActor.get_system_actor()` in tests for Ash read authorization where appropriate. + +--- + +## 2. Route and authorization + +**Router** ([lib/mv_web/router.ex](lib/mv_web/router.ex)): + +- In the same `ash_authentication_live_session` block where `/members` and `/membership_fee_types` live, add: + - `live "/statistics", StatisticsLive, :index` + +**PagePaths** ([lib/mv_web/page_paths.ex](lib/mv_web/page_paths.ex)): + +- Add module attribute `@statistics "/statistics"`. +- Add `def statistics, do: @statistics`. +- No change to `@admin_page_paths` (statistics is top-level). + +**Page permission** (route matrix is driven by [lib/mv/authorization/permission_sets.ex](lib/mv/authorization/permission_sets.ex)): + +- Add `"/statistics"` to the `pages` list of **read_only** (e.g. after `"/groups/:slug"`) and to the `pages` list of **normal_user** (e.g. after groups entries). **admin** already has `"*"` so no change. +- **own_data** must not list `/statistics` (so they cannot access it). +- Update [docs/page-permission-route-coverage.md](docs/page-permission-route-coverage.md): add row for `| /statistics | ✗ | ✓ | ✓ | ✓ |`. +- Add test in `test/mv_web/plugs/check_page_permission_test.exs`: read_only and normal_user and admin can access `/statistics`; own_data cannot. + +--- + +## 3. Sidebar + +**File:** [lib/mv_web/components/layouts/sidebar.ex](lib/mv_web/components/layouts/sidebar.ex). + +- In `sidebar_menu`, after the “Fee Types” menu item and before the “Administration” block, add a conditional menu item for Statistics: + - `can_access_page?(@current_user, PagePaths.statistics())` → show link. + - `href={~p"/statistics"}`, `icon="hero-chart-bar"` (or similar), `label={gettext("Statistics")}`. + +--- + +## 4. Statistics LiveView + +**Module:** `MvWeb.StatisticsLive` +**File:** `lib/mv_web/live/statistics_live.ex` +**Mount:** `:index` only. + +**Behaviour:** + +- `on_mount`: use `MvWeb.LiveUserAuth, :live_user_required` and ensure role/permission check (same as other protected LiveViews). In `mount` or `handle_params`, set default selected year to current year (e.g. `Date.utc_today().year`). +- **Assigns:** `:year` (integer), `:active_count`, `:inactive_count`, `:joins_this_year`, `:exits_this_year`, `:cycle_totals` (map with keys e.g. `:total`, `:paid`, `:unpaid`, `:suspended` for the selected year), `:open_amount_total`, and any extra needed for the bar data (e.g. list of `%{year: y, joins: j, exits: e}` for a small range of years if you show a minimal bar chart). +- **Year filter:** A single select or dropdown for year (e.g. from “first year with data” to current year). On change, send event (e.g. `"set_year"`) with `%{"year" => year}`; in `handle_event` update `assigns.year` and reload data by calling `Mv.Statistics` again and re-assigning. + +**Data loading:** + +- In `mount` and whenever year changes, call `Mv.Statistics` with `actor: current_actor(socket)` (and optionally `year: @year` where needed). Assign results to socket. Handle errors (e.g. redirect or flash) if a call fails. + +**Layout (sections):** + +1. **Page title:** e.g. “Statistics” (gettext). +2. **Year filter:** One control to select year; applies to “joins/exits” and “contribution sums” for that year. +3. **Cards (top row):** + - Active members (count) + - Inactive members (count) + - Joins in selected year + - Exits in selected year + - Open amount total (sum of all unpaid cycles; format with `MvWeb.Helpers.MembershipFeeHelpers.format_currency/1`) + - Optionally: “Paid this year” (from `cycle_totals_by_year` for selected year) +4. **Contributions for selected year:** One section showing for the chosen year: total (Soll), paid, unpaid, suspended (sums and optionally counts). Use simple table or key-value list; no chart required for MVP. +5. **Joins / Exits by year (simple bar chart):** Data: e.g. last 5 or 10 years. For each year, show joins and exits as horizontal bars (HTML/CSS: e.g. `div` with `width: #{percent}%`). Pure HTML/SVG; no external chart library. Use Tailwind/DaisyUI for layout and cards. + +**Accessibility:** Semantic HTML; headings (e.g. `h2`) for each section; ensure year filter has a label; format numbers in a screen-reader-friendly way (e.g. no purely visual abbreviations without aria-label). + +**i18n:** All user-visible strings via gettext (e.g. “Statistics”, “Active members”, “Inactive members”, “Joins (year)”, “Exits (year)”, “Open amount”, “Contributions for year”, “Total”, “Paid”, “Unpaid”, “Suspended”). Add keys to `priv/gettext` as needed. + +--- + +## 5. Implementation order (tasks) + +Execute in this order so that each step is testable: + +1. **Statistics module** + - Add `lib/mv/statistics.ex` with the six functions above and `@moduledoc`. + - Add `test/mv/statistics_test.exs` with tests for each function (use fixtures for members and cycles; pass actor in opts). + - Run tests and fix until green. + +2. **Route and permission** + - Add `live "/statistics", StatisticsLive, :index` in router. + - Add `statistics/0` and `@statistics` in PagePaths. + - Add `/statistics` to page permission logic so read_only, normal_user, admin are allowed and own_data is denied. + - Update `docs/page-permission-route-coverage.md` and add/update plug tests for `/statistics`. + +3. **Sidebar** + - Add Statistics link in sidebar (top-level) with `can_access_page?` and `PagePaths.statistics()`. + +4. **StatisticsLive** + - Create `lib/mv_web/live/statistics_live.ex` with mount, assigns, year param, and data loading from `Mv.Statistics`. + - Implement UI: title, year filter, cards, contribution section, simple joins/exits bar (HTML). + - Add gettext keys and use them in the template. + - Optionally add a simple LiveView test (e.g. authenticated user sees statistics page and key labels). + +5. **CI and docs** + - Run `just ci-dev` (or project equivalent); fix formatting, Credo, and tests. + - In [docs/feature-roadmap.md](docs/feature-roadmap.md), update “Reporting & Analytics” to reflect that a basic statistics page is implemented (MVP). + - In [CODE_GUIDELINES.md](CODE_GUIDELINES.md), add a short note under a suitable section (e.g. “Reporting” or “LiveView”) that statistics are provided by `Mv.Statistics` and displayed in `StatisticsLive`, if desired. + +--- + +## 6. Out of scope (not in this plan) + +- Export (CSV/PDF). +- Caching (ETS/GenServer/HTTP). +- Month or quarter filters. +- “Members per fee type” or “members per group” statistics. +- Overdue vs. not-yet-due split for open amount. +- Contex or Chart.js. +- New database tables or Ash resources. + +These can be added later as separate tasks or follow-up plans. diff --git a/lib/mv/authorization/permission_sets.ex b/lib/mv/authorization/permission_sets.ex index ea878a2..fffc818 100644 --- a/lib/mv/authorization/permission_sets.ex +++ b/lib/mv/authorization/permission_sets.ex @@ -178,7 +178,9 @@ defmodule Mv.Authorization.PermissionSets do # Groups overview "/groups", # Group detail - "/groups/:slug" + "/groups/:slug", + # Statistics + "/statistics" ] } end @@ -243,7 +245,9 @@ defmodule Mv.Authorization.PermissionSets do # Group detail "/groups/:slug", # Edit group - "/groups/:slug/edit" + "/groups/:slug/edit", + # Statistics + "/statistics" ] } end diff --git a/lib/mv/membership_fees/cycle_generator.ex b/lib/mv/membership_fees/cycle_generator.ex index ec33914..1a33ca8 100644 --- a/lib/mv/membership_fees/cycle_generator.ex +++ b/lib/mv/membership_fees/cycle_generator.ex @@ -87,7 +87,7 @@ defmodule Mv.MembershipFees.CycleGenerator do def generate_cycles_for_member(member_or_id, opts \\ []) def generate_cycles_for_member(member_id, opts) when is_binary(member_id) do - case load_member(member_id) do + case load_member(member_id, opts) do {:ok, member} -> generate_cycles_for_member(member, opts) {:error, reason} -> {:error, reason} end @@ -97,25 +97,25 @@ defmodule Mv.MembershipFees.CycleGenerator do today = Keyword.get(opts, :today, Date.utc_today()) skip_lock? = Keyword.get(opts, :skip_lock?, false) - do_generate_cycles_with_lock(member, today, skip_lock?) + do_generate_cycles_with_lock(member, today, skip_lock?, opts) end # Generate cycles with lock handling # Returns {:ok, cycles, notifications} - notifications are never sent here, # they should be returned to the caller (e.g., via after_action hook) - defp do_generate_cycles_with_lock(member, today, true = _skip_lock?) do - # Lock already set by caller (e.g., regenerate_cycles_on_type_change) + defp do_generate_cycles_with_lock(member, today, true = _skip_lock?, opts) do + # Lock already set by caller (e.g., regenerate_cycles_on_type_change or seeds) # Just generate cycles without additional locking - do_generate_cycles(member, today) + do_generate_cycles(member, today, opts) end - defp do_generate_cycles_with_lock(member, today, false) do + defp do_generate_cycles_with_lock(member, today, false, opts) do lock_key = :erlang.phash2(member.id) Repo.transaction(fn -> Ecto.Adapters.SQL.query!(Repo, "SELECT pg_advisory_xact_lock($1)", [lock_key]) - case do_generate_cycles(member, today) do + case do_generate_cycles(member, today, opts) do {:ok, cycles, notifications} -> # Return cycles and notifications - do NOT send notifications here # They will be sent by the caller (e.g., via after_action hook) @@ -235,25 +235,33 @@ defmodule Mv.MembershipFees.CycleGenerator do # Private functions - defp load_member(member_id) do - system_actor = SystemActor.get_system_actor() - opts = Helpers.ash_actor_opts(system_actor) + # Use actor from opts when provided (e.g. seeds pass admin); otherwise system actor + defp get_actor(opts) do + case Keyword.get(opts, :actor) do + nil -> SystemActor.get_system_actor() + actor -> actor + end + end + + defp load_member(member_id, opts) do + actor = get_actor(opts) + read_opts = Helpers.ash_actor_opts(actor) query = Member |> Ash.Query.filter(id == ^member_id) |> Ash.Query.load([:membership_fee_type, :membership_fee_cycles]) - case Ash.read_one(query, opts) do + case Ash.read_one(query, read_opts) do {:ok, nil} -> {:error, :member_not_found} {:ok, member} -> {:ok, member} {:error, reason} -> {:error, reason} end end - defp do_generate_cycles(member, today) do + defp do_generate_cycles(member, today, opts) do # Reload member with relationships to ensure fresh data - case load_member(member.id) do + case load_member(member.id, opts) do {:ok, member} -> cond do is_nil(member.membership_fee_type_id) -> @@ -263,7 +271,7 @@ defmodule Mv.MembershipFees.CycleGenerator do {:error, :no_join_date} true -> - generate_missing_cycles(member, today) + generate_missing_cycles(member, today, opts) end {:error, reason} -> @@ -271,7 +279,7 @@ defmodule Mv.MembershipFees.CycleGenerator do end end - defp generate_missing_cycles(member, today) do + defp generate_missing_cycles(member, today, opts) do fee_type = member.membership_fee_type interval = fee_type.interval amount = fee_type.amount @@ -287,7 +295,7 @@ defmodule Mv.MembershipFees.CycleGenerator do # Only generate if start_date <= end_date if start_date && Date.compare(start_date, end_date) != :gt do cycle_starts = generate_cycle_starts(start_date, end_date, interval) - create_cycles(cycle_starts, member.id, fee_type.id, amount) + create_cycles(cycle_starts, member.id, fee_type.id, amount, opts) else {:ok, [], []} end @@ -382,9 +390,9 @@ defmodule Mv.MembershipFees.CycleGenerator do end end - defp create_cycles(cycle_starts, member_id, fee_type_id, amount) do - system_actor = SystemActor.get_system_actor() - opts = Helpers.ash_actor_opts(system_actor) + defp create_cycles(cycle_starts, member_id, fee_type_id, amount, opts) do + actor = get_actor(opts) + create_opts = Helpers.ash_actor_opts(actor) # Always use return_notifications?: true to collect notifications # Notifications will be returned to the caller, who is responsible for @@ -400,7 +408,7 @@ defmodule Mv.MembershipFees.CycleGenerator do } handle_cycle_creation_result( - Ash.create(MembershipFeeCycle, attrs, [return_notifications?: true] ++ opts), + Ash.create(MembershipFeeCycle, attrs, [return_notifications?: true] ++ create_opts), cycle_start ) end) diff --git a/lib/mv/statistics.ex b/lib/mv/statistics.ex new file mode 100644 index 0000000..b3c54c0 --- /dev/null +++ b/lib/mv/statistics.ex @@ -0,0 +1,237 @@ +defmodule Mv.Statistics do + @moduledoc """ + Aggregated statistics for members and membership fee cycles. + + Used by the statistics LiveView to display counts and sums. All functions + accept an `opts` keyword list and pass `:actor` (and `:domain` where needed) + to Ash reads so that policies are enforced. + """ + + require Ash.Query + import Ash.Expr + + require Logger + + alias Mv.Membership.Member + alias Mv.MembershipFees + alias Mv.MembershipFees.MembershipFeeCycle + + @doc """ + Returns the earliest year in which any member has a join_date. + + Used to determine the start of the "relevant" year range for statistics + (from first membership to current year). Returns `nil` if no member has + a join_date. + """ + @spec first_join_year(keyword()) :: non_neg_integer() | nil + def first_join_year(opts) do + query = + Member + |> Ash.Query.filter(expr(not is_nil(join_date))) + |> Ash.Query.sort(join_date: :asc) + |> Ash.Query.limit(1) + + case Ash.read_one(query, opts) do + {:ok, nil} -> + nil + + {:ok, member} -> + member.join_date.year + + {:error, reason} -> + Logger.warning("Statistics.first_join_year failed: #{inspect(reason)}") + nil + end + end + + @doc """ + Returns the count of active members (exit_date is nil). + """ + @spec active_member_count(keyword()) :: non_neg_integer() + def active_member_count(opts) do + query = + Member + |> Ash.Query.filter(expr(is_nil(exit_date))) + + case Ash.count(query, opts) do + {:ok, count} -> + count + + {:error, reason} -> + Logger.warning("Statistics.active_member_count failed: #{inspect(reason)}") + 0 + end + end + + @doc """ + Returns the count of inactive members (exit_date is not nil). + """ + @spec inactive_member_count(keyword()) :: non_neg_integer() + def inactive_member_count(opts) do + query = + Member + |> Ash.Query.filter(expr(not is_nil(exit_date))) + + case Ash.count(query, opts) do + {:ok, count} -> + count + + {:error, reason} -> + Logger.warning("Statistics.inactive_member_count failed: #{inspect(reason)}") + 0 + end + end + + @doc """ + Returns the count of members who joined in the given year (join_date in that year). + """ + @spec joins_by_year(integer(), keyword()) :: non_neg_integer() + def joins_by_year(year, opts) do + first_day = Date.new!(year, 1, 1) + last_day = Date.new!(year, 12, 31) + + query = + Member + |> Ash.Query.filter(expr(join_date >= ^first_day and join_date <= ^last_day)) + + case Ash.count(query, opts) do + {:ok, count} -> + count + + {:error, reason} -> + Logger.warning("Statistics.joins_by_year failed: #{inspect(reason)}") + 0 + end + end + + @doc """ + Returns the count of members who exited in the given year (exit_date in that year). + """ + @spec exits_by_year(integer(), keyword()) :: non_neg_integer() + def exits_by_year(year, opts) do + first_day = Date.new!(year, 1, 1) + last_day = Date.new!(year, 12, 31) + + query = + Member + |> Ash.Query.filter(expr(exit_date >= ^first_day and exit_date <= ^last_day)) + + case Ash.count(query, opts) do + {:ok, count} -> + count + + {:error, reason} -> + Logger.warning("Statistics.exits_by_year failed: #{inspect(reason)}") + 0 + end + end + + @doc """ + Returns totals for membership fee cycles whose cycle_start falls in the given year. + + Returns a map with keys: `:total`, `:paid`, `:unpaid`, `:suspended` (each a Decimal sum). + """ + @spec cycle_totals_by_year(integer(), keyword()) :: %{ + total: Decimal.t(), + paid: Decimal.t(), + unpaid: Decimal.t(), + suspended: Decimal.t() + } + def cycle_totals_by_year(year, opts) do + first_day = Date.new!(year, 1, 1) + last_day = Date.new!(year, 12, 31) + + query = + MembershipFeeCycle + |> Ash.Query.filter(expr(cycle_start >= ^first_day and cycle_start <= ^last_day)) + + query = maybe_filter_by_fee_type(query, opts) + # Only pass actor and domain to Ash.read; fee_type_id is only for our filter above + opts_for_read = + opts + |> Keyword.drop([:fee_type_id]) + |> Keyword.put(:domain, MembershipFees) + + case Ash.read(query, opts_for_read) do + {:ok, cycles} -> + cycle_totals_from_cycles(cycles) + + {:error, reason} -> + Logger.warning("Statistics.cycle_totals_by_year failed: #{inspect(reason)}") + zero_cycle_totals() + end + end + + defp cycle_totals_from_cycles(cycles) do + by_status = Enum.group_by(cycles, & &1.status) + sum = fn status -> sum_amounts(by_status[status] || []) end + + total = + [:paid, :unpaid, :suspended] + |> Enum.map(&sum.(&1)) + |> Enum.reduce(Decimal.new(0), &Decimal.add/2) + + %{ + total: total, + paid: sum.(:paid), + unpaid: sum.(:unpaid), + suspended: sum.(:suspended) + } + end + + defp sum_amounts(cycles), + do: Enum.reduce(cycles, Decimal.new(0), fn c, acc -> Decimal.add(acc, c.amount) end) + + defp zero_cycle_totals do + %{ + total: Decimal.new(0), + paid: Decimal.new(0), + unpaid: Decimal.new(0), + suspended: Decimal.new(0) + } + end + + defp maybe_filter_by_fee_type(query, opts) do + case Keyword.get(opts, :fee_type_id) do + nil -> + query + + id when is_binary(id) -> + # Only apply filter for valid UUID strings (e.g. from form/URL) + if Ecto.UUID.cast(id) != :error do + Ash.Query.filter(query, expr(membership_fee_type_id == ^id)) + else + query + end + + id -> + Ash.Query.filter(query, expr(membership_fee_type_id == ^id)) + end + end + + @doc """ + Returns the sum of amount for all cycles with status :unpaid. + """ + @spec open_amount_total(keyword()) :: Decimal.t() + def open_amount_total(opts) do + query = + MembershipFeeCycle + |> Ash.Query.filter(expr(status == :unpaid)) + + query = maybe_filter_by_fee_type(query, opts) + + opts_for_read = + opts + |> Keyword.drop([:fee_type_id]) + |> Keyword.put(:domain, MembershipFees) + + case Ash.read(query, opts_for_read) do + {:ok, cycles} -> + Enum.reduce(cycles, Decimal.new(0), fn c, acc -> Decimal.add(acc, c.amount) end) + + {:error, reason} -> + Logger.warning("Statistics.open_amount_total failed: #{inspect(reason)}") + Decimal.new(0) + end + end +end diff --git a/lib/mv_web/components/layouts/sidebar.ex b/lib/mv_web/components/layouts/sidebar.ex index 89519ae..1896f24 100644 --- a/lib/mv_web/components/layouts/sidebar.ex +++ b/lib/mv_web/components/layouts/sidebar.ex @@ -88,6 +88,14 @@ defmodule MvWeb.Layouts.Sidebar do /> <% end %> + <%= if can_access_page?(@current_user, PagePaths.statistics()) do %> + <.menu_item + href={~p"/statistics"} + icon="hero-chart-bar" + label={gettext("Statistics")} + /> + <% end %> + <%= if admin_menu_visible?(@current_user) do %> <.menu_group icon="hero-cog-6-tooth" diff --git a/lib/mv_web/live/group_live/show.ex b/lib/mv_web/live/group_live/show.ex index 0899728..0251fb6 100644 --- a/lib/mv_web/live/group_live/show.ex +++ b/lib/mv_web/live/group_live/show.ex @@ -15,6 +15,8 @@ defmodule MvWeb.GroupLive.Show do """ use MvWeb, :live_view + require Logger + import MvWeb.LiveHelpers, only: [current_actor: 1] import MvWeb.Authorization @@ -22,7 +24,15 @@ defmodule MvWeb.GroupLive.Show do @impl true def mount(_params, _session, socket) do - {:ok, socket} + {:ok, + socket + |> assign(:show_add_member_input, false) + |> assign(:member_search_query, "") + |> assign(:available_members, []) + |> assign(:selected_member_ids, []) + |> assign(:selected_members, []) + |> assign(:show_member_dropdown, false) + |> assign(:focused_member_index, nil)} end @impl true @@ -122,6 +132,128 @@ defmodule MvWeb.GroupLive.Show do )}

+ <%= if can?(@current_user, :update, Mv.Membership.Group) do %> +
+ <%= if assigns[:show_add_member_input] do %> +
+
+
+
+ <%= for member <- @selected_members do %> + + {MvWeb.Helpers.MemberHelpers.display_name(member)} + + + <% end %> + +
+ + <%= if length(@available_members) > 0 do %> +
+ <%= for {member, index} <- Enum.with_index(@available_members) do %> +
+

+ {MvWeb.Helpers.MemberHelpers.display_name(member)} +

+

+ {member.email || gettext("No email")} +

+
+ <% end %> +
+ <% end %> +
+
+ + +
+ <% else %> + <.button + variant="primary" + phx-click="show_add_member_input" + aria-label={gettext("Add Member")} + > + {gettext("Add Member")} + + <% end %> +
+ <% end %> + <%= if Enum.empty?(@group.members || []) do %>

{gettext("No members in this group")}

<% else %> @@ -131,6 +263,9 @@ defmodule MvWeb.GroupLive.Show do {gettext("Name")} {gettext("Email")} + <%= if can?(@current_user, :update, Mv.Membership.Group) do %> + {gettext("Actions")} + <% end %> @@ -156,6 +291,20 @@ defmodule MvWeb.GroupLive.Show do <% end %> + <%= if can?(@current_user, :update, Mv.Membership.Group) do %> + + + + <% end %> <% end %> @@ -236,11 +385,13 @@ defmodule MvWeb.GroupLive.Show do """ end + # Delete Modal Events @impl true def handle_event("open_delete_modal", _params, socket) do {:noreply, assign(socket, show_delete_modal: true, name_confirmation: "")} end + @impl true def handle_event("cancel_delete", _params, socket) do {:noreply, socket @@ -248,10 +399,12 @@ defmodule MvWeb.GroupLive.Show do |> assign(:name_confirmation, "")} end + @impl true def handle_event("update_name_confirmation", %{"name" => name}, socket) do {:noreply, assign(socket, :name_confirmation, name)} end + @impl true def handle_event("confirm_delete", %{"slug" => slug}, socket) do actor = current_actor(socket) group = socket.assigns.group @@ -275,6 +428,417 @@ defmodule MvWeb.GroupLive.Show do end end + # Add Member Events + @impl true + def handle_event("show_add_member_input", _params, socket) do + # Reload group to ensure we have the latest members list + actor = current_actor(socket) + group = socket.assigns.group + socket = reload_group(socket, group.slug, actor) + + {:noreply, + socket + |> assign(:show_add_member_input, true) + |> assign(:member_search_query, "") + |> assign(:available_members, []) + |> assign(:selected_member_ids, []) + |> assign(:selected_members, []) + |> assign(:show_member_dropdown, false) + |> assign(:focused_member_index, nil)} + end + + @impl true + def handle_event("show_member_dropdown", _params, socket) do + # Use existing group.members for filtering; reload only on add/remove + socket = + socket + |> load_available_members("") + |> assign(:show_member_dropdown, true) + |> assign(:focused_member_index, nil) + + {:noreply, socket} + end + + @impl true + def handle_event("hide_add_member_input", _params, socket) do + {:noreply, + socket + |> assign(:show_add_member_input, false) + |> assign(:member_search_query, "") + |> assign(:available_members, []) + |> assign(:selected_member_ids, []) + |> assign(:selected_members, []) + |> assign(:show_member_dropdown, false) + |> assign(:focused_member_index, nil)} + end + + @impl true + def handle_event("hide_member_dropdown", _params, socket) do + {:noreply, assign(socket, show_member_dropdown: false, focused_member_index: nil)} + end + + @impl true + def handle_event("member_dropdown_keydown", %{"key" => "ArrowDown"}, socket) do + return_if_dropdown_closed(socket, fn -> + max_index = length(socket.assigns.available_members) - 1 + current = socket.assigns.focused_member_index + + new_index = + case current do + nil -> 0 + index when index < max_index -> index + 1 + _ -> current + end + + {:noreply, assign(socket, focused_member_index: new_index)} + end) + end + + @impl true + def handle_event("member_dropdown_keydown", %{"key" => "ArrowUp"}, socket) do + return_if_dropdown_closed(socket, fn -> + current = socket.assigns.focused_member_index + + new_index = + case current do + nil -> 0 + 0 -> 0 + index -> index - 1 + end + + {:noreply, assign(socket, focused_member_index: new_index)} + end) + end + + @impl true + def handle_event("member_dropdown_keydown", %{"key" => "Enter"}, socket) do + return_if_dropdown_closed(socket, fn -> + select_focused_member(socket) + end) + end + + @impl true + def handle_event("member_dropdown_keydown", %{"key" => "Escape"}, socket) do + return_if_dropdown_closed(socket, fn -> + {:noreply, assign(socket, show_member_dropdown: false, focused_member_index: nil)} + end) + end + + @impl true + def handle_event("member_dropdown_keydown", _params, socket) do + # Ignore other keys + {:noreply, socket} + end + + @impl true + def handle_event("search_members", %{"member_search" => query}, socket) do + # Use existing group.members for filtering; reload only on add/remove + socket = + socket + |> assign(:member_search_query, query) + |> load_available_members(query) + |> assign(:show_member_dropdown, true) + |> assign(:focused_member_index, nil) + + {:noreply, socket} + end + + @impl true + def handle_event("select_member", %{"id" => member_id}, socket) do + # Check if member is already selected + if member_id in socket.assigns.selected_member_ids do + {:noreply, socket} + else + # Find the selected member + selected_member = Enum.find(socket.assigns.available_members, &(&1.id == member_id)) + + if selected_member do + socket = + socket + |> assign(:selected_member_ids, [member_id | socket.assigns.selected_member_ids]) + |> assign(:selected_members, [selected_member | socket.assigns.selected_members]) + |> assign(:member_search_query, "") + |> assign(:show_member_dropdown, false) + |> assign(:focused_member_index, nil) + + {:noreply, socket} + else + {:noreply, socket} + end + end + end + + @impl true + def handle_event("remove_selected_member", %{"member_id" => member_id}, socket) do + socket = + socket + |> assign(:selected_member_ids, List.delete(socket.assigns.selected_member_ids, member_id)) + |> assign( + :selected_members, + Enum.reject(socket.assigns.selected_members, &(&1.id == member_id)) + ) + + {:noreply, socket} + end + + @impl true + def handle_event("add_selected_members", _params, socket) do + actor = current_actor(socket) + group = socket.assigns.group + + # Server-side authorization check + if can?(actor, :update, group) do + member_ids = Enum.uniq(socket.assigns.selected_member_ids) + perform_add_members(socket, group, member_ids, actor) + else + {:noreply, + socket + |> put_flash(:error, gettext("Not authorized.")) + |> redirect(to: ~p"/groups/#{group.slug}")} + end + end + + @impl true + def handle_event("remove_member", %{"member_id" => member_id}, socket) do + actor = current_actor(socket) + group = socket.assigns.group + + # Server-side authorization check + if can?(actor, :update, group) do + perform_remove_member(socket, group, member_id, actor) + else + {:noreply, + socket + |> put_flash(:error, gettext("Not authorized.")) + |> redirect(to: ~p"/groups/#{group.slug}")} + end + end + + # Helper functions + defp return_if_dropdown_closed(socket, fun) do + if socket.assigns.show_member_dropdown do + fun.() + else + {:noreply, socket} + end + end + + defp select_focused_member(socket) do + case socket.assigns.focused_member_index do + nil -> + {:noreply, socket} + + index -> + select_member_by_index(socket, index) + end + end + + defp select_member_by_index(socket, index) do + case Enum.at(socket.assigns.available_members, index) do + nil -> + {:noreply, socket} + + member -> + add_member_to_selection(socket, member) + end + end + + defp add_member_to_selection(socket, member) do + # Check if member is already selected + if member.id in socket.assigns.selected_member_ids do + {:noreply, socket} + else + socket = + socket + |> assign(:selected_member_ids, [member.id | socket.assigns.selected_member_ids]) + |> assign(:selected_members, [member | socket.assigns.selected_members]) + |> assign(:member_search_query, "") + |> assign(:show_member_dropdown, false) + |> assign(:focused_member_index, nil) + + {:noreply, socket} + end + end + + defp load_available_members(socket, query) do + require Ash.Query + + current_member_ids = group_member_ids_set(socket.assigns.group) + base_query = available_members_base_query(query) + + # Fetch more than 10, then exclude already-in-group and take 10 (avoids empty dropdown when first N are all in group) + fetch_limit = 50 + limited_query = Ash.Query.limit(base_query, fetch_limit) + actor = current_actor(socket) + + case Ash.read(limited_query, actor: actor, domain: Mv.Membership) do + {:ok, members} -> + available = + members + |> Enum.reject(fn m -> MapSet.member?(current_member_ids, m.id) end) + |> Enum.take(10) + + assign(socket, available_members: available) + + {:error, error} -> + Logger.warning("Failed to load available members for group: #{inspect(error)}") + + socket + |> put_flash(:error, gettext("Could not load member search. Please try again.")) + |> assign(:available_members, []) + end + end + + defp available_members_base_query(query) do + search_query = if query && String.trim(query) != "", do: String.trim(query), else: nil + + if search_query do + Mv.Membership.Member + |> Ash.Query.for_read(:search, %{query: search_query}) + else + Mv.Membership.Member + |> Ash.Query.new() + end + end + + defp group_member_ids_set(group) do + members = group.members || [] + members |> Enum.map(& &1.id) |> MapSet.new() + end + + defp perform_add_members(socket, group, member_ids, actor) when is_list(member_ids) do + # Add all members in a transaction-like manner + results = + Enum.map(member_ids, fn member_id -> + Membership.create_member_group( + %{member_id: member_id, group_id: group.id}, + actor: actor + ) + end) + + # Check for errors + errors = Enum.filter(results, &match?({:error, _}, &1)) + + if Enum.empty?(errors) do + handle_successful_add_members(socket, group, actor) + else + handle_failed_add_members(socket, group, errors, actor) + end + end + + defp perform_add_members(socket, _group, _member_ids, _actor) do + {:noreply, + socket + |> put_flash(:error, gettext("No members selected."))} + end + + defp handle_successful_add_members(socket, group, actor) do + socket = reload_group(socket, group.slug, actor) + + {:noreply, + socket + |> assign(:show_add_member_input, false) + |> assign(:member_search_query, "") + |> assign(:available_members, []) + |> assign(:selected_member_ids, []) + |> assign(:selected_members, []) + |> assign(:show_member_dropdown, false) + |> assign(:focused_member_index, nil)} + end + + defp handle_failed_add_members(socket, group, errors, actor) do + error_messages = extract_error_messages(errors) + + # Still reload to show any successful additions + socket = reload_group(socket, group.slug, actor) + + {:noreply, + socket + |> put_flash( + :error, + gettext("Some members could not be added: %{errors}", errors: error_messages) + ) + |> assign(:show_add_member_input, true)} + end + + defp extract_error_messages(errors) do + Enum.map(errors, fn {:error, error} -> + format_single_error(error) + end) + |> Enum.uniq() + |> Enum.join(", ") + end + + defp format_single_error(%{errors: [%{message: message}]}) when is_binary(message), do: message + + defp format_single_error(%{errors: [%{field: :member_id, message: message}]}) + when is_binary(message), + do: message + + defp format_single_error(error), do: format_error(error) + + defp perform_remove_member(socket, group, member_id, actor) do + require Ash.Query + + # Find the MemberGroup association + query = + Mv.Membership.MemberGroup + |> Ash.Query.filter(member_id == ^member_id and group_id == ^group.id) + + case Ash.read_one(query, actor: actor, domain: Mv.Membership) do + {:ok, nil} -> + {:noreply, + socket + |> put_flash(:error, gettext("Member is not in this group."))} + + {:ok, member_group} -> + case Membership.destroy_member_group(member_group, actor: actor) do + :ok -> + # Reload group with members and member_count + socket = reload_group(socket, group.slug, actor) + + {:noreply, socket} + + {:error, error} -> + error_message = format_error(error) + + {:noreply, + socket + |> put_flash( + :error, + gettext("Failed to remove member: %{error}", error: error_message) + )} + end + + {:error, error} -> + error_message = format_error(error) + + {:noreply, + socket + |> put_flash( + :error, + gettext("Failed to remove member: %{error}", error: error_message) + )} + end + end + + defp reload_group(socket, slug, actor) do + require Ash.Query + + query = + Mv.Membership.Group + |> Ash.Query.filter(slug == ^slug) + |> Ash.Query.load([:members, :member_count]) + + case Ash.read_one(query, actor: actor, domain: Mv.Membership) do + {:ok, group} -> + assign(socket, :group, group) + + {:error, _} -> + socket + end + end + defp handle_delete_confirmation(socket, group, actor) do if socket.assigns.name_confirmation == group.name do perform_group_deletion(socket, group, actor) diff --git a/lib/mv_web/live/statistics_live.ex b/lib/mv_web/live/statistics_live.ex new file mode 100644 index 0000000..32dda6f --- /dev/null +++ b/lib/mv_web/live/statistics_live.ex @@ -0,0 +1,628 @@ +defmodule MvWeb.StatisticsLive do + @moduledoc """ + LiveView for the statistics page at /statistics. + + Displays aggregated member and membership fee cycle statistics. + """ + use MvWeb, :live_view + + require Logger + + import MvWeb.LiveHelpers, only: [current_actor: 1] + alias Mv.Statistics + alias Mv.MembershipFees.MembershipFeeType + alias MvWeb.Helpers.MembershipFeeHelpers + + @impl true + def mount(_params, _session, socket) do + # Only static assigns and fee types here; load_statistics runs once in handle_params + socket = + socket + |> assign(:page_title, gettext("Statistics")) + |> assign(:selected_fee_type_id, nil) + |> load_fee_types() + + {:ok, socket} + end + + @impl true + def handle_params(params, uri, socket) do + # Query params: after push_patch, params may not include query string in some cases; + # always derive from URI as well so fee_type_id is reliable. + uri_query = if uri, do: URI.decode_query(URI.parse(uri).query || ""), else: %{} + fee_type_id = params["fee_type_id"] || uri_query["fee_type_id"] + fee_type_id = normalize_fee_type_id(fee_type_id) + + socket = + socket + |> assign(:selected_fee_type_id, fee_type_id) + |> load_statistics() + + {:noreply, socket} + end + + defp normalize_fee_type_id(nil), do: nil + defp normalize_fee_type_id(""), do: nil + + defp normalize_fee_type_id(id) when is_binary(id) do + case String.trim(id) do + "" -> nil + trimmed -> trimmed + end + end + + defp normalize_fee_type_id(_), do: nil + + @impl true + def render(assigns) do + ~H""" + + <.header> + {gettext("Statistics")} + <:subtitle>{gettext("Overview from first membership to today")} + + +
+

{gettext("Members")}

+
+
+
+

+ {gettext("Active members")} +

+

": " <> to_string(@active_count)} + > + {@active_count} +

+
+
+
+
+

+ {gettext("Inactive members")} +

+

": " <> to_string(@inactive_count)} + > + {@inactive_count} +

+
+
+
+
+
+

{gettext("Member numbers by year")}

+

+ {gettext("From %{first} to %{last} (relevant years with membership data)", + first: @years |> List.last() |> to_string(), + last: @years |> List.first() |> to_string() + )} +

+ <.member_numbers_table joins_exits_by_year={@joins_exits_by_year} /> +
+
+
+ +
+

+ {gettext("Contributions")} +

+
+
+
+ + +
+
+
+
+
+

{gettext("Contributions by year")}

+
+
+ <.contributions_bars_by_year + contributions_by_year={@contributions_by_year} + totals_over_all_years={@totals_over_all_years} + /> +
+
+

{gettext("All years combined (pie)")}

+ <.contributions_pie cycle_totals={@totals_over_all_years} /> +

+ + {gettext("Paid")} + + + {gettext("Unpaid")} + + + {gettext("Suspended")} +

+
+
+
+
+
+
+ """ + end + + @impl true + def handle_event("change_fee_type", %{"fee_type_id" => ""}, socket) do + {:noreply, push_patch(socket, to: ~p"/statistics")} + end + + def handle_event("change_fee_type", %{"fee_type_id" => id}, socket) when is_binary(id) do + trimmed = String.trim(id) + + to = + if trimmed == "", + do: ~p"/statistics", + else: ~p"/statistics" <> "?" <> URI.encode_query(%{"fee_type_id" => trimmed}) + + {:noreply, push_patch(socket, to: to)} + end + + attr :joins_exits_by_year, :list, required: true + + defp member_numbers_table(assigns) do + rows = assigns.joins_exits_by_year + total_activity = Enum.map(rows, fn r -> r.joins + r.exits end) + max_total = (total_activity != [] && Enum.max(total_activity)) || 1 + + rows_with_pct = + Enum.map(rows, fn row -> + sum = row.joins + row.exits + + bar_pct = + if max_total > 0 and sum > 0 do + min(100.0, Float.round(sum / max_total * 100, 1)) + else + 0 + end + + seg_scale = max(sum, 1) + joins_pct = min(100.0, row.joins / seg_scale * 100) + exits_pct = min(100.0, row.exits / seg_scale * 100) + + %{ + year: row.year, + joins: row.joins, + exits: row.exits, + bar_pct: bar_pct, + joins_pct: Float.round(joins_pct, 1), + exits_pct: Float.round(exits_pct, 1) + } + end) + + assigns = assign(assigns, :rows, rows_with_pct) + + ~H""" + + """ + end + + attr :contributions_by_year, :list, required: true + attr :totals_over_all_years, :map, required: true + + defp contributions_bars_by_year(assigns) do + rows = assigns.contributions_by_year + totals = assigns.totals_over_all_years + + all_rows_with_decimals = + Enum.map(rows, fn row -> + %{ + year: row.year, + summary: false, + total: row.total, + paid: row.paid, + unpaid: row.unpaid, + suspended: row.suspended + } + end) ++ + [ + %{ + year: nil, + summary: true, + total: totals.total, + paid: totals.paid, + unpaid: totals.unpaid, + suspended: totals.suspended + } + ] + + max_total = max_decimal(all_rows_with_decimals, :total) + + rows_with_pct = + Enum.map(all_rows_with_decimals, fn row -> + bar_pct = bar_pct(row.total, max_total) + + sum_positive = + Decimal.add(Decimal.add(row.paid, row.unpaid), row.suspended) + + seg_scale = + if Decimal.compare(sum_positive, 0) == :gt, do: sum_positive, else: Decimal.new(1) + + paid_pct = + row.paid + |> Decimal.div(seg_scale) + |> Decimal.mult(100) + |> Decimal.to_float() + |> min(100.0) + + unpaid_pct = + row.unpaid + |> Decimal.div(seg_scale) + |> Decimal.mult(100) + |> Decimal.to_float() + |> min(100.0) + + suspended_pct = + row.suspended + |> Decimal.div(seg_scale) + |> Decimal.mult(100) + |> Decimal.to_float() + |> min(100.0) + + %{ + year: row.year, + summary: row.summary, + total_formatted: MembershipFeeHelpers.format_currency(row.total), + paid_formatted: MembershipFeeHelpers.format_currency(row.paid), + unpaid_formatted: MembershipFeeHelpers.format_currency(row.unpaid), + suspended_formatted: MembershipFeeHelpers.format_currency(row.suspended), + bar_pct: bar_pct, + paid_pct: paid_pct, + unpaid_pct: unpaid_pct, + suspended_pct: suspended_pct + } + end) + + assigns = assign(assigns, :rows, rows_with_pct) + + ~H""" + + """ + end + + defp max_decimal(rows, key) do + Enum.reduce(rows, Decimal.new(0), fn row, acc -> + val = Map.get(row, key) + if Decimal.compare(val, acc) == :gt, do: val, else: acc + end) + end + + defp bar_pct(value, max) do + scale = if Decimal.compare(max, 0) == :gt, do: max, else: Decimal.new(1) + pct = value |> Decimal.div(scale) |> Decimal.mult(100) |> Decimal.to_float() + min(100.0, pct) + end + + attr :cycle_totals, :map, required: true + + defp contributions_pie(assigns) do + paid = assigns.cycle_totals.paid + unpaid = assigns.cycle_totals.unpaid + suspended = assigns.cycle_totals.suspended + + sum_positive = Decimal.add(Decimal.add(paid, unpaid), suspended) + scale = if Decimal.compare(sum_positive, 0) == :gt, do: sum_positive, else: Decimal.new(1) + + paid_pct = Decimal.div(paid, scale) |> Decimal.mult(100) |> Decimal.to_float() + unpaid_pct = Decimal.div(unpaid, scale) |> Decimal.mult(100) |> Decimal.to_float() + suspended_pct = Decimal.div(suspended, scale) |> Decimal.mult(100) |> Decimal.to_float() + + # Conic gradient: 0deg = top, clockwise. Success (paid), warning (unpaid), base-300 (suspended) + # Use theme CSS variables (--color-*) so the pie renders in all themes + paid_deg = paid_pct * 3.6 + unpaid_deg = unpaid_pct * 3.6 + + gradient_stops = + "var(--color-success) 0deg, var(--color-success) #{paid_deg}deg, var(--color-warning) #{paid_deg}deg, var(--color-warning) #{paid_deg + unpaid_deg}deg, var(--color-base-300) #{paid_deg + unpaid_deg}deg, var(--color-base-300) 360deg" + + assigns = + assigns + |> assign(:paid_pct, paid_pct) + |> assign(:unpaid_pct, unpaid_pct) + |> assign(:suspended_pct, suspended_pct) + |> assign(:gradient_stops, gradient_stops) + + ~H""" + + """ + end + + defp load_fee_types(socket) do + actor = current_actor(socket) + + case MembershipFeeType + |> Ash.Query.sort(name: :asc) + |> Ash.read(domain: Mv.MembershipFees, actor: actor) do + {:ok, fee_types} -> + assign(socket, :membership_fee_types, fee_types) + + {:error, reason} -> + Logger.warning("StatisticsLive: failed to load fee types: #{inspect(reason)}") + + socket + |> put_flash(:error, gettext("Fee types could not be loaded.")) + |> assign(:membership_fee_types, []) + end + end + + defp load_statistics(socket) do + actor = current_actor(socket) + fee_type_id = socket.assigns[:selected_fee_type_id] + # Member stats must never depend on fee type (only contributions do) + opts_member = [actor: actor] + + opts_contributions = + [actor: actor] ++ if fee_type_id, do: [fee_type_id: fee_type_id], else: [] + + current_year = Date.utc_today().year + first_year = Statistics.first_join_year(opts_member) || current_year + years = first_year..current_year |> Enum.to_list() |> Enum.reverse() + + active_count = Statistics.active_member_count(opts_member) + inactive_count = Statistics.inactive_member_count(opts_member) + joins_exits_by_year = build_joins_exits_by_year(years, opts_member) + contributions_by_year = build_contributions_by_year(years, opts_contributions) + totals_over_all_years = sum_cycle_totals(contributions_by_year) + + assign(socket, + years: years, + active_count: active_count, + inactive_count: inactive_count, + joins_exits_by_year: joins_exits_by_year, + contributions_by_year: contributions_by_year, + totals_over_all_years: totals_over_all_years + ) + end + + defp build_joins_exits_by_year(years, opts) do + Enum.map(years, fn y -> + %{ + year: y, + joins: Statistics.joins_by_year(y, opts), + exits: Statistics.exits_by_year(y, opts) + } + end) + end + + defp build_contributions_by_year(years, opts) do + Enum.map(years, fn y -> + totals = Statistics.cycle_totals_by_year(y, opts) + + %{ + year: y, + total: totals.total, + paid: totals.paid, + unpaid: totals.unpaid, + suspended: totals.suspended + } + end) + end + + defp sum_cycle_totals(contributions_by_year) do + Enum.reduce( + contributions_by_year, + %{ + total: Decimal.new(0), + paid: Decimal.new(0), + unpaid: Decimal.new(0), + suspended: Decimal.new(0) + }, + fn row, acc -> + %{ + total: Decimal.add(acc.total, row.total), + paid: Decimal.add(acc.paid, row.paid), + unpaid: Decimal.add(acc.unpaid, row.unpaid), + suspended: Decimal.add(acc.suspended, row.suspended) + } + end + ) + end +end diff --git a/lib/mv_web/page_paths.ex b/lib/mv_web/page_paths.ex index 5606c76..2720c0f 100644 --- a/lib/mv_web/page_paths.ex +++ b/lib/mv_web/page_paths.ex @@ -9,6 +9,7 @@ defmodule MvWeb.PagePaths do # Sidebar top-level menu paths @members "/members" @membership_fee_types "/membership_fee_types" + @statistics "/statistics" # Administration submenu paths (all must match router) @users "/users" @@ -31,6 +32,9 @@ defmodule MvWeb.PagePaths do @doc "Path for Membership Fee Types index (sidebar and page permission check)." def membership_fee_types, do: @membership_fee_types + @doc "Path for Statistics page (sidebar and page permission check)." + def statistics, do: @statistics + @doc "Paths for Administration menu; show group if user can access any of these." def admin_menu_paths, do: @admin_page_paths diff --git a/lib/mv_web/router.ex b/lib/mv_web/router.ex index 21c3c2f..61532ff 100644 --- a/lib/mv_web/router.ex +++ b/lib/mv_web/router.ex @@ -73,6 +73,9 @@ defmodule MvWeb.Router do # Membership Fee Types Management live "/membership_fee_types", MembershipFeeTypeLive.Index, :index + + # Statistics + live "/statistics", StatisticsLive, :index live "/membership_fee_types/new", MembershipFeeTypeLive.Form, :new live "/membership_fee_types/:id/edit", MembershipFeeTypeLive.Form, :edit diff --git a/mix.exs b/mix.exs index 21aa3d9..6ac9e8d 100644 --- a/mix.exs +++ b/mix.exs @@ -38,7 +38,7 @@ defmodule Mv.MixProject do [ {:tidewave, "~> 0.5", only: [:dev]}, {:sourceror, "~> 1.8", only: [:dev, :test]}, - {:live_debugger, "~> 0.5", only: [:dev]}, + {:live_debugger, "~> 0.6", only: [:dev]}, {:ash_admin, "~> 0.13"}, {:ash_postgres, "~> 2.0"}, {:ash_phoenix, "~> 2.0"}, diff --git a/mix.lock b/mix.lock index f17e9cb..0b581ff 100644 --- a/mix.lock +++ b/mix.lock @@ -1,11 +1,11 @@ %{ - "ash": {:hex, :ash, "3.14.1", "22e0ac5dfd4c7d502bd103f0b4380defd66d7c6c83b3a4f54af7045f13da00d7", [:mix], [{:crux, ">= 0.1.2 and < 1.0.0-0", [hex: :crux, repo: "hexpm", optional: false]}, {:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:ecto, "~> 3.7", [hex: :ecto, repo: "hexpm", optional: false]}, {:ets, "~> 0.8", [hex: :ets, repo: "hexpm", optional: false]}, {:igniter, ">= 0.6.29 and < 1.0.0-0", [hex: :igniter, repo: "hexpm", optional: true]}, {:jason, ">= 1.0.0", [hex: :jason, repo: "hexpm", optional: false]}, {:picosat_elixir, "~> 0.2", [hex: :picosat_elixir, repo: "hexpm", optional: true]}, {:plug, ">= 0.0.0", [hex: :plug, repo: "hexpm", optional: true]}, {:reactor, "~> 1.0", [hex: :reactor, repo: "hexpm", optional: false]}, {:simple_sat, ">= 0.1.1 and < 1.0.0-0", [hex: :simple_sat, repo: "hexpm", optional: true]}, {:spark, ">= 2.3.14 and < 3.0.0-0", [hex: :spark, repo: "hexpm", optional: false]}, {:splode, "~> 0.3", [hex: :splode, repo: "hexpm", optional: false]}, {:stream_data, "~> 1.0", [hex: :stream_data, repo: "hexpm", optional: false]}, {:telemetry, "~> 1.1", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "776a5963790d5af79855ddca1718a037d06b49063a6b97fae9110050b3d5127d"}, + "ash": {:hex, :ash, "3.16.0", "6389927b322ca7fa7990a75730133db44fcff6368adb63f41cf9eec7a5d38862", [:mix], [{:crux, ">= 0.1.2 and < 1.0.0-0", [hex: :crux, repo: "hexpm", optional: false]}, {:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:ecto, "~> 3.7", [hex: :ecto, repo: "hexpm", optional: false]}, {:ets, "~> 0.8", [hex: :ets, repo: "hexpm", optional: false]}, {:igniter, ">= 0.6.29 and < 1.0.0-0", [hex: :igniter, repo: "hexpm", optional: true]}, {:jason, ">= 1.0.0", [hex: :jason, repo: "hexpm", optional: false]}, {:picosat_elixir, "~> 0.2", [hex: :picosat_elixir, repo: "hexpm", optional: true]}, {:plug, ">= 0.0.0", [hex: :plug, repo: "hexpm", optional: true]}, {:reactor, "~> 1.0", [hex: :reactor, repo: "hexpm", optional: false]}, {:simple_sat, ">= 0.1.1 and < 1.0.0-0", [hex: :simple_sat, repo: "hexpm", optional: true]}, {:spark, ">= 2.3.14 and < 3.0.0-0", [hex: :spark, repo: "hexpm", optional: false]}, {:splode, "~> 0.3", [hex: :splode, repo: "hexpm", optional: false]}, {:stream_data, "~> 1.0", [hex: :stream_data, repo: "hexpm", optional: false]}, {:telemetry, "~> 1.1", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "1ea69d932ea2ae6cc2971b92576d8ac2721218a8f2f3599e0e25305edb56949b"}, "ash_admin": {:hex, :ash_admin, "0.13.24", "4fafddc7b4450a92878b58630688c55cab20b0c27e35cad68f29811f73815816", [:mix], [{:ash, ">= 3.4.63 and < 4.0.0-0", [hex: :ash, repo: "hexpm", optional: false]}, {:ash_phoenix, ">= 2.1.8 and < 3.0.0-0", [hex: :ash_phoenix, repo: "hexpm", optional: false]}, {:gettext, "~> 0.26 or ~> 1.0", [hex: :gettext, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.7", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 4.1", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:phoenix_live_view, "~> 1.1-rc", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: false]}], "hexpm", "8f298cf6cb6635744ed75dd401295ed52513ea4df169f0f89d6a9a75dc4de4dc"}, "ash_authentication": {:hex, :ash_authentication, "4.13.7", "421b5ddb516026f6794435980a632109ec116af2afa68a45e15fb48b41c92cfa", [:mix], [{:argon2_elixir, "~> 4.0", [hex: :argon2_elixir, repo: "hexpm", optional: true]}, {:ash, "~> 3.7", [hex: :ash, repo: "hexpm", optional: false]}, {:ash_postgres, ">= 2.6.8 and < 3.0.0-0", [hex: :ash_postgres, repo: "hexpm", optional: true]}, {:assent, "> 0.2.0 and < 0.3.0", [hex: :assent, repo: "hexpm", optional: false]}, {:bcrypt_elixir, "~> 3.0", [hex: :bcrypt_elixir, repo: "hexpm", optional: false]}, {:castore, "~> 1.0", [hex: :castore, repo: "hexpm", optional: false]}, {:finch, "~> 0.19", [hex: :finch, repo: "hexpm", optional: false]}, {:igniter, "~> 0.4", [hex: :igniter, repo: "hexpm", optional: true]}, {:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}, {:joken, "~> 2.5", [hex: :joken, repo: "hexpm", optional: false]}, {:plug, "~> 1.13", [hex: :plug, repo: "hexpm", optional: false]}, {:spark, "~> 2.0", [hex: :spark, repo: "hexpm", optional: false]}, {:splode, "~> 0.2", [hex: :splode, repo: "hexpm", optional: false]}], "hexpm", "0d45ac3fdcca6902dabbe161ce63e9cea8f90583863c2e14261c9309e5837121"}, "ash_authentication_phoenix": {:hex, :ash_authentication_phoenix, "2.15.0", "89e71e96a3d954aed7ed0c1f511d42cbfd19009b813f580b12749b01bbea5148", [:mix], [{:ash, "~> 3.0", [hex: :ash, repo: "hexpm", optional: false]}, {:ash_authentication, "~> 4.10", [hex: :ash_authentication, repo: "hexpm", optional: false]}, {:ash_phoenix, ">= 2.3.11 and < 3.0.0-0", [hex: :ash_phoenix, repo: "hexpm", optional: false]}, {:bcrypt_elixir, "~> 3.0", [hex: :bcrypt_elixir, repo: "hexpm", optional: false]}, {:gettext, "~> 0.26 or ~> 1.0", [hex: :gettext, repo: "hexpm", optional: true]}, {:igniter, ">= 0.5.25 and < 1.0.0-0", [hex: :igniter, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.6", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:phoenix_html_helpers, "~> 1.0", [hex: :phoenix_html_helpers, repo: "hexpm", optional: false]}, {:phoenix_live_view, "~> 1.1", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: false]}, {:slugify, "~> 1.3", [hex: :slugify, repo: "hexpm", optional: false]}], "hexpm", "d2da66dcf62bc1054ce8f5d9c2829b1dff1dbc3f1d03f9ef0cbe89123d7df107"}, "ash_phoenix": {:hex, :ash_phoenix, "2.3.19", "244b24256a7d730e5223f36f371a95971542a547a12f0fb73406f67977e86c97", [:mix], [{:ash, ">= 3.5.13 and < 4.0.0-0", [hex: :ash, repo: "hexpm", optional: false]}, {:igniter, "~> 0.6", [hex: :igniter, repo: "hexpm", optional: true]}, {:inertia, "~> 2.3", [hex: :inertia, repo: "hexpm", optional: true]}, {:phoenix, "~> 1.5.6 or ~> 1.6", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:phoenix_live_view, "~> 0.20.3 or ~> 1.0-rc.1", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}, {:spark, ">= 2.2.29 and < 3.0.0-0", [hex: :spark, repo: "hexpm", optional: false]}], "hexpm", "754a7d869a3961a927abb7ff700af9895d2e69dd3b8f9471b0aa8e859cc4b135"}, - "ash_postgres": {:hex, :ash_postgres, "2.6.29", "93c7d39890930548acc704613b7f83e65c0880940be1b2048ee86dfb44918529", [:mix], [{:ash, "~> 3.14", [hex: :ash, repo: "hexpm", optional: false]}, {:ash_sql, ">= 0.4.3 and < 1.0.0-0", [hex: :ash_sql, repo: "hexpm", optional: false]}, {:ecto, "~> 3.13", [hex: :ecto, repo: "hexpm", optional: false]}, {:ecto_sql, "~> 3.13", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:igniter, ">= 0.6.29 and < 1.0.0-0", [hex: :igniter, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:postgrex, ">= 0.0.0", [hex: :postgrex, repo: "hexpm", optional: false]}, {:spark, ">= 2.3.4 and < 3.0.0-0", [hex: :spark, repo: "hexpm", optional: false]}], "hexpm", "0aed7ac3d8407ff094218b1dc86b88ea7e39249fb9e94360c7dac1711e206d8b"}, - "ash_sql": {:hex, :ash_sql, "0.4.3", "2c74e0a19646e3d31a384a2712fc48a82d04ceea74467771ce496fd64dbb55db", [:mix], [{:ash, "~> 3.7", [hex: :ash, repo: "hexpm", optional: false]}, {:ecto, ">= 3.13.4 and < 4.0.0-0", [hex: :ecto, repo: "hexpm", optional: false]}, {:ecto_sql, "~> 3.9", [hex: :ecto_sql, repo: "hexpm", optional: false]}], "hexpm", "b0ecc00502178407e607ae4bcfd2f264f36f6a884218024b5e4d5b3dcfa5e027"}, + "ash_postgres": {:hex, :ash_postgres, "2.6.31", "2fde375f7ff5b0a4d1ec54d64089e65c4460ff08be222119e7587b820ebd782b", [:mix], [{:ash, "~> 3.15", [hex: :ash, repo: "hexpm", optional: false]}, {:ash_sql, ">= 0.4.3 and < 1.0.0-0", [hex: :ash_sql, repo: "hexpm", optional: false]}, {:ecto, "~> 3.13", [hex: :ecto, repo: "hexpm", optional: false]}, {:ecto_sql, "~> 3.13", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:igniter, ">= 0.6.29 and < 1.0.0-0", [hex: :igniter, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:postgrex, ">= 0.0.0", [hex: :postgrex, repo: "hexpm", optional: false]}, {:spark, ">= 2.3.4 and < 3.0.0-0", [hex: :spark, repo: "hexpm", optional: false]}], "hexpm", "0f045d905fe63eb6d43313309dded5db294e437fb8e9ddcf769d4f838b9c5274"}, + "ash_sql": {:hex, :ash_sql, "0.4.4", "7e8943b984ad416ba46d297fea6b4d2bcea25c8dfe5666e22d14c42182907798", [:mix], [{:ash, "~> 3.7", [hex: :ash, repo: "hexpm", optional: false]}, {:ecto, ">= 3.13.4 and < 4.0.0-0", [hex: :ecto, repo: "hexpm", optional: false]}, {:ecto_sql, "~> 3.9", [hex: :ecto_sql, repo: "hexpm", optional: false]}], "hexpm", "19859ba3f111f1e6e4b0b9ab2f7d849e17b6b0ea5dc54811b3e2b54a7ddff5c0"}, "assent": {:hex, :assent, "0.2.13", "11226365d2d8661d23e9a2cf94d3255e81054ff9d88ac877f28bfdf38fa4ef31", [:mix], [{:certifi, ">= 0.0.0", [hex: :certifi, repo: "hexpm", optional: true]}, {:finch, "~> 0.15", [hex: :finch, repo: "hexpm", optional: true]}, {:jose, "~> 1.8", [hex: :jose, repo: "hexpm", optional: true]}, {:mint, "~> 1.0", [hex: :mint, repo: "hexpm", optional: true]}, {:req, "~> 0.4", [hex: :req, repo: "hexpm", optional: true]}, {:ssl_verify_fun, ">= 0.0.0", [hex: :ssl_verify_fun, repo: "hexpm", optional: true]}], "hexpm", "bf9f351b01dd6bceea1d1f157f05438f6765ce606e6eb8d29296003d29bf6eab"}, "bandit": {:hex, :bandit, "1.10.2", "d15ea32eb853b5b42b965b24221eb045462b2ba9aff9a0bda71157c06338cbff", [:mix], [{:hpax, "~> 1.0", [hex: :hpax, repo: "hexpm", optional: false]}, {:plug, "~> 1.18", [hex: :plug, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}, {:thousand_island, "~> 1.0", [hex: :thousand_island, repo: "hexpm", optional: false]}, {:websock, "~> 0.5", [hex: :websock, repo: "hexpm", optional: false]}], "hexpm", "27b2a61b647914b1726c2ced3601473be5f7aa6bb468564a688646a689b3ee45"}, "bcrypt_elixir": {:hex, :bcrypt_elixir, "3.3.2", "d50091e3c9492d73e17fc1e1619a9b09d6a5ef99160eb4d736926fd475a16ca3", [:make, :mix], [{:comeonin, "~> 5.3", [hex: :comeonin, repo: "hexpm", optional: false]}, {:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm", "471be5151874ae7931911057d1467d908955f93554f7a6cd1b7d804cac8cef53"}, @@ -41,9 +41,9 @@ "jason": {:hex, :jason, "1.4.4", "b9226785a9aa77b6857ca22832cffa5d5011a667207eb2a0ad56adb5db443b8a", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "c5eb0cab91f094599f94d55bc63409236a8ec69a21a67814529e8d5f6cc90b3b"}, "joken": {:hex, :joken, "2.6.2", "5daaf82259ca603af4f0b065475099ada1b2b849ff140ccd37f4b6828ca6892a", [:mix], [{:jose, "~> 1.11.10", [hex: :jose, repo: "hexpm", optional: false]}], "hexpm", "5134b5b0a6e37494e46dbf9e4dad53808e5e787904b7c73972651b51cce3d72b"}, "jose": {:hex, :jose, "1.11.12", "06e62b467b61d3726cbc19e9b5489f7549c37993de846dfb3ee8259f9ed208b3", [:mix, :rebar3], [], "hexpm", "31e92b653e9210b696765cdd885437457de1add2a9011d92f8cf63e4641bab7b"}, - "lazy_html": {:hex, :lazy_html, "0.1.8", "677a8642e644eef8de98f3040e2520d42d0f0f8bd6c5cd49db36504e34dffe91", [:make, :mix], [{:cc_precompiler, "~> 0.1", [hex: :cc_precompiler, repo: "hexpm", optional: false]}, {:elixir_make, "~> 0.9.0", [hex: :elixir_make, repo: "hexpm", optional: false]}, {:fine, "~> 0.1.0", [hex: :fine, repo: "hexpm", optional: false]}], "hexpm", "0d8167d930b704feb94b41414ca7f5779dff9bca7fcf619fcef18de138f08736"}, + "lazy_html": {:hex, :lazy_html, "0.1.10", "ffe42a0b4e70859cf21a33e12a251e0c76c1dff76391609bd56702a0ef5bc429", [:make, :mix], [{:cc_precompiler, "~> 0.1", [hex: :cc_precompiler, repo: "hexpm", optional: false]}, {:elixir_make, "~> 0.9.0", [hex: :elixir_make, repo: "hexpm", optional: false]}, {:fine, "~> 0.1.0", [hex: :fine, repo: "hexpm", optional: false]}], "hexpm", "50f67e5faa09d45a99c1ddf3fac004f051997877dc8974c5797bb5ccd8e27058"}, "libgraph": {:hex, :libgraph, "0.16.0", "3936f3eca6ef826e08880230f806bfea13193e49bf153f93edcf0239d4fd1d07", [:mix], [], "hexpm", "41ca92240e8a4138c30a7e06466acc709b0cbb795c643e9e17174a178982d6bf"}, - "live_debugger": {:hex, :live_debugger, "0.5.1", "7302a4fda1920ba541b456c2d7a97acc3c7f9d7b938b5435927883b709c968a2", [:mix], [{:igniter, ">= 0.5.40 and < 1.0.0-0", [hex: :igniter, repo: "hexpm", optional: true]}, {:phoenix, "~> 1.7", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_live_view, "~> 0.20.8 or ~> 1.0", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}], "hexpm", "797fdca7cc60d7588c6e285b0d7ea73f2dce8b123bac43eae70271fa519bb907"}, + "live_debugger": {:hex, :live_debugger, "0.6.0", "77fcbb11b1909ff6edc29a755aa5f14cb176d188b24593526b3e482be7519990", [:mix], [{:file_system, "~> 1.0", [hex: :file_system, repo: "hexpm", optional: false]}, {:igniter, ">= 0.5.40 and < 1.0.0-0", [hex: :igniter, repo: "hexpm", optional: true]}, {:phoenix, "~> 1.7", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_live_view, "~> 0.20.8 or ~> 1.0", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}], "hexpm", "ad2458f4acd8b86e15b1cf7aef3304907e858f4ac35644986e5c958ea993ffb3"}, "luhn": {:hex, :luhn, "0.3.3", "5aa0c6a32c2db4b9db9f9b883ba8301c1ae169d57199b9e6cb1ba2707bc51d96", [:mix], [], "hexpm", "3e823a913a25aab51352c727f135278d22954874d5f0835be81ed4fec3daf78d"}, "mime": {:hex, :mime, "2.0.7", "b8d739037be7cd402aee1ba0306edfdef982687ee7e9859bee6198c1e7e2f128", [:mix], [], "hexpm", "6171188e399ee16023ffc5b76ce445eb6d9672e2e241d2df6050f3c771e80ccd"}, "mint": {:hex, :mint, "1.7.1", "113fdb2b2f3b59e47c7955971854641c61f378549d73e829e1768de90fc1abf1", [:mix], [{:castore, "~> 0.1.0 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:hpax, "~> 0.1.1 or ~> 0.2.0 or ~> 1.0", [hex: :hpax, repo: "hexpm", optional: false]}], "hexpm", "fceba0a4d0f24301ddee3024ae116df1c3f4bb7a563a731f45fdfeb9d39a231b"}, @@ -74,7 +74,7 @@ "sobelow": {:hex, :sobelow, "0.14.1", "2f81e8632f15574cba2402bcddff5497b413c01e6f094bc0ab94e83c2f74db81", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "8fac9a2bd90fdc4b15d6fca6e1608efb7f7c600fa75800813b794ee9364c87f2"}, "sourceror": {:hex, :sourceror, "1.10.1", "325753ed460fe9fa34ebb4deda76d57b2e1507dcd78a5eb9e1c41bfb78b7cdfe", [:mix], [], "hexpm", "288f3079d93865cd1e3e20df5b884ef2cb440e0e03e8ae393624ee8a770ba588"}, "spark": {:hex, :spark, "2.4.0", "f93d3ae6b5f3004e956d52f359fa40670366685447631bc7c058f4fbf250ebf3", [:mix], [{:igniter, ">= 0.3.64 and < 1.0.0-0", [hex: :igniter, repo: "hexpm", optional: true]}, {:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: true]}, {:sourceror, "~> 1.2", [hex: :sourceror, repo: "hexpm", optional: true]}], "hexpm", "4e5185f5737cd987bb9ef377ae3462a55b8312f5007c2bc4ad6e850d14ac0111"}, - "spitfire": {:hex, :spitfire, "0.3.1", "409b5ed3a2677df8790ed8b0542ca7e36c607d744fef4cb8cb8872fc80dd1803", [:mix], [], "hexpm", "72ff34d8f0096313a4b1a6505513c5ef4bbc0919bd8c181c07fc8d8dea8c9056"}, + "spitfire": {:hex, :spitfire, "0.3.3", "be195b27648f21454932bf46014455cdbce4fca55fef1f0e41d36076c47b6c4a", [:mix], [], "hexpm", "5dc51c3b61a1d98cdcac1c130f0a374d22d51beed982df90834bdd616356e1fa"}, "splode": {:hex, :splode, "0.3.0", "ff8effecc509a51245df2f864ec78d849248647c37a75886033e3b1a53ca9470", [:mix], [], "hexpm", "73cfd0892d7316d6f2c93e6e8784bd6e137b2aa38443de52fd0a25171d106d81"}, "stream_data": {:hex, :stream_data, "1.2.0", "58dd3f9e88afe27dc38bef26fce0c84a9e7a96772b2925c7b32cd2435697a52b", [:mix], [], "hexpm", "eb5c546ee3466920314643edf68943a5b14b32d1da9fe01698dc92b73f89a9ed"}, "sweet_xml": {:hex, :sweet_xml, "0.7.5", "803a563113981aaac202a1dbd39771562d0ad31004ddbfc9b5090bdcd5605277", [:mix], [], "hexpm", "193b28a9b12891cae351d81a0cead165ffe67df1b73fe5866d10629f4faefb12"}, diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po index dc698cd..26e1ff1 100644 --- a/priv/gettext/de/LC_MESSAGES/default.po +++ b/priv/gettext/de/LC_MESSAGES/default.po @@ -12,6 +12,7 @@ msgstr "" #: lib/mv_web/components/core_components.ex #: lib/mv_web/live/group_live/index.ex +#: lib/mv_web/live/group_live/show.ex #, elixir-autogen, elixir-format msgid "Actions" msgstr "Aktionen" @@ -153,6 +154,7 @@ msgstr "Notizen" #: lib/mv_web/live/components/member_filter_component.ex #: lib/mv_web/live/member_live/show.ex #: lib/mv_web/live/member_live/show/membership_fees_component.ex +#: lib/mv_web/live/statistics_live.ex #: lib/mv_web/member_live/index/membership_fee_status.ex #, elixir-autogen, elixir-format msgid "Paid" @@ -318,6 +320,7 @@ msgstr "Benutzer*innen auflisten" #: lib/mv_web/live/member_live/index.ex #: lib/mv_web/live/member_live/index.html.heex #: lib/mv_web/live/membership_fee_type_live/index.ex +#: lib/mv_web/live/statistics_live.ex #, elixir-autogen, elixir-format msgid "Members" msgstr "Mitglieder" @@ -671,6 +674,7 @@ msgstr "Einstellungen erfolgreich gespeichert" msgid "A member with this email already exists. To link with a different member, please change one of the email addresses first." msgstr "Ein Mitglied mit dieser E-Mail-Adresse existiert bereits. Um mit einem anderen Mitglied zu verknüpfen, ändere bitte zuerst eine der E-Mail-Adressen." +#: lib/mv_web/live/group_live/show.ex #: lib/mv_web/live/user_live/form.ex #, elixir-autogen, elixir-format msgid "Available members" @@ -761,6 +765,7 @@ msgstr "Dieses Feld darf nicht leer bleiben" #: lib/mv_web/components/core_components.ex #: lib/mv_web/live/components/member_filter_component.ex +#: lib/mv_web/live/statistics_live.ex #, elixir-autogen, elixir-format msgid "All" msgstr "Alle" @@ -931,6 +936,7 @@ msgstr "Status" #: lib/mv/membership/members_pdf.ex #: lib/mv_web/live/member_live/show.ex #: lib/mv_web/live/member_live/show/membership_fees_component.ex +#: lib/mv_web/live/statistics_live.ex #: lib/mv_web/member_live/index/membership_fee_status.ex #, elixir-autogen, elixir-format msgid "Suspended" @@ -940,6 +946,7 @@ msgstr "Pausiert" #: lib/mv_web/live/components/member_filter_component.ex #: lib/mv_web/live/member_live/show.ex #: lib/mv_web/live/member_live/show/membership_fees_component.ex +#: lib/mv_web/live/statistics_live.ex #: lib/mv_web/member_live/index/membership_fee_status.ex #, elixir-autogen, elixir-format msgid "Unpaid" @@ -2251,6 +2258,71 @@ msgstr "Nicht berechtigt." msgid "Could not load data fields. Please check your permissions." msgstr "Datenfelder konnten nicht geladen werden. Bitte überprüfe deine Berechtigungen." +#: lib/mv_web/live/group_live/show.ex +#, elixir-autogen, elixir-format +msgid "Could not load member search. Please try again." +msgstr "Mitgliedersuche konnte nicht geladen werden. Bitte versuchen Sie es erneut." + +#: lib/mv_web/live/group_live/show.ex +#, elixir-autogen, elixir-format +msgid "Add Member" +msgstr "Mitglied hinzufügen" + +#: lib/mv_web/live/group_live/show.ex +#, elixir-autogen, elixir-format +msgid "Failed to remove member: %{error}" +msgstr "Mitglied konnte nicht entfernt werden: %{error}" + +#: lib/mv_web/live/group_live/show.ex +#, elixir-autogen, elixir-format +msgid "Member is not in this group." +msgstr "Mitglied ist nicht in dieser Gruppe." + +#: lib/mv_web/live/group_live/show.ex +#, elixir-autogen, elixir-format +msgid "No email" +msgstr "Keine E-Mail" + +#: lib/mv_web/live/group_live/show.ex +#, elixir-autogen, elixir-format +msgid "Remove" +msgstr "Entfernen" + +#: lib/mv_web/live/group_live/show.ex +#, elixir-autogen, elixir-format +msgid "Remove member from group" +msgstr "Mitglied aus Gruppe entfernen" + +#: lib/mv_web/live/group_live/show.ex +#, elixir-autogen, elixir-format +msgid "Search for a member" +msgstr "Nach einem Mitglied suchen" + +#: lib/mv_web/live/group_live/show.ex +#, elixir-autogen, elixir-format +msgid "Search for a member..." +msgstr "Nach einem Mitglied suchen..." + +#: lib/mv_web/live/group_live/show.ex +#, elixir-autogen, elixir-format +msgid "Add members" +msgstr "Mitglieder hinzufügen" + +#: lib/mv_web/live/group_live/show.ex +#, elixir-autogen, elixir-format +msgid "No members selected." +msgstr "Keine Mitglieder ausgewählt." + +#: lib/mv_web/live/group_live/show.ex +#, elixir-autogen, elixir-format +msgid "Remove %{name}" +msgstr "%{name} entfernen" + +#: lib/mv_web/live/group_live/show.ex +#, elixir-autogen, elixir-format +msgid "Some members could not be added: %{errors}" +msgstr "Einige Mitglieder konnten nicht hinzugefügt werden: %{errors}" + #: lib/mv_web/live/import_export_live/components.ex #, elixir-autogen, elixir-format, fuzzy msgid "CSV files only, maximum %{size} MB" @@ -2399,6 +2471,97 @@ msgstr "Pausiert" msgid "unpaid" msgstr "Unbezahlt" +#: lib/mv_web/live/statistics_live.ex +#, elixir-autogen, elixir-format +msgid "Active members" +msgstr "Aktive Mitglieder" + +#: lib/mv_web/live/statistics_live.ex +#, elixir-autogen, elixir-format +msgid "Exits" +msgstr "Austritte" + +#: lib/mv_web/live/statistics_live.ex +#, elixir-autogen, elixir-format +msgid "Inactive members" +msgstr "Inaktive Mitglieder" + +#: lib/mv_web/live/statistics_live.ex +#, elixir-autogen, elixir-format +msgid "Joins" +msgstr "Eintritte" + +#: lib/mv_web/components/layouts/sidebar.ex +#: lib/mv_web/live/statistics_live.ex +#, elixir-autogen, elixir-format +msgid "Statistics" +msgstr "Statistik" + +#: lib/mv_web/live/statistics_live.ex +#, elixir-autogen, elixir-format +msgid "Total" +msgstr "Gesamt" + +#: lib/mv_web/live/statistics_live.ex +#, elixir-autogen, elixir-format +msgid "Year" +msgstr "Jahr" + +#: lib/mv_web/live/statistics_live.ex +#, elixir-autogen, elixir-format +msgid "Contributions pie: paid %{paid}%%, unpaid %{unpaid}%%, suspended %{suspended}%%" +msgstr "Beiträge Kreis: bezahlt %{paid}%, unbezahlt %{unpaid}%, pausiert %{suspended}%" + +#: lib/mv_web/live/statistics_live.ex +#, elixir-autogen, elixir-format +msgid "All years combined (pie)" +msgstr "Alle Jahre zusammengefasst (Kreis)" + +#: lib/mv_web/live/statistics_live.ex +#, elixir-autogen, elixir-format +msgid "Contributions by year" +msgstr "Beiträge nach Jahr" + +#: lib/mv_web/live/statistics_live.ex +#, elixir-autogen, elixir-format +msgid "Overview from first membership to today" +msgstr "Übersicht vom ersten Eintritt bis heute" + +#: lib/mv_web/live/statistics_live.ex +#, elixir-autogen, elixir-format +msgid "Contributions by year as table with stacked bars" +msgstr "Beiträge nach Jahr als Tabelle mit gestapelten Balken" + +#: lib/mv_web/live/statistics_live.ex +#, elixir-autogen, elixir-format, fuzzy +msgid "Contributions" +msgstr "Beiträge" + +#: lib/mv_web/live/statistics_live.ex +#, elixir-autogen, elixir-format +msgid "Fee type" +msgstr "Beitragsart" + +#: lib/mv_web/live/statistics_live.ex +#, elixir-autogen, elixir-format +msgid "Member numbers by year" +msgstr "Mitgliederzahlen nach Jahr" + +#: lib/mv_web/live/statistics_live.ex +#, elixir-autogen, elixir-format +msgid "From %{first} to %{last} (relevant years with membership data)" +msgstr "Von %{first} bis %{last} (Jahre mit Mitgliederdaten)" + +#: lib/mv_web/live/statistics_live.ex +#, elixir-autogen, elixir-format +msgid "Member numbers by year as table with bars" +msgstr "Mitgliederzahlen nach Jahr als Tabelle mit Balken" + +#: lib/mv_web/live/statistics_live.ex +#, elixir-autogen, elixir-format +msgid "Fee types could not be loaded." +msgstr "Beitragsarten konnten nicht geladen werden." + #: lib/mv_web/components/export_dropdown.ex #, elixir-autogen, elixir-format msgid "CSV" @@ -2449,17 +2612,6 @@ msgstr "PDF" #~ msgid "Custom Fields in CSV Import" #~ msgstr "Benutzerdefinierte Felder" -#~ #: lib/mv_web/live/global_settings_live.ex #~ #, elixir-autogen, elixir-format #~ msgid "Failed to prepare CSV import: %{error}" #~ msgstr "Das Vorbereiten des CSV Imports ist gescheitert: %{error}" - -#~ #: lib/mv_web/live/global_settings_live.ex -#~ #, elixir-autogen, elixir-format, fuzzy -#~ msgid "Individual data fields must be created in Mila before importing. Use the field name as the CSV column header. Unknown custom field columns will be ignored with a warning." -#~ msgstr "Individuelle Datenfelder müssen in Mila erstellt werden, bevor sie importiert werden können. Verwende den Namen des Datenfeldes als CSV-Spaltenüberschrift. Unbekannte Spaltenüberschriften werden mit einer Warnung ignoriert." - -#~ #: lib/mv_web/live/member_live/show/membership_fees_component.ex -#~ #, elixir-autogen, elixir-format -#~ msgid "Only administrators can regenerate cycles" -#~ msgstr "Nur Administrator*innen können Zyklen regenerieren" diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot index ae29e02..73152cd 100644 --- a/priv/gettext/default.pot +++ b/priv/gettext/default.pot @@ -13,6 +13,7 @@ msgstr "" #: lib/mv_web/components/core_components.ex #: lib/mv_web/live/group_live/index.ex +#: lib/mv_web/live/group_live/show.ex #, elixir-autogen, elixir-format msgid "Actions" msgstr "" @@ -154,6 +155,7 @@ msgstr "" #: lib/mv_web/live/components/member_filter_component.ex #: lib/mv_web/live/member_live/show.ex #: lib/mv_web/live/member_live/show/membership_fees_component.ex +#: lib/mv_web/live/statistics_live.ex #: lib/mv_web/member_live/index/membership_fee_status.ex #, elixir-autogen, elixir-format msgid "Paid" @@ -319,6 +321,7 @@ msgstr "" #: lib/mv_web/live/member_live/index.ex #: lib/mv_web/live/member_live/index.html.heex #: lib/mv_web/live/membership_fee_type_live/index.ex +#: lib/mv_web/live/statistics_live.ex #, elixir-autogen, elixir-format msgid "Members" msgstr "" @@ -672,6 +675,7 @@ msgstr "" msgid "A member with this email already exists. To link with a different member, please change one of the email addresses first." msgstr "" +#: lib/mv_web/live/group_live/show.ex #: lib/mv_web/live/user_live/form.ex #, elixir-autogen, elixir-format msgid "Available members" @@ -762,6 +766,7 @@ msgstr "" #: lib/mv_web/components/core_components.ex #: lib/mv_web/live/components/member_filter_component.ex +#: lib/mv_web/live/statistics_live.ex #, elixir-autogen, elixir-format msgid "All" msgstr "" @@ -932,6 +937,7 @@ msgstr "" #: lib/mv/membership/members_pdf.ex #: lib/mv_web/live/member_live/show.ex #: lib/mv_web/live/member_live/show/membership_fees_component.ex +#: lib/mv_web/live/statistics_live.ex #: lib/mv_web/member_live/index/membership_fee_status.ex #, elixir-autogen, elixir-format msgid "Suspended" @@ -941,6 +947,7 @@ msgstr "" #: lib/mv_web/live/components/member_filter_component.ex #: lib/mv_web/live/member_live/show.ex #: lib/mv_web/live/member_live/show/membership_fees_component.ex +#: lib/mv_web/live/statistics_live.ex #: lib/mv_web/member_live/index/membership_fee_status.ex #, elixir-autogen, elixir-format msgid "Unpaid" @@ -2252,8 +2259,73 @@ msgstr "" msgid "Could not load data fields. Please check your permissions." msgstr "" -#: lib/mv_web/live/import_export_live/components.ex +#: lib/mv_web/live/group_live/show.ex #, elixir-autogen, elixir-format +msgid "Could not load member search. Please try again." +msgstr "" + +#: lib/mv_web/live/group_live/show.ex +#, elixir-autogen, elixir-format +msgid "Add Member" +msgstr "" + +#: lib/mv_web/live/group_live/show.ex +#, elixir-autogen, elixir-format +msgid "Failed to remove member: %{error}" +msgstr "" + +#: lib/mv_web/live/group_live/show.ex +#, elixir-autogen, elixir-format +msgid "Member is not in this group." +msgstr "" + +#: lib/mv_web/live/group_live/show.ex +#, elixir-autogen, elixir-format +msgid "No email" +msgstr "" + +#: lib/mv_web/live/group_live/show.ex +#, elixir-autogen, elixir-format +msgid "Remove" +msgstr "" + +#: lib/mv_web/live/group_live/show.ex +#, elixir-autogen, elixir-format +msgid "Remove member from group" +msgstr "" + +#: lib/mv_web/live/group_live/show.ex +#, elixir-autogen, elixir-format +msgid "Search for a member" +msgstr "" + +#: lib/mv_web/live/group_live/show.ex +#, elixir-autogen, elixir-format +msgid "Search for a member..." +msgstr "" + +#: lib/mv_web/live/group_live/show.ex +#, elixir-autogen, elixir-format +msgid "Add members" +msgstr "" + +#: lib/mv_web/live/group_live/show.ex +#, elixir-autogen, elixir-format +msgid "No members selected." +msgstr "" + +#: lib/mv_web/live/group_live/show.ex +#, elixir-autogen, elixir-format +msgid "Remove %{name}" +msgstr "" + +#: lib/mv_web/live/group_live/show.ex +#, elixir-autogen, elixir-format +msgid "Some members could not be added: %{errors}" +msgstr "" + +#: lib/mv_web/live/import_export_live/components.ex +#, elixir-autogen, elixir-format, fuzzy msgid "CSV files only, maximum %{size} MB" msgstr "" @@ -2400,6 +2472,97 @@ msgstr "" msgid "unpaid" msgstr "" +#: lib/mv_web/live/statistics_live.ex +#, elixir-autogen, elixir-format +msgid "Active members" +msgstr "" + +#: lib/mv_web/live/statistics_live.ex +#, elixir-autogen, elixir-format +msgid "Exits" +msgstr "" + +#: lib/mv_web/live/statistics_live.ex +#, elixir-autogen, elixir-format +msgid "Inactive members" +msgstr "" + +#: lib/mv_web/live/statistics_live.ex +#, elixir-autogen, elixir-format +msgid "Joins" +msgstr "" + +#: lib/mv_web/components/layouts/sidebar.ex +#: lib/mv_web/live/statistics_live.ex +#, elixir-autogen, elixir-format +msgid "Statistics" +msgstr "" + +#: lib/mv_web/live/statistics_live.ex +#, elixir-autogen, elixir-format +msgid "Total" +msgstr "" + +#: lib/mv_web/live/statistics_live.ex +#, elixir-autogen, elixir-format +msgid "Year" +msgstr "" + +#: lib/mv_web/live/statistics_live.ex +#, elixir-autogen, elixir-format +msgid "Contributions pie: paid %{paid}%%, unpaid %{unpaid}%%, suspended %{suspended}%%" +msgstr "" + +#: lib/mv_web/live/statistics_live.ex +#, elixir-autogen, elixir-format +msgid "All years combined (pie)" +msgstr "" + +#: lib/mv_web/live/statistics_live.ex +#, elixir-autogen, elixir-format +msgid "Contributions by year" +msgstr "" + +#: lib/mv_web/live/statistics_live.ex +#, elixir-autogen, elixir-format +msgid "Overview from first membership to today" +msgstr "" + +#: lib/mv_web/live/statistics_live.ex +#, elixir-autogen, elixir-format +msgid "Contributions by year as table with stacked bars" +msgstr "" + +#: lib/mv_web/live/statistics_live.ex +#, elixir-autogen, elixir-format +msgid "Contributions" +msgstr "" + +#: lib/mv_web/live/statistics_live.ex +#, elixir-autogen, elixir-format +msgid "Fee type" +msgstr "" + +#: lib/mv_web/live/statistics_live.ex +#, elixir-autogen, elixir-format +msgid "Member numbers by year" +msgstr "" + +#: lib/mv_web/live/statistics_live.ex +#, elixir-autogen, elixir-format +msgid "From %{first} to %{last} (relevant years with membership data)" +msgstr "" + +#: lib/mv_web/live/statistics_live.ex +#, elixir-autogen, elixir-format +msgid "Member numbers by year as table with bars" +msgstr "" + +#: lib/mv_web/live/statistics_live.ex +#, elixir-autogen, elixir-format +msgid "Fee types could not be loaded." +msgstr "" + #: lib/mv_web/components/export_dropdown.ex #, elixir-autogen, elixir-format msgid "CSV" diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po index e0a98e4..3df18d4 100644 --- a/priv/gettext/en/LC_MESSAGES/default.po +++ b/priv/gettext/en/LC_MESSAGES/default.po @@ -13,6 +13,7 @@ msgstr "" #: lib/mv_web/components/core_components.ex #: lib/mv_web/live/group_live/index.ex +#: lib/mv_web/live/group_live/show.ex #, elixir-autogen, elixir-format msgid "Actions" msgstr "" @@ -154,6 +155,7 @@ msgstr "" #: lib/mv_web/live/components/member_filter_component.ex #: lib/mv_web/live/member_live/show.ex #: lib/mv_web/live/member_live/show/membership_fees_component.ex +#: lib/mv_web/live/statistics_live.ex #: lib/mv_web/member_live/index/membership_fee_status.ex #, elixir-autogen, elixir-format msgid "Paid" @@ -319,6 +321,7 @@ msgstr "" #: lib/mv_web/live/member_live/index.ex #: lib/mv_web/live/member_live/index.html.heex #: lib/mv_web/live/membership_fee_type_live/index.ex +#: lib/mv_web/live/statistics_live.ex #, elixir-autogen, elixir-format msgid "Members" msgstr "" @@ -672,6 +675,7 @@ msgstr "" msgid "A member with this email already exists. To link with a different member, please change one of the email addresses first." msgstr "" +#: lib/mv_web/live/group_live/show.ex #: lib/mv_web/live/user_live/form.ex #, elixir-autogen, elixir-format msgid "Available members" @@ -762,6 +766,7 @@ msgstr "" #: lib/mv_web/components/core_components.ex #: lib/mv_web/live/components/member_filter_component.ex +#: lib/mv_web/live/statistics_live.ex #, elixir-autogen, elixir-format msgid "All" msgstr "" @@ -932,6 +937,7 @@ msgstr "" #: lib/mv/membership/members_pdf.ex #: lib/mv_web/live/member_live/show.ex #: lib/mv_web/live/member_live/show/membership_fees_component.ex +#: lib/mv_web/live/statistics_live.ex #: lib/mv_web/member_live/index/membership_fee_status.ex #, elixir-autogen, elixir-format msgid "Suspended" @@ -941,6 +947,7 @@ msgstr "" #: lib/mv_web/live/components/member_filter_component.ex #: lib/mv_web/live/member_live/show.ex #: lib/mv_web/live/member_live/show/membership_fees_component.ex +#: lib/mv_web/live/statistics_live.ex #: lib/mv_web/member_live/index/membership_fee_status.ex #, elixir-autogen, elixir-format msgid "Unpaid" @@ -2252,6 +2259,71 @@ msgstr "" msgid "Could not load data fields. Please check your permissions." msgstr "" +#: lib/mv_web/live/group_live/show.ex +#, elixir-autogen, elixir-format +msgid "Could not load member search. Please try again." +msgstr "" + +#: lib/mv_web/live/group_live/show.ex +#, elixir-autogen, elixir-format, fuzzy +msgid "Add Member" +msgstr "" + +#: lib/mv_web/live/group_live/show.ex +#, elixir-autogen, elixir-format, fuzzy +msgid "Failed to remove member: %{error}" +msgstr "" + +#: lib/mv_web/live/group_live/show.ex +#, elixir-autogen, elixir-format +msgid "Member is not in this group." +msgstr "" + +#: lib/mv_web/live/group_live/show.ex +#, elixir-autogen, elixir-format, fuzzy +msgid "No email" +msgstr "" + +#: lib/mv_web/live/group_live/show.ex +#, elixir-autogen, elixir-format +msgid "Remove" +msgstr "" + +#: lib/mv_web/live/group_live/show.ex +#, elixir-autogen, elixir-format +msgid "Remove member from group" +msgstr "" + +#: lib/mv_web/live/group_live/show.ex +#, elixir-autogen, elixir-format, fuzzy +msgid "Search for a member" +msgstr "" + +#: lib/mv_web/live/group_live/show.ex +#, elixir-autogen, elixir-format, fuzzy +msgid "Search for a member..." +msgstr "" + +#: lib/mv_web/live/group_live/show.ex +#, elixir-autogen, elixir-format +msgid "Add members" +msgstr "" + +#: lib/mv_web/live/group_live/show.ex +#, elixir-autogen, elixir-format, fuzzy +msgid "No members selected." +msgstr "" + +#: lib/mv_web/live/group_live/show.ex +#, elixir-autogen, elixir-format +msgid "Remove %{name}" +msgstr "" + +#: lib/mv_web/live/group_live/show.ex +#, elixir-autogen, elixir-format +msgid "Some members could not be added: %{errors}" +msgstr "" + #: lib/mv_web/live/import_export_live/components.ex #, elixir-autogen, elixir-format, fuzzy msgid "CSV files only, maximum %{size} MB" @@ -2400,6 +2472,97 @@ msgstr "" msgid "unpaid" msgstr "" +#: lib/mv_web/live/statistics_live.ex +#, elixir-autogen, elixir-format, fuzzy +msgid "Active members" +msgstr "" + +#: lib/mv_web/live/statistics_live.ex +#, elixir-autogen, elixir-format +msgid "Exits" +msgstr "" + +#: lib/mv_web/live/statistics_live.ex +#, elixir-autogen, elixir-format +msgid "Inactive members" +msgstr "" + +#: lib/mv_web/live/statistics_live.ex +#, elixir-autogen, elixir-format +msgid "Joins" +msgstr "" + +#: lib/mv_web/components/layouts/sidebar.ex +#: lib/mv_web/live/statistics_live.ex +#, elixir-autogen, elixir-format +msgid "Statistics" +msgstr "" + +#: lib/mv_web/live/statistics_live.ex +#, elixir-autogen, elixir-format +msgid "Total" +msgstr "" + +#: lib/mv_web/live/statistics_live.ex +#, elixir-autogen, elixir-format, fuzzy +msgid "Year" +msgstr "" + +#: lib/mv_web/live/statistics_live.ex +#, elixir-autogen, elixir-format +msgid "Contributions pie: paid %{paid}%%, unpaid %{unpaid}%%, suspended %{suspended}%%" +msgstr "" + +#: lib/mv_web/live/statistics_live.ex +#, elixir-autogen, elixir-format +msgid "All years combined (pie)" +msgstr "" + +#: lib/mv_web/live/statistics_live.ex +#, elixir-autogen, elixir-format, fuzzy +msgid "Contributions by year" +msgstr "" + +#: lib/mv_web/live/statistics_live.ex +#, elixir-autogen, elixir-format +msgid "Overview from first membership to today" +msgstr "" + +#: lib/mv_web/live/statistics_live.ex +#, elixir-autogen, elixir-format, fuzzy +msgid "Contributions by year as table with stacked bars" +msgstr "" + +#: lib/mv_web/live/statistics_live.ex +#, elixir-autogen, elixir-format, fuzzy +msgid "Contributions" +msgstr "" + +#: lib/mv_web/live/statistics_live.ex +#, elixir-autogen, elixir-format, fuzzy +msgid "Fee type" +msgstr "" + +#: lib/mv_web/live/statistics_live.ex +#, elixir-autogen, elixir-format +msgid "Member numbers by year" +msgstr "" + +#: lib/mv_web/live/statistics_live.ex +#, elixir-autogen, elixir-format +msgid "From %{first} to %{last} (relevant years with membership data)" +msgstr "" + +#: lib/mv_web/live/statistics_live.ex +#, elixir-autogen, elixir-format, fuzzy +msgid "Member numbers by year as table with bars" +msgstr "" + +#: lib/mv_web/live/statistics_live.ex +#, elixir-autogen, elixir-format +msgid "Fee types could not be loaded." +msgstr "" + #: lib/mv_web/components/export_dropdown.ex #, elixir-autogen, elixir-format msgid "CSV" @@ -2449,18 +2612,3 @@ msgstr "" #~ #, elixir-autogen, elixir-format, fuzzy #~ msgid "Custom Fields in CSV Import" #~ msgstr "" - -#~ #: lib/mv_web/live/global_settings_live.ex -#~ #, elixir-autogen, elixir-format -#~ msgid "Failed to prepare CSV import: %{error}" -#~ msgstr "" - -#~ #: lib/mv_web/live/global_settings_live.ex -#~ #, elixir-autogen, elixir-format, fuzzy -#~ msgid "Individual data fields must be created in Mila before importing. Use the field name as the CSV column header. Unknown custom field columns will be ignored with a warning." -#~ msgstr "" - -#~ #: lib/mv_web/live/member_live/show/membership_fees_component.ex -#~ #, elixir-autogen, elixir-format -#~ msgid "Only administrators can regenerate cycles" -#~ msgstr "" diff --git a/priv/repo/seeds.exs b/priv/repo/seeds.exs index f686c73..e96ca6e 100644 --- a/priv/repo/seeds.exs +++ b/priv/repo/seeds.exs @@ -379,10 +379,9 @@ Enum.each(member_attrs_list, fn member_attrs -> # Generate cycles if member has a fee type if final_member.membership_fee_type_id do - # Load member with cycles to check if they already exist + # Load member with cycles to check if they already exist (actor required for auth) member_with_cycles = - final_member - |> Ash.load!(:membership_fee_cycles) + Ash.load!(final_member, :membership_fee_cycles, actor: admin_user_with_role) # Only generate if no cycles exist yet (to avoid duplicates on re-run) cycles = @@ -427,7 +426,7 @@ Enum.each(member_attrs_list, fn member_attrs -> if cycle.status != status do cycle |> Ash.Changeset.for_update(:update, %{status: status}) - |> Ash.update!(actor: admin_user_with_role) + |> Ash.update!(actor: admin_user_with_role, domain: Mv.MembershipFees) end end) end @@ -542,10 +541,9 @@ Enum.with_index(linked_members) # Generate cycles for linked members if final_member.membership_fee_type_id do - # Load member with cycles to check if they already exist + # Load member with cycles to check if they already exist (actor required for auth) member_with_cycles = - final_member - |> Ash.load!(:membership_fee_cycles) + Ash.load!(final_member, :membership_fee_cycles, actor: admin_user_with_role) # Only generate if no cycles exist yet (to avoid duplicates on re-run) cycles = @@ -575,7 +573,7 @@ Enum.with_index(linked_members) if cycle.status != status do cycle |> Ash.Changeset.for_update(:update, %{status: status}) - |> Ash.update!() + |> Ash.update!(actor: admin_user_with_role, domain: Mv.MembershipFees) end end) end diff --git a/test/mv/statistics_test.exs b/test/mv/statistics_test.exs new file mode 100644 index 0000000..d4b4e05 --- /dev/null +++ b/test/mv/statistics_test.exs @@ -0,0 +1,227 @@ +defmodule Mv.StatisticsTest do + @moduledoc """ + Tests for Mv.Statistics module (member and membership fee cycle statistics). + """ + use Mv.DataCase, async: true + + require Ash.Query + import Ash.Expr + + alias Mv.Membership.Member + alias Mv.Statistics + alias Mv.MembershipFees + alias Mv.MembershipFees.MembershipFeeCycle + alias Mv.MembershipFees.MembershipFeeType + + setup do + actor = Mv.Helpers.SystemActor.get_system_actor() + %{actor: actor} + end + + defp create_fee_type(actor, attrs) do + MembershipFeeType + |> Ash.Changeset.for_create( + :create, + Map.merge( + %{ + name: "Test Fee #{System.unique_integer([:positive])}", + amount: Decimal.new("50.00"), + interval: :yearly + }, + attrs + ) + ) + |> Ash.create!(actor: actor) + end + + describe "first_join_year/1" do + test "returns the year of the earliest join_date", %{actor: actor} do + Mv.Fixtures.member_fixture(%{join_date: ~D[2019-03-15]}) + Mv.Fixtures.member_fixture(%{join_date: ~D[2022-01-01]}) + assert Statistics.first_join_year(actor: actor) == 2019 + end + + test "returns the only member's join year when one member exists", %{actor: actor} do + Mv.Fixtures.member_fixture(%{join_date: ~D[2021-06-01]}) + assert Statistics.first_join_year(actor: actor) == 2021 + end + + test "returns nil when no members exist", %{actor: actor} do + # Guarantee empty member table so the assertion is deterministic + Member + |> Ash.read!(actor: actor) + |> Enum.each(&Ash.destroy!(&1, actor: actor)) + + result = Statistics.first_join_year(actor: actor) + assert is_nil(result) + end + end + + describe "active_member_count/1" do + test "returns 0 when there are no members", %{actor: actor} do + assert Statistics.active_member_count(actor: actor) == 0 + end + + test "returns 1 when one member has no exit_date", %{actor: actor} do + Mv.Fixtures.member_fixture(%{join_date: ~D[2023-01-15]}) + assert Statistics.active_member_count(actor: actor) == 1 + end + + test "returns 0 for that member when exit_date is set", %{actor: actor} do + _member = + Mv.Fixtures.member_fixture(%{join_date: ~D[2023-01-15], exit_date: ~D[2024-06-01]}) + + assert Statistics.active_member_count(actor: actor) == 0 + end + + test "counts only active members when mix of active and inactive", %{actor: actor} do + Mv.Fixtures.member_fixture(%{join_date: ~D[2022-01-01]}) + Mv.Fixtures.member_fixture(%{join_date: ~D[2023-01-01], exit_date: ~D[2024-01-01]}) + assert Statistics.active_member_count(actor: actor) == 1 + end + end + + describe "inactive_member_count/1" do + test "returns 0 when all members are active", %{actor: actor} do + Mv.Fixtures.member_fixture(%{join_date: ~D[2023-01-01]}) + assert Statistics.inactive_member_count(actor: actor) == 0 + end + + test "returns 1 when one member has exit_date set", %{actor: actor} do + Mv.Fixtures.member_fixture(%{join_date: ~D[2022-01-01], exit_date: ~D[2024-06-01]}) + assert Statistics.inactive_member_count(actor: actor) == 1 + end + end + + describe "joins_by_year/2" do + test "returns 0 for year with no joins", %{actor: actor} do + assert Statistics.joins_by_year(1999, actor: actor) == 0 + end + + test "returns 1 when one member has join_date in that year", %{actor: actor} do + Mv.Fixtures.member_fixture(%{join_date: ~D[2023-06-15]}) + assert Statistics.joins_by_year(2023, actor: actor) == 1 + end + + test "returns 2 when two members joined in that year", %{actor: actor} do + Mv.Fixtures.member_fixture(%{join_date: ~D[2023-01-01]}) + Mv.Fixtures.member_fixture(%{join_date: ~D[2023-12-31]}) + assert Statistics.joins_by_year(2023, actor: actor) == 2 + end + end + + describe "exits_by_year/2" do + test "returns 0 for year with no exits", %{actor: actor} do + assert Statistics.exits_by_year(1999, actor: actor) == 0 + end + + test "returns 1 when one member has exit_date in that year", %{actor: actor} do + Mv.Fixtures.member_fixture(%{join_date: ~D[2020-01-01], exit_date: ~D[2023-06-15]}) + assert Statistics.exits_by_year(2023, actor: actor) == 1 + end + end + + describe "cycle_totals_by_year/2" do + test "returns zero totals for year with no cycles", %{actor: actor} do + result = Statistics.cycle_totals_by_year(1999, actor: actor) + assert result.total == Decimal.new(0) + assert result.paid == Decimal.new(0) + assert result.unpaid == Decimal.new(0) + assert result.suspended == Decimal.new(0) + end + + test "returns totals by status for cycles in that year", %{actor: actor} do + fee_type = create_fee_type(actor, %{amount: Decimal.new("50.00")}) + + # Creating members with fee type triggers cycle generation (2020..today). We use 2024 cycles. + _member1 = + Mv.Fixtures.member_fixture(%{ + join_date: ~D[2020-01-01], + membership_fee_type_id: fee_type.id + }) + + _member2 = + Mv.Fixtures.member_fixture(%{ + join_date: ~D[2020-01-01], + membership_fee_type_id: fee_type.id + }) + + # Get 2024 cycles and set status (each member has one 2024 yearly cycle from generator) + cycles_2024 = + MembershipFeeCycle + |> Ash.Query.filter( + expr(cycle_start >= ^~D[2024-01-01] and cycle_start < ^~D[2025-01-01]) + ) + |> Ash.read!(actor: actor) + |> Enum.sort_by(& &1.member_id) + + [c1, c2] = cycles_2024 + assert {:ok, _} = Ash.update(c1, %{status: :paid}, domain: MembershipFees, actor: actor) + + assert {:ok, _} = + Ash.update(c2, %{status: :suspended}, domain: MembershipFees, actor: actor) + + result = Statistics.cycle_totals_by_year(2024, actor: actor) + assert Decimal.equal?(result.total, Decimal.new("100.00")) + assert Decimal.equal?(result.paid, Decimal.new("50.00")) + assert Decimal.equal?(result.unpaid, Decimal.new(0)) + assert Decimal.equal?(result.suspended, Decimal.new("50.00")) + end + + test "when fee_type_id is passed in opts, returns only cycles of that fee type", %{ + actor: actor + } do + fee_type_a = create_fee_type(actor, %{amount: Decimal.new("30.00")}) + fee_type_b = create_fee_type(actor, %{amount: Decimal.new("70.00")}) + + _m1 = + Mv.Fixtures.member_fixture(%{ + join_date: ~D[2020-01-01], + membership_fee_type_id: fee_type_a.id + }) + + _m2 = + Mv.Fixtures.member_fixture(%{ + join_date: ~D[2020-01-01], + membership_fee_type_id: fee_type_b.id + }) + + # Without filter: both fee types' cycles (2024) + all_result = Statistics.cycle_totals_by_year(2024, actor: actor) + assert Decimal.equal?(all_result.total, Decimal.new("100.00")) + + # With fee_type_id as string (as from form/URL): only that type's cycles + opts_a = [actor: actor, fee_type_id: to_string(fee_type_a.id)] + result_a = Statistics.cycle_totals_by_year(2024, opts_a) + assert Decimal.equal?(result_a.total, Decimal.new("30.00")) + + opts_b = [actor: actor, fee_type_id: to_string(fee_type_b.id)] + result_b = Statistics.cycle_totals_by_year(2024, opts_b) + assert Decimal.equal?(result_b.total, Decimal.new("70.00")) + end + end + + describe "open_amount_total/1" do + test "returns 0 when there are no unpaid cycles", %{actor: actor} do + assert Statistics.open_amount_total(actor: actor) == Decimal.new(0) + end + + test "returns sum of amount for all unpaid cycles", %{actor: actor} do + fee_type = create_fee_type(actor, %{amount: Decimal.new("50.00")}) + + _member = + Mv.Fixtures.member_fixture(%{ + join_date: ~D[2020-01-01], + membership_fee_type_id: fee_type.id + }) + + # Cycle generator creates yearly cycles (2020..today), all unpaid by default + unpaid_sum = Statistics.open_amount_total(actor: actor) + assert Decimal.compare(unpaid_sum, Decimal.new(0)) == :gt + # Should be 50 * number of years from 2020 to current year + current_year = Date.utc_today().year + expected_count = current_year - 2020 + 1 + assert Decimal.equal?(unpaid_sum, Decimal.new(50 * expected_count)) + end + end +end diff --git a/test/mv_web/components/sidebar_authorization_test.exs b/test/mv_web/components/sidebar_authorization_test.exs index 079572f..110d9e5 100644 --- a/test/mv_web/components/sidebar_authorization_test.exs +++ b/test/mv_web/components/sidebar_authorization_test.exs @@ -25,12 +25,13 @@ defmodule MvWeb.SidebarAuthorizationTest do end describe "sidebar menu with admin user" do - test "shows Members, Fee Types and Administration with all subitems" do + test "shows Members, Fee Types, Statistics and Administration with all subitems" do user = Fixtures.user_with_role_fixture("admin") html = render_sidebar(sidebar_assigns(user)) assert html =~ ~s(href="/members") assert html =~ ~s(href="/membership_fee_types") + assert html =~ ~s(href="/statistics") assert html =~ ~s(data-testid="sidebar-administration") assert html =~ ~s(href="/users") assert html =~ ~s(href="/groups") @@ -41,11 +42,12 @@ defmodule MvWeb.SidebarAuthorizationTest do end describe "sidebar menu with read_only user (Vorstand/Buchhaltung)" do - test "shows Members and Groups (from Administration)" do + test "shows Members, Statistics and Groups (from Administration)" do user = Fixtures.user_with_role_fixture("read_only") html = render_sidebar(sidebar_assigns(user)) assert html =~ ~s(href="/members") + assert html =~ ~s(href="/statistics") assert html =~ ~s(href="/groups") end @@ -61,11 +63,12 @@ defmodule MvWeb.SidebarAuthorizationTest do end describe "sidebar menu with normal_user (Kassenwart)" do - test "shows Members and Groups" do + test "shows Members, Statistics and Groups" do user = Fixtures.user_with_role_fixture("normal_user") html = render_sidebar(sidebar_assigns(user)) assert html =~ ~s(href="/members") + assert html =~ ~s(href="/statistics") assert html =~ ~s(href="/groups") end @@ -88,10 +91,11 @@ defmodule MvWeb.SidebarAuthorizationTest do refute html =~ ~s(href="/members") end - test "does not show Fee Types or Administration" do + test "does not show Statistics, Fee Types or Administration" do user = Fixtures.user_with_role_fixture("own_data") html = render_sidebar(sidebar_assigns(user)) + refute html =~ ~s(href="/statistics") refute html =~ ~s(href="/membership_fee_types") refute html =~ ~s(href="/users") refute html =~ ~s(data-testid="sidebar-administration") diff --git a/test/mv_web/live/group_live/show_accessibility_test.exs b/test/mv_web/live/group_live/show_accessibility_test.exs new file mode 100644 index 0000000..97ce469 --- /dev/null +++ b/test/mv_web/live/group_live/show_accessibility_test.exs @@ -0,0 +1,301 @@ +defmodule MvWeb.GroupLive.ShowAccessibilityTest do + @moduledoc """ + Accessibility tests for Add/Remove Member functionality. + Tests ARIA labels, keyboard navigation, and screen reader support. + """ + + use MvWeb.ConnCase, async: false + import Phoenix.LiveViewTest + use Gettext, backend: MvWeb.Gettext + + alias Mv.Membership + alias Mv.Fixtures + + describe "ARIA labels and roles" do + test "search input has proper ARIA attributes", %{conn: conn} do + group = Fixtures.group_fixture() + + {:ok, view, _html} = live(conn, "/groups/#{group.slug}") + + # Open inline input + view + |> element("button", "Add Member") + |> render_click() + + html = render(view) + + # Search input should have proper ARIA attributes + assert html =~ ~r/aria-label/ || + html =~ ~r/aria-autocomplete/ || + html =~ ~r/role=["']combobox["']/ + end + + test "search input has correct aria-label and aria-autocomplete attributes", %{conn: conn} do + group = Fixtures.group_fixture() + + {:ok, view, _html} = live(conn, "/groups/#{group.slug}") + + # Open inline input + view + |> element("button", "Add Member") + |> render_click() + + html = render(view) + + # Search input should have ARIA attributes + assert html =~ ~r/aria-label.*[Ss]earch.*member/ || + html =~ ~r/aria-autocomplete=["']list["']/ + end + + test "remove button has aria-label with tooltip text", %{conn: conn} do + system_actor = Mv.Helpers.SystemActor.get_system_actor() + group = Fixtures.group_fixture() + + {:ok, member} = + Membership.create_member( + %{ + first_name: "Alice", + last_name: "Smith", + email: "alice@example.com" + }, + actor: system_actor + ) + + Membership.create_member_group(%{member_id: member.id, group_id: group.id}, + actor: system_actor + ) + + {:ok, view, _html} = live(conn, "/groups/#{group.slug}") + + html = render(view) + + # Remove button should have aria-label + assert html =~ ~r/aria-label.*[Rr]emove/ || + html =~ ~r/aria-label.*member/i + end + + test "add button has correct aria-label", %{conn: conn} do + group = Fixtures.group_fixture() + + {:ok, view, _html} = live(conn, "/groups/#{group.slug}") + + # Open inline input + view + |> element("button", "Add Member") + |> render_click() + + html = render(view) + + # Add button should have aria-label + assert html =~ ~r/aria-label.*[Aa]dd/ || + html =~ ~r/button.*[Aa]dd/ + end + end + + describe "keyboard navigation" do + test "tab navigation works in inline add member area", %{conn: conn} do + # This test verifies that keyboard navigation is possible + # Actual tab order testing would require more complex setup + group = Fixtures.group_fixture() + + {:ok, view, _html} = live(conn, "/groups/#{group.slug}") + + # Open inline input + view + |> element("button", "Add Member") + |> render_click() + + html = render(view) + + # Inline add member area should have focusable elements + assert html =~ ~r/input|button/ || + html =~ "#member-search-input" + end + + test "inline input can be closed", %{conn: conn} do + group = Fixtures.group_fixture() + + {:ok, view, _html} = live(conn, "/groups/#{group.slug}") + + # Open inline input + view + |> element("button", "Add Member") + |> render_click() + + assert has_element?(view, "#member-search-input") + + # Click Add Member button again to close (or add a member to close it) + # For now, we verify the input is visible when opened + html = render(view) + assert html =~ "#member-search-input" || has_element?(view, "#member-search-input") + end + + test "enter/space activates buttons when focused", %{conn: conn} do + # This test verifies that buttons can be activated via keyboard + # Actual keyboard event testing would require more complex setup + system_actor = Mv.Helpers.SystemActor.get_system_actor() + group = Fixtures.group_fixture() + + {:ok, member} = + Membership.create_member( + %{ + first_name: "Bob", + last_name: "Jones", + email: "bob@example.com" + }, + actor: system_actor + ) + + {:ok, view, _html} = live(conn, "/groups/#{group.slug}") + + # Open inline input + view + |> element("button", "Add Member") + |> render_click() + + # Select member + view + |> element("#member-search-input") + |> render_focus() + + # phx-change is on the form, so we need to trigger it via the form + view + |> element("form[phx-change='search_members']") + |> render_change(%{"member_search" => "Bob"}) + + view + |> element("[data-member-id='#{member.id}']") + |> render_click() + + # Add button should be enabled and clickable + view + |> element("button[phx-click='add_selected_members']") + |> render_click() + + # Should succeed (member should appear in list) + html = render(view) + assert html =~ "Bob" + end + + test "focus management: focus is set to input when opened", %{conn: conn} do + # This test verifies that focus is properly managed + # When inline input opens, focus should move to input field + group = Fixtures.group_fixture() + + {:ok, view, _html} = live(conn, "/groups/#{group.slug}") + + # Open inline input + view + |> element("button", "Add Member") + |> render_click() + + html = render(view) + + # Input should be visible and focusable + assert html =~ "#member-search-input" || + html =~ ~r/autofocus|tabindex/ + end + end + + describe "screen reader support" do + test "search input has proper label for screen readers", %{conn: conn} do + group = Fixtures.group_fixture() + + {:ok, view, _html} = live(conn, "/groups/#{group.slug}") + + # Open inline input + view + |> element("button", "Add Member") + |> render_click() + + html = render(view) + + # Input should have aria-label + assert html =~ ~r/aria-label.*[Ss]earch.*member/ || + html =~ ~r/aria-label/ + end + + test "search results are properly announced", %{conn: conn} do + system_actor = Mv.Helpers.SystemActor.get_system_actor() + group = Fixtures.group_fixture() + + {:ok, _member} = + Membership.create_member( + %{ + first_name: "Charlie", + last_name: "Brown", + email: "charlie@example.com" + }, + actor: system_actor + ) + + {:ok, view, _html} = live(conn, "/groups/#{group.slug}") + + # Open inline input + view + |> element("button", "Add Member") + |> render_click() + + # Search + view + |> element("#member-search-input") + |> render_focus() + + # phx-change is on the form, so we need to trigger it via the form + view + |> element("form[phx-change='search_members']") + |> render_change(%{"member_search" => "Charlie"}) + + html = render(view) + + # Search results should have proper ARIA attributes + assert html =~ ~r/role=["']listbox["']/ || + html =~ ~r/role=["']option["']/ || + html =~ "Charlie" + end + + test "flash messages are properly announced", %{conn: conn} do + system_actor = Mv.Helpers.SystemActor.get_system_actor() + group = Fixtures.group_fixture() + + {:ok, member} = + Membership.create_member( + %{ + first_name: "David", + last_name: "Wilson", + email: "david@example.com" + }, + actor: system_actor + ) + + {:ok, view, _html} = live(conn, "/groups/#{group.slug}") + + # Add member + view + |> element("button", "Add Member") + |> render_click() + + view + |> element("#member-search-input") + |> render_focus() + + # phx-change is on the form, so we need to trigger it via the form + view + |> element("form[phx-change='search_members']") + |> render_change(%{"member_search" => "David"}) + + view + |> element("[data-member-id='#{member.id}']") + |> render_click() + + view + |> element("button[phx-click='add_selected_members']") + |> render_click() + + html = render(view) + + # Member should appear in list (no flash message) + assert html =~ "David" + end + end +end diff --git a/test/mv_web/live/group_live/show_add_member_test.exs b/test/mv_web/live/group_live/show_add_member_test.exs new file mode 100644 index 0000000..783db9d --- /dev/null +++ b/test/mv_web/live/group_live/show_add_member_test.exs @@ -0,0 +1,460 @@ +defmodule MvWeb.GroupLive.ShowAddMemberTest do + @moduledoc """ + Tests for adding members to groups via the inline Add Member combobox. + Tests successful add, error handling, and edge cases. + """ + + use MvWeb.ConnCase, async: false + import Phoenix.LiveViewTest + import MvWeb.GroupLiveHelpers + use Gettext, backend: MvWeb.Gettext + + alias Mv.Membership + alias Mv.Fixtures + + describe "successful add member" do + test "member is added to group after selection and clicking Add", %{conn: conn} do + system_actor = Mv.Helpers.SystemActor.get_system_actor() + group = Fixtures.group_fixture() + + {:ok, member} = + Membership.create_member( + %{ + first_name: "Alice", + last_name: "Johnson", + email: "alice@example.com" + }, + actor: system_actor + ) + + {:ok, view, _html} = live(conn, "/groups/#{group.slug}") + + open_add_member(view) + search_member(view, "Alice") + select_member(view, member) + add_selected(view) + + html = render(view) + assert html =~ "Alice" + assert html =~ "Johnson" + end + + test "member is successfully added to group (verified in list)", %{conn: conn} do + system_actor = Mv.Helpers.SystemActor.get_system_actor() + group = Fixtures.group_fixture() + + {:ok, member} = + Membership.create_member( + %{ + first_name: "Bob", + last_name: "Smith", + email: "bob@example.com" + }, + actor: system_actor + ) + + {:ok, view, _html} = live(conn, "/groups/#{group.slug}") + + # Open inline input and add member + view + |> element("button", "Add Member") + |> render_click() + + view + |> element("#member-search-input") + |> render_focus() + + # phx-change is on the form, so we need to trigger it via the form + view + |> element("form[phx-change='search_members']") + |> render_change(%{"member_search" => "Bob"}) + + view + |> element("[data-member-id='#{member.id}']") + |> render_click() + + view + |> element("button[phx-click='add_selected_members']") + |> render_click() + + html = render(view) + + # Verify member appears in group list (no success flash message) + assert html =~ "Bob" + assert html =~ "Smith" + end + + test "group member list updates automatically after add", %{conn: conn} do + system_actor = Mv.Helpers.SystemActor.get_system_actor() + group = Fixtures.group_fixture() + + {:ok, member} = + Membership.create_member( + %{ + first_name: "Charlie", + last_name: "Brown", + email: "charlie@example.com" + }, + actor: system_actor + ) + + {:ok, view, html} = live(conn, "/groups/#{group.slug}") + + # Initially member should NOT be in list + refute html =~ "Charlie" + + # Add member + view + |> element("button", "Add Member") + |> render_click() + + view + |> element("#member-search-input") + |> render_focus() + + # phx-change is on the form, so we need to trigger it via the form + view + |> element("form[phx-change='search_members']") + |> render_change(%{"member_search" => "Charlie"}) + + view + |> element("[data-member-id='#{member.id}']") + |> render_click() + + view + |> element("button[phx-click='add_selected_members']") + |> render_click() + + # Member should now appear in list + html = render(view) + assert html =~ "Charlie" + assert html =~ "Brown" + end + + test "member count updates automatically after add", %{conn: conn} do + system_actor = Mv.Helpers.SystemActor.get_system_actor() + group = Fixtures.group_fixture() + + {:ok, member} = + Membership.create_member( + %{ + first_name: "David", + last_name: "Wilson", + email: "david@example.com" + }, + actor: system_actor + ) + + {:ok, view, html} = live(conn, "/groups/#{group.slug}") + + # Get initial count (should be 0) + initial_count = extract_member_count(html) + + # Add member + view + |> element("button", "Add Member") + |> render_click() + + view + |> element("#member-search-input") + |> render_focus() + + # phx-change is on the form, so we need to trigger it via the form + view + |> element("form[phx-change='search_members']") + |> render_change(%{"member_search" => "David"}) + + view + |> element("[data-member-id='#{member.id}']") + |> render_click() + + view + |> element("button[phx-click='add_selected_members']") + |> render_click() + + # Count should have increased + html = render(view) + new_count = extract_member_count(html) + assert new_count == initial_count + 1 + end + + test "inline add member area closes after successful member addition", %{conn: conn} do + system_actor = Mv.Helpers.SystemActor.get_system_actor() + group = Fixtures.group_fixture() + + {:ok, member} = + Membership.create_member( + %{ + first_name: "Eve", + last_name: "Davis", + email: "eve@example.com" + }, + actor: system_actor + ) + + {:ok, view, _html} = live(conn, "/groups/#{group.slug}") + + # Open inline input + view + |> element("button", "Add Member") + |> render_click() + + assert has_element?(view, "#member-search-input") + + # Add member + view + |> element("#member-search-input") + |> render_focus() + + # phx-change is on the form, so we need to trigger it via the form + view + |> element("form[phx-change='search_members']") + |> render_change(%{"member_search" => "Eve"}) + + view + |> element("[data-member-id='#{member.id}']") + |> render_click() + + view + |> element("button[phx-click='add_selected_members']") + |> render_click() + + # Inline input should be closed (Add Member button should be visible again) + refute has_element?(view, "#member-search-input") + end + + test "Cancel button closes inline add member area without adding", %{conn: conn} do + group = Fixtures.group_fixture() + + {:ok, view, _html} = live(conn, "/groups/#{group.slug}") + + open_add_member(view) + assert has_element?(view, "#member-search-input") + assert has_element?(view, "button[phx-click='hide_add_member_input']") + + cancel_add_member(view) + + refute has_element?(view, "#member-search-input") + assert has_element?(view, "button", "Add Member") + end + end + + describe "error handling" do + test "error flash message when member is already in group", %{conn: conn} do + system_actor = Mv.Helpers.SystemActor.get_system_actor() + group = Fixtures.group_fixture() + + {:ok, member} = + Membership.create_member( + %{ + first_name: "Frank", + last_name: "Moore", + email: "frank@example.com" + }, + actor: system_actor + ) + + # Add member to group first + Membership.create_member_group(%{member_id: member.id, group_id: group.id}, + actor: system_actor + ) + + {:ok, view, _html} = live(conn, "/groups/#{group.slug}") + + # Try to add same member again + view + |> element("button", "Add Member") + |> render_click() + + # Member should not appear in search (filtered out) + # But if they do appear somehow, try to add them + # phx-change is on the form, so we need to trigger it via the form + view + |> element("form[phx-change='search_members']") + |> render_change(%{"member_search" => "Frank"}) + + # If member appears in results (shouldn't), try to add + # This tests the server-side duplicate prevention + if has_element?(view, "[data-member-id='#{member.id}']") do + view + |> element("[data-member-id='#{member.id}']") + |> render_click() + + view + |> element("button", "Add") + |> render_click() + + # Should show error + html = render(view) + assert html =~ gettext("already in group") || html =~ ~r/already.*group|duplicate/i + end + end + + test "error flash message for other errors", %{conn: conn} do + # This test verifies that error handling works for unexpected errors + # We can't easily simulate all error cases, but we test the error path exists + _system_actor = Mv.Helpers.SystemActor.get_system_actor() + group = Fixtures.group_fixture() + + {:ok, view, _html} = live(conn, "/groups/#{group.slug}") + + # Open inline input + view + |> element("button", "Add Member") + |> render_click() + + # Try to add with invalid member ID (if possible) + # This tests error handling path + # Note: Actual implementation will handle this + end + + test "inline input remains open on error (user can correct)", %{conn: conn} do + system_actor = Mv.Helpers.SystemActor.get_system_actor() + group = Fixtures.group_fixture() + + {:ok, member} = + Membership.create_member( + %{ + first_name: "Grace", + last_name: "Taylor", + email: "grace@example.com" + }, + actor: system_actor + ) + + # Add member first + Membership.create_member_group(%{member_id: member.id, group_id: group.id}, + actor: system_actor + ) + + {:ok, view, _html} = live(conn, "/groups/#{group.slug}") + + # Open inline input + view + |> element("button", "Add Member") + |> render_click() + + # Inline input should be open + assert has_element?(view, "#member-search-input") + + # If error occurs, inline input should remain open + # (Implementation will handle this) + end + + test "Add button remains disabled until member selected", %{conn: conn} do + group = Fixtures.group_fixture() + + {:ok, view, _html} = live(conn, "/groups/#{group.slug}") + + # Open inline input + view + |> element("button", "Add Member") + |> render_click() + + # Add button should be disabled + assert has_element?(view, "button[phx-click='add_selected_members'][disabled]") + end + end + + describe "edge cases" do + test "add works for group with 0 members", %{conn: conn} do + system_actor = Mv.Helpers.SystemActor.get_system_actor() + group = Fixtures.group_fixture() + + {:ok, member} = + Membership.create_member( + %{ + first_name: "Henry", + last_name: "Anderson", + email: "henry@example.com" + }, + actor: system_actor + ) + + {:ok, view, _html} = live(conn, "/groups/#{group.slug}") + + # Add member to empty group + view + |> element("button", "Add Member") + |> render_click() + + view + |> element("#member-search-input") + |> render_focus() + + # phx-change is on the form, so we need to trigger it via the form + view + |> element("form[phx-change='search_members']") + |> render_change(%{"member_search" => "Henry"}) + + view + |> element("[data-member-id='#{member.id}']") + |> render_click() + + view + |> element("button[phx-click='add_selected_members']") + |> render_click() + + # Member should be added + html = render(view) + assert html =~ "Henry" + end + + test "add works when member is already in other groups", %{conn: conn} do + system_actor = Mv.Helpers.SystemActor.get_system_actor() + group1 = Fixtures.group_fixture() + group2 = Fixtures.group_fixture() + + {:ok, member} = + Membership.create_member( + %{ + first_name: "Isabel", + last_name: "Martinez", + email: "isabel@example.com" + }, + actor: system_actor + ) + + # Add member to group1 + Membership.create_member_group(%{member_id: member.id, group_id: group1.id}, + actor: system_actor + ) + + {:ok, view, _html} = live(conn, "/groups/#{group2.slug}") + + # Add same member to group2 (should work) + view + |> element("button", "Add Member") + |> render_click() + + view + |> element("#member-search-input") + |> render_focus() + + # phx-change is on the form, so we need to trigger it via the form + view + |> element("form[phx-change='search_members']") + |> render_change(%{"member_search" => "Isabel"}) + + view + |> element("[data-member-id='#{member.id}']") + |> render_click() + + view + |> element("button[phx-click='add_selected_members']") + |> render_click() + + # Member should be added to group2 + html = render(view) + assert html =~ "Isabel" + end + end + + # Helper function to extract member count from HTML + defp extract_member_count(html) do + case Regex.run(~r/Total:\s*(\d+)/, html) do + [_, count_str] -> String.to_integer(count_str) + _ -> 0 + end + end +end diff --git a/test/mv_web/live/group_live/show_add_remove_members_test.exs b/test/mv_web/live/group_live/show_add_remove_members_test.exs new file mode 100644 index 0000000..c014372 --- /dev/null +++ b/test/mv_web/live/group_live/show_add_remove_members_test.exs @@ -0,0 +1,135 @@ +defmodule MvWeb.GroupLive.ShowAddRemoveMembersTest do + @moduledoc """ + UI tests for Add/Remove Member buttons visibility and inline add member display. + Tests UI rendering and permission-based visibility. + """ + + use MvWeb.ConnCase, async: false + import Phoenix.LiveViewTest + use Gettext, backend: MvWeb.Gettext + + alias Mv.Membership + alias Mv.Fixtures + + describe "Add Member button visibility" do + @tag role: :read_only + test "read_only user can access group show page (page permission)", %{conn: conn} do + group = Fixtures.group_fixture() + conn = get(conn, "/groups/#{group.slug}") + assert conn.status == 200 + end + + test "Add Member button is visible for users with :update permission", %{conn: conn} do + group = Fixtures.group_fixture() + + {:ok, _view, html} = live(conn, "/groups/#{group.slug}") + + assert html =~ gettext("Add Member") or html =~ "Add Member" + end + + @tag role: :read_only + test "Add Member button is NOT visible for users without :update permission", %{conn: conn} do + group = Fixtures.group_fixture() + + {:ok, _view, html} = live(conn, "/groups/#{group.slug}") + + refute html =~ gettext("Add Member") + end + + test "Add Member button is positioned above member table", %{conn: conn} do + group = Fixtures.group_fixture() + + {:ok, view, _html} = live(conn, "/groups/#{group.slug}") + + # Button should exist + assert has_element?(view, "button", gettext("Add Member")) || + has_element?(view, "a", gettext("Add Member")) + end + end + + describe "Remove button visibility" do + test "Remove button is visible for each member for users with :update permission", %{ + conn: conn + } do + group = Fixtures.group_fixture() + member = Fixtures.member_fixture(%{first_name: "Alice", last_name: "Smith"}) + system_actor = Mv.Helpers.SystemActor.get_system_actor() + + Membership.create_member_group(%{member_id: member.id, group_id: group.id}, + actor: system_actor + ) + + {:ok, view, _html} = live(conn, "/groups/#{group.slug}") + + # Remove button should exist (can be icon button with trash icon) + html = render(view) + + assert html =~ "Remove" or html =~ "remove" or html =~ "trash" or + html =~ ~r/hero-trash|hero-x-mark/ + end + + @tag role: :read_only + test "Remove button is NOT visible for users without :update permission", %{conn: conn} do + group = Fixtures.group_fixture() + member = Fixtures.member_fixture(%{first_name: "Bob", last_name: "Jones"}) + system_actor = Mv.Helpers.SystemActor.get_system_actor() + + Membership.create_member_group(%{member_id: member.id, group_id: group.id}, + actor: system_actor + ) + + {:ok, _view, html} = live(conn, "/groups/#{group.slug}") + + # Remove button should NOT exist (check for trash icon or remove button specifically) + refute html =~ "hero-trash" or html =~ ~r/]*remove_member/ + end + end + + describe "inline add member input" do + test "inline input appears when Add Member button is clicked", %{conn: conn} do + group = Fixtures.group_fixture() + + {:ok, view, _html} = live(conn, "/groups/#{group.slug}") + + # Click Add Member button + view + |> element("button", gettext("Add Member")) + |> render_click() + + # Inline input should be visible + assert has_element?(view, "#member-search-input") + end + + test "search input has correct placeholder", %{conn: conn} do + group = Fixtures.group_fixture() + + {:ok, view, _html} = live(conn, "/groups/#{group.slug}") + + # Open inline input + view + |> element("button", gettext("Add Member")) + |> render_click() + + html = render(view) + + assert html =~ gettext("Search for a member...") || + html =~ ~r/search.*member/i + end + + test "Add button (plus icon) is disabled until member selected", %{conn: conn} do + group = Fixtures.group_fixture() + + {:ok, view, _html} = live(conn, "/groups/#{group.slug}") + + # Open inline input + view + |> element("button", gettext("Add Member")) + |> render_click() + + html = render(view) + # Add button should exist and be disabled initially + assert has_element?(view, "button[phx-click='add_selected_members'][disabled]") || + html =~ ~r/disabled/ + end + end +end diff --git a/test/mv_web/live/group_live/show_authorization_test.exs b/test/mv_web/live/group_live/show_authorization_test.exs new file mode 100644 index 0000000..f121b36 --- /dev/null +++ b/test/mv_web/live/group_live/show_authorization_test.exs @@ -0,0 +1,285 @@ +defmodule MvWeb.GroupLive.ShowAuthorizationTest do + @moduledoc """ + Tests for authorization and security in Add/Remove Member functionality. + Tests server-side authorization checks and UI permission enforcement. + """ + + use MvWeb.ConnCase, async: false + import Phoenix.LiveViewTest + use Gettext, backend: MvWeb.Gettext + + alias Mv.Membership + alias Mv.Fixtures + + describe "server-side authorization" do + test "add member event handler checks :update permission", %{conn: conn} do + system_actor = Mv.Helpers.SystemActor.get_system_actor() + group = Fixtures.group_fixture() + + {:ok, member} = + Membership.create_member( + %{ + first_name: "Alice", + last_name: "Smith", + email: "alice@example.com" + }, + actor: system_actor + ) + + {:ok, view, _html} = live(conn, "/groups/#{group.slug}") + + # Open inline input and try to add member + view + |> element("button", "Add Member") + |> render_click() + + view + |> element("#member-search-input") + |> render_focus() + + # phx-change is on the form, so we need to trigger it via the form + view + |> element("form[phx-change='search_members']") + |> render_change(%{"member_search" => "Alice"}) + + view + |> element("[data-member-id='#{member.id}']") + |> render_click() + + # Try to add (should succeed for admin) + view + |> element("button[phx-click='add_selected_members']") + |> render_click() + + # Should succeed (admin has :update permission, member should appear in list) + html = render(view) + assert html =~ "Alice" + end + + @tag role: :read_only + test "unauthorized user cannot add member (server-side check)", %{conn: conn} do + system_actor = Mv.Helpers.SystemActor.get_system_actor() + group = Fixtures.group_fixture() + + {:ok, _member} = + Membership.create_member( + %{ + first_name: "Bob", + last_name: "Jones", + email: "bob@example.com" + }, + actor: system_actor + ) + + {:ok, view, _html} = live(conn, "/groups/#{group.slug}") + + # Try to trigger add event directly (even if button is hidden) + # This tests server-side authorization + # Note: If button is hidden, we can't click it, but we test the event handler + # by trying to send the event directly if possible + + # For now, we verify that the button is not visible + html = render(view) + refute html =~ "Add Member" + end + + test "remove member event handler checks :update permission", %{conn: conn} do + system_actor = Mv.Helpers.SystemActor.get_system_actor() + group = Fixtures.group_fixture() + + {:ok, member} = + Membership.create_member( + %{ + first_name: "Charlie", + last_name: "Brown", + email: "charlie@example.com" + }, + actor: system_actor + ) + + Membership.create_member_group(%{member_id: member.id, group_id: group.id}, + actor: system_actor + ) + + {:ok, view, _html} = live(conn, "/groups/#{group.slug}") + + # Remove member (should succeed for admin) + view + |> element("button[phx-click='remove_member'][phx-value-member_id='#{member.id}']") + |> render_click() + + # Should succeed (member should no longer be in list) + html = render(view) + refute html =~ "Charlie" + end + + @tag role: :read_only + test "unauthorized user cannot remove member (server-side check)", %{conn: conn} do + system_actor = Mv.Helpers.SystemActor.get_system_actor() + group = Fixtures.group_fixture() + + {:ok, member} = + Membership.create_member( + %{ + first_name: "David", + last_name: "Wilson", + email: "david@example.com" + }, + actor: system_actor + ) + + Membership.create_member_group(%{member_id: member.id, group_id: group.id}, + actor: system_actor + ) + + {:ok, view, _html} = live(conn, "/groups/#{group.slug}") + + # Remove button should not be visible + html = render(view) + + # Read-only user should NOT see Remove button (check for trash icon or remove button specifically) + refute html =~ "hero-trash" or html =~ ~r/]*remove_member/ + end + + test "error flash message on unauthorized access", %{conn: conn} do + # This test verifies that error messages are shown for unauthorized access + # Implementation will handle this in event handlers + _system_actor = Mv.Helpers.SystemActor.get_system_actor() + group = Fixtures.group_fixture() + + {:ok, _view, _html} = live(conn, "/groups/#{group.slug}") + + # For admin, should not see error + # For non-admin, buttons are hidden (UI-level check) + # Server-side check will show error if event is somehow triggered + end + end + + describe "UI permission checks" do + test "buttons are hidden for unauthorized users", %{conn: conn} do + system_actor = Mv.Helpers.SystemActor.get_system_actor() + group = Fixtures.group_fixture() + + {:ok, member} = + Membership.create_member( + %{ + first_name: "Eve", + last_name: "Davis", + email: "eve@example.com" + }, + actor: system_actor + ) + + Membership.create_member_group(%{member_id: member.id, group_id: group.id}, + actor: system_actor + ) + + {:ok, _view, html} = live(conn, "/groups/#{group.slug}") + + # Admin should see buttons + assert html =~ "Add Member" || html =~ "Remove" + end + + @tag role: :read_only + test "Add Member button is hidden for read-only users", %{conn: conn} do + _system_actor = Mv.Helpers.SystemActor.get_system_actor() + group = Fixtures.group_fixture() + + {:ok, _view, html} = live(conn, "/groups/#{group.slug}") + + # Read-only user should NOT see Add Member button + refute html =~ "Add Member" + end + + @tag role: :read_only + test "Remove button is hidden for read-only users", %{conn: conn} do + system_actor = Mv.Helpers.SystemActor.get_system_actor() + group = Fixtures.group_fixture() + + {:ok, member} = + Membership.create_member( + %{ + first_name: "Frank", + last_name: "Moore", + email: "frank@example.com" + }, + actor: system_actor + ) + + Membership.create_member_group(%{member_id: member.id, group_id: group.id}, + actor: system_actor + ) + + {:ok, _view, html} = live(conn, "/groups/#{group.slug}") + + # Read-only user should NOT see Remove button (check for trash icon or remove button specifically) + refute html =~ "hero-trash" or html =~ ~r/]*remove_member/ + end + + @tag role: :read_only + test "inline add member area cannot be opened for unauthorized users", %{conn: conn} do + group = Fixtures.group_fixture() + + {:ok, _view, html} = live(conn, "/groups/#{group.slug}") + + # Inline input should not be accessible (button hidden) + refute html =~ "Add Member" + refute html =~ "#member-search-input" + end + end + + describe "member (own_data) page access" do + # Members have no page permission for /groups or /groups/:slug; they are redirected. + # This tests that limited access for the member role is enforced. + @tag role: :member + test "member is redirected when accessing group show page", %{conn: conn} do + group = Fixtures.group_fixture() + + result = live(conn, "/groups/#{group.slug}") + + assert {:error, {:redirect, %{to: path, flash: %{"error" => _}}}} = result + assert path =~ ~r|^/users/[^/]+$| + end + + @tag role: :member + test "member is redirected when accessing groups index", %{conn: conn} do + result = live(conn, "/groups") + + assert {:error, {:redirect, %{to: path, flash: %{"error" => _}}}} = result + assert path =~ ~r|^/users/[^/]+$| + end + end + + describe "security edge cases" do + test "slug injection attempts are prevented", %{conn: conn} do + # Try to inject malicious content in slug + malicious_slug = "'; DROP TABLE groups; --" + + result = live(conn, "/groups/#{malicious_slug}") + + # Should not execute SQL, should return 404 or error + assert match?({:error, {:redirect, %{to: "/groups"}}}, result) || + match?({:error, {:live_redirect, %{to: "/groups"}}}, result) + end + + @tag :skip + test "non-existent member IDs are handled", %{conn: conn} do + # Future: test add_selected_members with invalid ID (would require pushing event with forged selected_member_ids) + group = Fixtures.group_fixture() + + {:ok, view, _html} = live(conn, "/groups/#{group.slug}") + + assert has_element?(view, "button", "Add Member") + end + + test "non-existent group IDs are handled", %{conn: conn} do + # Accessing non-existent group should redirect + non_existent_slug = "non-existent-group-#{System.unique_integer([:positive])}" + + result = live(conn, "/groups/#{non_existent_slug}") + + assert match?({:error, {:redirect, %{to: "/groups"}}}, result) || + match?({:error, {:live_redirect, %{to: "/groups"}}}, result) + end + end +end diff --git a/test/mv_web/live/group_live/show_integration_test.exs b/test/mv_web/live/group_live/show_integration_test.exs new file mode 100644 index 0000000..0a82be8 --- /dev/null +++ b/test/mv_web/live/group_live/show_integration_test.exs @@ -0,0 +1,432 @@ +defmodule MvWeb.GroupLive.ShowIntegrationTest do + @moduledoc """ + Integration tests for Add/Remove Member functionality. + Tests data consistency, database operations, and multiple operations. + """ + + use MvWeb.ConnCase, async: false + import Phoenix.LiveViewTest + use Gettext, backend: MvWeb.Gettext + + alias Mv.Membership + alias Mv.Fixtures + + describe "data consistency" do + test "member appears in group after add (verified in database)", %{conn: conn} do + system_actor = Mv.Helpers.SystemActor.get_system_actor() + group = Fixtures.group_fixture() + + {:ok, member} = + Membership.create_member( + %{ + first_name: "Alice", + last_name: "Smith", + email: "alice@example.com" + }, + actor: system_actor + ) + + {:ok, view, _html} = live(conn, "/groups/#{group.slug}") + + # Add member via UI + view + |> element("button", "Add Member") + |> render_click() + + view + |> element("#member-search-input") + |> render_focus() + + # phx-change is on the form, so we need to trigger it via the form + view + |> element("form[phx-change='search_members']") + |> render_change(%{"member_search" => "Alice"}) + + view + |> element("[data-member-id='#{member.id}']") + |> render_click() + + view + |> element("button[phx-click='add_selected_members']") + |> render_click() + + # Verify in database + require Ash.Query + + query = + Mv.Membership.Group + |> Ash.Query.filter(slug == ^group.slug) + |> Ash.Query.load([:members]) + + {:ok, updated_group} = Ash.read_one(query, actor: system_actor, domain: Mv.Membership) + + # Member should be in group + assert Enum.any?(updated_group.members, &(&1.id == member.id)) + end + + test "member disappears from group after remove (verified in database)", %{conn: conn} do + system_actor = Mv.Helpers.SystemActor.get_system_actor() + group = Fixtures.group_fixture() + + {:ok, member} = + Membership.create_member( + %{ + first_name: "Bob", + last_name: "Jones", + email: "bob@example.com" + }, + actor: system_actor + ) + + # Add member to group + Membership.create_member_group(%{member_id: member.id, group_id: group.id}, + actor: system_actor + ) + + {:ok, view, _html} = live(conn, "/groups/#{group.slug}") + + # Remove member via UI + view + |> element("button[phx-click='remove_member'][phx-value-member_id='#{member.id}']") + |> render_click() + + # Verify in database + require Ash.Query + + query = + Mv.Membership.Group + |> Ash.Query.filter(slug == ^group.slug) + |> Ash.Query.load([:members]) + + {:ok, updated_group} = Ash.read_one(query, actor: system_actor, domain: Mv.Membership) + + # Member should NOT be in group + refute Enum.any?(updated_group.members, &(&1.id == member.id)) + end + + test "MemberGroup association is created correctly", %{conn: conn} do + system_actor = Mv.Helpers.SystemActor.get_system_actor() + group = Fixtures.group_fixture() + + {:ok, member} = + Membership.create_member( + %{ + first_name: "Charlie", + last_name: "Brown", + email: "charlie@example.com" + }, + actor: system_actor + ) + + {:ok, view, _html} = live(conn, "/groups/#{group.slug}") + + # Add member + view + |> element("button", "Add Member") + |> render_click() + + view + |> element("#member-search-input") + |> render_focus() + + # phx-change is on the form, so we need to trigger it via the form + view + |> element("form[phx-change='search_members']") + |> render_change(%{"member_search" => "Charlie"}) + + view + |> element("[data-member-id='#{member.id}']") + |> render_click() + + view + |> element("button[phx-click='add_selected_members']") + |> render_click() + + # Verify MemberGroup association exists + require Ash.Query + + {:ok, member_groups} = + Ash.read( + Mv.Membership.MemberGroup + |> Ash.Query.filter(member_id == ^member.id and group_id == ^group.id), + actor: system_actor, + domain: Mv.Membership + ) + + assert length(member_groups) == 1 + assert hd(member_groups).member_id == member.id + assert hd(member_groups).group_id == group.id + end + + test "MemberGroup association is deleted correctly", %{conn: conn} do + system_actor = Mv.Helpers.SystemActor.get_system_actor() + group = Fixtures.group_fixture() + + {:ok, member} = + Membership.create_member( + %{ + first_name: "David", + last_name: "Wilson", + email: "david@example.com" + }, + actor: system_actor + ) + + # Add member first + Membership.create_member_group(%{member_id: member.id, group_id: group.id}, + actor: system_actor + ) + + {:ok, view, _html} = live(conn, "/groups/#{group.slug}") + + # Remove member + view + |> element("button[phx-click='remove_member'][phx-value-member_id='#{member.id}']") + |> render_click() + + # Verify MemberGroup association is deleted + require Ash.Query + + {:ok, member_groups} = + Ash.read( + Mv.Membership.MemberGroup + |> Ash.Query.filter(member_id == ^member.id and group_id == ^group.id), + actor: system_actor, + domain: Mv.Membership + ) + + assert member_groups == [] + end + + test "member itself is NOT deleted (only association)", %{conn: conn} do + system_actor = Mv.Helpers.SystemActor.get_system_actor() + group = Fixtures.group_fixture() + + {:ok, member} = + Membership.create_member( + %{ + first_name: "Eve", + last_name: "Davis", + email: "eve@example.com" + }, + actor: system_actor + ) + + # Add member to group + Membership.create_member_group(%{member_id: member.id, group_id: group.id}, + actor: system_actor + ) + + {:ok, view, _html} = live(conn, "/groups/#{group.slug}") + + # Remove member from group + view + |> element("button[phx-click='remove_member']", "") + |> render_click() + + # Verify member still exists + {:ok, member_after_remove} = + Ash.get(Mv.Membership.Member, member.id, actor: system_actor) + + assert member_after_remove.id == member.id + assert member_after_remove.first_name == "Eve" + end + end + + describe "multiple operations" do + test "multiple members can be added sequentially", %{conn: conn} do + system_actor = Mv.Helpers.SystemActor.get_system_actor() + group = Fixtures.group_fixture() + + {:ok, member1} = + Membership.create_member( + %{ + first_name: "Frank", + last_name: "Moore", + email: "frank@example.com" + }, + actor: system_actor + ) + + {:ok, member2} = + Membership.create_member( + %{ + first_name: "Grace", + last_name: "Taylor", + email: "grace@example.com" + }, + actor: system_actor + ) + + {:ok, view, _html} = live(conn, "/groups/#{group.slug}") + + # Add first member + view + |> element("button", "Add Member") + |> render_click() + + view + |> element("#member-search-input") + |> render_focus() + + # phx-change is on the form, so we need to trigger it via the form + view + |> element("form[phx-change='search_members']") + |> render_change(%{"member_search" => "Frank"}) + + view + |> element("[data-member-id='#{member1.id}']") + |> render_click() + + view + |> element("button[phx-click='add_selected_members']") + |> render_click() + + # Add second member + view + |> element("button", "Add Member") + |> render_click() + + view + |> element("#member-search-input") + |> render_focus() + + # phx-change is on the form, so we need to trigger it via the form + view + |> element("form[phx-change='search_members']") + |> render_change(%{"member_search" => "Grace"}) + + view + |> element("[data-member-id='#{member2.id}']") + |> render_click() + + view + |> element("button[phx-click='add_selected_members']") + |> render_click() + + # Both members should be in list + html = render(view) + assert html =~ "Frank" + assert html =~ "Grace" + end + + test "multiple members can be removed sequentially", %{conn: conn} do + system_actor = Mv.Helpers.SystemActor.get_system_actor() + group = Fixtures.group_fixture() + + {:ok, member1} = + Membership.create_member( + %{ + first_name: "Henry", + last_name: "Anderson", + email: "henry@example.com" + }, + actor: system_actor + ) + + {:ok, member2} = + Membership.create_member( + %{ + first_name: "Isabel", + last_name: "Martinez", + email: "isabel@example.com" + }, + actor: system_actor + ) + + # Add both members + Membership.create_member_group(%{member_id: member1.id, group_id: group.id}, + actor: system_actor + ) + + Membership.create_member_group(%{member_id: member2.id, group_id: group.id}, + actor: system_actor + ) + + {:ok, view, html} = live(conn, "/groups/#{group.slug}") + + # Both should be in list initially + assert html =~ "Henry" + assert html =~ "Isabel" + + # Remove first member + view + |> element("button[phx-click='remove_member'][phx-value-member_id='#{member1.id}']") + |> render_click() + + # Remove second member + view + |> element("button[phx-click='remove_member'][phx-value-member_id='#{member2.id}']") + |> render_click() + + # Both should be removed + html = render(view) + refute html =~ "Henry" + refute html =~ "Isabel" + end + + test "add and remove can be mixed", %{conn: conn} do + system_actor = Mv.Helpers.SystemActor.get_system_actor() + group = Fixtures.group_fixture() + + {:ok, member1} = + Membership.create_member( + %{ + first_name: "Jack", + last_name: "White", + email: "jack@example.com" + }, + actor: system_actor + ) + + {:ok, member2} = + Membership.create_member( + %{ + first_name: "Kate", + last_name: "Black", + email: "kate@example.com" + }, + actor: system_actor + ) + + # Add member1 first + Membership.create_member_group(%{member_id: member1.id, group_id: group.id}, + actor: system_actor + ) + + {:ok, view, _html} = live(conn, "/groups/#{group.slug}") + + # Add member2 + view + |> element("button", "Add Member") + |> render_click() + + view + |> element("#member-search-input") + |> render_focus() + + # phx-change is on the form, so we need to trigger it via the form + view + |> element("form[phx-change='search_members']") + |> render_change(%{"member_search" => "Kate"}) + + view + |> element("[data-member-id='#{member2.id}']") + |> render_click() + + view + |> element("button[phx-click='add_selected_members']") + |> render_click() + + # Remove member1 + view + |> element("button[phx-click='remove_member'][phx-value-member_id='#{member1.id}']") + |> render_click() + + # Only member2 should remain + html = render(view) + refute html =~ "Jack" + assert html =~ "Kate" + end + end +end diff --git a/test/mv_web/live/group_live/show_member_search_test.exs b/test/mv_web/live/group_live/show_member_search_test.exs new file mode 100644 index 0000000..75d1803 --- /dev/null +++ b/test/mv_web/live/group_live/show_member_search_test.exs @@ -0,0 +1,339 @@ +defmodule MvWeb.GroupLive.ShowMemberSearchTest do + @moduledoc """ + UI tests for member search functionality in inline Add Member combobox. + Tests search behavior and filtering of members already in group. + """ + + use MvWeb.ConnCase, async: false + import Phoenix.LiveViewTest + use Gettext, backend: MvWeb.Gettext + + alias Mv.Membership + alias Mv.Fixtures + + # Helper to setup authenticated connection for admin + defp setup_admin_conn(conn) do + conn_with_oidc_user(conn, %{email: "admin@example.com"}) + end + + describe "search functionality" do + test "search finds member by exact name", %{conn: conn} do + system_actor = Mv.Helpers.SystemActor.get_system_actor() + conn = setup_admin_conn(conn) + group = Fixtures.group_fixture() + + {:ok, _member} = + Membership.create_member( + %{ + first_name: "Jonathan", + last_name: "Smith", + email: "jonathan.smith@example.com" + }, + actor: system_actor + ) + + {:ok, view, _html} = live(conn, "/groups/#{group.slug}") + + # Open inline input + view + |> element("button", "Add Member") + |> render_click() + + # Type exact name + # phx-change is on the form, so we need to trigger it via the form + view + |> element("form[phx-change='search_members']") + |> render_change(%{"member_search" => "Jonathan"}) + + html = render(view) + + assert html =~ "Jonathan" + assert html =~ "Smith" + end + + test "search finds member by partial name (fuzzy)", %{conn: conn} do + system_actor = Mv.Helpers.SystemActor.get_system_actor() + conn = setup_admin_conn(conn) + group = Fixtures.group_fixture() + + {:ok, _member} = + Membership.create_member( + %{ + first_name: "Jonathan", + last_name: "Smith", + email: "jonathan.smith@example.com" + }, + actor: system_actor + ) + + {:ok, view, _html} = live(conn, "/groups/#{group.slug}") + + # Open inline input + view + |> element("button", "Add Member") + |> render_click() + + # Type partial name + # phx-change is on the form, so we need to trigger it via the form + view + |> element("form[phx-change='search_members']") + |> render_change(%{"member_search" => "Jon"}) + + html = render(view) + + # Fuzzy search should find Jonathan + assert html =~ "Jonathan" + assert html =~ "Smith" + end + + test "search finds member by email", %{conn: conn} do + system_actor = Mv.Helpers.SystemActor.get_system_actor() + conn = setup_admin_conn(conn) + group = Fixtures.group_fixture() + + {:ok, _member} = + Membership.create_member( + %{ + first_name: "Alice", + last_name: "Johnson", + email: "alice.johnson@example.com" + }, + actor: system_actor + ) + + {:ok, view, _html} = live(conn, "/groups/#{group.slug}") + + # Open inline input + view + |> element("button", "Add Member") + |> render_click() + + # Search by email + # phx-change is on the form, so we need to trigger it via the form + view + |> element("form[phx-change='search_members']") + |> render_change(%{"member_search" => "alice.johnson"}) + + html = render(view) + + assert html =~ "Alice" + assert html =~ "Johnson" + assert html =~ "alice.johnson@example.com" + end + + test "dropdown shows member name and email", %{conn: conn} do + system_actor = Mv.Helpers.SystemActor.get_system_actor() + conn = setup_admin_conn(conn) + group = Fixtures.group_fixture() + + {:ok, _member} = + Membership.create_member( + %{ + first_name: "Bob", + last_name: "Williams", + email: "bob@example.com" + }, + actor: system_actor + ) + + {:ok, view, _html} = live(conn, "/groups/#{group.slug}") + + # Open inline input + view + |> element("button", "Add Member") + |> render_click() + + # Focus and search + view + |> element("#member-search-input") + |> render_focus() + + # phx-change is on the form, so we need to trigger it via the form + view + |> element("form[phx-change='search_members']") + |> render_change(%{"member_search" => "Bob"}) + + html = render(view) + + assert html =~ "Bob" + assert html =~ "Williams" + assert html =~ "bob@example.com" + end + + test "ComboBox hook works (focus opens dropdown)", %{conn: conn} do + system_actor = Mv.Helpers.SystemActor.get_system_actor() + conn = setup_admin_conn(conn) + group = Fixtures.group_fixture() + + {:ok, _member} = + Membership.create_member( + %{ + first_name: "Charlie", + last_name: "Brown", + email: "charlie@example.com" + }, + actor: system_actor + ) + + {:ok, view, _html} = live(conn, "/groups/#{group.slug}") + + # Open inline input + view + |> element("button", "Add Member") + |> render_click() + + # Focus input + view + |> element("#member-search-input") + |> render_focus() + + html = render(view) + + # Dropdown should be visible + assert html =~ ~r/role="listbox"/ || html =~ "listbox" + end + end + + describe "filtering members already in group" do + test "members already in group are NOT shown in search results", %{conn: conn} do + system_actor = Mv.Helpers.SystemActor.get_system_actor() + conn = setup_admin_conn(conn) + group = Fixtures.group_fixture() + + # Create member and add to group + {:ok, member_in_group} = + Membership.create_member( + %{ + first_name: "David", + last_name: "Miller", + email: "david@example.com" + }, + actor: system_actor + ) + + Membership.create_member_group(%{member_id: member_in_group.id, group_id: group.id}, + actor: system_actor + ) + + # Create another member NOT in group + {:ok, _member_not_in_group} = + Membership.create_member( + %{ + first_name: "David", + last_name: "Anderson", + email: "david.anderson@example.com" + }, + actor: system_actor + ) + + {:ok, view, _html} = live(conn, "/groups/#{group.slug}") + + # Open inline input + view + |> element("button", "Add Member") + |> render_click() + + # Search for "David" + # phx-change is on the form, so we need to trigger it via the form + view + |> element("form[phx-change='search_members']") + |> render_change(%{"member_search" => "David"}) + + # Assert only on dropdown (available members), not the members table + dropdown_html = view |> element("#member-dropdown") |> render() + assert dropdown_html =~ "Anderson" + refute dropdown_html =~ "Miller" + end + + test "search filters correctly when group has many members", %{conn: conn} do + system_actor = Mv.Helpers.SystemActor.get_system_actor() + conn = setup_admin_conn(conn) + group = Fixtures.group_fixture() + + # Add multiple members to group + Enum.each(1..5, fn i -> + {:ok, m} = + Membership.create_member( + %{ + first_name: "Member#{i}", + last_name: "InGroup", + email: "member#{i}@example.com" + }, + actor: system_actor + ) + + Membership.create_member_group(%{member_id: m.id, group_id: group.id}, + actor: system_actor + ) + end) + + # Create member NOT in group + {:ok, _member_not_in_group} = + Membership.create_member( + %{ + first_name: "Available", + last_name: "Member", + email: "available@example.com" + }, + actor: system_actor + ) + + {:ok, view, _html} = live(conn, "/groups/#{group.slug}") + + # Open inline input + view + |> element("button", "Add Member") + |> render_click() + + # Search + # phx-change is on the form, so we need to trigger it via the form + view + |> element("form[phx-change='search_members']") + |> render_change(%{"member_search" => "Available"}) + + # Assert only on dropdown (available members), not the members table + dropdown_html = view |> element("#member-dropdown") |> render() + assert dropdown_html =~ "Available" + assert dropdown_html =~ "Member" + refute dropdown_html =~ "Member1" + refute dropdown_html =~ "Member2" + end + + test "search shows no results when all available members are already in group", %{conn: conn} do + system_actor = Mv.Helpers.SystemActor.get_system_actor() + conn = setup_admin_conn(conn) + group = Fixtures.group_fixture() + + # Create and add all members to group + {:ok, member} = + Membership.create_member( + %{ + first_name: "Only", + last_name: "Member", + email: "only@example.com" + }, + actor: system_actor + ) + + Membership.create_member_group(%{member_id: member.id, group_id: group.id}, + actor: system_actor + ) + + {:ok, view, _html} = live(conn, "/groups/#{group.slug}") + + # Open inline input + view + |> element("button", "Add Member") + |> render_click() + + # Search + # phx-change is on the form, so we need to trigger it via the form + view + |> element("form[phx-change='search_members']") + |> render_change(%{"member_search" => "Only"}) + + # When no available members, dropdown is not rendered (length(@available_members) == 0) + refute has_element?(view, "#member-dropdown") + end + end +end diff --git a/test/mv_web/live/group_live/show_remove_member_test.exs b/test/mv_web/live/group_live/show_remove_member_test.exs new file mode 100644 index 0000000..d081b50 --- /dev/null +++ b/test/mv_web/live/group_live/show_remove_member_test.exs @@ -0,0 +1,334 @@ +defmodule MvWeb.GroupLive.ShowRemoveMemberTest do + @moduledoc """ + Tests for removing members from groups via the Remove button. + Tests successful remove, edge cases, and immediate removal (no confirmation). + """ + + use MvWeb.ConnCase, async: false + import Phoenix.LiveViewTest + use Gettext, backend: MvWeb.Gettext + + alias Mv.Membership + alias Mv.Fixtures + + describe "successful remove member" do + test "member is removed from group after clicking Remove", %{conn: conn} do + system_actor = Mv.Helpers.SystemActor.get_system_actor() + group = Fixtures.group_fixture() + + {:ok, member} = + Membership.create_member( + %{ + first_name: "Alice", + last_name: "Smith", + email: "alice@example.com" + }, + actor: system_actor + ) + + # Add member to group + Membership.create_member_group(%{member_id: member.id, group_id: group.id}, + actor: system_actor + ) + + {:ok, view, html} = live(conn, "/groups/#{group.slug}") + + # Member should be in list initially + assert html =~ "Alice" + + # Click Remove button + view + |> element("button[phx-click='remove_member'][phx-value-member_id='#{member.id}']") + |> render_click() + + # Member should no longer be in list (no success flash message) + html = render(view) + refute html =~ "Alice" + end + + test "member is successfully removed from group (verified in list)", %{conn: conn} do + system_actor = Mv.Helpers.SystemActor.get_system_actor() + group = Fixtures.group_fixture() + + {:ok, member} = + Membership.create_member( + %{ + first_name: "Bob", + last_name: "Jones", + email: "bob@example.com" + }, + actor: system_actor + ) + + Membership.create_member_group(%{member_id: member.id, group_id: group.id}, + actor: system_actor + ) + + {:ok, view, html} = live(conn, "/groups/#{group.slug}") + + # Member should be in list initially + assert html =~ "Bob" + + # Remove member + view + |> element("button[phx-click='remove_member'][phx-value-member_id='#{member.id}']") + |> render_click() + + html = render(view) + + # Member should no longer be in list (no success flash message) + refute html =~ "Bob" + end + + test "group member list updates automatically after remove", %{conn: conn} do + system_actor = Mv.Helpers.SystemActor.get_system_actor() + group = Fixtures.group_fixture() + + {:ok, member} = + Membership.create_member( + %{ + first_name: "Charlie", + last_name: "Brown", + email: "charlie@example.com" + }, + actor: system_actor + ) + + Membership.create_member_group(%{member_id: member.id, group_id: group.id}, + actor: system_actor + ) + + {:ok, view, html} = live(conn, "/groups/#{group.slug}") + + # Member should be in list initially + assert html =~ "Charlie" + + # Remove member + view + |> element("button[phx-click='remove_member'][phx-value-member_id='#{member.id}']") + |> render_click() + + # Member should no longer be in list + html = render(view) + refute html =~ "Charlie" + end + + test "member count updates automatically after remove", %{conn: conn} do + system_actor = Mv.Helpers.SystemActor.get_system_actor() + group = Fixtures.group_fixture() + + {:ok, member1} = + Membership.create_member( + %{ + first_name: "David", + last_name: "Wilson", + email: "david@example.com" + }, + actor: system_actor + ) + + {:ok, member2} = + Membership.create_member( + %{ + first_name: "Eve", + last_name: "Davis", + email: "eve@example.com" + }, + actor: system_actor + ) + + # Add both members + Membership.create_member_group(%{member_id: member1.id, group_id: group.id}, + actor: system_actor + ) + + Membership.create_member_group(%{member_id: member2.id, group_id: group.id}, + actor: system_actor + ) + + {:ok, view, html} = live(conn, "/groups/#{group.slug}") + + # Get initial count (should be 2) + initial_count = extract_member_count(html) + assert initial_count >= 2 + + # Remove one member (need to get member_id from HTML or use first available) + # For this test, we'll remove the first member + _html_before = render(view) + # Extract first member ID from the rendered HTML or use a different approach + # Since we have member1 and member2, we can target member1 specifically + view + |> element("button[phx-click='remove_member'][phx-value-member_id='#{member1.id}']") + |> render_click() + + # Count should have decreased + html = render(view) + new_count = extract_member_count(html) + assert new_count == initial_count - 1 + end + + test "no confirmation dialog appears (immediate removal)", %{conn: conn} do + system_actor = Mv.Helpers.SystemActor.get_system_actor() + group = Fixtures.group_fixture() + + {:ok, member} = + Membership.create_member( + %{ + first_name: "Frank", + last_name: "Moore", + email: "frank@example.com" + }, + actor: system_actor + ) + + Membership.create_member_group(%{member_id: member.id, group_id: group.id}, + actor: system_actor + ) + + {:ok, view, _html} = live(conn, "/groups/#{group.slug}") + + # Click Remove - should remove immediately without confirmation + view + |> element("button[phx-click='remove_member'][phx-value-member_id='#{member.id}']") + |> render_click() + + # No confirmation dialog should appear (immediate removal) + # This is verified by the member being removed without any dialog + + # Member should be removed + html = render(view) + refute html =~ "Frank" + end + end + + describe "edge cases" do + test "remove works for last member in group (group becomes empty)", %{conn: conn} do + system_actor = Mv.Helpers.SystemActor.get_system_actor() + group = Fixtures.group_fixture() + + {:ok, member} = + Membership.create_member( + %{ + first_name: "Grace", + last_name: "Taylor", + email: "grace@example.com" + }, + actor: system_actor + ) + + Membership.create_member_group(%{member_id: member.id, group_id: group.id}, + actor: system_actor + ) + + {:ok, view, html} = live(conn, "/groups/#{group.slug}") + + # Member should be in list + assert html =~ "Grace" + + # Remove last member + view + |> element("button[phx-click='remove_member'][phx-value-member_id='#{member.id}']") + |> render_click() + + # Group should show empty state + html = render(view) + + assert html =~ gettext("No members in this group") || + html =~ ~r/no.*members/i + + # Count should be 0 + count = extract_member_count(html) + assert count == 0 + end + + test "remove works when member is in multiple groups (only this group affected)", %{ + conn: conn + } do + system_actor = Mv.Helpers.SystemActor.get_system_actor() + group1 = Fixtures.group_fixture() + group2 = Fixtures.group_fixture() + + {:ok, member} = + Membership.create_member( + %{ + first_name: "Henry", + last_name: "Anderson", + email: "henry@example.com" + }, + actor: system_actor + ) + + # Add member to both groups + Membership.create_member_group(%{member_id: member.id, group_id: group1.id}, + actor: system_actor + ) + + Membership.create_member_group(%{member_id: member.id, group_id: group2.id}, + actor: system_actor + ) + + {:ok, view, _html} = live(conn, "/groups/#{group1.slug}") + + # Remove from group1 + view + |> element("button[phx-click='remove_member'][phx-value-member_id='#{member.id}']") + |> render_click() + + # Member should be removed from group1 + html = render(view) + refute html =~ "Henry" + + # Verify member is still in group2 + {:ok, _view2, html2} = live(conn, "/groups/#{group2.slug}") + assert html2 =~ "Henry" + end + + test "remove is idempotent (no error if member already removed)", %{conn: conn} do + system_actor = Mv.Helpers.SystemActor.get_system_actor() + group = Fixtures.group_fixture() + + {:ok, member} = + Membership.create_member( + %{ + first_name: "Isabel", + last_name: "Martinez", + email: "isabel@example.com" + }, + actor: system_actor + ) + + Membership.create_member_group(%{member_id: member.id, group_id: group.id}, + actor: system_actor + ) + + {:ok, view, _html} = live(conn, "/groups/#{group.slug}") + + # Remove member first time + view + |> element("button[phx-click='remove_member'][phx-value-member_id='#{member.id}']") + |> render_click() + + # Try to remove again (should not error, just be idempotent) + # Note: Implementation should handle this gracefully + # If button is still visible somehow, try to click again + html = render(view) + + if html =~ "Isabel" do + view + |> element("button[phx-click='remove_member'][phx-value-member_id='#{member.id}']") + |> render_click() + + # Should not crash + assert render(view) + end + end + end + + # Helper function to extract member count from HTML + defp extract_member_count(html) do + case Regex.run(~r/Total:\s*(\d+)/, html) do + [_, count_str] -> String.to_integer(count_str) + _ -> 0 + end + end +end diff --git a/test/mv_web/live/statistics_live_test.exs b/test/mv_web/live/statistics_live_test.exs new file mode 100644 index 0000000..ed6128f --- /dev/null +++ b/test/mv_web/live/statistics_live_test.exs @@ -0,0 +1,78 @@ +defmodule MvWeb.StatisticsLiveTest do + @moduledoc """ + Tests for the Statistics LiveView at /statistics. + + Uses explicit auth: conn is authenticated with a role that has access to + the statistics page (read_only by default; override with @tag :role). + """ + use MvWeb.ConnCase, async: true + + import Phoenix.LiveViewTest + + alias Mv.MembershipFees.MembershipFeeType + + describe "statistics page" do + @describetag role: :read_only + test "renders statistics page with title and key labels for authenticated user with access", + %{ + conn: conn + } do + {:ok, _view, html} = live(conn, ~p"/statistics") + + assert html =~ "Statistics" + assert html =~ "Active members" + assert html =~ "Unpaid" + assert html =~ "Contributions by year" + assert html =~ "Member numbers by year" + end + + test "page shows overview of all relevant years without year selector", %{conn: conn} do + {:ok, _view, html} = live(conn, ~p"/statistics") + + # No year dropdown: single select for year should not be present as main control + assert html =~ "Overview" or html =~ "overview" + # table header or legend + assert html =~ "Year" + end + + test "fee_type_id in URL updates selected filter and contributions", %{conn: conn} do + actor = Mv.Helpers.SystemActor.get_system_actor() + + fee_types = + MembershipFeeType + |> Ash.Query.sort(name: :asc) + |> Ash.read!(domain: Mv.MembershipFees, actor: actor) + + fee_type = + case List.first(fee_types) do + nil -> + MembershipFeeType + |> Ash.Changeset.for_create(:create, %{ + name: "Test Fee #{System.unique_integer([:positive])}", + amount: Decimal.new("50.00"), + interval: :yearly + }) + |> Ash.create!(actor: actor) + + ft -> + ft + end + + path = ~p"/statistics" <> "?" <> URI.encode_query(%{"fee_type_id" => fee_type.id}) + {:ok, view, html} = live(conn, path) + + assert view |> element("select#fee-type-filter") |> has_element?() + assert html =~ fee_type.name + assert html =~ "Contributions by year" + end + end + + describe "statistics page with own_data role" do + @describetag role: :member + test "redirects when user has only own_data (no access to statistics page)", %{conn: conn} do + # member role uses own_data permission set; /statistics is not in own_data pages + conn = get(conn, ~p"/statistics") + assert redirected_to(conn) != ~p"/statistics" + end + end +end diff --git a/test/mv_web/plugs/check_page_permission_test.exs b/test/mv_web/plugs/check_page_permission_test.exs index 2e33474..e342744 100644 --- a/test/mv_web/plugs/check_page_permission_test.exs +++ b/test/mv_web/plugs/check_page_permission_test.exs @@ -107,6 +107,37 @@ defmodule MvWeb.Plugs.CheckPagePermissionTest do end end + describe "statistics route /statistics" do + test "read_only can access /statistics" do + user = Fixtures.user_with_role_fixture("read_only") + conn = conn_with_user("/statistics", user) |> CheckPagePermission.call([]) + + refute conn.halted + end + + test "normal_user can access /statistics" do + user = Fixtures.user_with_role_fixture("normal_user") + conn = conn_with_user("/statistics", user) |> CheckPagePermission.call([]) + + refute conn.halted + end + + test "admin can access /statistics" do + user = Fixtures.user_with_role_fixture("admin") + conn = conn_with_user("/statistics", user) |> CheckPagePermission.call([]) + + refute conn.halted + end + + test "own_data cannot access /statistics" do + user = Fixtures.user_with_role_fixture("own_data") + conn = conn_with_user("/statistics", user) |> CheckPagePermission.call([]) + + assert conn.halted + assert redirected_to(conn) == "/users/#{user.id}" + end + end + describe "read_only and normal_user denied on admin routes" do test "read_only cannot access /admin/roles" do user = Fixtures.user_with_role_fixture("read_only") diff --git a/test/support/conn_case.ex b/test/support/conn_case.ex index 745be5a..89b6ab0 100644 --- a/test/support/conn_case.ex +++ b/test/support/conn_case.ex @@ -178,6 +178,7 @@ defmodule MvWeb.ConnCase do :read_only -> # Vorstand/Buchhaltung: can read members, groups; cannot edit or access admin/settings read_only_user = Mv.Fixtures.user_with_role_fixture("read_only") + read_only_user = Mv.Authorization.Actor.ensure_loaded(read_only_user) authenticated_conn = conn_with_password_user(conn, read_only_user) {authenticated_conn, read_only_user} diff --git a/test/support/group_live_helpers.ex b/test/support/group_live_helpers.ex new file mode 100644 index 0000000..50e2f9e --- /dev/null +++ b/test/support/group_live_helpers.ex @@ -0,0 +1,59 @@ +defmodule MvWeb.GroupLiveHelpers do + @moduledoc """ + Helpers for Group LiveView tests (e.g. group show add/remove member flow). + + Use these to reduce duplication in tests that open the add member area, + search, select, and add members. + """ + + import Phoenix.LiveViewTest + + @doc """ + Opens the inline add member area by clicking "Add Member". + """ + def open_add_member(view) do + view + |> element("button", "Add Member") + |> render_click() + end + + @doc """ + Triggers member search by focusing the input and sending a form change with the given query. + """ + def search_member(view, query) do + view + |> element("#member-search-input") + |> render_focus() + + view + |> element("form[phx-change='search_members']") + |> render_change(%{"member_search" => query}) + end + + @doc """ + Clicks the option for the given member in the dropdown (by data-member-id). + """ + def select_member(view, member) do + view + |> element("[data-member-id='#{member.id}']") + |> render_click() + end + + @doc """ + Clicks the "Add" button (add_selected_members). + """ + def add_selected(view) do + view + |> element("button[phx-click='add_selected_members']") + |> render_click() + end + + @doc """ + Clicks the "Cancel" button to close the inline add member area. + """ + def cancel_add_member(view) do + view + |> element("button[phx-click='hide_add_member_input']") + |> render_click() + end +end