Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed notification logic to ensure check in and out emails are delivered #13733

Merged
merged 6 commits into from
Oct 11, 2023
Merged

Fixed notification logic to ensure check in and out emails are delivered #13733

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
47a77ea
Avoid logging error messages for webhook request failures
marcusmoore Oct 10, 2023
ab3a3de
Fire webhook notification after sending emails
marcusmoore Oct 10, 2023
2a29566
Catch all ClientExceptions on check out
marcusmoore Oct 10, 2023
9ef598d
Apply changes to exception handling for check outs to check ins
marcusmoore Oct 10, 2023
dae9e6d
Improve try catch blocks
marcusmoore Oct 10, 2023
43b9e64
Formatting
marcusmoore Oct 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 18 additions & 13 deletions app/Listeners/CheckoutableListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
use App\Notifications\CheckoutAssetNotification;
use App\Notifications\CheckoutConsumableNotification;
use App\Notifications\CheckoutLicenseSeatNotification;
use GuzzleHttp\Exception\ClientException;
use Illuminate\Support\Facades\Notification;
use Exception;
use Log;
Expand All @@ -41,14 +42,9 @@ public function onCheckedOut($event)
/**
* Make a checkout acceptance and attach it in the notification
*/
$acceptance = $this->getCheckoutAcceptance($event);
$acceptance = $this->getCheckoutAcceptance($event);

try {
if ($this->shouldSendWebhookNotification()) {
Notification::route('slack', Setting::getSettings()->webhook_endpoint)
->notify($this->getCheckoutNotification($event));
}

if (! $event->checkedOutTo->locale) {
Notification::locale(Setting::getSettings()->locale)->send(
$this->getNotifiables($event),
Expand All @@ -60,8 +56,15 @@ public function onCheckedOut($event)
$this->getCheckoutNotification($event, $acceptance)
);
}

if ($this->shouldSendWebhookNotification()) {
Notification::route('slack', Setting::getSettings()->webhook_endpoint)
->notify($this->getCheckoutNotification($event));
}
} catch (ClientException $e) {
Log::debug("Exception caught during checkout notification: " . $e->getMessage());
} catch (Exception $e) {
Log::error("Exception caught during checkout notification: ".$e->getMessage());
Log::error("Exception caught during checkout notification: " . $e->getMessage());
}
}

Expand Down Expand Up @@ -92,11 +95,6 @@ public function onCheckedIn($event)
}

try {
if ($this->shouldSendWebhookNotification()) {
Notification::route('slack', Setting::getSettings()->webhook_endpoint)
->notify($this->getCheckinNotification($event));
}

// Use default locale
if (! $event->checkedOutTo->locale) {
Notification::locale(Setting::getSettings()->locale)->send(
Expand All @@ -109,8 +107,15 @@ public function onCheckedIn($event)
$this->getCheckinNotification($event)
);
}

if ($this->shouldSendWebhookNotification()) {
Notification::route('slack', Setting::getSettings()->webhook_endpoint)
->notify($this->getCheckinNotification($event));
}
} catch (ClientException $e) {
Log::debug("Exception caught during checkout notification: " . $e->getMessage());
} catch (Exception $e) {
Log::error("Exception caught during checkin notification: ".$e->getMessage());
Log::error("Exception caught during checkin notification: " . $e->getMessage());
}
}

Expand Down
Loading