kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Correct account balances better.

Browse Source
This commit is contained in:
James Cole
2024-05-12 18:24:38 +02:00
parent 45e9d4f8de
commit 04fe5d1fc4
5 changed files with 75 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
app/Support/Models/AccountBalanceCalculator.php
View File

@@ -27,26 +27,32 @@ use DB;
use FireflyIII\Models\Account;
use FireflyIII\Models\AccountBalance;
use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionJournal;
use Illuminate\Support\Facades\Log;
use stdClass;
class AccountBalanceCalculator
{
public static function recalculate(?Account $account): void
public static function recalculate(?Account $account, ?TransactionJournal $transactionJournal): void
{
// first collect normal amounts (in whatever currency), and set them.
// select account_id, transaction_currency_id, foreign_currency_id, sum(amount), sum(foreign_amount) from transactions group by account_id, transaction_currency_id, foreign_currency_id
$query = Transaction::groupBy(['account_id', 'transaction_currency_id', 'foreign_currency_id']);
$query = Transaction::groupBy(['transactions.account_id', 'transactions.transaction_currency_id', 'transactions.foreign_currency_id']);
$title = 'balance';
if (null !== $account) {
$query->where('account_id', $account->id);
$query->where('transactions.account_id', $account->id);
}
if (null !== $transactionJournal) {
$query->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id');
$query->where('transaction_journals.date', '<=', $transactionJournal->date);
$title = 'balance_after_journal';
}
$result = $query->get(['account_id', 'transaction_currency_id', 'foreign_currency_id', DB::raw('SUM(amount) as sum_amount'), DB::raw('SUM(foreign_amount) as sum_foreign_amount')]);
$result = $query->get(['transactions.account_id', 'transactions.transaction_currency_id', 'transactions.foreign_currency_id', DB::raw('SUM(transactions.amount) as sum_amount'), DB::raw('SUM(transactions.foreign_amount) as sum_foreign_amount')]);
// reset account balances:
self::resetAccountBalances($account);
self::resetAccountBalances($title, $account, $transactionJournal);
/** @var stdClass $row */
foreach ($result as $row) {
@@ -57,48 +63,73 @@ class AccountBalanceCalculator
$sumForeignAmount = $row->sum_foreign_amount;
// first create for normal currency:
$entry = self::getBalance('balance', $account, $transactionCurrency);
$entry->balance = bcadd($entry->balance, $sumAmount);
$entry = self::getBalance($title, $account, $transactionCurrency, $transactionJournal?->id);
$entry->balance = bcadd($entry->balance, $sumAmount);
$entry->transaction_journal_id = $transactionJournal?->id;
$entry->save();
Log::debug(sprintf('Set balance entry #%d to amount %s', $entry->id, $entry->balance));
Log::debug(sprintf('Set balance entry "%s" #%d to amount %s', $title, $entry->id, $entry->balance));
// then do foreign amount, if present:
if ($foreignCurrency > 0) {
$entry = self::getBalance('balance', $account, $foreignCurrency);
$entry->balance = bcadd($entry->balance, $sumForeignAmount);
$entry = self::getBalance($title, $account, $foreignCurrency, $transactionJournal?->id);
$entry->balance = bcadd($entry->balance, $sumForeignAmount);
$entry->transaction_journal_id = $transactionJournal?->id;
$entry->save();
Log::debug(sprintf('Set balance entry #%d to amount %s', $entry->id, $entry->balance));
Log::debug(sprintf('Set balance entry "%s" #%d to amount %s', $title, $entry->id, $entry->balance));
}
}
return;
}
private static function getBalance(string $title, int $account, int $currency): AccountBalance
private static function getBalance(string $title, int $account, int $currency, ?int $journal): AccountBalance
{
$entry = AccountBalance::where('title', $title)->where('account_id', $account)->where('transaction_currency_id', $currency)->first();
$query = AccountBalance::where('title', $title)->where('account_id', $account)->where('transaction_currency_id', $currency);
if (null !== $journal) {
$query->where('transaction_journal_id', $journal);
}
$entry = $query->first();
if (null !== $entry) {
Log::debug(sprintf('Found account balance for account #%d and currency #%d: %s', $account, $currency, $entry->balance));
Log::debug(sprintf('Found account balance "%s" for account #%d and currency #%d: %s', $title, $account, $currency, $entry->balance));
return $entry;
}
$entry = new AccountBalance;
$entry->title = $title;
$entry->account_id = $account;
$entry->transaction_currency_id = $currency;
$entry->transaction_journal_id = $journal;
$entry->balance = '0';
$entry->save();
Log::debug(sprintf('Created new account balance for account #%d and currency #%d: %s', $account, $currency, $entry->balance));
return $entry;
}
private static function resetAccountBalances(?Account $account): void
private static function resetAccountBalances(string $title, ?Account $account, ?TransactionJournal $transactionJournal): void
{
if (null === $account) {
AccountBalance::whereNotNull('updated_at')->update(['balance' => '0']);
if (null === $account && null === $transactionJournal) {
AccountBalance::whereNotNull('updated_at')->where('title', $title)->update(['balance' => '0']);
Log::debug('Set ALL balances to zero.');
return;
}
AccountBalance::where('account_id', $account->id)->update(['balance' => '0']);
Log::debug(sprintf('Set balances of account #%d to zero.', $account->id));
if(null !== $account && null === $transactionJournal) {
AccountBalance::where('account_id', $account->id)->where('title', $title)->update(['balance' => '0']);
Log::debug(sprintf('Set balances of account #%d to zero.', $account->id));
return;
}
AccountBalance::where('account_id', $account->id)->where('transaction_journal_id', $transactionJournal->id)->where('title', $title)->update(['balance' => '0']);
Log::debug(sprintf('Set balances of account #%d + journal #%d to zero.', $account->id, $transactionJournal->id));
}
public static function recalculateByJournal(TransactionJournal $transactionJournal)
{
Log::debug(sprintf('Recalculate balance after journal #%d', $transactionJournal->id));
// update both account balances, but limit to this transaction or earlier.
foreach ($transactionJournal->transactions as $transaction) {
self::recalculate($transaction->account, $transactionJournal);
}
}