Account:: namespace simplifications and cleanup (#2110)

* Flatten Holding model

* Flatten balance model

* Entries domain renames

* Fix valuations reference

* Fix trades stream

* Fix brakeman warnings

* Fix tests

* Replace existing entryable type references in DB

.cursor/rules/project-conventions.mdc

@@ -71,7 +71,7 @@ Due to the open-source nature of this project, we have chosen Minitest + Fixture
 
 - Always use Minitest and fixtures for testing.
 - Keep fixtures to a minimum.  Most models should have 2-3 fixtures maximum that represent the "base cases" for that model.  "Edge cases" should be created on the fly, within the context of the test which it is needed.
-- For tests that require a large number of fixture records to be created, use Rails helpers such as [entries_test_helper.rb](mdc:test/support/account/entries_test_helper.rb) to act as a "factory" for creating these.  For a great example of this, check out [forward_calculator_test.rb](mdc:test/models/account/balance/forward_calculator_test.rb)
+- For tests that require a large number of fixture records to be created, use Rails helpers such as [entries_test_helper.rb](mdc:test/support/entries_test_helper.rb) to act as a "factory" for creating these.  For a great example of this, check out [forward_calculator_test.rb](mdc:test/models/account/balance/forward_calculator_test.rb)
 - Take a minimal approach to testing—only test the absolutely critical code paths that will significantly increase developer confidence
 
 #### Convention 5a: Write minimal, effective tests
@@ -87,26 +87,26 @@ Below are examples of necessary vs. unnecessary tests:
 # GOOD!!
 # Necessary test - in this case, we're testing critical domain business logic
 test "syncs balances" do
-  Account::Holding::Syncer.any_instance.expects(:sync_holdings).returns([]).once
+  Holding::Syncer.any_instance.expects(:sync_holdings).returns([]).once
 
   @account.expects(:start_date).returns(2.days.ago.to_date)
 
-  Account::Balance::ForwardCalculator.any_instance.expects(:calculate).returns(
+  Balance::ForwardCalculator.any_instance.expects(:calculate).returns(
     [
-      Account::Balance.new(date: 1.day.ago.to_date, balance: 1000, cash_balance: 1000, currency: "USD"),
-      Account::Balance.new(date: Date.current, balance: 1000, cash_balance: 1000, currency: "USD")
+      Balance.new(date: 1.day.ago.to_date, balance: 1000, cash_balance: 1000, currency: "USD"),
+      Balance.new(date: Date.current, balance: 1000, cash_balance: 1000, currency: "USD")
     ]
   )
 
   assert_difference "@account.balances.count", 2 do
-    Account::Balance::Syncer.new(@account, strategy: :forward).sync_balances
+    Balance::Syncer.new(@account, strategy: :forward).sync_balances
   end
 end
 
 # BAD!!
 # Unnecessary test - in this case, this is simply testing ActiveRecord's functionality
 test "saves balance" do 
-  balance_record = Account::Balance.new(balance: 100, currency: "USD")
+  balance_record = Balance.new(balance: 100, currency: "USD")
 
   assert balance_record.save
 end

.cursor/rules/project-design.mdc

@@ -55,29 +55,29 @@ All balances are calculated daily by [balance_calculator.rb](mdc:app/models/acco
 
 ### Account Holdings
 
-An account [holding.rb](mdc:app/models/account/holding.rb) applies to [investment.rb](mdc:app/models/investment.rb) type accounts and represents a `qty` of a certain [security.rb](mdc:app/models/security.rb) at a specific `price` on a specific `date`.
+An account [holding.rb](mdc:app/models/holding.rb) applies to [investment.rb](mdc:app/models/investment.rb) type accounts and represents a `qty` of a certain [security.rb](mdc:app/models/security.rb) at a specific `price` on a specific `date`.
 
-For investment accounts with holdings, [holding_calculator.rb](mdc:app/models/account/holding_calculator.rb) is used to calculate the daily historical holding quantities and prices, which are then rolled up into a final "Balance" for the account in [balance_calculator.rb](mdc:app/models/account/balance_calculator.rb).
+For investment accounts with holdings, [base_calculator.rb](mdc:app/models/holding/base_calculator.rb) is used to calculate the daily historical holding quantities and prices, which are then rolled up into a final "Balance" for the account in [base_calculator.rb](mdc:app/models/account/balance/base_calculator.rb).
 
 ### Account Entries
 
-An account [entry.rb](mdc:app/models/account/entry.rb) is also a Rails "delegated type".  `Account::Entry` represents any record that _modifies_ an `Account` [balance.rb](mdc:app/models/account/balance.rb) and/or [holding.rb](mdc:app/models/account/holding.rb).  Therefore, every entry must have a `date`, `amount`, and `currency`.
+An account [entry.rb](mdc:app/models/entry.rb) is also a Rails "delegated type".  `Entry` represents any record that _modifies_ an `Account` [balance.rb](mdc:app/models/account/balance.rb) and/or [holding.rb](mdc:app/models/holding.rb).  Therefore, every entry must have a `date`, `amount`, and `currency`.
 
-The `amount` of an [entry.rb](mdc:app/models/account/entry.rb) is a signed value.  A _negative_ amount is an "inflow" of money to that account.  A _positive_ value is an "outflow" of money from that account.  For example:
+The `amount` of an [entry.rb](mdc:app/models/entry.rb) is a signed value.  A _negative_ amount is an "inflow" of money to that account.  A _positive_ value is an "outflow" of money from that account.  For example:
 
 - A negative amount for a credit card account represents a "payment" to that account, which _reduces_ its balance (since it is a `liability`)
 - A negative amount for a checking account represents an "income" to that account, which _increases_ its balance (since it is an `asset`)
 - A negative amount for an investment/brokerage trade represents a "sell" transaction, which _increases_ the cash balance of the account 
 
-There are 3 entry types, defined as [entryable.rb](mdc:app/models/account/entryable.rb) records: 
+There are 3 entry types, defined as [entryable.rb](mdc:app/models/entryable.rb) records: 
 
-- `Account::Valuation` - an account [valuation.rb](mdc:app/models/account/valuation.rb) is an entry that says, "here is the value of this account on this date".  It is an absolute measure of an account value / debt.  If there is an `Account::Valuation` of 5,000 for today's date, that means that the account balance will be 5,000 today.
-- `Account::Transaction` - an account [transaction.rb](mdc:app/models/account/transaction.rb) is an entry that alters the account balance by the `amount`.  This is the most common type of entry and can be thought of as an "income" or "expense".  
-- `Account::Trade` - an account [trade.rb](mdc:app/models/account/trade.rb) is an entry that only applies to an investment account.  This represents a "buy" or "sell" of a holding and has a `qty` and `price`.
+- `Valuation` - an account [valuation.rb](mdc:app/models/valuation.rb) is an entry that says, "here is the value of this account on this date".  It is an absolute measure of an account value / debt.  If there is an `Valuation` of 5,000 for today's date, that means that the account balance will be 5,000 today.
+- `Transaction` - an account [transaction.rb](mdc:app/models/transaction.rb) is an entry that alters the account balance by the `amount`.  This is the most common type of entry and can be thought of as an "income" or "expense".  
+- `Trade` - an account [trade.rb](mdc:app/models/trade.rb) is an entry that only applies to an investment account.  This represents a "buy" or "sell" of a holding and has a `qty` and `price`.
 
 ### Account Transfers
 
-A [transfer.rb](mdc:app/models/transfer.rb) represents a movement of money between two accounts.  A transfer has an inflow [transaction.rb](mdc:app/models/account/transaction.rb) and an outflow [transaction.rb](mdc:app/models/account/transaction.rb).  The Maybe system auto-matches transfers based on the following criteria:
+A [transfer.rb](mdc:app/models/transfer.rb) represents a movement of money between two accounts.  A transfer has an inflow [transaction.rb](mdc:app/models/transaction.rb) and an outflow [transaction.rb](mdc:app/models/transaction.rb).  The Maybe system auto-matches transfers based on the following criteria:
 
 - Must be from different accounts
 - Must be within 4 days of each other
@@ -115,10 +115,10 @@ The most important type of sync is the account sync.  It is orchestrated by the
 
 - Auto-matches transfer records for the account
 - Calculates daily [balance.rb](mdc:app/models/account/balance.rb) records for the account from `account.start_date` to `Date.current` using [base_calculator.rb](mdc:app/models/account/balance/base_calculator.rb)
-  - Balances are dependent on the calculation of [holding.rb](mdc:app/models/account/holding.rb), which uses [base_calculator.rb](mdc:app/models/account/holding/base_calculator.rb) 
+  - Balances are dependent on the calculation of [holding.rb](mdc:app/models/holding.rb), which uses [base_calculator.rb](mdc:app/models/account/holding/base_calculator.rb) 
 - Enriches transaction data if enabled by user
 
-An account sync happens every time an [entry.rb](mdc:app/models/account/entry.rb) is updated.
+An account sync happens every time an [entry.rb](mdc:app/models/entry.rb) is updated.
 
 ### Plaid Item Syncs
 
@@ -126,7 +126,7 @@ A Plaid Item sync is an ETL (extract, transform, load) operation:
 
 1. [plaid_item.rb](mdc:app/models/plaid_item.rb) fetches data from the external Plaid API
 2. [plaid_item.rb](mdc:app/models/plaid_item.rb) creates and loads this data to [plaid_account.rb](mdc:app/models/plaid_account.rb) records
-3. [plaid_item.rb](mdc:app/models/plaid_item.rb) and [plaid_account.rb](mdc:app/models/plaid_account.rb) transform and load data to [account.rb](mdc:app/models/account.rb) and [entry.rb](mdc:app/models/account/entry.rb), the internal Maybe representations of the data.
+3. [plaid_item.rb](mdc:app/models/plaid_item.rb) and [plaid_account.rb](mdc:app/models/plaid_account.rb) transform and load data to [account.rb](mdc:app/models/account.rb) and [entry.rb](mdc:app/models/entry.rb), the internal Maybe representations of the data.
 
 ### Family Syncs