EP/myep
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: improved error handling and feedback

Browse Source
This commit is contained in:
Björn Fromme
2025-03-24 19:41:51 +01:00
parent 7bcda3e6f8
commit 296464701d
7 changed files with 64 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Controller/Booking/DownloadController.php
+11 -6
View File
@@ -3,6 +3,8 @@
namespace App\Controller\Booking;
use App\BusProNet\ApiClient;
use App\BusProNet\Exception\ApiClientException;
use App\BusProNet\Exception\ResponseParserException;
use App\BusProNet\Model\Notification;
use Psr\Log\LoggerInterface;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
@@ -56,13 +58,16 @@ class DownloadController extends AbstractController
'booking_id' => $id,
]);
$file = $this
->apiClient
->getDocuments($bpnUser->getEmail(), $bpnUser->getPassword(), $id, $type)
;
try {
$file = $this
->apiClient
->getDocuments($bpnUser->getEmail(), $bpnUser->getPassword(), $id, $type);
} catch (ApiClientException|ResponseParserException $e) {
$file = null;
}
if (null === $file || $file instanceof Notification) {
$this->addFlash('error', 'Keine Dokumente vorhanden');
$this->addFlash('error', 'Keine Dokumente vorhanden oder nicht abrufbar');
return $this->redirectToRoute('app_bookings');
}
@@ -84,4 +89,4 @@ class DownloadController extends AbstractController
return $response;
}
}
}
src/Controller/Booking/EditController.php
+16 -2
View File
@@ -3,6 +3,8 @@
namespace App\Controller\Booking;
use App\BusProNet\ApiClient;
use App\BusProNet\Exception\ApiClientException;
use App\BusProNet\Exception\ResponseParserException;
use App\BusProNet\Model\Notification;
use App\BusProNet\XmlLoader\PickupLoader;
use App\BusProNet\XmlLoader\TravelLoader;
@@ -69,10 +71,22 @@ class EditController extends AbstractController
}
// Fetch mutability information via API
$mutableData = $this->apiClient->getMutableData($bookingData->travelId);
try {
$mutableData = $this->apiClient->getMutableData($bookingData->travelId);
} catch (ApiClientException|ResponseParserException $e) {
$this->addFlash('error', 'Reisedaten nicht (mehr) verfügbar');
return $this->redirectToRoute('app_bookings');
}
// Fetch availability information via API
$availabilities = $this->apiClient->getAvailabilities($bookingData->travelId);
try {
$availabilities = $this->apiClient->getAvailabilities($bookingData->travelId);
} catch (ApiClientException|ResponseParserException $e) {
$this->addFlash('error', 'Reisedaten nicht (mehr) verfügbar');
return $this->redirectToRoute('app_bookings');
}
// Patch travel data with additional information from above
$this->travelDataLoader->patchAvailabilities($travelData, $availabilities);
src/Controller/Booking/IndexController.php
+10 -2
View File
@@ -3,6 +3,9 @@
namespace App\Controller\Booking;
use App\BusProNet\ApiClient;
use App\BusProNet\Exception\ApiClientException;
use App\BusProNet\Exception\ResponseParserException;
use App\BusProNet\Model\BaseData;
use App\BusProNet\XmlLoader\TravelLoader;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Bundle\SecurityBundle\Security;
@@ -30,11 +33,16 @@ class IndexController extends AbstractController
return $this->security->logout();
}
$bookings = $this->apiClient->getBookings($bpnUser->getEmail(), $bpnUser->getPassword());
try {
$bookings = $this->apiClient->getBookings($bpnUser->getEmail(), $bpnUser->getPassword());
} catch (ApiClientException|ResponseParserException $e) {
$this->addFlash('error', 'Buchungen nicht abrufbar');
$bookings = new BaseData([]);
}
$this->travelDataLoader->patchBookings($bookings);
return $this->render('booking/index.html.twig', [
'bookings' => $bookings->getItems(),
]);
}
}
}
src/Controller/PersonalDataController.php
+20 -10
View File
@@ -4,6 +4,8 @@ namespace App\Controller;
use App\BusProNet\ApiClient;
use App\BusProNet\Exception\ApiClientException;
use App\BusProNet\Exception\ResponseParserException;
use App\BusProNet\Model\PersonalData;
use App\Form\PersonalDataType;
use Psr\Log\LoggerInterface;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
@@ -32,10 +34,14 @@ class PersonalDataController extends AbstractController
return $this->security->logout();
}
$personalData = $this
->apiClient
->getPersonalData($bpnUser->getEmail(), $bpnUser->getPassword())
;
try {
$personalData = $this
->apiClient
->getPersonalData($bpnUser->getEmail(), $bpnUser->getPassword());
} catch (ApiClientException|ResponseParserException $e) {
$this->addFlash('error', 'Deine persönlichen Daten konnten nicht abgerufen werden');
$personalData = new PersonalData();
}
$personalDataForm = $this->createForm(PersonalDataType::class, $personalData, [
'attr' => ['novalidate' => 'novalidate'],
@@ -72,10 +78,14 @@ class PersonalDataController extends AbstractController
return $this->security->logout();
}
$personalData = $this
->apiClient
->getPersonalData($bpnUser->getEmail(), $bpnUser->getPassword())
;
try {
$personalData = $this
->apiClient
->getPersonalData($bpnUser->getEmail(), $bpnUser->getPassword());
} catch (ApiClientException|ResponseParserException $e) {
$this->addFlash('error', 'Deine persönlichen Daten konnten nicht abgerufen werden');
$personalData = new PersonalData();
}
$personalData->communication->newsletter = !$personalData->communication->newsletter;
@@ -85,10 +95,10 @@ class PersonalDataController extends AbstractController
$this->logger->info('Updated newsletter registration', [
'email' => $bpnUser->getEmail(),
]);
} catch (ApiClientException $e) {
} catch (ApiClientException|ResponseParserException $e) {
$this->addFlash('error', $e->getMessage());
}
return $this->redirectToRoute('app_personal_data');
}
}
}
src/Controller/RegistrationController.php
+2 -1
View File
@@ -4,6 +4,7 @@ namespace App\Controller;
use App\BusProNet\ApiClient;
use App\BusProNet\Exception\ApiClientException;
use App\BusProNet\Exception\ResponseParserException;
use App\Form\Model\RegistrationData;
use App\Form\RegistrationType;
use Psr\Log\LoggerInterface;
@@ -42,7 +43,7 @@ class RegistrationController extends AbstractController
$this->logger->info('Initiated registration', [
'email' => $registrationData->email,
]);
} catch (ApiClientException $e) {
} catch (ApiClientException|ResponseParserException $e) {
$this->addFlash('error', $e->getMessage());
$this->logger->error('Error initiating registration', [
'email' => $registrationData->email,
src/Controller/ResetPasswordController.php
+3 -2
View File
@@ -4,6 +4,7 @@ namespace App\Controller;
use App\BusProNet\ApiClient;
use App\BusProNet\Exception\ApiClientException;
use App\BusProNet\Exception\ResponseParserException;
use Psr\Log\LoggerInterface;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\Form\Extension\Core\Type\EmailType;
@@ -51,7 +52,7 @@ class ResetPasswordController extends AbstractController
$this->logger->info('Initiated password reset', [
'email' => $form->get('email')->getData(),
]);
} catch (ApiClientException $e) {
} catch (ApiClientException|ResponseParserException $e) {
$this->addFlash('error', $e->getMessage());
$this->logger->error('Error initiating password reset', [
'email' => $form->get('email')->getData(),
@@ -66,4 +67,4 @@ class ResetPasswordController extends AbstractController
'form' => $form->createView(),
]);
}
}
}