From ef3468ef1f974a4e235bc41ff4db7c261519e66d Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 2 May 2021 14:53:13 +0200 Subject: [PATCH] Do not fire when fireWebhooks = false --- app/Handlers/Events/StoredGroupEventHandler.php | 8 +++++++- app/Handlers/Events/UpdatedGroupEventHandler.php | 9 +++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/app/Handlers/Events/StoredGroupEventHandler.php b/app/Handlers/Events/StoredGroupEventHandler.php index 3824d6f499..255ae5bda0 100644 --- a/app/Handlers/Events/StoredGroupEventHandler.php +++ b/app/Handlers/Events/StoredGroupEventHandler.php @@ -85,7 +85,13 @@ class StoredGroupEventHandler { Log::debug(__METHOD__); $group = $storedGroupEvent->transactionGroup; - $user = $group->user; + if (false === $storedGroupEvent->fireWebhooks) { + Log::info(sprintf('Will not fire webhooks for transaction group #%d', $group->id)); + + return; + } + + $user = $group->user; /** @var MessageGeneratorInterface $engine */ $engine = app(MessageGeneratorInterface::class); $engine->setUser($user); diff --git a/app/Handlers/Events/UpdatedGroupEventHandler.php b/app/Handlers/Events/UpdatedGroupEventHandler.php index 5cd7cf4619..4c793fc757 100644 --- a/app/Handlers/Events/UpdatedGroupEventHandler.php +++ b/app/Handlers/Events/UpdatedGroupEventHandler.php @@ -81,9 +81,14 @@ class UpdatedGroupEventHandler */ public function triggerWebhooks(UpdatedTransactionGroup $updatedGroupEvent): void { - Log::debug('UpdatedGroupEventHandler:triggerWebhooks'); + Log::debug(__METHOD__); $group = $updatedGroupEvent->transactionGroup; - $user = $group->user; + if (false === $updatedGroupEvent->fireWebhooks) { + Log::info(sprintf('Will not fire webhooks for transaction group #%d', $group->id)); + + return; + } + $user = $group->user; /** @var MessageGeneratorInterface $engine */ $engine = app(MessageGeneratorInterface::class); $engine->setUser($user);