Remove all uses of "finalAccountBalance", move towards one function to rule them all.

improved balance range date handling

app/Api/V1/Controllers/Autocomplete/AccountController.php

@@ -84,7 +84,7 @@ class AccountController extends Controller
         $data        = $request->getData();
         $types       = $data['types'];
         $query       = $data['query'];
-        $date        = $data['date'] ?? today(config('app.timezone'));
+        $date        = $data['date'];
         $return      = [];
         $timer       = Timer::getInstance();
         $timer->start(sprintf('AC accounts "%s"', $query));

app/Api/V1/Controllers/Summary/BasicController.php

@@ -589,8 +589,6 @@ class BasicController extends Controller
 
     private function getNetWorthInfo(Carbon $end): array
     {
-        $end->endOfDay();
-
         /** @var User $user */
         $user           = auth()->user();
         Log::debug(sprintf('getNetWorthInfo up until "%s".', $end->format('Y-m-d H:i:s')));

app/Api/V1/Requests/Autocomplete/AutocompleteRequest.php

@@ -48,10 +48,11 @@ class AutocompleteRequest extends FormRequest
         // remove 'initial balance' from allowed types. its internal
         $array = array_diff($array, [AccountTypeEnum::INITIAL_BALANCE->value, AccountTypeEnum::RECONCILIATION->value]);
 
+        $date = $this->getCarbonDate('date') ?? today(config('app.timezone'));
         return [
             'types' => $array,
             'query' => $this->convertString('query'),
-            'date'  => $this->getCarbonDate('date'),
+            'date'  => $date->endOfDay(),
         ];
     }
 

app/Api/V1/Requests/Data/DateRequest.php

@@ -28,6 +28,7 @@ use FireflyIII\Exceptions\ValidationException;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\Validator;
 
 /**
  * Request class for end points that require date parameters.
@@ -55,7 +56,6 @@ class DateRequest extends FormRequest
         // sanity check on dates:
         [$start, $end] = $end < $start ? [$end, $start] : [$start, $end];
 
-
         $start->startOfDay();
         $end->endOfDay();
         if ($start->diffInYears($end, true) > 5) {

app/Generator/Report/Audit/MonthReportGenerator.php

@@ -137,9 +137,12 @@ class MonthReportGenerator implements ReportGeneratorInterface
         ;
         $journals          = $collector->getExtractedJournals();
         $journals          = array_reverse($journals, true);
-        // this call is correct.
-        Log::debug(sprintf('getAuditReport: Call finalAccountBalance with date/time "%s"', $date->toIso8601String()));
-        $dayBeforeBalance  = Steam::finalAccountBalance($account, $date);
+
+        Log::debug(sprintf('getAuditReport: Call accountsBalancesOptimized with date/time "%s"', $date->toIso8601String()));
+        // 2025-10-08 replace with accountsBalancesOptimized.
+        // $dayBeforeBalance  = Steam::finalAccountBalance($account, $date);
+        $dayBeforeBalance  = Steam::accountsBalancesOptimized(new Collection()->push($account), $date)[$account->id];
+
         $startBalance      = $dayBeforeBalance['balance'];
         $primaryCurrency   = app('amount')->getPrimaryCurrencyByUserGroup($account->user->userGroup);
         $currency          = $accountRepository->getAccountCurrency($account) ?? $primaryCurrency;
@@ -176,12 +179,14 @@ class MonthReportGenerator implements ReportGeneratorInterface
         // call is correct.
         Log::debug(sprintf('getAuditReport end: Call finalAccountBalance with date/time "%s"', $this->end->toIso8601String()));
 
+        // 2025-10-08 replace with accountsBalancesOptimized:
         return [
             'journals'         => $journals,
             'currency'         => $currency,
             'exists'           => 0 !== count($journals),
             'end'              => $this->end->isoFormat((string) trans('config.month_and_day_moment_js', [], $locale)),
-            'endBalance'       => Steam::finalAccountBalance($account, $this->end)['balance'],
+            // 'endBalance'       => Steam::finalAccountBalance($account, $this->end)['balance'],
+            'endBalance'       => Steam::accountsBalancesOptimized(new Collection()->push($account), $this->end)[$account->id]['balance'],
             'dayBefore'        => $date->isoFormat((string) trans('config.month_and_day_moment_js', [], $locale)),
             'dayBeforeBalance' => $dayBeforeBalance,
         ];

app/Helpers/Collector/Extensions/AccountCollection.php

@@ -62,12 +62,13 @@ trait AccountCollection
                 if (null === $account) {
                     continue;
                 }
+
+                // 2025-10-08 replace with accountsBalancesOptimized
                 // the balance must be found BEFORE the transaction date.
-                // so sub one second. This is not perfect, but works well enough.
-                $date      = clone $transaction['date'];
-                $date->subSecond();
-                Log::debug(sprintf('accountBalanceIs: Call finalAccountBalance with date/time "%s"', $date->toIso8601String()));
-                $balance   = Steam::finalAccountBalance($account, $date);
+                // so inclusive = false
+                Log::debug(sprintf('accountBalanceIs: Call accountsBalancesOptimized with date/time "%s"', $transaction['date']->toIso8601String()));
+                $balance = Steam::accountsBalancesOptimized(new Collection()->push($account), $transaction['date'], convertToPrimary: null, inclusive: false)[$account->id];
+                // $balance   = Steam::finalAccountBalance($account, $date);
                 $result    = bccomp((string) $balance['balance'], $value);
                 Log::debug(sprintf('"%s" vs "%s" is %d', $balance['balance'], $value, $result));
 

app/Helpers/Report/NetWorth.php

@@ -130,55 +130,4 @@ class NetWorth implements NetWorthInterface
         $this->accountRepository->setUserGroup($userGroup);
 
     }
-
-    #[Deprecated]
-    public function sumNetWorthByCurrency(Carbon $date): array
-    {
-        /**
-         * Collect accounts
-         */
-        $accounts = $this->getAccounts();
-        $return   = [];
-        Log::debug(sprintf('SumNetWorth: accountsBalancesOptimized("%s")', $date->format('Y-m-d H:i:s')));
-        $balances = Steam::accountsBalancesOptimized($accounts, $date);
-        foreach ($accounts as $account) {
-            $currency                     = $this->accountRepository->getAccountCurrency($account);
-            $balance                      = $balances[$account->id]['balance'] ?? '0';
-
-            // always subtract virtual balance.
-            $virtualBalance               = $account->virtual_balance;
-            if ('' !== $virtualBalance) {
-                $balance = bcsub($balance, (string) $virtualBalance);
-            }
-
-            $return[$currency->id] ??= [
-                'id'             => (string) $currency->id,
-                'name'           => $currency->name,
-                'symbol'         => $currency->symbol,
-                'code'           => $currency->code,
-                'decimal_places' => $currency->decimal_places,
-                'sum'            => '0',
-            ];
-            $return[$currency->id]['sum'] = bcadd($return[$currency->id]['sum'], (string) $balance);
-        }
-
-        return $return;
-    }
-
-    private function getAccounts(): Collection
-    {
-        $accounts = $this->accountRepository->getAccountsByType(
-            [AccountTypeEnum::ASSET->value, AccountTypeEnum::DEFAULT->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value]
-        );
-        $filtered = new Collection();
-
-        /** @var Account $account */
-        foreach ($accounts as $account) {
-            if (1 === (int) $this->accountRepository->getMetaValue($account, 'include_net_worth')) {
-                $filtered->push($account);
-            }
-        }
-
-        return $filtered;
-    }
 }

app/Helpers/Report/NetWorthInterface.php

@@ -50,11 +50,4 @@ interface NetWorthInterface
 
     public function setUserGroup(UserGroup $userGroup): void;
 
-    /**
-     * TODO move to repository
-     *
-     * Same as above but cleaner function with less dependencies.
-     */
-    #[Deprecated]
-    public function sumNetWorthByCurrency(Carbon $date): array;
 }

app/Http/Controllers/Account/IndexController.php

@@ -91,14 +91,12 @@ class IndexController extends Controller
         /** @var Carbon $end */
         $end           = clone session('end', today(config('app.timezone'))->endOfMonth());
 
-        // #10618 go to the end of the previous day.
-        $start->subSecond();
-
         $ids           = $accounts->pluck('id')->toArray();
-        Log::debug(sprintf('inactive start: accountsBalancesOptimized("%s")', $start->format('Y-m-d H:i:s')));
-        Log::debug(sprintf('inactive end: accountsBalancesOptimized("%s")', $end->format('Y-m-d H:i:s')));
-        $startBalances = Steam::accountsBalancesOptimized($accounts, $start, $this->primaryCurrency, $this->convertToPrimary);
-        $endBalances   = Steam::accountsBalancesOptimized($accounts, $end, $this->primaryCurrency, $this->convertToPrimary);
+        Log::debug(sprintf('inactive start: accountsBalancesInRange("%s", "%s")', $start->format('Y-m-d H:i:s'), $end->format('Y-m-d H:i:s')));
+        [
+            $startBalances,
+            $endBalances,
+        ]              = Steam::accountsBalancesInRange($start, $end, $accounts, $this->primaryCurrency, $this->convertToPrimary);
         $activities    = Steam::getLastActivities($ids);
 
 
@@ -169,14 +167,12 @@ class IndexController extends Controller
         /** @var Carbon $end */
         $end           = clone session('end', today(config('app.timezone'))->endOfMonth());
 
-        // #10618 go to the end of the previous day.
-        $start->subSecond();
-
         $ids           = $accounts->pluck('id')->toArray();
-        Log::debug(sprintf('index start: accountsBalancesOptimized("%s")', $start->format('Y-m-d H:i:s')));
-        Log::debug(sprintf('index end: accountsBalancesOptimized("%s")', $end->format('Y-m-d H:i:s')));
-        $startBalances = Steam::accountsBalancesOptimized($accounts, $start, $this->primaryCurrency, $this->convertToPrimary);
-        $endBalances   = Steam::accountsBalancesOptimized($accounts, $end, $this->primaryCurrency, $this->convertToPrimary);
+        Log::debug(sprintf('index: accountsBalancesInRange("%s", "%s")', $start->format('Y-m-d H:i:s'), $end->format('Y-m-d H:i:s')));
+        [
+            $startBalances,
+            $endBalances,
+        ]              = Steam::accountsBalancesInRange($start, $end, $accounts, $this->primaryCurrency, $this->convertToPrimary);
         $activities    = Steam::getLastActivities($ids);
 
 

app/Http/Controllers/Account/ReconcileController.php

@@ -39,6 +39,7 @@ use FireflyIII\User;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Routing\Redirector;
+use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Log;
 use Illuminate\View\View;
 
@@ -113,13 +114,20 @@ class ReconcileController extends Controller
         $start->startOfDay();
         $end->endOfDay();
 
-        $startDate       = clone $start;
-        $startDate->subDay()->endOfDay(); // this is correct, subday endofday ends at 23:59:59
+//        $startDate       = clone $start;
+//        $startDate->subDay()->endOfDay(); // this is correct, subday endofday ends at 23:59:59
         // both are validated and are correct.
-        Log::debug(sprintf('reconcile: Call finalAccountBalance with date/time "%s"', $startDate->toIso8601String()));
-        Log::debug(sprintf('reconcile2: Call finalAccountBalance with date/time "%s"', $end->toIso8601String()));
-        $startBalance    = Steam::bcround(Steam::finalAccountBalance($account, $startDate)['balance'], $currency->decimal_places);
-        $endBalance      = Steam::bcround(Steam::finalAccountBalance($account, $end)['balance'], $currency->decimal_places);
+//        Log::debug(sprintf('reconcile: Call finalAccountBalance with date/time "%s"', $startDate->toIso8601String()));
+//        Log::debug(sprintf('reconcile2: Call finalAccountBalance with date/time "%s"', $end->toIso8601String()));
+//        $startBalance    = Steam::bcround(Steam::finalAccountBalance($account, $startDate)['balance'], $currency->decimal_places);
+//        $endBalance      = Steam::bcround(Steam::finalAccountBalance($account, $end)['balance'], $currency->decimal_places);
+
+        // 2025-10-08 replace with accountsBalancesOptimized
+        // no longer need to do subday->endofday on $start, set inclusive = false for the same effect.
+        $startBalance = Steam::bcround(Steam::accountsBalancesOptimized(new Collection()->push($account), $start, convertToPrimary: null, inclusive: false)[$account->id]['balance'], $currency->decimal_places);
+        $endBalance = Steam::bcround(Steam::accountsBalancesOptimized(new Collection()->push($account), $end)[$account->id]['balance'], $currency->decimal_places);
+
+
         $subTitleIcon    = config(sprintf('firefly.subIconsByIdentifier.%s', $account->accountType->type));
         $subTitle        = (string) trans('firefly.reconcile_account', ['account' => $account->name]);
 

app/Http/Controllers/Account/ShowController.php

@@ -169,8 +169,9 @@ class ShowController extends Controller
             $now = $end;
         }
 
-        Log::debug(sprintf('show: Call finalAccountBalance with date/time "%s"', $now->toIso8601String()));
-        $balances         = Steam::filterAccountBalance(Steam::finalAccountBalance($account, $now), $account, $this->convertToPrimary, $accountCurrency);
+        // 2025-10-08 replace finalAccountBalance with accountsBalancesOptimized.
+        $balances = Steam::accountsBalancesOptimized(new Collection()->push($account), $now)[$account->id];
+        // $balances         = Steam::filterAccountBalance(Steam::finalAccountBalance($account, $now), $account, $this->convertToPrimary, $accountCurrency);
 
         return view(
             'accounts.show',
@@ -237,8 +238,11 @@ class ShowController extends Controller
         $chartUrl        = route('chart.account.period', [$account->id, $start->format('Y-m-d'), $end->format('Y-m-d')]);
         $showAll         = true;
         // correct
-        Log::debug(sprintf('showAll: Call finalAccountBalance with date/time "%s"', $end->toIso8601String()));
-        $balances        = Steam::filterAccountBalance(Steam::finalAccountBalance($account, $end), $account, $this->convertToPrimary, $accountCurrency);
+        Log::debug(sprintf('showAll: Call accountsBalancesOptimized with date/time "%s"', $end->toIso8601String()));
+
+        // 2025-10-08 replace finalAccountBalance with accountsBalancesOptimized.
+        // $balances        = Steam::filterAccountBalance(Steam::finalAccountBalance($account, $end), $account, $this->convertToPrimary, $accountCurrency);
+        $balances = Steam::accountsBalancesOptimized(new Collection()->push($account), $end)[$account->id];
 
         return view(
             'accounts.show',

app/Http/Controllers/Chart/AccountController.php

@@ -116,10 +116,11 @@ class AccountController extends Controller
         $accountNames  = $this->extractNames($accounts);
 
         // grab all balances
-        Log::debug(sprintf('expenseAccounts: accountsBalancesOptimized("%s")', $start->format('Y-m-d H:i:s')));
-        Log::debug(sprintf('expenseAccounts: accountsBalancesOptimized("%s")', $end->format('Y-m-d H:i:s')));
-        $startBalances = Steam::accountsBalancesOptimized($accounts, $start, $this->primaryCurrency, $this->convertToPrimary);
-        $endBalances   = Steam::accountsBalancesOptimized($accounts, $end, $this->primaryCurrency, $this->convertToPrimary);
+        Log::debug(sprintf('expenseAccounts: accountsBalancesInRange("%s", "%s")', $start->format('Y-m-d H:i:s'), $end->format('Y-m-d H:i:s')));
+        [
+            $startBalances,
+            $endBalances,
+        ]              = Steam::accountsBalancesInRange($start, $end, $accounts, $this->primaryCurrency, $this->convertToPrimary);
         Log::debug('Done collecting balances');
         // loop the accounts, then check for balance and currency info.
         foreach ($accounts as $account) {
@@ -521,9 +522,9 @@ class AccountController extends Controller
         $range           = Steam::filterAccountBalances($range, $account, $this->convertToPrimary, $accountCurrency);
         Log::debug('Get and filter balance for entire range end');
         // temp, get end balance.
-        Log::debug(sprintf('period: Call finalAccountBalance with date/time "%s"', $end->toIso8601String()));
-        Steam::finalAccountBalance($account, $end);
-        Log::debug('END temp get end balance done');
+//        Log::debug(sprintf('period: Call finalAccountBalance with date/time "%s"', $end->toIso8601String()));
+//        Steam::finalAccountBalance($account, $end);
+//        Log::debug('END temp get end balance done');
 
         $previous        = array_values($range)[0];
         $accountCurrency ??= $this->primaryCurrency; // do this AFTER getting the balances.
@@ -666,10 +667,11 @@ class AccountController extends Controller
         $accountNames  = $this->extractNames($accounts);
 
         // grab all balances
-        Log::debug(sprintf('revAccounts: accountsBalancesOptimized("%s")', $start->format('Y-m-d H:i:s')));
-        Log::debug(sprintf('revAccounts: accountsBalancesOptimized("%s")', $end->format('Y-m-d H:i:s')));
-        $startBalances = Steam::accountsBalancesOptimized($accounts, $start, $this->primaryCurrency, $this->convertToPrimary);
-        $endBalances   = Steam::accountsBalancesOptimized($accounts, $end, $this->primaryCurrency, $this->convertToPrimary);
+        Log::debug(sprintf('revAccounts: accountsBalancesInRange("%s", "%s")', $start->format('Y-m-d H:i:s'), $end->format('Y-m-d H:i:s')));
+        [
+            $startBalances,
+            $endBalances,
+        ]              = Steam::accountsBalancesInRange($start, $end, $accounts, $this->primaryCurrency, $this->convertToPrimary);
 
 
         // loop the accounts, then check for balance and currency info.

app/Http/Controllers/Json/BoxController.php

@@ -38,6 +38,7 @@ use FireflyIII\Support\Facades\Amount;
 use FireflyIII\Support\Facades\Steam;
 use FireflyIII\Support\Http\Controllers\DateCalculation;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\Log;
 
 /**
  * Class BoxController.
@@ -165,7 +166,7 @@ class BoxController extends Controller
         $allAccounts       = $accountRepository->getActiveAccountsByType(
             [AccountTypeEnum::DEFAULT->value, AccountTypeEnum::ASSET->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value]
         );
-        app('log')->debug(sprintf('Found %d accounts.', $allAccounts->count()));
+        Log::debug(sprintf('Found %d accounts.', $allAccounts->count()));
 
         // filter list on preference of being included.
         $filtered          = $allAccounts->filter(
@@ -173,7 +174,7 @@ class BoxController extends Controller
                 $includeNetWorth = $accountRepository->getMetaValue($account, 'include_net_worth');
                 $result          = null === $includeNetWorth || '1' === $includeNetWorth;
                 if (false === $result) {
-                    app('log')->debug(sprintf('Will not include "%s" in net worth charts.', $account->name));
+                    Log::debug(sprintf('Will not include "%s" in net worth charts.', $account->name));
                 }
 
                 return $result;

app/Http/Controllers/Json/ReconcileController.php

@@ -197,10 +197,16 @@ class ReconcileController extends Controller
 
         $currency       = $this->accountRepos->getAccountCurrency($account) ?? $this->primaryCurrency;
         // correct
-        Log::debug(sprintf('transactions: Call finalAccountBalance with date/time "%s"', $startDate->toIso8601String()));
-        Log::debug(sprintf('transactions2: Call finalAccountBalance with date/time "%s"', $end->toIso8601String()));
-        $startBalance   = Steam::bcround(Steam::finalAccountBalance($account, $startDate)['balance'], $currency->decimal_places);
-        $endBalance     = Steam::bcround(Steam::finalAccountBalance($account, $end)['balance'], $currency->decimal_places);
+        Log::debug(sprintf('transactions: Call accountsBalancesOptimized with date/time "%s"', $startDate->toIso8601String()));
+        Log::debug(sprintf('transactions2: Call accountsBalancesOptimized with date/time "%s"', $end->toIso8601String()));
+
+        // 2025-10-08 replace finalAccountBalance with accountsBalancesOptimized
+//        $startBalance   = Steam::bcround(Steam::finalAccountBalance($account, $startDate)['balance'], $currency->decimal_places);
+//        $endBalance     = Steam::bcround(Steam::finalAccountBalance($account, $end)['balance'], $currency->decimal_places);
+
+        $startBalance = Steam::accountsBalancesOptimized(new Collection()->push($account), $startDate)[$account->id];
+        $endBalance = Steam::accountsBalancesOptimized(new Collection()->push($account), $end)[$account->id];
+
 
         // get the transactions
         $selectionStart = clone $start;

app/Http/Controllers/Transaction/ConvertController.php

@@ -37,6 +37,7 @@ use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Services\Internal\Update\JournalUpdateService;
+use FireflyIII\Support\Facades\Amount;
 use FireflyIII\Support\Facades\Steam;
 use FireflyIII\Support\Http\Controllers\ModelInformation;
 use FireflyIII\Transformers\TransactionGroupTransformer;
@@ -45,6 +46,7 @@ use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Redirector;
+use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Log;
 use Illuminate\View\View;
 
@@ -228,11 +230,13 @@ class ConvertController extends Controller
         foreach ($accountList as $account) {
             $date                        = today()->endOfDay();
             Log::debug(sprintf('getLiabilities: Call finalAccountBalance with date/time "%s"', $date->toIso8601String()));
-            $balance                     = Steam::finalAccountBalance($account, $date)['balance'];
+            // 2025-10-08 replace finalAccountBalance with accountsBalancesOptimized.
+            // $balance                     = Steam::finalAccountBalance($account, $date)['balance'];
+            $balance = Steam::accountsBalancesOptimized(new Collection()->push($account), $date)[$account->id]['balance'] ?? '0';
             $currency                    = $this->accountRepository->getAccountCurrency($account) ?? $this->primaryCurrency;
-            $role                        = 'l_'.$account->accountType->type;
-            $key                         = (string) trans('firefly.opt_group_'.$role);
-            $grouped[$key][$account->id] = $account->name.' ('.app('amount')->formatAnything($currency, $balance, false).')';
+            $role                        = sprintf('l_%s',$account->accountType->type);
+            $key                         = (string) trans(sprintf('firefly.opt_group_%s',$role));
+            $grouped[$key][$account->id] = sprintf('%s (%s)', $account->name, Amount::formatAnything($currency, $balance, false));
         }
 
         return $grouped;
@@ -252,15 +256,18 @@ class ConvertController extends Controller
         foreach ($accountList as $account) {
             $date                        = today()->endOfDay();
             Log::debug(sprintf('getAssetAccounts: Call finalAccountBalance with date/time "%s"', $date->toIso8601String()));
-            $balance                     = Steam::finalAccountBalance($account, $date)['balance'];
+            // 2025-10-08 replace finalAccountBalance with accountsBalancesOptimized.
+            // $balance                     = Steam::finalAccountBalance($account, $date)['balance'];
+            $balance = Steam::accountsBalancesOptimized(new Collection()->push($account), $date)[$account->id]['balance'] ?? '0';
+
             $currency                    = $this->accountRepository->getAccountCurrency($account) ?? $this->primaryCurrency;
             $role                        = (string) $this->accountRepository->getMetaValue($account, 'account_role');
             if ('' === $role) {
                 $role = 'no_account_type';
             }
 
-            $key                         = (string) trans('firefly.opt_group_'.$role);
-            $grouped[$key][$account->id] = $account->name.' ('.app('amount')->formatAnything($currency, $balance, false).')';
+            $key                         = (string) trans(sprintf('firefly.opt_group_%s',$role));
+            $grouped[$key][$account->id] = sprintf('%s (%s)', $account->name, Amount::formatAnything($currency, $balance, false));
         }
 
         return $grouped;

app/Repositories/Account/AccountTasker.php

@@ -50,10 +50,11 @@ class AccountTasker implements AccountTaskerInterface, UserGroupInterface
         $yesterday       = clone $start;
         $yesterday->subDay()->endOfDay(); // exactly up until $start but NOT including.
         $end->endOfDay();                 // needs to be end of day to be correct.
-        Log::debug(sprintf('getAccountReport: accountsBalancesOptimized("%s")', $yesterday->format('Y-m-d H:i:s')));
-        Log::debug(sprintf('getAccountReport: accountsBalancesOptimized("%s")', $end->format('Y-m-d H:i:s')));
-        $startSet        = Steam::accountsBalancesOptimized($accounts, $yesterday);
-        $endSet          = Steam::accountsBalancesOptimized($accounts, $end);
+        Log::debug(sprintf('getAccountReport: accountsBalancesInRange("%s", "%s")', $yesterday->format('Y-m-d H:i:s'), $end->format('Y-m-d H:i:s')));
+        [
+            $startSet,
+            $endSet,
+        ]              = Steam::accountsBalancesInRange($yesterday, $end, $accounts);
         Log::debug('Start of accountreport');
 
         /** @var AccountRepositoryInterface $repository */

app/Repositories/PiggyBank/PiggyBankRepository.php

@@ -375,7 +375,9 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface, UserGroupInte
     {
         Log::debug(sprintf('leftOnAccount("%s","%s","%s")', $piggyBank->name, $account->name, $date->format('Y-m-d H:i:s')));
         Log::debug(sprintf('leftOnAccount: Call finalAccountBalance with date/time "%s"', $date->toIso8601String()));
-        $balance = Steam::finalAccountBalance($account, $date)['balance'];
+        // 2025-10-08 replace finalAccountBalance with accountsBalancesOptimized.
+        $balance = Steam::accountsBalancesOptimized(new Collection()->push($account), $date)[$account->id];
+        //$balance = Steam::finalAccountBalance($account, $date)['balance'];
 
         Log::debug(sprintf('Balance is: %s', $balance));
 

app/Support/Authentication/RemoteUserGuard.php

@@ -49,14 +49,14 @@ class RemoteUserGuard implements Guard
     {
         /** @var null|Request $request */
         $request           = $app->get('request');
-        Log::debug(sprintf('Created RemoteUserGuard for %s "%s"', $request?->getMethod(), $request?->getRequestUri()));
+        // Log::debug(sprintf('Created RemoteUserGuard for %s "%s"', $request?->getMethod(), $request?->getRequestUri()));
         $this->application = $app;
         $this->user        = null;
     }
 
     public function authenticate(): void
     {
-        Log::debug(sprintf('Now at %s', __METHOD__));
+        // Log::debug(sprintf('Now at %s', __METHOD__));
         if ($this->user instanceof User) {
             Log::debug(sprintf('%s is found: #%d, "%s".', $this->user::class, $this->user->id, $this->user->email));
 
@@ -104,21 +104,21 @@ class RemoteUserGuard implements Guard
 
     public function check(): bool
     {
-        Log::debug(sprintf('Now at %s', __METHOD__));
+        // Log::debug(sprintf('Now at %s', __METHOD__));
 
         return $this->user() instanceof User;
     }
 
     public function guest(): bool
     {
-        Log::debug(sprintf('Now at %s', __METHOD__));
+        // Log::debug(sprintf('Now at %s', __METHOD__));
 
         return !$this->check();
     }
 
     public function hasUser(): bool
     {
-        Log::debug(sprintf('Now at %s', __METHOD__));
+        // Log::debug(sprintf('Now at %s', __METHOD__));
 
         throw new FireflyException('Did not implement RemoteUserGuard::hasUser()');
     }
@@ -128,14 +128,14 @@ class RemoteUserGuard implements Guard
      */
     public function id(): int|string|null
     {
-        Log::debug(sprintf('Now at %s', __METHOD__));
+        // Log::debug(sprintf('Now at %s', __METHOD__));
 
         return $this->user?->id;
     }
 
     public function setUser(Authenticatable|User|null $user): void // @phpstan-ignore-line
     {
-        Log::debug(sprintf('Now at %s', __METHOD__));
+        // Log::debug(sprintf('Now at %s', __METHOD__));
         if ($user instanceof User) {
             $this->user = $user;
 
@@ -146,7 +146,7 @@ class RemoteUserGuard implements Guard
 
     public function user(): ?User
     {
-        Log::debug(sprintf('Now at %s', __METHOD__));
+        // Log::debug(sprintf('Now at %s', __METHOD__));
         $user = $this->user;
         if (!$user instanceof User) {
             Log::debug('User is NULL');
@@ -164,14 +164,14 @@ class RemoteUserGuard implements Guard
      */
     public function validate(array $credentials = []): bool
     {
-        Log::debug(sprintf('Now at %s', __METHOD__));
+        // Log::debug(sprintf('Now at %s', __METHOD__));
 
         throw new FireflyException('Did not implement RemoteUserGuard::validate()');
     }
 
     public function viaRemember(): bool
     {
-        Log::debug(sprintf('Now at %s', __METHOD__));
+        // Log::debug(sprintf('Now at %s', __METHOD__));
 
         return false;
     }

app/Support/JsonApi/Enrichments/AccountEnrichment.php

@@ -289,8 +289,10 @@ class AccountEnrichment implements EnrichmentInterface
     {
         $this->balances = Steam::accountsBalancesOptimized($this->collection, $this->getDate(), $this->primaryCurrency, $this->convertToPrimary);
         if ($this->start instanceof Carbon && $this->end instanceof Carbon) {
-            $this->startBalances = Steam::accountsBalancesOptimized($this->collection, $this->start, $this->primaryCurrency, $this->convertToPrimary);
-            $this->endBalances   = Steam::accountsBalancesOptimized($this->collection, $this->end, $this->primaryCurrency, $this->convertToPrimary);
+            [
+                $this->startBalances,
+                $this->endBalances,
+            ] = Steam::accountsBalancesInRange($this->start, $this->end, $this->collection, $this->primaryCurrency, $this->convertToPrimary);
         }
     }
 

app/Support/Request/ConvertsDataTypes.php

@@ -402,21 +402,21 @@ trait ConvertsDataTypes
      */
     protected function getCarbonDate(string $field): ?Carbon
     {
-        $result = null;
+        $data = (string)$this->get($field);
+        Log::debug(sprintf('Date string is "%s"', $data));
 
-        Log::debug(sprintf('Date string is "%s"', (string)$this->get($field)));
+        if ('' === $data) {
+            return null;
+        }
 
         try {
-            $result = '' !== (string)$this->get($field) ? new Carbon((string)$this->get($field), config('app.timezone')) : null;
+            return new Carbon($data, config('app.timezone'));
         } catch (InvalidFormatException) {
             // @ignoreException
-            Log::debug(sprintf('Exception when parsing date "%s".', $this->get($field)));
-        }
-        if (!$result instanceof Carbon) {
-            Log::debug(sprintf('Exception when parsing date "%s".', $this->get($field)));
+            Log::debug(sprintf('Exception when parsing date "%s".', $data));
         }
 
-        return $result;
+        return null;
     }
 
     /**

app/Support/Steam.php

@@ -40,7 +40,6 @@ use Illuminate\Support\Str;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
 use ValueError;
-
 use function Safe\parse_url;
 use function Safe\preg_replace;
 
@@ -49,9 +48,9 @@ use function Safe\preg_replace;
  */
 class Steam
 {
-    public function accountsBalancesOptimized(Collection $accounts, Carbon $date, ?TransactionCurrency $primary = null, ?bool $convertToPrimary = null): array
+    public function accountsBalancesOptimized(Collection $accounts, Carbon $date, ?TransactionCurrency $primary = null, ?bool $convertToPrimary = null, bool $inclusive = true): array
     {
-        Log::debug(sprintf('accountsBalancesOptimized: Called for %d account(s) with date/time "%s"', $accounts->count(), $date->toIso8601String()));
+        Log::debug(sprintf('accountsBalancesOptimized: Called for %d account(s) with date/time "%s" (inclusive: %s)', $accounts->count(), $date->toIso8601String(), var_export($inclusive, true)));
         $result           = [];
         $convertToPrimary ??= Amount::convertToPrimary();
         $primary          ??= Amount::getPrimaryCurrency();
@@ -61,14 +60,12 @@ class Steam
         $arrayOfSums = Transaction::whereIn('account_id', $accounts->pluck('id')->toArray())
                                   ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
                                   ->leftJoin('transaction_currencies', 'transaction_currencies.id', '=', 'transactions.transaction_currency_id')
-            ->where('transaction_journals.date', '<=', $date->format('Y-m-d H:i:s'))
+                                  ->where('transaction_journals.date', $inclusive ? '<=' : '<', $date->format('Y-m-d H:i:s'))
                                   ->groupBy(['transactions.account_id', 'transaction_currencies.code'])
-            ->get(['transactions.account_id', 'transaction_currencies.code', DB::raw('SUM(transactions.amount) as sum_of_amount')])->toArray()
-        ;
+                                  ->get(['transactions.account_id', 'transaction_currencies.code', DB::raw('SUM(transactions.amount) as sum_of_amount')])->toArray();
 
         /** @var Account $account */
         foreach ($accounts as $account) {
-            // this array is PER account, so we wait a bit before we change code here.
             $return   = [
                 'pc_balance' => '0',
                 'balance'    => '0', // this key is overwritten right away, but I must remember it is always created.
@@ -125,6 +122,17 @@ class Steam
         return $result;
     }
 
+    /**
+     * Calls accountsBalancesOptimized for the given accounts and makes sure that inclusive is set to false, so it properly gets the balance of a range.
+     */
+    public function accountsBalancesInRange(Carbon $start, Carbon $end, Collection $accounts, ?TransactionCurrency $primary = null, ?bool $convertToPrimary = null): array
+    {
+        return [
+            $this->accountsBalancesOptimized($accounts, $start, $primary, $convertToPrimary, inclusive: false),
+            $this->accountsBalancesOptimized($accounts, $end, $primary, $convertToPrimary),
+        ];
+    }
+
     /**
      * https://stackoverflow.com/questions/1642614/how-to-ceil-floor-and-round-bcmath-numbers
      */
@@ -276,7 +284,9 @@ class Steam
     }
 
     /**
-     * Returns smaller than or equal to, so be careful with END OF DAY.
+     * @deprecated
+     * By default this method returns "smaller than or equal to", so be careful with END OF DAY.
+     * If you need end of day balance, use "inclusive = false".
      *
      * Returns the balance of an account at exact moment given. Array with at least one value.
      * Always returns:
@@ -288,18 +298,17 @@ class Steam
      * --> "pc_balance": balance in the user's primary currency, with all amounts converted to the primary currency.
      * "EUR": balance in EUR (or whatever currencies the account has balance in)
      */
-    public function finalAccountBalance(Account $account, Carbon $date, ?TransactionCurrency $primary = null, ?bool $convertToPrimary = null): array
+    public function finalAccountBalance(Account $account, Carbon $date, ?TransactionCurrency $primary = null, ?bool $convertToPrimary = null, bool $inclusive = true): array
     {
 
         $cache = new CacheProperties();
         $cache->addProperty($account->id);
         $cache->addProperty($date);
         if ($cache->has()) {
-            Log::debug(sprintf('CACHED finalAccountBalance(#%d, %s)', $account->id, $date->format('Y-m-d H:i:s')));
-
-            // return $cache->get();
+            Log::debug(sprintf('CACHED finalAccountBalance(#%d, %s, inclusive:%s)', $account->id, $date->format('Y-m-d H:i:s'), var_export($inclusive, true)));
+            return $cache->get();
         }
-        // Log::debug(sprintf('finalAccountBalance(#%d, %s)', $account->id, $date->format('Y-m-d H:i:s')));
+        Log::debug(sprintf('finalAccountBalance(#%d, %s)', $account->id, $date->format('Y-m-d H:i:s')));
         if (null === $convertToPrimary) {
             $convertToPrimary = Amount::convertToPrimary($account->user);
         }
@@ -325,9 +334,8 @@ class Steam
         $array  = $account->transactions()
                           ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
                           ->leftJoin('transaction_currencies', 'transaction_currencies.id', '=', 'transactions.transaction_currency_id')
-            ->where('transaction_journals.date', '<=', $date->format('Y-m-d H:i:s'))
-            ->get(['transaction_currencies.code', 'transactions.amount'])->toArray()
-        ;
+                          ->where('transaction_journals.date', $inclusive ? '<=': '<', $date->format('Y-m-d H:i:s'))
+                          ->get(['transaction_currencies.code', 'transactions.amount'])->toArray();
         $others = $this->groupAndSumTransactions($array, 'code', 'amount');
         // Log::debug('All balances are (joined)', $others);
         // if there is no request to convert, take this as "balance" and "pc_balance".
@@ -434,8 +442,7 @@ class Steam
                              'transactions.transaction_currency_id',
                              DB::raw('SUM(transactions.amount) AS sum_of_day'),
                            ]
-            )
-        ;
+                       );
 
         $currentBalance = $startBalance;
         $converter      = new ExchangeRateConverter();
@@ -542,7 +549,7 @@ class Steam
         try {
             $hostName = gethostbyaddr($ipAddress);
         } catch (Exception $e) {
-            app('log')->error($e->getMessage());
+            Log::error($e->getMessage());
             $hostName = $ipAddress;
         }
 

app/Support/System/OAuthKeys.php

@@ -25,6 +25,7 @@ declare(strict_types=1);
 namespace FireflyIII\Support\System;
 
 use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Support\Facades\FireflyConfig;
 use Illuminate\Contracts\Encryption\DecryptException;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Crypt;
@@ -63,10 +64,10 @@ class OAuthKeys
         $privateKey = '';
         $publicKey  = '';
         // better check if keys are in the database:
-        if (app('fireflyconfig')->has(self::PRIVATE_KEY) && app('fireflyconfig')->has(self::PUBLIC_KEY)) {
+        if (FireflyConfig::has(self::PRIVATE_KEY) && FireflyConfig::has(self::PUBLIC_KEY)) {
             try {
-                $privateKey = (string)app('fireflyconfig')->get(self::PRIVATE_KEY)?->data;
-                $publicKey  = (string)app('fireflyconfig')->get(self::PUBLIC_KEY)?->data;
+                $privateKey = (string)FireflyConfig::get(self::PRIVATE_KEY)?->data;
+                $publicKey  = (string)FireflyConfig::get(self::PUBLIC_KEY)?->data;
             } catch (ContainerExceptionInterface|FireflyException|NotFoundExceptionInterface $e) {
                 app('log')->error(sprintf('Could not validate keysInDatabase(): %s', $e->getMessage()));
                 app('log')->error($e->getTraceAsString());
@@ -87,8 +88,8 @@ class OAuthKeys
      */
     public static function restoreKeysFromDB(): bool
     {
-        $privateKey = (string)app('fireflyconfig')->get(self::PRIVATE_KEY)?->data;
-        $publicKey  = (string)app('fireflyconfig')->get(self::PUBLIC_KEY)?->data;
+        $privateKey = (string)FireflyConfig::get(self::PRIVATE_KEY)?->data;
+        $publicKey  = (string)FireflyConfig::get(self::PUBLIC_KEY)?->data;
 
         try {
             $privateContent = Crypt::decrypt($privateKey);
@@ -98,8 +99,8 @@ class OAuthKeys
             app('log')->error($e->getMessage());
 
             // delete config vars from DB:
-            app('fireflyconfig')->delete(self::PRIVATE_KEY);
-            app('fireflyconfig')->delete(self::PUBLIC_KEY);
+            FireflyConfig::delete(self::PRIVATE_KEY);
+            FireflyConfig::delete(self::PUBLIC_KEY);
 
             return false;
         }
@@ -115,8 +116,8 @@ class OAuthKeys
     {
         $private = storage_path('oauth-private.key');
         $public  = storage_path('oauth-public.key');
-        app('fireflyconfig')->set(self::PRIVATE_KEY, Crypt::encrypt(file_get_contents($private)));
-        app('fireflyconfig')->set(self::PUBLIC_KEY, Crypt::encrypt(file_get_contents($public)));
+        FireflyConfig::set(self::PRIVATE_KEY, Crypt::encrypt(file_get_contents($private)));
+        FireflyConfig::set(self::PUBLIC_KEY, Crypt::encrypt(file_get_contents($public)));
     }
 
     public static function verifyKeysRoutine(): void

app/Support/Twig/General.php

@@ -30,6 +30,7 @@ use FireflyIII\Repositories\User\UserRepositoryInterface;
 use FireflyIII\Support\Facades\Amount;
 use FireflyIII\Support\Facades\Steam;
 use FireflyIII\Support\Search\OperatorQuerySearch;
+use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Route;
 use League\CommonMark\GithubFlavoredMarkdownConverter;
@@ -155,9 +156,12 @@ class General extends AbstractExtension
                 }
 
                 /** @var Carbon $date */
-                $date             = session('end', today(config('app.timezone'))->endOfMonth());
+                $date             = now();
                 Log::debug(sprintf('twig balance: Call finalAccountBalance with date/time "%s"', $date->toIso8601String()));
-                $info             = Steam::finalAccountBalance($account, $date);
+
+                // 2025-10-08 replace finalAccountBalance with accountsBalancesOptimized.
+                $info = Steam::accountsBalancesOptimized(new Collection()->push($account), $date)[$account->id];
+                // $info             = Steam::finalAccountBalance($account, $date);
                 $currency         = Steam::getAccountCurrency($account);
                 $primary          = Amount::getPrimaryCurrency();
                 $convertToPrimary = Amount::convertToPrimary();