From 0c6e00666b33764a2b79a151aac3f0244eda6825 Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 1 Nov 2022 19:33:43 +0100 Subject: [PATCH] Fix https://github.com/firefly-iii/firefly-iii/issues/6589 --- .../V1/Controllers/Models/Transaction/DestroyController.php | 2 -- app/Http/Controllers/Transaction/DeleteController.php | 4 +--- .../Internal/Destroy/TransactionGroupDestroyService.php | 3 +++ 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/Api/V1/Controllers/Models/Transaction/DestroyController.php b/app/Api/V1/Controllers/Models/Transaction/DestroyController.php index 3a0ba982db..746f95485d 100644 --- a/app/Api/V1/Controllers/Models/Transaction/DestroyController.php +++ b/app/Api/V1/Controllers/Models/Transaction/DestroyController.php @@ -97,8 +97,6 @@ class DestroyController extends Controller $this->groupRepository->destroy($transactionGroup); - // trigger just after destruction - event(new DestroyedTransactionGroup($transactionGroup)); app('preferences')->mark(); /** @var Account $account */ diff --git a/app/Http/Controllers/Transaction/DeleteController.php b/app/Http/Controllers/Transaction/DeleteController.php index 4e26cef71e..b023d78317 100644 --- a/app/Http/Controllers/Transaction/DeleteController.php +++ b/app/Http/Controllers/Transaction/DeleteController.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Transaction; +use FireflyIII\Events\DestroyedTransactionGroup; use FireflyIII\Events\UpdatedAccount; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Models\Account; @@ -131,9 +132,6 @@ class DeleteController extends Controller $this->repository->destroy($group); - app('preferences')->mark(); - - /** @var Account $account */ foreach($accounts as $account) { Log::debug(sprintf('Now going to trigger updated account event for account #%d', $account->id)); diff --git a/app/Services/Internal/Destroy/TransactionGroupDestroyService.php b/app/Services/Internal/Destroy/TransactionGroupDestroyService.php index c5e79feaa4..9e7c9d0717 100644 --- a/app/Services/Internal/Destroy/TransactionGroupDestroyService.php +++ b/app/Services/Internal/Destroy/TransactionGroupDestroyService.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Services\Internal\Destroy; use Exception; +use FireflyIII\Events\DestroyedTransactionGroup; use FireflyIII\Models\TransactionGroup; /** @@ -49,6 +50,8 @@ class TransactionGroupDestroyService } catch (Exception $e) { // @phpstan-ignore-line // @ignoreException } + // trigger just after destruction + event(new DestroyedTransactionGroup($transactionGroup)); } }