diff --git a/app/Helpers/Report/NetWorth.php b/app/Helpers/Report/NetWorth.php index 4297f835dd..5760466334 100644 --- a/app/Helpers/Report/NetWorth.php +++ b/app/Helpers/Report/NetWorth.php @@ -79,6 +79,7 @@ class NetWorth implements NetWorthInterface Log::debug(sprintf('Now in byAccounts("%s", "%s")', $ids, $date->format('Y-m-d H:i:s'))); $default = Amount::getNativeCurrency(); $netWorth = []; + Log::debug(sprintf('NetWorth: finalAccountsBalance("%s")', $date->format('Y-m-d H:i:s'))); $balances = Steam::finalAccountsBalance($accounts, $date); /** @var Account $account */ @@ -159,6 +160,7 @@ class NetWorth implements NetWorthInterface */ $accounts = $this->getAccounts(); $return = []; + Log::debug(sprintf('SumNetWorth: finalAccountsBalance("%s")', $date->format('Y-m-d H:i:s'))); $balances = Steam::finalAccountsBalance($accounts, $date); foreach ($accounts as $account) { $currency = $this->getRepository()->getAccountCurrency($account); diff --git a/app/Http/Controllers/Account/IndexController.php b/app/Http/Controllers/Account/IndexController.php index b0cfa9cfa4..9afdba5f4f 100644 --- a/app/Http/Controllers/Account/IndexController.php +++ b/app/Http/Controllers/Account/IndexController.php @@ -33,6 +33,7 @@ use FireflyIII\Support\Http\Controllers\BasicDataSupport; use Illuminate\Contracts\View\Factory; use Illuminate\Http\Request; use Illuminate\Pagination\LengthAwarePaginator; +use Illuminate\Support\Facades\Log; use Illuminate\View\View; /** @@ -90,9 +91,11 @@ class IndexController extends Controller $start->subDay(); $ids = $accounts->pluck('id')->toArray(); - $startBalances = app('steam')->finalAccountsBalance($accounts, $start); - $endBalances = app('steam')->finalAccountsBalance($accounts, $end); - $activities = app('steam')->getLastActivities($ids); + 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::finalAccountsBalance($accounts, $start); + $endBalances = Steam::finalAccountsBalance($accounts, $end); + $activities = Steam::getLastActivities($ids); $accounts->each( @@ -102,7 +105,7 @@ class IndexController extends Controller $account->startBalances = Steam::filterAccountBalance($startBalances[$account->id] ?? [], $account, $this->convertToNative, $currency); $account->endBalances = Steam::filterAccountBalance($endBalances[$account->id] ?? [], $account, $this->convertToNative, $currency); $account->differences = $this->subtract($account->startBalances, $account->endBalances); - $account->interest = app('steam')->bcround($this->repository->getMetaValue($account, 'interest'), 4); + $account->interest = Steam::bcround($this->repository->getMetaValue($account, 'interest'), 4); $account->interestPeriod = (string) trans(sprintf('firefly.interest_calc_%s', $this->repository->getMetaValue($account, 'interest_period'))); $account->accountTypeString = (string) trans(sprintf('firefly.account_type_%s', $account->accountType->type)); $account->current_debt = '0'; @@ -153,9 +156,11 @@ class IndexController extends Controller $start->subDay(); $ids = $accounts->pluck('id')->toArray(); - $startBalances = app('steam')->finalAccountsBalance($accounts, $start); - $endBalances = app('steam')->finalAccountsBalance($accounts, $end); - $activities = app('steam')->getLastActivities($ids); + 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::finalAccountsBalance($accounts, $start); + $endBalances = Steam::finalAccountsBalance($accounts, $end); + $activities = Steam::getLastActivities($ids); $accounts->each( @@ -168,7 +173,7 @@ class IndexController extends Controller $account->endBalances = Steam::filterAccountBalance($endBalances[$account->id] ?? [], $account, $this->convertToNative, $currency); $account->differences = $this->subtract($account->startBalances, $account->endBalances); $account->lastActivityDate = $this->isInArrayDate($activities, $account->id); - $account->interest = app('steam')->bcround($interest, 4); + $account->interest = Steam::bcround($interest, 4); $account->interestPeriod = (string) trans( sprintf('firefly.interest_calc_%s', $this->repository->getMetaValue($account, 'interest_period')) ); diff --git a/app/Http/Controllers/Chart/AccountController.php b/app/Http/Controllers/Chart/AccountController.php index 17dba32c78..709f1da811 100644 --- a/app/Http/Controllers/Chart/AccountController.php +++ b/app/Http/Controllers/Chart/AccountController.php @@ -109,6 +109,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'))); $startBalances = Steam::finalAccountsBalance($accounts, $start); $endBalances = Steam::finalAccountsBalance($accounts, $end); @@ -576,6 +578,8 @@ 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::finalAccountsBalance($accounts, $start); $endBalances = Steam::finalAccountsBalance($accounts, $end); diff --git a/app/Repositories/Account/AccountTasker.php b/app/Repositories/Account/AccountTasker.php index 27bf91a9c7..ce689681a3 100644 --- a/app/Repositories/Account/AccountTasker.php +++ b/app/Repositories/Account/AccountTasker.php @@ -29,9 +29,11 @@ use FireflyIII\Exceptions\FireflyException; use FireflyIII\Helpers\Collector\GroupCollectorInterface; use FireflyIII\Models\Account; use FireflyIII\Repositories\UserGroups\Currency\CurrencyRepositoryInterface; +use FireflyIII\Support\Facades\Steam; use FireflyIII\User; use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; +use Illuminate\Support\Facades\Log; /** * Class AccountTasker. @@ -46,9 +48,11 @@ class AccountTasker implements AccountTaskerInterface public function getAccountReport(Collection $accounts, Carbon $start, Carbon $end): array { $yesterday = clone $start; - $yesterday->subDay(); - $startSet = app('steam')->finalAccountsBalance($accounts, $yesterday); - $endSet = app('steam')->finalAccountsBalance($accounts, $end); + $yesterday->subDay()->endOfDay(); + 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'))); + $startSet = Steam::finalAccountsBalance($accounts, $yesterday); + $endSet = Steam::finalAccountsBalance($accounts, $end); app('log')->debug('Start of accountreport'); /** @var AccountRepositoryInterface $repository */ diff --git a/app/Transformers/V2/AccountTransformer.php b/app/Transformers/V2/AccountTransformer.php index 564ee87ba7..7ca1114793 100644 --- a/app/Transformers/V2/AccountTransformer.php +++ b/app/Transformers/V2/AccountTransformer.php @@ -183,6 +183,8 @@ class AccountTransformer extends AbstractTransformer $bEnd = []; try { + Log::debug(sprintf('v2 transformer: finalAccountsBalance("%s")', $start->format('Y-m-d H:i:s'))); + Log::debug(sprintf('v2 transformer: finalAccountsBalance("%s")', $end->format('Y-m-d H:i:s'))); $bStart = app('steam')->finalAccountsBalance($accounts, $start); $bEnd = app('steam')->finalAccountsBalance($accounts, $end); } catch (FireflyException $e) {