Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
Remove non-optimized method.
James Colee1ba2732afa6
diff --git a/app/Helpers/Report/NetWorth.php b/app/Helpers/Report/NetWorth.phpindex 3bea16257b..c3a2f0592c 100644--- a/app/Helpers/Report/NetWorth.php+++ b/app/Helpers/Report/NetWorth.php@@ -77,8 +77,8 @@ class NetWorth implements NetWorthInterfaceLog::debug(sprintf('Now in byAccounts("%s", "%s")', $ids, $date->format('Y-m-d H:i:s')));$primary = Amount::getPrimaryCurrency();$netWorth = [];- Log::debug(sprintf('NetWorth: finalAccountsBalance("%s")', $date->format('Y-m-d H:i:s')));- $balances = Steam::accountsBalancesOptimized($accounts, $date);+ Log::debug(sprintf('NetWorth: accountsBalancesOptimized("%s")', $date->format('Y-m-d H:i:s')));+ $balances = Steam::accountsBalancesOptimized($accounts, $date, null, $convertToPrimary);/** @var Account $account */foreach ($accounts as $account) {@@ -143,7 +143,7 @@ class NetWorth implements NetWorthInterface*/$accounts = $this->getAccounts();$return = [];- Log::debug(sprintf('SumNetWorth: finalAccountsBalance("%s")', $date->format('Y-m-d H:i:s')));+ 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);diff --git a/app/Http/Controllers/Account/IndexController.php b/app/Http/Controllers/Account/IndexController.phpindex 12e0e17262..1ee5f5cccf 100644--- a/app/Http/Controllers/Account/IndexController.php+++ b/app/Http/Controllers/Account/IndexController.php@@ -93,10 +93,10 @@ class IndexController extends Controller$start->subSecond();$ids = $accounts->pluck('id')->toArray();- Log::debug(sprintf('inactive start: finalAccountsBalance("%s")', $start->format('Y-m-d H:i:s')));- Log::debug(sprintf('inactive end: finalAccountsBalance("%s")', $end->format('Y-m-d H:i:s')));- $startBalances = Steam::accountsBalancesOptimized($accounts, $start);- $endBalances = Steam::accountsBalancesOptimized($accounts, $end);+ 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);$activities = Steam::getLastActivities($ids);@@ -170,10 +170,10 @@ class IndexController extends Controller$start->subSecond();$ids = $accounts->pluck('id')->toArray();- Log::debug(sprintf('index start: finalAccountsBalance("%s")', $start->format('Y-m-d H:i:s')));- Log::debug(sprintf('index end: finalAccountsBalance("%s")', $end->format('Y-m-d H:i:s')));- $startBalances = Steam::accountsBalancesOptimized($accounts, $start);- $endBalances = Steam::accountsBalancesOptimized($accounts, $end);+ 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);$activities = Steam::getLastActivities($ids);diff --git a/app/Http/Controllers/Chart/AccountController.php b/app/Http/Controllers/Chart/AccountController.phpindex b623637eb5..a8ee627ffd 100644--- a/app/Http/Controllers/Chart/AccountController.php+++ b/app/Http/Controllers/Chart/AccountController.php@@ -114,8 +114,8 @@ class AccountController extends Controller$accountNames = $this->extractNames($accounts);// grab all balances- Log::debug(sprintf('expenseAccounts: finalAccountsBalance("%s")', $start->format('Y-m-d H:i:s')));- Log::debug(sprintf('expenseAccounts: finalAccountsBalance("%s")', $end->format('Y-m-d H:i:s')));+ 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);@@ -654,10 +654,10 @@ class AccountController extends Controller$accountNames = $this->extractNames($accounts);// grab all balances- Log::debug(sprintf('revAccounts: finalAccountsBalance("%s")', $start->format('Y-m-d H:i:s')));- Log::debug(sprintf('revAccounts: finalAccountsBalance("%s")', $end->format('Y-m-d H:i:s')));- $startBalances = Steam::accountsBalancesOptimized($accounts, $start);- $endBalances = Steam::accountsBalancesOptimized($accounts, $end);+ 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);// loop the accounts, then check for balance and currency info.diff --git a/app/Repositories/Account/AccountTasker.php b/app/Repositories/Account/AccountTasker.phpindex 266446e3dd..1b3b7ff1ee 100644--- a/app/Repositories/Account/AccountTasker.php+++ b/app/Repositories/Account/AccountTasker.php@@ -50,8 +50,8 @@ 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: finalAccountsBalance("%s")', $yesterday->format('Y-m-d H:i:s')));- Log::debug(sprintf('getAccountReport: finalAccountsBalance("%s")', $end->format('Y-m-d H:i:s')));+ 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('Start of accountreport');diff --git a/app/Support/Steam.php b/app/Support/Steam.phpindex fafb6e05c3..d71ab013c2 100644--- a/app/Support/Steam.php+++ b/app/Support/Steam.php@@ -521,17 +521,6 @@ class Steamreturn $total;}- public function finalAccountsBalance(Collection $accounts, Carbon $date): array- {- Log::debug(sprintf('finalAccountsBalance: Call finalAccountBalance with date/time "%s"', $date->toIso8601String()));- $balances = [];- foreach ($accounts as $account) {- $balances[$account->id] = $this->finalAccountBalance($account, $date);- }-- return $balances;- }-/*** @throws FireflyException*/