Tweaks to initial calc logic

Author: zachgoll

app/models/account/anchorable.rb

@@ -29,6 +29,10 @@ def current_anchor_balance
     current_balance_manager.current_balance
   end
 
+  def current_anchor_date
+    current_balance_manager.current_date
+  end
+
 
   private
     def opening_balance_manager

app/models/account/current_balance_manager.rb

@@ -18,6 +18,14 @@ def current_balance
     end
   end
 
+  def current_date
+    if current_anchor_valuation
+      current_anchor_valuation.entry.date
+    else
+      Date.current
+    end
+  end
+
   def set_current_balance(balance)
     # A current balance anchor implies there is an external data source that will keep it updated. Since manual accounts
     # are tracked by the user, a current balance anchor is not appropriate.

app/models/balance/forward_calculator.rb

@@ -14,7 +14,7 @@ def calculate
   private
     def calculate_balances
       # Derive initial balances from opening anchor
-      opening_balance = opening_balance_manager.opening_balance
+      opening_balance = account.opening_anchor_balance
 
       if cash_only_account?
         current_cash_balance = opening_balance
@@ -23,7 +23,7 @@ def calculate_balances
         current_cash_balance = 0
         current_non_cash_balance = opening_balance
       else # mixed_account?
-        opening_holdings_value = holdings_value_for_date(opening_balance_manager.opening_date)
+        opening_holdings_value = holdings_value_for_date(account.opening_anchor_date)
         current_cash_balance = opening_balance - opening_holdings_value
         current_non_cash_balance = opening_holdings_value
       end
@@ -87,9 +87,6 @@ def sync_cache
       @sync_cache ||= Balance::SyncCache.new(account)
     end
 
-    def opening_balance_manager
-      @opening_balance_manager ||= Account::OpeningBalanceManager.new(account)
-    end
 
     def holdings_value_for_date(date)
       holdings = sync_cache.get_holdings(date)

test/support/entries_test_helper.rb

@@ -33,6 +33,15 @@ def create_reconciliation_valuation(account:, balance:, date:)
     )
   end
 
+  def create_current_anchor_valuation(account:, balance:, date: Date.current)
+    create_valuation(
+      account: account,
+      kind: "current_anchor",
+      amount: balance,
+      date: date
+    )
+  end
+
   def create_valuation(attributes = {})
     entry_attributes = attributes.except(:kind)
     valuation_attributes = attributes.slice(:kind)