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

Various includes fixed, optimize account deletion.

Browse Source
This commit is contained in:
James Cole
2025-02-16 19:30:40 +01:00
parent 6c38b87ec5
commit 344bfbe059
7 changed files with 36 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Services/Internal/Destroy/AccountDestroyService.php
View File

@@ -31,6 +31,7 @@ use FireflyIII\Models\RecurrenceTransaction;
use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionJournal;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Support\Facades\DB;
/**
* Class AccountDestroyService
@@ -46,8 +47,6 @@ class AccountDestroyService
$this->moveTransactions($account, $moveTo);
$this->updateRecurrences($account, $moveTo);
}
$this->destroyJournals($account);
// delete recurring transactions with this account:
if (null === $moveTo) {
$this->destroyRecurrences($account);
@@ -59,6 +58,7 @@ class AccountDestroyService
// delete account meta:
$account->accountMeta()->delete();
// delete account.
// at this point the account observer interferes and deletes most of the other stuff.
$account->delete();
}
@@ -134,8 +134,8 @@ class AccountDestroyService
private function updateRecurrences(Account $account, Account $moveTo): void
{
\DB::table('recurrences_transactions')->where('source_id', $account->id)->update(['source_id' => $moveTo->id]);
\DB::table('recurrences_transactions')->where('destination_id', $account->id)->update(['destination_id' => $moveTo->id]);
DB::table('recurrences_transactions')->where('source_id', $account->id)->update(['source_id' => $moveTo->id]);
DB::table('recurrences_transactions')->where('destination_id', $account->id)->update(['destination_id' => $moveTo->id]);
}
private function destroyJournals(Account $account): void