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

Code cleanup.

Browse Source
This commit is contained in:
James Cole
2023-12-20 19:35:52 +01:00
parent c4f6366642
commit 64ec0cf62e
997 changed files with 12908 additions and 28136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
app/Console/Commands/Correction/DeleteOrphanedTransactions.php
View File

@@ -23,12 +23,10 @@ declare(strict_types=1);
namespace FireflyIII\Console\Commands\Correction;
use Exception;
use FireflyIII\Console\Commands\ShowsFriendlyMessages;
use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionJournal;
use Illuminate\Console\Command;
use stdClass;
/**
* Deletes transactions where the journal has been deleted.
@@ -44,8 +42,7 @@ class DeleteOrphanedTransactions extends Command
/**
* Execute the console command.
*
* @return int
* @throws Exception
* @throws \Exception
*/
public function handle(): int
{
@@ -56,18 +53,17 @@ class DeleteOrphanedTransactions extends Command
return 0;
}
/**
* @return void
*/
private function deleteOrphanedJournals(): void
{
$set = TransactionJournal::leftJoin('transaction_groups', 'transaction_journals.transaction_group_id', 'transaction_groups.id')
->whereNotNull('transaction_groups.deleted_at')
->whereNull('transaction_journals.deleted_at')
->get(['transaction_journals.id', 'transaction_journals.transaction_group_id']);
->whereNotNull('transaction_groups.deleted_at')
->whereNull('transaction_journals.deleted_at')
->get(['transaction_journals.id', 'transaction_journals.transaction_group_id'])
;
$count = $set->count();
if (0 === $count) {
$this->friendlyPositive('No orphaned journals.');
return;
}
$this->friendlyInfo(sprintf('Found %d orphaned journal(s).', $count));
@@ -87,22 +83,24 @@ class DeleteOrphanedTransactions extends Command
}
/**
* @throws Exception
* @throws \Exception
*/
private function deleteOrphanedTransactions(): void
{
$count = 0;
$set = Transaction::leftJoin('transaction_journals', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
->whereNotNull('transaction_journals.deleted_at')
->whereNull('transactions.deleted_at')
->whereNotNull('transactions.id')
->get(
[
'transaction_journals.id as journal_id',
'transactions.id as transaction_id',
]
);
/** @var stdClass $entry */
->whereNotNull('transaction_journals.deleted_at')
->whereNull('transactions.deleted_at')
->whereNotNull('transactions.id')
->get(
[
'transaction_journals.id as journal_id',
'transactions.id as transaction_id',
]
)
;
/** @var \stdClass $entry */
foreach ($set as $entry) {
$transaction = Transaction::find((int)$entry->transaction_id);
if (null !== $transaction) {
@@ -122,16 +120,15 @@ class DeleteOrphanedTransactions extends Command
}
}
/**
*
*/
private function deleteFromOrphanedAccounts(): void
{
$set
= Transaction::leftJoin('accounts', 'transactions.account_id', '=', 'accounts.id')
->whereNotNull('accounts.deleted_at')
->get(['transactions.*']);
->whereNotNull('accounts.deleted_at')
->get(['transactions.*'])
;
$count = 0;
/** @var Transaction $transaction */
foreach ($set as $transaction) {
// delete journals
@@ -147,7 +144,7 @@ class DeleteOrphanedTransactions extends Command
$transaction->account_id
)
);
$count++;
++$count;
}
if (0 === $count) {
$this->friendlyPositive('No orphaned accounts.');