kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-07 06:31:22 +00:00
Code Issues Projects Releases Wiki Activity

Make sure all account meta data is deleted properly.

Browse Source
This commit is contained in:
James Cole
2019-08-18 09:00:15 +02:00
parent 525f69cf63
commit ccc12171d6
1 changed files with 45 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,6 +30,7 @@ use FireflyIII\Models\PiggyBank;
use FireflyIII\Models\RecurrenceTransaction; use FireflyIII\Models\RecurrenceTransaction;
use FireflyIII\Models\Transaction; use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use FireflyIII\Models\TransactionType;
use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Builder;
use Log; use Log;
@@ -58,6 +59,9 @@ class AccountDestroyService
*/ */
public function destroy(Account $account, ?Account $moveTo): void public function destroy(Account $account, ?Account $moveTo): void
{ {
// find and delete opening balance journal + opposing account
$this->destroyOpeningBalance($account);
if (null !== $moveTo) { if (null !== $moveTo) {
$this->moveTransactions($account, $moveTo); $this->moveTransactions($account, $moveTo);
$this->updateRecurrences($account, $moveTo); $this->updateRecurrences($account, $moveTo);
@@ -72,6 +76,10 @@ class AccountDestroyService
// delete piggy banks: // delete piggy banks:
PiggyBank::where('account_id', $account->id)->delete(); PiggyBank::where('account_id', $account->id)->delete();
// delete account meta:
$account->accountMeta()->delete();
// delete account. // delete account.
try { try {
$account->delete(); $account->delete();
@@ -102,6 +110,43 @@ class AccountDestroyService
} }
} }
/**
* @param Account $account
*/
private function destroyOpeningBalance(Account $account): void
{
Log::debug(sprintf('Searching for opening balance for account #%d "%s"', $account->id, $account->name));
$set = $account->transactions()
->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
->where('transaction_types.type', TransactionType::OPENING_BALANCE)
->get(['transactions.transaction_journal_id']);
if ($set->count() > 0) {
$journalId = (int)$set->first()->transaction_journal_id;
Log::debug(sprintf('Found opening balance journal with ID #%d', $journalId));
// get transactions with this journal (should be just one):
$transactions = Transaction
::where('transaction_journal_id', $journalId)
->where('account_id', '!=', $account->id)
->get();
/** @var Transaction $transaction */
foreach ($transactions as $transaction) {
Log::debug(sprintf('Found transaction with ID #%d', $transaction->id));
$ibAccount = $transaction->account;
Log::debug(sprintf('Connected to account #%d "%s"', $ibAccount->id, $ibAccount->name));
$ibAccount->accountMeta()->delete();
$transaction->delete();
$ibAccount->delete();
}
$journal = TransactionJournal::find($journalId);
/** @var JournalDestroyService $service */
$service = app(JournalDestroyService::class);
$service->destroy($journal);
}
}
/** /**
* @param Account $account * @param Account $account
*/ */