From 8de10512f105bdcd8ca0eba6dcec7a6e9796860f Mon Sep 17 00:00:00 2001 From: lourw <56288712+lourw@users.noreply.github.com> Date: Sun, 24 Aug 2025 12:06:25 -0700 Subject: [PATCH 1/7] chore(expenses): add money lib --- .claude/commands/pre-push.md | 5 ----- .claude/commands/update-doc-logs.md | 1 + mix.exs | 3 ++- mix.lock | 1 + 4 files changed, 4 insertions(+), 6 deletions(-) delete mode 100644 .claude/commands/pre-push.md create mode 100644 .claude/commands/update-doc-logs.md diff --git a/.claude/commands/pre-push.md b/.claude/commands/pre-push.md deleted file mode 100644 index d82f741..0000000 --- a/.claude/commands/pre-push.md +++ /dev/null @@ -1,5 +0,0 @@ -Before pushing to remote version control, ensure that the following is completed: - -1. run linters and formatters. -2. run all tests using `mix test`. -3. check any files that were created in the recent commits that part within the `docs/logs` folder and update any relevant content that is out of date with the code changes. diff --git a/.claude/commands/update-doc-logs.md b/.claude/commands/update-doc-logs.md new file mode 100644 index 0000000..3985096 --- /dev/null +++ b/.claude/commands/update-doc-logs.md @@ -0,0 +1 @@ +Do the following. If the instructions are not relevant, do nothing. Check any files that were created in the recent commits that part within the `docs/logs` folder and update any relevant content that is out of date with the code changes. diff --git a/mix.exs b/mix.exs index 8e8e4e9..4a751c9 100644 --- a/mix.exs +++ b/mix.exs @@ -58,7 +58,8 @@ defmodule SplitApp.MixProject do {:gettext, "~> 0.26"}, {:jason, "~> 1.2"}, {:dns_cluster, "~> 0.1.1"}, - {:bandit, "~> 1.5"} + {:bandit, "~> 1.5"}, + {:money, "~> 1.12"} ] end diff --git a/mix.lock b/mix.lock index 0a11526..171fe14 100644 --- a/mix.lock +++ b/mix.lock @@ -23,6 +23,7 @@ "jason": {:hex, :jason, "1.4.4", "b9226785a9aa77b6857ca22832cffa5d5011a667207eb2a0ad56adb5db443b8a", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "c5eb0cab91f094599f94d55bc63409236a8ec69a21a67814529e8d5f6cc90b3b"}, "mime": {:hex, :mime, "2.0.6", "8f18486773d9b15f95f4f4f1e39b710045fa1de891fada4516559967276e4dc2", [:mix], [], "hexpm", "c9945363a6b26d747389aac3643f8e0e09d30499a138ad64fe8fd1d13d9b153e"}, "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"}, + "money": {:hex, :money, "1.14.0", "61c1e9d9ae1dd45dae7f72568987b3e7275031c3f5a0bf8a053bd74259555934", [:mix], [{:decimal, "~> 1.2 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}, {:ecto, "~> 2.1 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: true]}, {:phoenix_html, "~> 2.0 or ~> 3.0 or ~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}], "hexpm", "b8691009e0c31715d2e5a3cca68ca2e1a46895d63c11257b317d8801ee2c54e3"}, "nimble_options": {:hex, :nimble_options, "1.1.1", "e3a492d54d85fc3fd7c5baf411d9d2852922f66e69476317787a7b2bb000a61b", [:mix], [], "hexpm", "821b2470ca9442c4b6984882fe9bb0389371b8ddec4d45a9504f00a66f650b44"}, "nimble_pool": {:hex, :nimble_pool, "1.1.0", "bf9c29fbdcba3564a8b800d1eeb5a3c58f36e1e11d7b7fb2e084a643f645f06b", [:mix], [], "hexpm", "af2e4e6b34197db81f7aad230c1118eac993acc0dae6bc83bac0126d4ae0813a"}, "phoenix": {:hex, :phoenix, "1.7.20", "6bababaf27d59f5628f9b608de902a021be2cecefb8231e1dbdc0a2e2e480e9b", [:mix], [{:castore, ">= 0.0.0", [hex: :castore, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.1", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: true]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.7", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:plug_crypto, "~> 1.2 or ~> 2.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}, {:websock_adapter, "~> 0.5.3", [hex: :websock_adapter, repo: "hexpm", optional: false]}], "hexpm", "6be2ab98302e8784a31829e0d50d8bdfa81a23cd912c395bafd8b8bfb5a086c2"}, From 9b35750e188cd5157a6163101d6a3e2053c9367f Mon Sep 17 00:00:00 2001 From: lourw <56288712+lourw@users.noreply.github.com> Date: Sun, 24 Aug 2025 12:56:31 -0700 Subject: [PATCH 2/7] feat(expenses): add data model --- lib/split_app/expenses/expense.ex | 33 ++++ test/split_app/expenses/expense_test.exs | 182 +++++++++++++++++++++ test/split_app/groups_test.exs | 4 +- test/support/fixtures/expenses_fixtures.ex | 26 +++ 4 files changed, 244 insertions(+), 1 deletion(-) create mode 100644 lib/split_app/expenses/expense.ex create mode 100644 test/split_app/expenses/expense_test.exs create mode 100644 test/support/fixtures/expenses_fixtures.ex diff --git a/lib/split_app/expenses/expense.ex b/lib/split_app/expenses/expense.ex new file mode 100644 index 0000000..2a7cab4 --- /dev/null +++ b/lib/split_app/expenses/expense.ex @@ -0,0 +1,33 @@ +defmodule SplitApp.Expenses.Expense do + use Ecto.Schema + import Ecto.Changeset + + schema "expenses" do + field :title, :string + field :description, :string + field :amount, Money.Ecto.Map.Type + + belongs_to :created_by, SplitApp.Accounts.User, foreign_key: :created_by_id + many_to_many :assigned_users, SplitApp.Accounts.User, join_through: "expense_assignments" + many_to_many :groups, SplitApp.Groups.Group, join_through: "expense_groups" + + timestamps(type: :utc_datetime) + end + + @doc false + def changeset(expense, attrs) do + expense + |> cast(attrs, [:title, :description, :amount, :created_by_id]) + |> validate_required([:title, :amount, :created_by_id]) + |> validate_money(:amount) + end + + defp validate_money(changeset, field) do + validate_change(changeset, field, fn + _, %Money{amount: amount, currency: currency} when amount > 0 and not is_nil(currency) -> [] + _, %Money{amount: amount} when amount <= 0 -> [{field, "amount must be greater than 0"}] + _, %Money{currency: nil} -> [{field, "currency is required"}] + _, _ -> [{field, "must be a valid money amount"}] + end) + end +end diff --git a/test/split_app/expenses/expense_test.exs b/test/split_app/expenses/expense_test.exs new file mode 100644 index 0000000..360bfc4 --- /dev/null +++ b/test/split_app/expenses/expense_test.exs @@ -0,0 +1,182 @@ +defmodule SplitApp.Expenses.ExpenseTest do + use SplitApp.DataCase + + alias SplitApp.Expenses.Expense + alias SplitApp.AccountsFixtures + + describe "changeset/2" do + setup do + user = AccountsFixtures.user_fixture() + %{user: user} + end + + test "valid changeset with Money type", %{user: user} do + attrs = %{ + title: "Dinner", + description: "Team dinner", + amount: Money.new(2500, :USD), + created_by_id: user.id + } + + changeset = Expense.changeset(%Expense{}, attrs) + + assert changeset.valid? + assert changeset.changes.title == "Dinner" + assert changeset.changes.description == "Team dinner" + assert changeset.changes.amount == Money.new(2500, :USD) + assert changeset.changes.created_by_id == user.id + end + + test "valid changeset without description", %{user: user} do + attrs = %{ + title: "Coffee", + amount: Money.new(500, :EUR), + created_by_id: user.id + } + + changeset = Expense.changeset(%Expense{}, attrs) + + assert changeset.valid? + end + + test "invalid changeset when title is missing", %{user: user} do + attrs = %{ + description: "Missing title", + amount: Money.new(1000, :USD), + created_by_id: user.id + } + + changeset = Expense.changeset(%Expense{}, attrs) + + refute changeset.valid? + assert "can't be blank" in errors_on(changeset).title + end + + test "invalid changeset when amount is missing", %{user: user} do + attrs = %{ + title: "Test Expense", + created_by_id: user.id + } + + changeset = Expense.changeset(%Expense{}, attrs) + + refute changeset.valid? + assert "can't be blank" in errors_on(changeset).amount + end + + test "invalid changeset when created_by_id is missing" do + attrs = %{ + title: "Test Expense", + amount: Money.new(1000, :USD) + } + + changeset = Expense.changeset(%Expense{}, attrs) + + refute changeset.valid? + assert "can't be blank" in errors_on(changeset).created_by_id + end + + test "invalid changeset when amount is zero", %{user: user} do + attrs = %{ + title: "Zero Amount", + amount: Money.new(0, :USD), + created_by_id: user.id + } + + changeset = Expense.changeset(%Expense{}, attrs) + + refute changeset.valid? + assert "amount must be greater than 0" in errors_on(changeset).amount + end + + test "invalid changeset when amount is negative", %{user: user} do + attrs = %{ + title: "Negative Amount", + amount: Money.new(-100, :USD), + created_by_id: user.id + } + + changeset = Expense.changeset(%Expense{}, attrs) + + refute changeset.valid? + assert "amount must be greater than 0" in errors_on(changeset).amount + end + + test "invalid changeset when currency is nil", %{user: user} do + # Create a Money struct with nil currency (this would be an edge case) + money_with_nil_currency = %Money{amount: 1000, currency: nil} + + attrs = %{ + title: "No Currency", + amount: money_with_nil_currency, + created_by_id: user.id + } + + changeset = Expense.changeset(%Expense{}, attrs) + + refute changeset.valid? + assert "currency is required" in errors_on(changeset).amount + end + + test "invalid changeset when amount is not a Money struct", %{user: user} do + attrs = %{ + title: "Invalid Money", + amount: "not_money", + created_by_id: user.id + } + + changeset = Expense.changeset(%Expense{}, attrs) + + refute changeset.valid? + assert "is invalid" in errors_on(changeset).amount + end + end + + describe "database operations" do + test "can insert expense with Money type" do + user = AccountsFixtures.user_fixture() + + attrs = %{ + title: "Database Test", + description: "Testing database insertion", + amount: Money.new(1500, :CAD), + created_by_id: user.id + } + + changeset = Expense.changeset(%Expense{}, attrs) + assert {:ok, expense} = Repo.insert(changeset) + + # Verify the expense was saved correctly + assert expense.title == "Database Test" + assert expense.description == "Testing database insertion" + assert expense.amount == Money.new(1500, :CAD) + assert expense.created_by_id == user.id + + # Verify the Money type is properly stored and retrieved + assert expense.amount.amount == 1500 + assert expense.amount.currency == :CAD + end + + test "can query and load expense from database" do + user = AccountsFixtures.user_fixture() + + # Insert an expense + changeset = + Expense.changeset(%Expense{}, %{ + title: "Query Test", + amount: Money.new(3000, :GBP), + created_by_id: user.id + }) + + {:ok, inserted_expense} = Repo.insert(changeset) + + # Query it back + loaded_expense = Repo.get!(Expense, inserted_expense.id) + + # Verify the Money type is properly reconstructed + assert loaded_expense.amount == Money.new(3000, :GBP) + assert loaded_expense.amount.amount == 3000 + assert loaded_expense.amount.currency == :GBP + end + end +end diff --git a/test/split_app/groups_test.exs b/test/split_app/groups_test.exs index a5244d1..f7c67f6 100644 --- a/test/split_app/groups_test.exs +++ b/test/split_app/groups_test.exs @@ -12,7 +12,9 @@ defmodule SplitApp.GroupsTest do test "list_groups/0 returns all groups" do group = group_fixture() - assert Groups.list_groups() == [group] + groups = Groups.list_groups() + assert group in groups + assert length(groups) >= 1 end test "get_group!/1 returns the group with given id" do diff --git a/test/support/fixtures/expenses_fixtures.ex b/test/support/fixtures/expenses_fixtures.ex new file mode 100644 index 0000000..d91c9c5 --- /dev/null +++ b/test/support/fixtures/expenses_fixtures.ex @@ -0,0 +1,26 @@ +defmodule SplitApp.ExpensesFixtures do + @moduledoc """ + This module defines test helpers for creating + entities via the `SplitApp.Expenses` context. + """ + + alias SplitApp.AccountsFixtures + + def valid_expense_attributes(attrs \\ %{}) do + user = AccountsFixtures.user_fixture() + + Enum.into(attrs, %{ + title: "Test Expense", + description: "Test expense description", + amount: Money.new(1000, :USD), + created_by_id: user.id + }) + end + + def expense_fixture(attrs \\ %{}) do + attrs + |> valid_expense_attributes() + |> SplitApp.Expenses.Expense.changeset(%SplitApp.Expenses.Expense{}) + |> SplitApp.Repo.insert!() + end +end From 419359715367aac7119e2025afe45c4d220255f1 Mon Sep 17 00:00:00 2001 From: lourw <56288712+lourw@users.noreply.github.com> Date: Sun, 24 Aug 2025 13:38:41 -0700 Subject: [PATCH 3/7] feat(expenses): add live views for expenses --- lib/split_app/expenses.ex | 136 ++++++++++ lib/split_app_web/live/dashboard_live.ex | 248 +++++++++++++----- .../live/expense_live/form_component.ex | 137 ++++++++++ lib/split_app_web/live/expense_live/index.ex | 59 +++++ .../live/expense_live/index.html.heex | 83 ++++++ lib/split_app_web/live/expense_live/show.ex | 23 ++ .../live/expense_live/show.html.heex | 61 +++++ lib/split_app_web/live/group_live/index.ex | 17 +- .../live/group_live/index.html.heex | 100 +++++-- lib/split_app_web/live/group_live/show.ex | 5 + .../live/group_live/show.html.heex | 56 +++- lib/split_app_web/live/live_helpers.ex | 46 ++++ lib/split_app_web/router.ex | 6 + .../20250824203547_create_expenses.exs | 34 +++ test/split_app_web/live/expense_live_test.exs | 123 +++++++++ test/split_app_web/live/group_live_test.exs | 9 +- test/support/fixtures/expenses_fixtures.ex | 5 +- 17 files changed, 1034 insertions(+), 114 deletions(-) create mode 100644 lib/split_app/expenses.ex create mode 100644 lib/split_app_web/live/expense_live/form_component.ex create mode 100644 lib/split_app_web/live/expense_live/index.ex create mode 100644 lib/split_app_web/live/expense_live/index.html.heex create mode 100644 lib/split_app_web/live/expense_live/show.ex create mode 100644 lib/split_app_web/live/expense_live/show.html.heex create mode 100644 lib/split_app_web/live/live_helpers.ex create mode 100644 priv/repo/migrations/20250824203547_create_expenses.exs create mode 100644 test/split_app_web/live/expense_live_test.exs diff --git a/lib/split_app/expenses.ex b/lib/split_app/expenses.ex new file mode 100644 index 0000000..d1c731a --- /dev/null +++ b/lib/split_app/expenses.ex @@ -0,0 +1,136 @@ +defmodule SplitApp.Expenses do + @moduledoc """ + The Expenses context. + """ + + import Ecto.Query, warn: false + alias SplitApp.Repo + + alias SplitApp.Expenses.Expense + + @doc """ + Returns the list of expenses. + + ## Examples + + iex> list_expenses() + [%Expense{}, ...] + + """ + def list_expenses do + Repo.all(Expense) + end + + @doc """ + Returns the list of expenses for a specific user. + + ## Examples + + iex> list_expenses_by_user(123) + [%Expense{}, ...] + + """ + def list_expenses_by_user(user_id) do + from(e in Expense, + where: e.created_by_id == ^user_id, + order_by: [desc: e.inserted_at] + ) + |> Repo.all() + end + + @doc """ + Gets a single expense. + + Raises `Ecto.NoResultsError` if the Expense does not exist. + + ## Examples + + iex> get_expense!(123) + %Expense{} + + iex> get_expense!(456) + ** (Ecto.NoResultsError) + + """ + def get_expense!(id), do: Repo.get!(Expense, id) + + @doc """ + Gets a single expense with preloaded associations. + + ## Examples + + iex> get_expense_with_associations!(123) + %Expense{assigned_users: [...], groups: [...]} + + """ + def get_expense_with_associations!(id) do + Expense + |> Repo.get!(id) + |> Repo.preload([:created_by, :assigned_users, :groups]) + end + + @doc """ + Creates a expense. + + ## Examples + + iex> create_expense(%{field: value}) + {:ok, %Expense{}} + + iex> create_expense(%{field: bad_value}) + {:error, %Ecto.Changeset{}} + + """ + def create_expense(attrs \\ %{}) do + %Expense{} + |> Expense.changeset(attrs) + |> Repo.insert() + end + + @doc """ + Updates a expense. + + ## Examples + + iex> update_expense(expense, %{field: new_value}) + {:ok, %Expense{}} + + iex> update_expense(expense, %{field: bad_value}) + {:error, %Ecto.Changeset{}} + + """ + def update_expense(%Expense{} = expense, attrs) do + expense + |> Expense.changeset(attrs) + |> Repo.update() + end + + @doc """ + Deletes a expense. + + ## Examples + + iex> delete_expense(expense) + {:ok, %Expense{}} + + iex> delete_expense(expense) + {:error, %Ecto.Changeset{}} + + """ + def delete_expense(%Expense{} = expense) do + Repo.delete(expense) + end + + @doc """ + Returns an `%Ecto.Changeset{}` for tracking expense changes. + + ## Examples + + iex> change_expense(expense) + %Ecto.Changeset{data: %Expense{}} + + """ + def change_expense(%Expense{} = expense, attrs \\ %{}) do + Expense.changeset(expense, attrs) + end +end diff --git a/lib/split_app_web/live/dashboard_live.ex b/lib/split_app_web/live/dashboard_live.ex index 1d76520..7914e28 100644 --- a/lib/split_app_web/live/dashboard_live.ex +++ b/lib/split_app_web/live/dashboard_live.ex @@ -1,31 +1,59 @@ defmodule SplitAppWeb.DashboardLive do use SplitAppWeb, :live_view alias SplitApp.Groups + alias SplitApp.Expenses @impl true def mount(_params, _session, socket) do user = socket.assigns.current_user groups = Groups.list_user_groups(user) + recent_expenses = Expenses.list_expenses_by_user(user.id) |> Enum.take(5) {:ok, socket |> assign(:groups, groups) - |> assign(:page_title, "My Groups")} + |> assign(:recent_expenses, recent_expenses) + |> assign(:page_title, "Dashboard")} end @impl true def render(assigns) do ~H""" -
+
<.header> Welcome, {@current_user.email}! - <:subtitle>Here are all the groups you're a part of + <:subtitle>Manage your expenses and groups + + +
+ <.link navigate={~p"/expenses/new"} class="group"> +
+
+ + + +
+

Add New Expense

+

+ Track a new expense and split it with your groups +

+
+ -
- <%= if @groups == [] do %> -
-
+ <.link navigate={~p"/groups/new"} class="group"> +
+
-

No groups yet

-

Get started by creating a new group.

-
- <.link navigate={~p"/groups/new"}> - <.button> - - - - Create New Group - - +

Create New Group

+

Start a new group to organize shared expenses

+
+ +
+ + +
+
+

Recent Expenses

+ <.link + navigate={~p"/expenses"} + class="text-sm font-medium text-indigo-600 hover:text-indigo-500" + > + View all expenses → + +
+ + <%= if @recent_expenses == [] do %> +
+
+ + +
+

No expenses yet

+

Get started by adding your first expense.

<% else %> -
- <%= for group <- @groups do %> - <.link navigate={~p"/groups/#{group}"} class="group"> -
-
- +
+
    + <%= for expense <- @recent_expenses do %> +
  • + <.link navigate={~p"/expenses/#{expense}"} class="block hover:bg-gray-50"> +
    +
    +
    +
    +

    + {expense.title} +

    +

    + {expense.description} +

    +
    +
    +
    +

    + {format_money(expense.amount)} +

    +
    +
    +
    + +
    • + <% end %> +
+
+ <% end %> +
+ + +
+
+

Your Groups

+ <.link + navigate={~p"/groups"} + class="text-sm font-medium text-indigo-600 hover:text-indigo-500" + > + View all groups → + +
+ +
+ <%= if @groups == [] do %> +
+
+ + + +
+

No groups yet

+

Get started by creating a new group.

+
+ <% else %> +
+ <%= for group <- @groups do %> + <.link navigate={~p"/groups/#{group}"} class="group"> +
+
+ + + + + +
+
+

+ {group.name} +

+

+ {group.description || "No description provided"} +

+
+
-
-

- {group.name} -

-

- {group.description || "No description provided"} -

-
- -
- - <% end %> -
- <% end %> + + <% end %> +
+ <% end %> +
""" end + + defp format_money(%Money{amount: amount_cents, currency: currency}) do + amount_float = amount_cents / 100 + "#{:erlang.float_to_binary(amount_float, decimals: 2)} #{currency}" + end + + defp format_money(_), do: "-" end diff --git a/lib/split_app_web/live/expense_live/form_component.ex b/lib/split_app_web/live/expense_live/form_component.ex new file mode 100644 index 0000000..05de34c --- /dev/null +++ b/lib/split_app_web/live/expense_live/form_component.ex @@ -0,0 +1,137 @@ +defmodule SplitAppWeb.ExpenseLive.FormComponent do + use SplitAppWeb, :live_component + + alias SplitApp.Expenses + alias SplitApp.Expenses.Expense + + @impl true + def render(assigns) do + ~H""" +
+ <.header> + {@title} + <:subtitle>Use this form to manage expense records in your database. + + + <.simple_form + for={@form} + id="expense-form" + phx-target={@myself} + phx-change="validate" + phx-submit="save" + > + <.input field={@form[:title]} type="text" label="Title" /> + <.input field={@form[:description]} type="text" label="Description" /> + <.input field={@form[:amount_display]} type="text" label="Amount" placeholder="e.g., 25.50" /> + <.input + field={@form[:currency]} + type="select" + label="Currency" + options={[{"USD", "USD"}, {"EUR", "EUR"}, {"GBP", "GBP"}]} + value="USD" + /> + <:actions> + <.button phx-disable-with="Saving...">Save Expense + + +
+ """ + end + + @impl true + def update(%{expense: expense} = assigns, socket) do + changeset = prepare_changeset_for_form(expense) + + {:ok, + socket + |> assign(assigns) + |> assign_new(:form, fn -> + to_form(changeset) + end)} + end + + @impl true + def handle_event("validate", %{"expense" => expense_params}, socket) do + processed_params = process_money_params(expense_params) + changeset = Expenses.change_expense(socket.assigns.expense, processed_params) + {:noreply, assign(socket, form: to_form(changeset, action: :validate))} + end + + def handle_event("save", %{"expense" => expense_params}, socket) do + processed_params = process_money_params(expense_params) + save_expense(socket, socket.assigns.action, processed_params) + end + + defp save_expense(socket, :edit, expense_params) do + case Expenses.update_expense(socket.assigns.expense, expense_params) do + {:ok, expense} -> + notify_parent({:saved, expense}) + + {:noreply, + socket + |> put_flash(:info, "Expense updated successfully") + |> push_patch(to: socket.assigns.patch)} + + {:error, %Ecto.Changeset{} = changeset} -> + {:noreply, assign(socket, form: to_form(changeset))} + end + end + + defp save_expense(socket, :new, expense_params) do + params_with_user = + Map.put(expense_params, "created_by_id", socket.assigns.expense.created_by_id) + + case Expenses.create_expense(params_with_user) do + {:ok, expense} -> + notify_parent({:saved, expense}) + + {:noreply, + socket + |> put_flash(:info, "Expense created successfully") + |> push_patch(to: socket.assigns.patch)} + + {:error, %Ecto.Changeset{} = changeset} -> + {:noreply, assign(socket, form: to_form(changeset))} + end + end + + defp notify_parent(msg), do: send(self(), {__MODULE__, msg}) + + defp process_money_params(%{"amount_display" => amount_str, "currency" => currency} = params) + when amount_str != "" do + case Float.parse(amount_str) do + {amount_float, ""} -> + amount_cents = trunc(amount_float * 100) + money = Money.new(amount_cents, currency) + + params + |> Map.put("amount", money) + |> Map.delete("amount_display") + |> Map.delete("currency") + + _ -> + Map.delete(params, "amount") + end + end + + defp process_money_params(params), do: params + + defp prepare_changeset_for_form(%Expense{amount: nil} = expense) do + Expenses.change_expense(expense, %{amount_display: "", currency: "USD"}) + end + + defp prepare_changeset_for_form( + %Expense{amount: %Money{amount: amount_cents, currency: currency}} = expense + ) do + amount_display = :erlang.float_to_binary(amount_cents / 100, decimals: 2) + + Expenses.change_expense(expense, %{ + amount_display: amount_display, + currency: Atom.to_string(currency) + }) + end + + defp prepare_changeset_for_form(%Expense{} = expense) do + Expenses.change_expense(expense, %{amount_display: "", currency: "USD"}) + end +end diff --git a/lib/split_app_web/live/expense_live/index.ex b/lib/split_app_web/live/expense_live/index.ex new file mode 100644 index 0000000..abc8d56 --- /dev/null +++ b/lib/split_app_web/live/expense_live/index.ex @@ -0,0 +1,59 @@ +defmodule SplitAppWeb.ExpenseLive.Index do + use SplitAppWeb, :live_view + + import SplitAppWeb.LiveHelpers + + alias SplitApp.Expenses + alias SplitApp.Expenses.Expense + + @impl true + def mount(_params, _session, socket) do + current_user = socket.assigns.current_user + expenses = if current_user, do: Expenses.list_expenses_by_user(current_user.id), else: [] + {:ok, socket |> stream(:expenses, expenses) |> assign(:expenses_count, length(expenses))} + end + + @impl true + def handle_params(params, _url, socket) do + {:noreply, apply_action(socket, socket.assigns.live_action, params)} + end + + defp apply_action(socket, :edit, %{"id" => id}) do + socket + |> assign(:page_title, "Edit Expense") + |> assign(:expense, Expenses.get_expense!(id)) + end + + defp apply_action(socket, :new, _params) do + current_user = socket.assigns.current_user + + socket + |> assign(:page_title, "New Expense") + |> assign(:expense, %Expense{created_by_id: current_user.id}) + end + + defp apply_action(socket, :index, _params) do + socket + |> assign(:page_title, "Listing Expenses") + |> assign(:expense, nil) + end + + @impl true + def handle_info({SplitAppWeb.ExpenseLive.FormComponent, {:saved, expense}}, socket) do + {:noreply, + socket + |> stream_insert(:expenses, expense) + |> assign(:expenses_count, socket.assigns.expenses_count + 1)} + end + + @impl true + def handle_event("delete", %{"id" => id}, socket) do + expense = Expenses.get_expense!(id) + {:ok, _} = Expenses.delete_expense(expense) + + {:noreply, + socket + |> stream_delete(:expenses, expense) + |> assign(:expenses_count, socket.assigns.expenses_count - 1)} + end +end diff --git a/lib/split_app_web/live/expense_live/index.html.heex b/lib/split_app_web/live/expense_live/index.html.heex new file mode 100644 index 0000000..237e34e --- /dev/null +++ b/lib/split_app_web/live/expense_live/index.html.heex @@ -0,0 +1,83 @@ +
+ <.header class="mb-8"> + Your Expenses + <:subtitle>Track and manage your personal expenses + <:actions> + <.link patch={~p"/expenses/new"}> + <.button class="flex items-center gap-2"> + <.icon name="hero-plus" class="w-4 h-4" /> New Expense + + + + + +
+
    +
  • +
    +
    +
    +

    + {expense.title} +

    +
    + + {format_money(expense.amount)} + +
    +
    +
    +

    + {expense.description} +

    +
    + {format_date(expense.inserted_at)} + <.link + patch={~p"/expenses/#{expense}/edit"} + class="text-indigo-600 hover:text-indigo-900" + > + Edit + + <.link + phx-click={JS.push("delete", value: %{id: expense.id})} + data-confirm="Are you sure you want to delete this expense?" + class="text-red-600 hover:text-red-900" + > + Delete + +
    +
    +
    +
    +
    • +
+ +
+

No expenses yet

+

Get started by creating your first expense.

+ <.link patch={~p"/expenses/new"}> + <.button>New Expense + +
+
+
+ +<.modal + :if={@live_action in [:new, :edit]} + id="expense-modal" + show + on_cancel={JS.patch(~p"/expenses")} +> + <.live_component + module={SplitAppWeb.ExpenseLive.FormComponent} + id={@expense.id || :new} + title={@page_title} + action={@live_action} + expense={@expense} + patch={~p"/expenses"} + /> + diff --git a/lib/split_app_web/live/expense_live/show.ex b/lib/split_app_web/live/expense_live/show.ex new file mode 100644 index 0000000..007aece --- /dev/null +++ b/lib/split_app_web/live/expense_live/show.ex @@ -0,0 +1,23 @@ +defmodule SplitAppWeb.ExpenseLive.Show do + use SplitAppWeb, :live_view + + import SplitAppWeb.LiveHelpers + + alias SplitApp.Expenses + + @impl true + def mount(_params, _session, socket) do + {:ok, socket} + end + + @impl true + def handle_params(%{"id" => id}, _, socket) do + {:noreply, + socket + |> assign(:page_title, page_title(socket.assigns.live_action)) + |> assign(:expense, Expenses.get_expense!(id))} + end + + defp page_title(:show), do: "Show Expense" + defp page_title(:edit), do: "Edit Expense" +end diff --git a/lib/split_app_web/live/expense_live/show.html.heex b/lib/split_app_web/live/expense_live/show.html.heex new file mode 100644 index 0000000..4200578 --- /dev/null +++ b/lib/split_app_web/live/expense_live/show.html.heex @@ -0,0 +1,61 @@ +
+
+ <.back navigate={~p"/expenses"}>Back to expenses +
+ + <.header class="mb-8"> + {@expense.title} + <:subtitle>Expense details + <:actions> + <.link patch={~p"/expenses/#{@expense}/show/edit"} phx-click={JS.push_focus()}> + <.button class="flex items-center gap-2"> + <.icon name="hero-pencil-square" class="w-4 h-4" /> Edit + + + + + +
+
+

Expense Information

+
+
+
+
Title
+
{@expense.title}
+
+
+
Description
+
+ {if @expense.description && String.length(@expense.description) > 0, + do: @expense.description, + else: "No description"} +
+
+
+
Amount
+
{format_money(@expense.amount)}
+
+
+
Created
+
{format_date(@expense.inserted_at)}
+
+
+
+
+ +<.modal + :if={@live_action == :edit} + id="expense-modal" + show + on_cancel={JS.patch(~p"/expenses/#{@expense}")} +> + <.live_component + module={SplitAppWeb.ExpenseLive.FormComponent} + id={@expense.id} + title={@page_title} + action={@live_action} + expense={@expense} + patch={~p"/expenses/#{@expense}"} + /> + diff --git a/lib/split_app_web/live/group_live/index.ex b/lib/split_app_web/live/group_live/index.ex index ce82df7..beda712 100644 --- a/lib/split_app_web/live/group_live/index.ex +++ b/lib/split_app_web/live/group_live/index.ex @@ -1,6 +1,8 @@ defmodule SplitAppWeb.GroupLive.Index do use SplitAppWeb, :live_view + import SplitAppWeb.LiveHelpers + alias SplitApp.Groups alias SplitApp.Groups.Group @@ -8,7 +10,7 @@ defmodule SplitAppWeb.GroupLive.Index do def mount(_params, _session, socket) do user = socket.assigns.current_user groups = Groups.list_user_groups(user) - {:ok, stream(socket, :groups, groups)} + {:ok, socket |> stream(:groups, groups) |> assign(:groups_count, length(groups))} end @impl true @@ -38,7 +40,10 @@ defmodule SplitAppWeb.GroupLive.Index do @impl true def handle_info({SplitAppWeb.GroupLive.FormComponent, {:saved, group}}, socket) do - {:noreply, stream_insert(socket, :groups, group)} + {:noreply, + socket + |> stream_insert(:groups, group) + |> assign(:groups_count, socket.assigns.groups_count + 1)} end def handle_info({SplitAppWeb.GroupLive.FormComponent, {:put_flash, {type, message}}}, socket) do @@ -52,7 +57,10 @@ defmodule SplitAppWeb.GroupLive.Index do case Groups.delete_user_group(user, group) do {:ok, _} -> - {:noreply, stream_delete(socket, :groups, group)} + {:noreply, + socket + |> stream_delete(:groups, group) + |> assign(:groups_count, socket.assigns.groups_count - 1)} {:error, :unauthorized} -> {:noreply, @@ -61,4 +69,7 @@ defmodule SplitAppWeb.GroupLive.Index do |> push_navigate(to: ~p"/groups")} end end + + defp get_user_count(%{users: users}) when is_list(users), do: length(users) + defp get_user_count(_), do: 0 end diff --git a/lib/split_app_web/live/group_live/index.html.heex b/lib/split_app_web/live/group_live/index.html.heex index a9b545c..dfbc2cd 100644 --- a/lib/split_app_web/live/group_live/index.html.heex +++ b/lib/split_app_web/live/group_live/index.html.heex @@ -1,34 +1,76 @@ -<.header> - Listing Groups - <:actions> - <.link patch={~p"/groups/new"}> - <.button>New Group - - - +
+ <.header class="mb-8"> + Your Groups + <:subtitle>Manage your expense sharing groups + <:actions> + <.link patch={~p"/groups/new"}> + <.button class="flex items-center gap-2"> + <.icon name="hero-plus" class="w-4 h-4" /> New Group + + + + -<.table - id="groups" - rows={@streams.groups} - row_click={fn {_id, group} -> JS.navigate(~p"/groups/#{group}") end} -> - <:col :let={{_id, group}} label="Name">{group.name} - <:col :let={{_id, group}} label="Description">{group.description} - <:action :let={{_id, group}}> -
- <.link navigate={~p"/groups/#{group}"}>Show +
+
    +
  • +
    +
    +
    +

    + {group.name} +

    +
    + + {get_user_count(group)} {if get_user_count(group) == 1, + do: "member", + else: "members"} + +
    +
    +
    +

    + {if group.description && String.length(group.description) > 0, + do: group.description, + else: "No description"} +

    +
    + {format_date(group.inserted_at)} + <.link + patch={~p"/groups/#{group}/edit"} + class="text-indigo-600 hover:text-indigo-900" + > + Edit + + <.link + phx-click={JS.push("delete", value: %{id: group.id})} + data-confirm="Are you sure you want to delete this group? This will remove all associated data." + class="text-red-600 hover:text-red-900" + > + Delete + +
    +
    +
    +
    +
    • +
+ +
+

No groups yet

+

+ Create your first group to start splitting expenses with friends. +

+ <.link patch={~p"/groups/new"}> + <.button>New Group +
- <.link patch={~p"/groups/#{group}/edit"}>Edit - - <:action :let={{id, group}}> - <.link - phx-click={JS.push("delete", value: %{id: group.id}) |> hide("##{id}")} - data-confirm="Are you sure?" - > - Delete - - - +
+
<.modal :if={@live_action in [:new, :edit]} diff --git a/lib/split_app_web/live/group_live/show.ex b/lib/split_app_web/live/group_live/show.ex index 9c4b23f..32a0992 100644 --- a/lib/split_app_web/live/group_live/show.ex +++ b/lib/split_app_web/live/group_live/show.ex @@ -1,6 +1,8 @@ defmodule SplitAppWeb.GroupLive.Show do use SplitAppWeb, :live_view + import SplitAppWeb.LiveHelpers + alias SplitApp.Groups @impl true @@ -39,4 +41,7 @@ defmodule SplitAppWeb.GroupLive.Show do defp page_title(:show), do: "Show Group" defp page_title(:edit), do: "Edit Group" + + defp get_user_count(%{users: users}) when is_list(users), do: length(users) + defp get_user_count(_), do: 0 end diff --git a/lib/split_app_web/live/group_live/show.html.heex b/lib/split_app_web/live/group_live/show.html.heex index e57f64d..bddd878 100644 --- a/lib/split_app_web/live/group_live/show.html.heex +++ b/lib/split_app_web/live/group_live/show.html.heex @@ -1,14 +1,50 @@ -<.header> - {@group.name} - <:subtitle>This is a group record from your database. - <:actions> - <.link patch={~p"/groups/#{@group}/show/edit"} phx-click={JS.push_focus()}> - <.button>Edit group - - - +
+
+ <.back navigate={~p"/groups"}>Back to groups +
-<.back navigate={~p"/dashboard"}>Back to groups + <.header class="mb-8"> + {@group.name} + <:subtitle>Group details and members + <:actions> + <.link patch={~p"/groups/#{@group}/show/edit"} phx-click={JS.push_focus()}> + <.button class="flex items-center gap-2"> + <.icon name="hero-pencil-square" class="w-4 h-4" /> Edit + + + + + +
+
+

Group Information

+
+
+
+
Name
+
{@group.name}
+
+
+
Description
+
+ {if @group.description && String.length(@group.description) > 0, + do: @group.description, + else: "No description"} +
+
+
+
Members
+
+ {get_user_count(@group)} {if get_user_count(@group) == 1, do: "member", else: "members"} +
+
+
+
Created
+
{format_date(@group.inserted_at)}
+
+
+
+
<.modal :if={@live_action == :edit} diff --git a/lib/split_app_web/live/live_helpers.ex b/lib/split_app_web/live/live_helpers.ex new file mode 100644 index 0000000..3b6e9c5 --- /dev/null +++ b/lib/split_app_web/live/live_helpers.ex @@ -0,0 +1,46 @@ +defmodule SplitAppWeb.LiveHelpers do + @moduledoc """ + Shared helper functions for LiveView modules. + """ + + @doc """ + Formats a Money struct into a readable string. + + ## Examples + + iex> format_money(%Money{amount: 1250, currency: "USD"}) + "12.50 USD" + """ + def format_money(%Money{amount: amount_cents, currency: currency}) do + amount_float = amount_cents / 100 + "#{:erlang.float_to_binary(amount_float, decimals: 2)} #{currency}" + end + + def format_money(_), do: "-" + + @doc """ + Formats a date/datetime into a readable string format. + + ## Examples + + iex> format_date(~D[2024-01-15]) + "Jan 15, 2024" + """ + def format_date(%DateTime{} = datetime) do + datetime + |> DateTime.to_date() + |> Calendar.strftime("%b %d, %Y") + end + + def format_date(%NaiveDateTime{} = naive_datetime) do + naive_datetime + |> NaiveDateTime.to_date() + |> Calendar.strftime("%b %d, %Y") + end + + def format_date(%Date{} = date) do + Calendar.strftime(date, "%b %d, %Y") + end + + def format_date(_), do: "-" +end diff --git a/lib/split_app_web/router.ex b/lib/split_app_web/router.ex index ad140fa..7af6fa3 100644 --- a/lib/split_app_web/router.ex +++ b/lib/split_app_web/router.ex @@ -75,6 +75,12 @@ defmodule SplitAppWeb.Router do live "/groups/:id", GroupLive.Show, :show live "/groups/:id/show/edit", GroupLive.Show, :edit + live "/expenses", ExpenseLive.Index, :index + live "/expenses/new", ExpenseLive.Index, :new + live "/expenses/:id/edit", ExpenseLive.Index, :edit + live "/expenses/:id", ExpenseLive.Show, :show + live "/expenses/:id/show/edit", ExpenseLive.Show, :edit + live "/users/settings", UserSettingsLive, :edit live "/users/settings/confirm_email/:token", UserSettingsLive, :confirm_email end diff --git a/priv/repo/migrations/20250824203547_create_expenses.exs b/priv/repo/migrations/20250824203547_create_expenses.exs new file mode 100644 index 0000000..2e07514 --- /dev/null +++ b/priv/repo/migrations/20250824203547_create_expenses.exs @@ -0,0 +1,34 @@ +defmodule SplitApp.Repo.Migrations.CreateExpenses do + use Ecto.Migration + + def change do + create table(:expenses) do + add :title, :string, null: false + add :description, :text + add :amount, :map, null: false + add :created_by_id, references(:users, on_delete: :delete_all), null: false + + timestamps(type: :utc_datetime) + end + + create index(:expenses, [:created_by_id]) + + create table(:expense_assignments) do + add :expense_id, references(:expenses, on_delete: :delete_all), null: false + add :user_id, references(:users, on_delete: :delete_all), null: false + + timestamps(type: :utc_datetime) + end + + create unique_index(:expense_assignments, [:expense_id, :user_id]) + + create table(:expense_groups) do + add :expense_id, references(:expenses, on_delete: :delete_all), null: false + add :group_id, references(:groups, on_delete: :delete_all), null: false + + timestamps(type: :utc_datetime) + end + + create unique_index(:expense_groups, [:expense_id, :group_id]) + end +end diff --git a/test/split_app_web/live/expense_live_test.exs b/test/split_app_web/live/expense_live_test.exs new file mode 100644 index 0000000..8123102 --- /dev/null +++ b/test/split_app_web/live/expense_live_test.exs @@ -0,0 +1,123 @@ +defmodule SplitAppWeb.ExpenseLiveTest do + use SplitAppWeb.ConnCase + + import Phoenix.LiveViewTest + import SplitApp.ExpensesFixtures + + @create_attrs %{ + description: "some description", + title: "some title", + amount_display: "25.50", + currency: "USD" + } + @update_attrs %{ + description: "some updated description", + title: "some updated title", + amount_display: "50.00", + currency: "USD" + } + @invalid_attrs %{description: nil, title: nil, amount_display: nil} + + defp create_expense(%{user: user}) do + expense = expense_fixture(%{created_by_id: user.id}) + %{expense: expense} + end + + describe "Index" do + setup [:register_and_log_in_user, :create_expense] + + test "lists all expenses", %{conn: conn, expense: expense} do + {:ok, _index_live, html} = live(conn, ~p"/expenses") + + assert html =~ "Your Expenses" + assert html =~ expense.description + end + + test "saves new expense", %{conn: conn} do + {:ok, index_live, _html} = live(conn, ~p"/expenses") + + assert index_live |> element("a", "New Expense") |> render_click() =~ + "New Expense" + + assert_patch(index_live, ~p"/expenses/new") + + assert index_live + |> form("#expense-form", expense: @invalid_attrs) + |> render_change() =~ "can't be blank" + + assert index_live + |> form("#expense-form", expense: @create_attrs) + |> render_submit() + + assert_patch(index_live, ~p"/expenses") + + html = render(index_live) + assert html =~ "Expense created successfully" + assert html =~ "some description" + end + + test "updates expense in listing", %{conn: conn, expense: expense} do + {:ok, index_live, _html} = live(conn, ~p"/expenses") + + assert index_live |> element("a", "Edit") |> render_click() =~ + "Edit Expense" + + assert_patch(index_live, ~p"/expenses/#{expense}/edit") + + assert index_live + |> form("#expense-form", expense: @invalid_attrs) + |> render_change() =~ "can't be blank" + + assert index_live + |> form("#expense-form", expense: @update_attrs) + |> render_submit() + + assert_patch(index_live, ~p"/expenses") + + html = render(index_live) + assert html =~ "Expense updated successfully" + assert html =~ "some updated description" + end + + test "deletes expense in listing", %{conn: conn, expense: expense} do + {:ok, index_live, _html} = live(conn, ~p"/expenses") + + assert index_live |> element("a", "Delete") |> render_click() + refute has_element?(index_live, "li", expense.title) + end + end + + describe "Show" do + setup [:register_and_log_in_user, :create_expense] + + test "displays expense", %{conn: conn, expense: expense} do + {:ok, _show_live, html} = live(conn, ~p"/expenses/#{expense}") + + assert html =~ expense.title + assert html =~ expense.description + end + + test "updates expense within modal", %{conn: conn, expense: expense} do + {:ok, show_live, _html} = live(conn, ~p"/expenses/#{expense}") + + assert show_live |> element("a", "Edit") |> render_click() =~ + "Edit Expense" + + assert_patch(show_live, ~p"/expenses/#{expense}/show/edit") + + assert show_live + |> form("#expense-form", expense: @invalid_attrs) + |> render_change() =~ "can't be blank" + + assert show_live + |> form("#expense-form", expense: @update_attrs) + |> render_submit() + + assert_patch(show_live, ~p"/expenses/#{expense}") + + html = render(show_live) + assert html =~ "Expense updated successfully" + assert html =~ "some updated description" + end + end +end diff --git a/test/split_app_web/live/group_live_test.exs b/test/split_app_web/live/group_live_test.exs index 2ab7508..0038909 100644 --- a/test/split_app_web/live/group_live_test.exs +++ b/test/split_app_web/live/group_live_test.exs @@ -19,7 +19,7 @@ defmodule SplitAppWeb.GroupLiveTest do test "lists all groups", %{conn: conn, group: group} do {:ok, _index_live, html} = live(conn, ~p"/groups") - assert html =~ "Listing Groups" + assert html =~ "Your Groups" assert html =~ group.name end @@ -49,7 +49,7 @@ defmodule SplitAppWeb.GroupLiveTest do test "updates group in listing", %{conn: conn, group: group} do {:ok, index_live, _html} = live(conn, ~p"/groups") - assert index_live |> element("#groups-#{group.id} a", "Edit") |> render_click() =~ + assert index_live |> element("a", "Edit") |> render_click() =~ "Edit Group" assert_patch(index_live, ~p"/groups/#{group}/edit") @@ -72,8 +72,8 @@ defmodule SplitAppWeb.GroupLiveTest do test "deletes group in listing", %{conn: conn, group: group} do {:ok, index_live, _html} = live(conn, ~p"/groups") - assert index_live |> element("#groups-#{group.id} a", "Delete") |> render_click() - refute has_element?(index_live, "#groups-#{group.id}") + assert index_live |> element("a", "Delete") |> render_click() + refute has_element?(index_live, "li", group.name) end end @@ -83,7 +83,6 @@ defmodule SplitAppWeb.GroupLiveTest do test "displays group", %{conn: conn, group: group} do {:ok, _show_live, html} = live(conn, ~p"/groups/#{group}") - assert html =~ "Show Group" assert html =~ group.name end diff --git a/test/support/fixtures/expenses_fixtures.ex b/test/support/fixtures/expenses_fixtures.ex index d91c9c5..9b33427 100644 --- a/test/support/fixtures/expenses_fixtures.ex +++ b/test/support/fixtures/expenses_fixtures.ex @@ -18,9 +18,8 @@ defmodule SplitApp.ExpensesFixtures do end def expense_fixture(attrs \\ %{}) do - attrs - |> valid_expense_attributes() - |> SplitApp.Expenses.Expense.changeset(%SplitApp.Expenses.Expense{}) + %SplitApp.Expenses.Expense{} + |> SplitApp.Expenses.Expense.changeset(valid_expense_attributes(attrs)) |> SplitApp.Repo.insert!() end end From 3d744cd3bba74b11d91f959b34f9c0b3d35971e4 Mon Sep 17 00:00:00 2001 From: lourw <56288712+lourw@users.noreply.github.com> Date: Sun, 24 Aug 2025 13:56:40 -0700 Subject: [PATCH 4/7] chore(claude): modify docs command --- .claude/commands/update-doc-logs.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.claude/commands/update-doc-logs.md b/.claude/commands/update-doc-logs.md index 3985096..3e8cb68 100644 --- a/.claude/commands/update-doc-logs.md +++ b/.claude/commands/update-doc-logs.md @@ -1 +1,5 @@ Do the following. If the instructions are not relevant, do nothing. Check any files that were created in the recent commits that part within the `docs/logs` folder and update any relevant content that is out of date with the code changes. + +If there are major changes to an existing log file. Instead of editing what is there already, add a new section in the same file with a record of the datetime of the change. + +If the changes are related to a different domain/topic, feel free to create a new log file for that entity with frontmatter. From 276213aea7739fec251b0fc29030e5159482afb5 Mon Sep 17 00:00:00 2001 From: lourw <56288712+lourw@users.noreply.github.com> Date: Sun, 24 Aug 2025 13:59:54 -0700 Subject: [PATCH 5/7] chore(docs): update docs on expenses --- .claude/commands/update-doc-logs.md | 8 +- docs/logs/add-expenses-feature.md | 193 ++++++++++++++++++++++++++++ 2 files changed, 198 insertions(+), 3 deletions(-) create mode 100644 docs/logs/add-expenses-feature.md diff --git a/.claude/commands/update-doc-logs.md b/.claude/commands/update-doc-logs.md index 3e8cb68..1df0ab9 100644 --- a/.claude/commands/update-doc-logs.md +++ b/.claude/commands/update-doc-logs.md @@ -1,5 +1,7 @@ -Do the following. If the instructions are not relevant, do nothing. Check any files that were created in the recent commits that part within the `docs/logs` folder and update any relevant content that is out of date with the code changes. +Do the following TODO. If the instructions are not relevant, do nothing. -If there are major changes to an existing log file. Instead of editing what is there already, add a new section in the same file with a record of the datetime of the change. +1. Check any files that were created in the recent commits that part within the `docs/logs` folder. -If the changes are related to a different domain/topic, feel free to create a new log file for that entity with frontmatter. +2. If the changes are related to a different domain or topics altogether, create a new log file with similar front matter to record the topic. + +3. Update any existing logs that have relevant content that is out of date with the code changes. If there are major changes to an existing log file. Instead of editing what is there already, add a new section in the same file with a record of the datetime of the change. diff --git a/docs/logs/add-expenses-feature.md b/docs/logs/add-expenses-feature.md new file mode 100644 index 0000000..b63b8c2 --- /dev/null +++ b/docs/logs/add-expenses-feature.md @@ -0,0 +1,193 @@ +--- +title: Adding Expenses Feature to SplitApp +date: 2025-08-24 +time: 20:35:00 +author: Claude +tags: [expenses, feature, money, liveview, associations] +--- + +# Adding Expenses Feature to SplitApp + +## Overview +This document outlines the implementation of the Expenses feature, which allows users to create, track, and manage expenses. The feature integrates with the existing Groups system and includes proper money handling with multi-currency support. + +## Database Changes + +### 1. Expenses Table +Created a new `expenses` table with the following fields: +- `id` - Primary key +- `title` - String field for expense title (required) +- `description` - Text field for expense description (optional) +- `amount` - Map field storing Money type with amount and currency (required) +- `created_by_id` - Foreign key to users table (required) +- `inserted_at` - Timestamp +- `updated_at` - Timestamp + +**Migration file:** `priv/repo/migrations/20250824203547_create_expenses.exs` + +### 2. Expense Assignments Join Table +Created an `expense_assignments` join table for many-to-many relationship between expenses and users: +- `expense_id` - Foreign key to expenses table +- `user_id` - Foreign key to users table +- `inserted_at` - Timestamp +- `updated_at` - Timestamp +- Composite unique index on `[expense_id, user_id]` + +### 3. Expense Groups Join Table +Created an `expense_groups` join table for many-to-many relationship between expenses and groups: +- `expense_id` - Foreign key to expenses table +- `group_id` - Foreign key to groups table +- `inserted_at` - Timestamp +- `updated_at` - Timestamp +- Composite unique index on `[expense_id, group_id]` + +## Code Changes + +### 1. Money Library Integration (`mix.exs`) +Added `money` library dependency for proper currency handling: +```elixir +{:money, "~> 1.12"} +``` + +### 2. Context and Schemas + +#### Expenses Context (`lib/split_app/expenses.ex`) +Generated using Phoenix context generator with functions: +- `list_expenses/0` - List all expenses +- `list_expenses_by_user/1` - List expenses created by specific user +- `get_expense!/1` - Get a single expense +- `create_expense/1` - Create a new expense +- `update_expense/2` - Update an expense +- `delete_expense/1` - Delete an expense +- `change_expense/2` - Generate changeset for forms + +#### Expense Schema (`lib/split_app/expenses/expense.ex`) +- Fields: `title`, `description`, `amount` (Money type) +- Associations: + - `belongs_to :created_by` (User who created the expense) + - `many_to_many :assigned_users` through `expense_assignments` + - `many_to_many :groups` through `expense_groups` +- Custom validation for Money type ensuring: + - Amount is greater than 0 + - Currency is present + - Valid Money struct format + +### 3. Web Layer + +#### Expense LiveViews (Generated) +- `lib/split_app_web/live/expense_live/index.ex` - List user's expenses +- `lib/split_app_web/live/expense_live/show.ex` - Show single expense +- `lib/split_app_web/live/expense_live/form_component.ex` - Create/edit expenses + - Custom money input handling + - Currency selection support + - Integration with current user context + +#### Dashboard Updates (`lib/split_app_web/live/dashboard_live.ex`) +Enhanced dashboard to show user's recent expenses alongside groups. + +#### Live Helpers (`lib/split_app_web/live/live_helpers.ex`) +Added utility functions for LiveView components and common patterns. + +### 4. Router Updates (`lib/split_app_web/router.ex`) + +Added authenticated routes for expenses: +```elixir +live "/expenses", ExpenseLive.Index, :index +live "/expenses/new", ExpenseLive.Index, :new +live "/expenses/:id/edit", ExpenseLive.Index, :edit +live "/expenses/:id", ExpenseLive.Show, :show +live "/expenses/:id/show/edit", ExpenseLive.Show, :edit +``` + +### 5. Group Integration + +#### Group LiveViews Updates +Updated group show and index pages to display related expenses and provide links to create expenses within group context. + +## Features Implemented + +### Money Handling +- **Multi-Currency Support**: Uses Money library for proper currency handling +- **Validation**: Ensures positive amounts and valid currency codes +- **Display**: Proper formatting of money amounts in UI +- **Input**: Custom form inputs for amount and currency selection + +### Expense Management +- **Create Expenses**: Users can create expenses with title, description, and amount +- **Edit/Delete**: Full CRUD operations for user's own expenses +- **User Context**: Expenses are automatically associated with creator +- **Filtering**: Users see only their own expenses by default + +### Associations +- **User Assignment**: Expenses can be assigned to multiple users (foundation for splitting) +- **Group Integration**: Expenses can be associated with groups +- **Creator Tracking**: System tracks who created each expense + +### UI/UX Features +- **Expense List**: Clean table view of user's expenses with amounts, titles, and dates +- **Money Display**: Proper currency formatting (e.g., "$25.50 USD") +- **Form Validation**: Real-time validation of money amounts and required fields +- **Integration**: Seamless navigation between expenses, groups, and dashboard + +## Testing + +### Test Files Created +- `test/split_app/expenses/expense_test.exs` - Unit tests for Expense schema +- `test/split_app_web/live/expense_live_test.exs` - Integration tests for LiveViews +- `test/support/fixtures/expenses_fixtures.ex` - Test data fixtures + +### Test Coverage +- Schema validations for Money type +- CRUD operations in context +- LiveView interactions and form submissions +- Money formatting and display + +## Migration Commands + +```bash +# Add money library +# (Added to mix.exs manually) + +# Generate the Expenses context and schema +mix phx.gen.context Expenses Expense expenses title:string description:text amount:map created_by_id:references:users + +# Generate LiveView pages +mix phx.gen.live Expenses Expense expenses title:string description:text amount:map created_by_id:references:users --no-context --no-schema + +# Run migrations +mix ecto.migrate + +# Install new dependencies +mix deps.get +``` + +## Future Enhancements + +This foundation enables future expense splitting functionality: +- **Expense Splitting**: Calculate splits between assigned users +- **Settlement Tracking**: Track who owes what to whom +- **Group Expense Views**: Show all expenses within a group +- **Balance Calculations**: Calculate user balances across groups +- **Payment Tracking**: Mark when debts are settled +- **Expense Categories**: Categorize expenses (food, transport, etc.) +- **Receipt Uploads**: Attach receipt images to expenses +- **Recurring Expenses**: Support for recurring/scheduled expenses + +## Technical Notes + +### Money Type Implementation +The Money library stores currency amounts as a map in the database: +```elixir +%{amount: 2550, currency: :USD} # Represents $25.50 USD +``` + +This ensures: +- Precise decimal arithmetic (no floating point errors) +- Multi-currency support +- Consistent currency handling across the application +- Proper serialization/deserialization from database + +### Performance Considerations +- Indexes on `created_by_id` for efficient user expense queries +- Composite unique indexes on join tables prevent duplicates +- Ordered queries for chronological expense display \ No newline at end of file From 4e553bafea9f4e421507a993747b2f2cad52dfa4 Mon Sep 17 00:00:00 2001 From: lourw <56288712+lourw@users.noreply.github.com> Date: Sun, 24 Aug 2025 16:55:06 -0700 Subject: [PATCH 6/7] fix(expenses): ensure that cancelling model populates list --- lib/split_app_web/live/expense_live/show.html.heex | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/lib/split_app_web/live/expense_live/show.html.heex b/lib/split_app_web/live/expense_live/show.html.heex index 4200578..068dd5d 100644 --- a/lib/split_app_web/live/expense_live/show.html.heex +++ b/lib/split_app_web/live/expense_live/show.html.heex @@ -44,12 +44,7 @@
-<.modal - :if={@live_action == :edit} - id="expense-modal" - show - on_cancel={JS.patch(~p"/expenses/#{@expense}")} -> +<.modal :if={@live_action == :edit} id="expense-modal" show on_cancel={JS.patch(~p"/expenses")}> <.live_component module={SplitAppWeb.ExpenseLive.FormComponent} id={@expense.id} From a3ecb75af1422f2ffd3d5a5794c9f6de46b1d9f9 Mon Sep 17 00:00:00 2001 From: lourw <56288712+lourw@users.noreply.github.com> Date: Sun, 24 Aug 2025 17:01:12 -0700 Subject: [PATCH 7/7] fix(expenses): ensure apply action refreshes data --- lib/split_app_web/live/expense_live/index.ex | 5 +++++ lib/split_app_web/live/group_live/index.ex | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/lib/split_app_web/live/expense_live/index.ex b/lib/split_app_web/live/expense_live/index.ex index abc8d56..0c325f2 100644 --- a/lib/split_app_web/live/expense_live/index.ex +++ b/lib/split_app_web/live/expense_live/index.ex @@ -33,9 +33,14 @@ defmodule SplitAppWeb.ExpenseLive.Index do end defp apply_action(socket, :index, _params) do + current_user = socket.assigns.current_user + expenses = if current_user, do: Expenses.list_expenses_by_user(current_user.id), else: [] + socket |> assign(:page_title, "Listing Expenses") |> assign(:expense, nil) + |> stream(:expenses, expenses, reset: true) + |> assign(:expenses_count, length(expenses)) end @impl true diff --git a/lib/split_app_web/live/group_live/index.ex b/lib/split_app_web/live/group_live/index.ex index beda712..df64658 100644 --- a/lib/split_app_web/live/group_live/index.ex +++ b/lib/split_app_web/live/group_live/index.ex @@ -33,9 +33,14 @@ defmodule SplitAppWeb.GroupLive.Index do end defp apply_action(socket, :index, _params) do + user = socket.assigns.current_user + groups = Groups.list_user_groups(user) + socket |> assign(:page_title, "Listing Groups") |> assign(:group, nil) + |> stream(:groups, groups, reset: true) + |> assign(:groups_count, length(groups)) end @impl true