kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 23:45:10 +00:00
Code Issues Projects Releases Wiki Activity

Replace log.

Browse Source
This commit is contained in:
James Cole
2025-10-05 12:49:39 +02:00
parent 362705ec71
commit 072212c112
39 changed files with 194 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
app/Console/Commands/Upgrade/UpgradesToGroups.php
View File

@@ -38,6 +38,7 @@ use Illuminate\Console\Command;
use Illuminate\Support\Collection;
use Illuminate\Support\Facades\DB;
use Exception;
use Illuminate\Support\Facades\Log;
class UpgradesToGroups extends Command
{
@@ -127,11 +128,11 @@ class UpgradesToGroups extends Command
{
// double check transaction count.
if ($journal->transactions->count() <= 2) {
app('log')->debug(sprintf('Will not try to convert journal #%d because it has 2 or fewer transactions.', $journal->id));
Log::debug(sprintf('Will not try to convert journal #%d because it has 2 or fewer transactions.', $journal->id));
return;
}
app('log')->debug(sprintf('Will now try to convert journal #%d', $journal->id));
Log::debug(sprintf('Will now try to convert journal #%d', $journal->id));
$this->journalRepository->setUser($journal->user);
$this->groupFactory->setUser($journal->user);
@@ -144,15 +145,15 @@ class UpgradesToGroups extends Command
];
$destTransactions = $this->getDestinationTransactions($journal);
app('log')->debug(sprintf('Will use %d positive transactions to create a new group.', $destTransactions->count()));
Log::debug(sprintf('Will use %d positive transactions to create a new group.', $destTransactions->count()));
/** @var Transaction $transaction */
foreach ($destTransactions as $transaction) {
$data['transactions'][] = $this->generateTransaction($journal, $transaction);
}
app('log')->debug(sprintf('Now calling transaction journal factory (%d transactions in array)', count($data['transactions'])));
Log::debug(sprintf('Now calling transaction journal factory (%d transactions in array)', count($data['transactions'])));
$group = $this->groupFactory->create($data);
app('log')->debug('Done calling transaction journal factory');
Log::debug('Done calling transaction journal factory');
// delete the old transaction journal.
$this->service->destroy($journal);
@@ -160,7 +161,7 @@ class UpgradesToGroups extends Command
++$this->count;
// report on result:
app('log')->debug(
Log::debug(
sprintf(
'Migrated journal #%d into group #%d with these journals: #%s',
$journal->id,
@@ -190,7 +191,7 @@ class UpgradesToGroups extends Command
*/
private function generateTransaction(TransactionJournal $journal, Transaction $transaction): array
{
app('log')->debug(sprintf('Now going to add transaction #%d to the array.', $transaction->id));
Log::debug(sprintf('Now going to add transaction #%d to the array.', $transaction->id));
$opposingTr = $this->findOpposingTransaction($journal, $transaction);
if (!$opposingTr instanceof Transaction) {
@@ -282,8 +283,8 @@ class UpgradesToGroups extends Command
static function (Transaction $subject) use ($transaction) {
$amount = (float) $transaction->amount * -1 === (float) $subject->amount; // intentional float
$identifier = $transaction->identifier === $subject->identifier;
app('log')->debug(sprintf('Amount the same? %s', var_export($amount, true)));
app('log')->debug(sprintf('ID the same? %s', var_export($identifier, true)));
Log::debug(sprintf('Amount the same? %s', var_export($amount, true)));
Log::debug(sprintf('ID the same? %s', var_export($identifier, true)));
return $amount && $identifier;
}
@@ -294,13 +295,13 @@ class UpgradesToGroups extends Command
private function getTransactionBudget(Transaction $left, Transaction $right): ?int
{
app('log')->debug('Now in getTransactionBudget()');
Log::debug('Now in getTransactionBudget()');
// try to get a budget ID from the left transaction:
/** @var null|Budget $budget */
$budget = $left->budgets()->first();
if (null !== $budget) {
app('log')->debug(sprintf('Return budget #%d, from transaction #%d', $budget->id, $left->id));
Log::debug(sprintf('Return budget #%d, from transaction #%d', $budget->id, $left->id));
return $budget->id;
}
@@ -309,11 +310,11 @@ class UpgradesToGroups extends Command
/** @var null|Budget $budget */
$budget = $right->budgets()->first();
if (null !== $budget) {
app('log')->debug(sprintf('Return budget #%d, from transaction #%d', $budget->id, $right->id));
Log::debug(sprintf('Return budget #%d, from transaction #%d', $budget->id, $right->id));
return $budget->id;
}
app('log')->debug('Neither left or right have a budget, return NULL');
Log::debug('Neither left or right have a budget, return NULL');
// if all fails, return NULL.
return null;
@@ -321,13 +322,13 @@ class UpgradesToGroups extends Command
private function getTransactionCategory(Transaction $left, Transaction $right): ?int
{
app('log')->debug('Now in getTransactionCategory()');
Log::debug('Now in getTransactionCategory()');
// try to get a category ID from the left transaction:
/** @var null|Category $category */
$category = $left->categories()->first();
if (null !== $category) {
app('log')->debug(sprintf('Return category #%d, from transaction #%d', $category->id, $left->id));
Log::debug(sprintf('Return category #%d, from transaction #%d', $category->id, $left->id));
return $category->id;
}
@@ -336,11 +337,11 @@ class UpgradesToGroups extends Command
/** @var null|Category $category */
$category = $right->categories()->first();
if (null !== $category) {
app('log')->debug(sprintf('Return category #%d, from transaction #%d', $category->id, $category->id));
Log::debug(sprintf('Return category #%d, from transaction #%d', $category->id, $category->id));
return $category->id;
}
app('log')->debug('Neither left or right have a category, return NULL');
Log::debug('Neither left or right have a category, return NULL');
// if all fails, return NULL.
return null;
@@ -354,7 +355,7 @@ class UpgradesToGroups extends Command
$orphanedJournals = $this->cliRepository->getJournalsWithoutGroup();
$total = count($orphanedJournals);
if ($total > 0) {
app('log')->debug(sprintf('Going to convert %d transaction journals. Please hold..', $total));
Log::debug(sprintf('Going to convert %d transaction journals. Please hold..', $total));
$this->friendlyInfo(sprintf('Going to convert %d transaction journals. Please hold..', $total));
/** @var array $array */