kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-16 17:33:45 +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

10
app/Console/Commands/Correction/CorrectAccountBalance.php
View File

@@ -6,8 +6,10 @@ use DB;
use FireflyIII\Console\Commands\ShowsFriendlyMessages; use FireflyIII\Console\Commands\ShowsFriendlyMessages;
use FireflyIII\Models\AccountBalance; use FireflyIII\Models\AccountBalance;
use FireflyIII\Models\Transaction; use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Support\Models\AccountBalanceCalculator; use FireflyIII\Support\Models\AccountBalanceCalculator;
use Illuminate\Console\Command; use Illuminate\Console\Command;
use Illuminate\Support\Facades\Log;
use stdClass; use stdClass;
/** /**
@@ -33,6 +35,12 @@ class CorrectAccountBalance extends Command
private function correctBalanceAmounts(): void private function correctBalanceAmounts(): void
{ {
AccountBalanceCalculator::recalculate(null); AccountBalanceCalculator::recalculate(null, null);
foreach(TransactionJournal::all() as $journal) {
Log::debug(sprintf('Recalculating account balances for journal #%d', $journal->id));
foreach($journal->transactions as $transaction) {
AccountBalanceCalculator::recalculate($transaction->account, $journal);
}
}
} }
} }

2
app/Handlers/Observer/TransactionJournalObserver.php
View File

@@ -24,6 +24,7 @@ declare(strict_types=1);
namespace FireflyIII\Handlers\Observer; namespace FireflyIII\Handlers\Observer;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use Illuminate\Support\Facades\Log;
/** /**
* Class TransactionJournalObserver * Class TransactionJournalObserver
@@ -48,4 +49,5 @@ class TransactionJournalObserver
$transactionJournal->destJournalLinks()->delete(); $transactionJournal->destJournalLinks()->delete();
$transactionJournal->auditLogEntries()->delete(); $transactionJournal->auditLogEntries()->delete();
} }
} }

13
app/Handlers/Observer/TransactionObserver.php
View File

@@ -43,6 +43,17 @@ class TransactionObserver
public function updated(Transaction $transaction): void public function updated(Transaction $transaction): void
{ {
app('log')->debug('Observe "updated" of a transaction.'); app('log')->debug('Observe "updated" of a transaction.');
AccountBalanceCalculator::recalculate($transaction->account); AccountBalanceCalculator::recalculate($transaction->account, null);
if((float)$transaction->amount > 0) {
AccountBalanceCalculator::recalculateByJournal($transaction->transactionJournal);
}
}
public function created(Transaction $transaction): void
{
app('log')->debug('Observe "created" of a transaction.');
AccountBalanceCalculator::recalculate($transaction->account, null);
if((float)$transaction->amount > 0) {
AccountBalanceCalculator::recalculateByJournal($transaction->transactionJournal);
}
} }
} }

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

@@ -27,26 +27,32 @@ use DB;
use FireflyIII\Models\Account; use FireflyIII\Models\Account;
use FireflyIII\Models\AccountBalance; use FireflyIII\Models\AccountBalance;
use FireflyIII\Models\Transaction; use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionJournal;
use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Log;
use stdClass; use stdClass;
class AccountBalanceCalculator 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. // 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 // 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) { 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: // reset account balances:
self::resetAccountBalances($account); self::resetAccountBalances($title, $account, $transactionJournal);
/** @var stdClass $row */ /** @var stdClass $row */
foreach ($result as $row) { foreach ($result as $row) {
@@ -57,48 +63,73 @@ class AccountBalanceCalculator
$sumForeignAmount = $row->sum_foreign_amount; $sumForeignAmount = $row->sum_foreign_amount;
// first create for normal currency: // first create for normal currency:
$entry = self::getBalance('balance', $account, $transactionCurrency); $entry = self::getBalance($title, $account, $transactionCurrency, $transactionJournal?->id);
$entry->balance = bcadd($entry->balance, $sumAmount); $entry->balance = bcadd($entry->balance, $sumAmount);
$entry->transaction_journal_id = $transactionJournal?->id;
$entry->save(); $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: // then do foreign amount, if present:
if ($foreignCurrency > 0) { if ($foreignCurrency > 0) {
$entry = self::getBalance('balance', $account, $foreignCurrency); $entry = self::getBalance($title, $account, $foreignCurrency, $transactionJournal?->id);
$entry->balance = bcadd($entry->balance, $sumForeignAmount); $entry->balance = bcadd($entry->balance, $sumForeignAmount);
$entry->transaction_journal_id = $transactionJournal?->id;
$entry->save(); $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; 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) { 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; return $entry;
} }
$entry = new AccountBalance; $entry = new AccountBalance;
$entry->title = $title; $entry->title = $title;
$entry->account_id = $account; $entry->account_id = $account;
$entry->transaction_currency_id = $currency; $entry->transaction_currency_id = $currency;
$entry->transaction_journal_id = $journal;
$entry->balance = '0'; $entry->balance = '0';
$entry->save(); $entry->save();
Log::debug(sprintf('Created new account balance for account #%d and currency #%d: %s', $account, $currency, $entry->balance)); Log::debug(sprintf('Created new account balance for account #%d and currency #%d: %s', $account, $currency, $entry->balance));
return $entry; return $entry;
} }
private static function resetAccountBalances(?Account $account): void private static function resetAccountBalances(string $title, ?Account $account, ?TransactionJournal $transactionJournal): void
{ {
if (null === $account) { if (null === $account && null === $transactionJournal) {
AccountBalance::whereNotNull('updated_at')->update(['balance' => '0']); AccountBalance::whereNotNull('updated_at')->where('title', $title)->update(['balance' => '0']);
Log::debug('Set ALL balances to zero.'); Log::debug('Set ALL balances to zero.');
return; return;
} }
AccountBalance::where('account_id', $account->id)->update(['balance' => '0']); if(null !== $account && null === $transactionJournal) {
Log::debug(sprintf('Set balances of account #%d to zero.', $account->id)); 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);
}
} }

3
database/migrations/2024_05_12_060551_create_account_balance_table.php
View File

@@ -25,8 +25,7 @@ return new class extends Migration {
$table->foreign('transaction_currency_id')->references('id')->on('transaction_currencies')->onDelete('cascade'); $table->foreign('transaction_currency_id')->references('id')->on('transaction_currencies')->onDelete('cascade');
$table->unique(['account_id', 'transaction_currency_id', 'transaction_journal_id','date', 'title'], 'unique_account_currency');
$table->unique(['account_id', 'transaction_currency_id', 'title'], 'unique_account_currency');
}); });
} }
} }