IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix balance in range.

Browse Source
This commit is contained in:
James Cole 2025-02-04 21:27:24 +01:00
parent 443036936d
commit 35a8fa5f02
No known key found for this signature in database
GPG Key ID: B49A324B7EAD6D80
1 changed files with 56 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
app/Support/Steam.php
View File

@ -70,7 +70,7 @@ class Steam
$cache->addProperty($start); $cache->addProperty($start);
$cache->addProperty($end); $cache->addProperty($end);
if ($cache->has()) { if ($cache->has()) {
return $cache->get(); // return $cache->get();
} }
$balances = []; $balances = [];
@ -103,29 +103,24 @@ class Steam
->where('transaction_journals.date', '<=', $end->format('Y-m-d H:i:s')) ->where('transaction_journals.date', '<=', $end->format('Y-m-d H:i:s'))
->groupBy('transaction_journals.date') ->groupBy('transaction_journals.date')
->groupBy('transactions.transaction_currency_id') ->groupBy('transactions.transaction_currency_id')
->groupBy('transactions.foreign_currency_id')
->orderBy('transaction_journals.date', 'ASC') ->orderBy('transaction_journals.date', 'ASC')
->whereNull('transaction_journals.deleted_at') ->whereNull('transaction_journals.deleted_at')
->get( ->get(
[ // @phpstan-ignore-line [ // @phpstan-ignore-line
'transaction_journals.date', 'transaction_journals.date',
'transactions.transaction_currency_id', 'transactions.transaction_currency_id',
DB::raw('SUM(transactions.amount) AS modified'), DB::raw('SUM(transactions.amount) AS sum_of_day'),
'transactions.foreign_currency_id',
DB::raw('SUM(transactions.foreign_amount) AS modified_foreign'),
DB::raw('SUM(transactions.native_amount) AS modified_native'),
] ]
); );
$currentBalance = $startBalance; $currentBalance = $startBalance;
$converter = new ExchangeRateConverter();
/** @var Transaction $entry */ /** @var Transaction $entry */
foreach ($set as $entry) { foreach ($set as $entry) {
// normal, native and foreign amount // normal, native and foreign amount
$carbon = new Carbon($entry->date, $entry->date_tz); $carbon = new Carbon($entry->date, $entry->date_tz);
$modified = (string) (null === $entry->modified ? '0' : $entry->modified); $sumOfDay = (string) (null === $entry->sum_of_day ? '0' : $entry->sum_of_day);
$foreignModified = (string) (null === $entry->modified_foreign ? '0' : $entry->modified_foreign);
$nativeModified = (string) (null === $entry->modified_native ? '0' : $entry->modified_native);
// find currency of this entry. // find currency of this entry.
$currencies[$entry->transaction_currency_id] ??= TransactionCurrency::find($entry->transaction_currency_id); $currencies[$entry->transaction_currency_id] ??= TransactionCurrency::find($entry->transaction_currency_id);
@ -134,39 +129,61 @@ class Steam
$entryCurrency = $currencies[$entry->transaction_currency_id]; $entryCurrency = $currencies[$entry->transaction_currency_id];
Log::debug(sprintf('Processing transaction(s) on date %s', $carbon->format('Y-m-d H:i:s'))); Log::debug(sprintf('Processing transaction(s) on date %s', $carbon->format('Y-m-d H:i:s')));
$currentBalance[$entryCurrency->code] ??= '0';
$currentBalance[$entryCurrency->code] = bcadd($sumOfDay, $currentBalance[$entryCurrency->code]);
// if convert to native, if NOT convert to native. // if not convert to native, add the amount to "balance" and "native_balance" alike:
if ($convertToNative) { if(!$convertToNative) {
Log::debug(sprintf('Amount is %s %s, foreign amount is %s, native amount is %s', $entryCurrency->code, $this->bcround($modified, 2), $this->bcround($foreignModified, 2), $this->bcround($nativeModified, 2))); $currentBalance['balance'] = bcadd($currentBalance['balance'], $sumOfDay);
// if the currency is the default currency add to native balance + currency balance $currentBalance['native_balance'] = bcadd($currentBalance['native_balance'], $sumOfDay);
if ($entry->transaction_currency_id === $defaultCurrency->id) { }
Log::debug('Add amount to native.'); // if convert to native add the converted amount to native balance.
$currentBalance['native_balance'] = bcadd($currentBalance['native_balance'], $modified); if($convertToNative) {
$nativeSumOfDay = $converter->convert($entryCurrency, $defaultCurrency, $carbon, $sumOfDay);
$currentBalance['native_balance'] = bcadd($currentBalance['native_balance'], $nativeSumOfDay);
// only add to "balance" if it has the correct currency code (the same as "native")
if($defaultCurrency->code === $entryCurrency->code) {
$currentBalance['balance'] = bcadd($currentBalance['balance'], $sumOfDay);
} }
}
// add to native balance.
if ($entry->foreign_currency_id !== $defaultCurrency->id) { // // if convert to native, if NOT convert to native.
// this check is not necessary, because if the foreign currency is the same as the default currency, the native amount is zero. // if ($convertToNative) {
// so adding this would mean nothing. // // convert for this day to native
$currentBalance['native_balance'] = bcadd($currentBalance['native_balance'], $nativeModified); // $currentNative = '0'; // TODO
} // //$currentBalance['native_balance']
if ($entry->foreign_currency_id === $defaultCurrency->id) { //
$currentBalance['native_balance'] = bcadd($currentBalance['native_balance'], $foreignModified); //// Log::debug(sprintf('Amount is %s %s, foreign amount is %s, native amount is %s', $entryCurrency->code, $this->bcround($modified, 2), $this->bcround($foreignModified, 2), $this->bcround($nativeModified, 2)));
} //// // if the currency is the default currency add to native balance + currency balance
// add to balance if is the same. //// if ($entry->transaction_currency_id === $defaultCurrency->id) {
if ($entry->transaction_currency_id === $accountCurrency?->id) { //// Log::debug('Add amount to native.');
$currentBalance['balance'] = bcadd($currentBalance['balance'], $modified); //// $currentBalance['native_balance'] = bcadd($currentBalance['native_balance'], $modified);
} //// }
// add currency balance ////
$currentBalance[$entryCurrency->code] = bcadd($currentBalance[$entryCurrency->code] ?? '0', $modified); //// // add to native balance.
} //// if ($entry->foreign_currency_id !== $defaultCurrency->id) {
if (!$convertToNative) { //// // this check is not necessary, because if the foreign currency is the same as the default currency, the native amount is zero.
Log::debug(sprintf('Amount is %s %s, foreign amount is %s, native amount is %s', $entryCurrency->code, $modified, $foreignModified, $nativeModified)); //// // so adding this would mean nothing.
// add to balance, as expected. //// $currentBalance['native_balance'] = bcadd($currentBalance['native_balance'], $nativeModified);
$currentBalance['balance'] = bcadd($currentBalance['balance'] ?? '0', $modified); //// }
// add to GBP, as expected. //// if ($entry->foreign_currency_id === $defaultCurrency->id) {
$currentBalance[$entryCurrency->code] = bcadd($currentBalance[$entryCurrency->code] ?? '0', $modified); //// $currentBalance['native_balance'] = bcadd($currentBalance['native_balance'], $foreignModified);
} //// }
//// // add to balance if is the same.
//// if ($entry->transaction_currency_id === $accountCurrency?->id) {
//// $currentBalance['balance'] = bcadd($currentBalance['balance'], $modified);
//// }
//// // add currency balance
//// $currentBalance[$entryCurrency->code] = bcadd($currentBalance[$entryCurrency->code] ?? '0', $modified);
// }
// if (!$convertToNative) {
// Log::debug(sprintf('Amount is %s %s, foreign amount is %s, native amount is %s', $entryCurrency->code, $modified, $foreignModified, $nativeModified));
// // add to balance, as expected.
// $currentBalance['balance'] = bcadd($currentBalance['balance'] ?? '0', $modified);
// // add to GBP, as expected.
// $currentBalance[$entryCurrency->code] = bcadd($currentBalance[$entryCurrency->code] ?? '0', $modified);
// }
$balances[$carbon->format('Y-m-d')] = $currentBalance; $balances[$carbon->format('Y-m-d')] = $currentBalance;
Log::debug('Updated entry', $currentBalance); Log::debug('Updated entry', $currentBalance);
} }