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

Clean up some code.

Browse Source
This commit is contained in:
James Cole
2019-06-07 18:13:54 +02:00
parent fba3cb6d90
commit 9c5df6ab6e
16 changed files with 55 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/Console/Commands/Correction/DeleteEmptyJournals.php
View File

@@ -25,6 +25,8 @@ use DB;
use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionJournal;
use Illuminate\Console\Command;
use Exception;
use Log;
/**
* Class DeleteEmptyJournals
@@ -68,7 +70,11 @@ class DeleteEmptyJournals extends Command
->get(['transaction_journals.id']);
foreach ($set as $entry) {
TransactionJournal::find($entry->id)->delete();
try {
TransactionJournal::find($entry->id)->delete();
} catch (Exception $e) {
Log::info(sprintf('Could not delete entry: %s', $e->getMessage()));
}
$this->info(sprintf('Deleted empty transaction journal #%d', $entry->id));
++$count;
}
@@ -103,7 +109,11 @@ class DeleteEmptyJournals extends Command
$count = (int)$row->the_count;
if (1 === $count % 2) {
// uneven number, delete journal and transactions:
TransactionJournal::find((int)$row->transaction_journal_id)->delete();
try {
TransactionJournal::find((int)$row->transaction_journal_id)->delete();
} catch(Exception $e) {
Log::info(sprintf('Could not delete journal: %s', $e->getMessage()));
}
Transaction::where('transaction_journal_id', (int)$row->transaction_journal_id)->delete();
$this->info(sprintf('Deleted transaction journal #%d because it had an uneven number of transactions.', $row->transaction_journal_id));
$total++;

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

@@ -26,6 +26,7 @@ use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionJournal;
use Illuminate\Console\Command;
use stdClass;
use Log;
/**
* Deletes transactions where the journal has been deleted.
@@ -78,7 +79,11 @@ class DeleteOrphanedTransactions extends Command
// delete journals
$journal = TransactionJournal::find((int)$transaction->transaction_journal_id);
if ($journal) {
$journal->delete();
try {
$journal->delete();
} catch (Exception $e) {
Log::info(sprintf('Could not delete transaction %s', $e->getMessage()));
}
}
Transaction::where('transaction_journal_id', (int)$transaction->transaction_journal_id)->delete();
$this->line(