fix(orders): render RegateExportFailedException gracefully while keeping rollback and Sentry reporting
This commit is contained in:
parent
fdb7df5858
commit
e0d2074b2b
4 changed files with 57 additions and 0 deletions
|
|
@ -5,6 +5,7 @@ declare(strict_types=1);
|
|||
namespace App\Exceptions;
|
||||
|
||||
use Domain\Exceptions\OrderTunnel\MissingOrderBuilderException;
|
||||
use Domain\Exceptions\OrderTunnel\RegateExportFailedException;
|
||||
use Illuminate\Foundation\Configuration\Exceptions;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
|
|
@ -26,6 +27,14 @@ final class GlobalHandler
|
|||
)])
|
||||
);
|
||||
|
||||
$exceptions->render(
|
||||
fn (RegateExportFailedException $_, Request $__) => to_route('fo.sales.confirmation')
|
||||
->with(
|
||||
'message',
|
||||
__('An error occurred while validating your order. Please try again later.')
|
||||
)
|
||||
);
|
||||
|
||||
$exceptions->render(function (CustomerNotEmployedException $_, Request $request) {
|
||||
Auth::guard('frontend')->logout();
|
||||
$request->session()->invalidate();
|
||||
|
|
|
|||
|
|
@ -59,6 +59,7 @@
|
|||
"An error has occurred.": "An error has occurred.",
|
||||
"An error has occurred. Please try again later": "An error occurred, please try again later.",
|
||||
"An error occurred while fetching the preview.": "An error occurred while fetching the preview.",
|
||||
"An error occurred while validating your order. Please try again later.": "An error occurred while validating your order. Please try again later.",
|
||||
"An error occurred, please try again later.": "An error occurred, please try again later.",
|
||||
"An error occurred, please try again with a new activation link.": "An error occurred, please try again with a new activation link.",
|
||||
"An order was placed": "An order was placed",
|
||||
|
|
|
|||
|
|
@ -58,6 +58,7 @@
|
|||
"An error has occurred.": "Une erreur est survenue.",
|
||||
"An error has occurred. Please try again later": "Une erreur est survenue, merci de réessayer ultérieurement",
|
||||
"An error occurred while fetching the preview.": "Une erreur est survenue lors de la récupération de la prévisualisation.",
|
||||
"An error occurred while validating your order. Please try again later.": "Une erreur est survenue lors de la validation de votre commande, merci de réessayer ultérieurement.",
|
||||
"An error occurred, please try again later.": "Une erreur est survenue, merci de réessayer ultérieurement",
|
||||
"An error occurred, please try again with a new activation link.": "Une erreur est survenue, veuillez réessayer avec un nouveau lien d'activation.",
|
||||
"An order was placed": "Une commande a été passée",
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@ use Domain\Builders\OrderBuilderCompleted;
|
|||
use Domain\Builders\OrderBuilderWithBasket;
|
||||
use Domain\Enums\OrderStatus;
|
||||
use Domain\Enums\OrderTunnelStep;
|
||||
use Domain\Exceptions\OrderTunnel\RegateExportFailedException;
|
||||
use Domain\Models\Entities\Basket;
|
||||
use Domain\Models\Entities\Shopper;
|
||||
use Domain\Models\ValueObjects\DeliveryAddress;
|
||||
|
|
@ -39,6 +40,7 @@ use Illuminate\Support\Facades\Gate;
|
|||
use Illuminate\Support\Facades\View;
|
||||
use Money\Money;
|
||||
use Ramsey\Uuid\Uuid;
|
||||
use Sentry\State\HubInterface;
|
||||
use Shared\ValueObjects\CrmHashcode;
|
||||
|
||||
describe('TunnelController', function (): void {
|
||||
|
|
@ -777,4 +779,48 @@ describe('TunnelController', function (): void {
|
|||
->assertViewHas('shop')
|
||||
->assertViewHas('mapUrl');
|
||||
});
|
||||
|
||||
it('reports RegateExportFailedException to Sentry and redirects cleanly to confirmation instead of 500', function (): void {
|
||||
/** @var \Tests\TestCase $this */
|
||||
// GIVEN
|
||||
$this->seed(ContentSeeder::class);
|
||||
View::share('PageList', Page::getCached()
|
||||
->mapWithKeys(fn ($page) => [
|
||||
$page->slug->value() => $page,
|
||||
]));
|
||||
Cache::flush();
|
||||
|
||||
$customer = new Customer();
|
||||
$customer->email = new Email('regate-fail@example.com');
|
||||
$customer->hashcode = new CrmHashcode(Uuid::uuid4());
|
||||
$customer->save();
|
||||
$this->actingAs($customer, 'frontend');
|
||||
|
||||
$this->withoutMiddleware([
|
||||
CustomerIsEmployed::class,
|
||||
EnsureCustomerEmailIsVerified::class,
|
||||
]);
|
||||
Gate::before(fn () => true);
|
||||
|
||||
$sentryHub = \Mockery::mock(HubInterface::class);
|
||||
$sentryHub->shouldReceive('captureException')
|
||||
->once()
|
||||
->with(\Mockery::type(RegateExportFailedException::class));
|
||||
$this->app->instance(HubInterface::class, $sentryHub);
|
||||
|
||||
$this->mock(Executor::class, function ($mock): void {
|
||||
$mock->shouldReceive('execute')
|
||||
->once()
|
||||
->andThrow(new RegateExportFailedException('SMTP transport down'));
|
||||
});
|
||||
|
||||
// WHEN
|
||||
$response = $this->from('/commande/confirmation')->post('/commande/confirmation', [
|
||||
'ok_cgv' => '1',
|
||||
]);
|
||||
|
||||
// THEN
|
||||
$response->assertRedirectToRoute('fo.sales.confirmation')
|
||||
->assertSessionHas('message', __('An error occurred while validating your order. Please try again later.'));
|
||||
});
|
||||
});
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue