QT/sure
1
0
Fork 0
mirror of https://github.com/we-promise/sure.git synced 2026-04-19 20:14:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove exclude_from_cashflow flag and consolidate logic into excluded toggle

Browse Source 
- Removed `exclude_from_cashflow` attribute across models, controllers, and views.
- Updated queries to rely solely on the `excluded` flag for filtering transactions and entries.
- Simplified migration by consolidating `exclude_from_cashflow` functionality into the existing `excluded` toggle.
- Refactored related tests to remove outdated logic and ensured compatibility with the updated implementation.
This commit is contained in:
Josh Waldrep
2026-01-12 15:10:33 -05:00
parent cfda5a6d3d
commit 582eda999b
12 changed files with 13 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
test/models/income_statement_test.rb
View File

@@ -286,35 +286,6 @@ class IncomeStatementTest < ActiveSupport::TestCase
assert_equal Money.new(1050, @family.currency), totals.expense_money # 900 + 150
end
# NEW TESTS: exclude_from_cashflow Feature
test "excludes transactions with exclude_from_cashflow flag from totals" do
# Create an expense transaction and mark it as excluded from cashflow
excluded_entry = create_transaction(account: @checking_account, amount: 250, category: @groceries_category)
excluded_entry.update!(exclude_from_cashflow: true)
income_statement = IncomeStatement.new(@family)
totals = income_statement.totals(date_range: Period.last_30_days.date_range)
# Should NOT include the excluded transaction
assert_equal 4, totals.transactions_count # Only original 4 transactions
assert_equal Money.new(1000, @family.currency), totals.income_money
assert_equal Money.new(900, @family.currency), totals.expense_money
end
test "excludes income transactions with exclude_from_cashflow flag" do
# Create income and mark as excluded from cashflow
excluded_income = create_transaction(account: @checking_account, amount: -500, category: @income_category)
excluded_income.update!(exclude_from_cashflow: true)
income_statement = IncomeStatement.new(@family)
totals = income_statement.totals(date_range: Period.last_30_days.date_range)
# Should NOT include the excluded income
assert_equal 4, totals.transactions_count
assert_equal Money.new(1000, @family.currency), totals.income_money # Original income only
assert_equal Money.new(900, @family.currency), totals.expense_money
end
test "excludes investment_contribution transactions from income statement" do
# Create a transfer to investment account (marked as investment_contribution)
investment_contribution = create_transaction(
@@ -332,23 +303,4 @@ class IncomeStatementTest < ActiveSupport::TestCase
assert_equal Money.new(1000, @family.currency), totals.income_money
assert_equal Money.new(900, @family.currency), totals.expense_money
end
test "exclude_from_cashflow works with median calculations" do
# Clear existing transactions
Entry.joins(:account).where(accounts: { family_id: @family.id }).destroy_all
# Create expenses: 100, 200, 300
create_transaction(account: @checking_account, amount: 100, category: @groceries_category)
create_transaction(account: @checking_account, amount: 200, category: @groceries_category)
excluded_entry = create_transaction(account: @checking_account, amount: 300, category: @groceries_category)
# Exclude the 300 transaction from cashflow
excluded_entry.update!(exclude_from_cashflow: true)
income_statement = IncomeStatement.new(@family)
# Median should only consider non-excluded transactions (100, 200)
# Monthly total = 300, so median = 300.0
assert_equal 300.0, income_statement.median_expense(interval: "month")
end
end