feat: improved error handling in controllers, cleanup

src/Controller/Booking/CreateStep1Controller.php

@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace App\Controller\Booking;
 
-use App\Exception\NoRoomsAvailableException;
 use App\Form\BookingCreateStep1Type;
 use App\Service\BookingService;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
@@ -21,6 +20,7 @@ use Symfony\Component\Routing\Attribute\Route;
 class CreateStep1Controller extends AbstractController
 {
     use BookingCreateTrait;
+    use BookingExceptionHandlerTrait;
 
     public function __construct(
         private readonly BookingService $bookingService,
@@ -33,11 +33,11 @@ class CreateStep1Controller extends AbstractController
     #[Route('/bookings/create', name: 'app_booking_create_step_1')]
     public function index(Request $request): Response
     {
-        try {
-            $bookingCreateDto = $this->bookingService->getOrCreateBookingCreateDto($request);
-        } catch (NoRoomsAvailableException $e) {
-            throw $this->createNotFoundException('No rooms available for this travel.');
+        $result = $this->getOrCreateBookingCreateDto($this->bookingService, $request);
+        if ($result instanceof Response) {
+            return $result;
         }
+        $bookingCreateDto = $result;
 
         // Get or create baseline snapshot for change detection
         $oldRoomSelectionSnapshot = $this->bookingService->getOrCreateBaselineSnapshot($request, $bookingCreateDto);
@@ -45,7 +45,9 @@ class CreateStep1Controller extends AbstractController
         $summary = $this->bookingService->getRoomSummaryAndParticipantCount($bookingCreateDto);
 
         // Validate step access - allow step 1 or redirect to current step
-        $this->validateStepAccess($bookingCreateDto, 1);
+        if ($redirect = $this->validateStepAccess($bookingCreateDto, 1)) {
+            return $redirect;
+        }
 
         $form = $this->createForm(BookingCreateStep1Type::class, $bookingCreateDto, [
             'validation_groups' => ['booking_create_step_1'],
@@ -88,11 +90,11 @@ class CreateStep1Controller extends AbstractController
     #[Route('/bookings/create/room-summary', name: 'app_booking_create_step_1_room_summary', methods: ['POST'])]
     public function roomSummary(Request $request): Response
     {
-        try {
-            $bookingCreateDto = $this->bookingService->getOrCreateBookingCreateDto($request);
-        } catch (NoRoomsAvailableException $e) {
-            throw $this->createNotFoundException('No rooms available for this travel.');
+        $result = $this->getOrCreateBookingCreateDto($this->bookingService, $request);
+        if ($result instanceof Response) {
+            return $result;
         }
+        $bookingCreateDto = $result;
 
         // Process the form to update the DTO with the latest room selection
         $form = $this->createForm(BookingCreateStep1Type::class, $bookingCreateDto, [