chore: further cleanup and refactor

src/Controller/Booking/Create/Step3Controller.php

@@ -8,8 +8,9 @@ use App\BusProNet\ApiClient;
 use App\BusProNet\Exception\TimeoutException;
 use App\BusProNet\Model\BookingResponse;
 use App\BusProNet\Model\Notification;
-use App\Controller\Booking\Traits\BookingCreateTrait;
-use App\Controller\Booking\Traits\BookingExceptionHandlerTrait;
+use App\Exception\BookingSessionNotFoundException;
+use App\Exception\HotelNotInTravelException;
+use App\Exception\TravelNotFoundException;
 use App\Form\BookingCreateStep3Type;
 use App\Form\Model\BookingDto;
 use App\Htmx\HxTrait;
@@ -20,7 +21,6 @@ use App\Service\BookingPriceMismatchAnalyzer;
 use App\Service\BookingSessionManager;
 use App\Service\RoomPricingCalculator;
 use Psr\Log\LoggerInterface;
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -29,10 +29,8 @@ use Symfony\Component\Routing\Attribute\Route;
 /**
  * Handles the third step of the booking creation process (payment method selection).
  */
-class Step3Controller extends AbstractController
+class Step3Controller extends AbstractBookingCreateController
 {
-    use BookingCreateTrait;
-    use BookingExceptionHandlerTrait;
     use HxTrait;
 
     public function __construct(
@@ -52,14 +50,14 @@ class Step3Controller extends AbstractController
     #[Route('/bookings/create/payment', name: 'app_booking_create_step_3')]
     public function index(Request $request): Response
     {
-        $result = $this->getOrCreateBookingCreateDto($this->bookingSessionService, $request);
-        if ($result instanceof Response) {
-            return $result;
+        try {
+            $bookingCreateDto = $this->loadBookingCreateDto($this->bookingSessionService, $request);
+        } catch (BookingSessionNotFoundException|TravelNotFoundException|HotelNotInTravelException $exception) {
+            return $this->createBookingCreateFailureResponse($exception, false);
         }
-        $bookingCreateDto = $result;
 
         // Validate step access
-        if ($redirect = $this->validateStepAccess($bookingCreateDto, 3)) {
+        if (null !== $redirect = $this->validateStepAccess($bookingCreateDto, 3)) {
             return $redirect;
         }
 
@@ -203,11 +201,11 @@ class Step3Controller extends AbstractController
     #[Route('/bookings/create/payment/refresh', name: 'app_booking_create_step_3_refresh', methods: ['POST'])]
     public function refresh(Request $request): Response
     {
-        $result = $this->getOrCreateBookingCreateDto($this->bookingSessionService, $request);
-        if ($result instanceof Response) {
-            return $result;
+        try {
+            $bookingCreateDto = $this->loadBookingCreateDto($this->bookingSessionService, $request);
+        } catch (BookingSessionNotFoundException|TravelNotFoundException|HotelNotInTravelException $exception) {
+            return $this->createBookingCreateFailureResponse($exception, true);
         }
-        $bookingCreateDto = $result;
 
         $form = $this->createForm(BookingCreateStep3Type::class, $bookingCreateDto, [
             'validation_groups' => false,
@@ -248,7 +246,7 @@ class Step3Controller extends AbstractController
     private function shouldFallbackToInquiryMode(BookingResponse $response): bool
     {
         // Check for "nicht möglich" status + inquiry suggestion in message
-        if ('nicht möglich' !== $response->status) {
+        if (BookingResponse::BOOKING_IMPOSSIBLE !== $response->status) {
             return false;
         }