mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-10-13 07:53:16 +00:00
Clean up logs, add cache.
This commit is contained in:
@@ -159,7 +159,7 @@ class CreditRecalculateService
|
|||||||
|
|
||||||
private function processWorkAccount(Account $account): void
|
private function processWorkAccount(Account $account): void
|
||||||
{
|
{
|
||||||
Log::debug(sprintf('Now processing account #%d ("%s"). All amounts with 2 decimals!', $account->id, $account->name));
|
Log::debug(sprintf('Now processing account #%d ("%s").', $account->id, $account->name));
|
||||||
// get opening balance (if present)
|
// get opening balance (if present)
|
||||||
$this->repository->setUser($account->user);
|
$this->repository->setUser($account->user);
|
||||||
$direction = (string) $this->repository->getMetaValue($account, 'liability_direction');
|
$direction = (string) $this->repository->getMetaValue($account, 'liability_direction');
|
||||||
@@ -230,7 +230,7 @@ class CreditRecalculateService
|
|||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
Log::debug('Opening balance is valid');
|
//Log::debug('Opening balance is valid');
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -263,7 +263,7 @@ class CreditRecalculateService
|
|||||||
return $leftOfDebt;
|
return $leftOfDebt;
|
||||||
}
|
}
|
||||||
if (TransactionTypeEnum::LIABILITY_CREDIT->value === $type || TransactionTypeEnum::OPENING_BALANCE->value === $type) {
|
if (TransactionTypeEnum::LIABILITY_CREDIT->value === $type || TransactionTypeEnum::OPENING_BALANCE->value === $type) {
|
||||||
Log::warning(sprintf('Transaction type is "%s", so do nothing.', $type));
|
// Log::warning(sprintf('Transaction type is "%s", so do nothing.', $type));
|
||||||
|
|
||||||
return $leftOfDebt;
|
return $leftOfDebt;
|
||||||
}
|
}
|
||||||
|
@@ -310,7 +310,15 @@ class Steam
|
|||||||
*/
|
*/
|
||||||
public function finalAccountBalance(Account $account, Carbon $date): array
|
public function finalAccountBalance(Account $account, Carbon $date): array
|
||||||
{
|
{
|
||||||
|
$cache = new CacheProperties();
|
||||||
|
$cache->addProperty($account->id);
|
||||||
|
$cache->addProperty($date);
|
||||||
|
if ($cache->has()) {
|
||||||
|
return $cache->get();
|
||||||
|
}
|
||||||
|
|
||||||
Log::debug(sprintf('Now in finalAccountBalance(#%d, "%s", "%s")', $account->id, $account->name, $date->format('Y-m-d H:i:s')));
|
Log::debug(sprintf('Now in finalAccountBalance(#%d, "%s", "%s")', $account->id, $account->name, $date->format('Y-m-d H:i:s')));
|
||||||
|
|
||||||
$native = Amount::getDefaultCurrencyByUserGroup($account->user->userGroup);
|
$native = Amount::getDefaultCurrencyByUserGroup($account->user->userGroup);
|
||||||
$convertToNative = Amount::convertToNative($account->user);
|
$convertToNative = Amount::convertToNative($account->user);
|
||||||
$accountCurrency = $this->getAccountCurrency($account);
|
$accountCurrency = $this->getAccountCurrency($account);
|
||||||
@@ -387,6 +395,7 @@ class Steam
|
|||||||
}
|
}
|
||||||
$final = array_merge($return, $others);
|
$final = array_merge($return, $others);
|
||||||
// Log::debug('Return is', $final);
|
// Log::debug('Return is', $final);
|
||||||
|
$cache->store($final);
|
||||||
|
|
||||||
return $final;
|
return $final;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user