feat: improved error handling in controllers, cleanup

src/Controller/Booking/CreateStep2Controller.php

@@ -5,7 +5,6 @@ declare(strict_types=1);
 namespace App\Controller\Booking;
 
 use App\Controller\Traits\HtmxControllerTrait;
-use App\Exception\NoRoomsAvailableException;
 use App\Form\BookingCreateStep2Type;
 use App\Form\Model\BookingCreateDto;
 use App\Form\Model\ParticipantDto;
@@ -25,6 +24,7 @@ use Symfony\Component\Routing\Attribute\Route;
 class CreateStep2Controller extends AbstractController
 {
     use BookingCreateTrait;
+    use BookingExceptionHandlerTrait;
     use HtmxControllerTrait;
 
     public function __construct(
@@ -39,21 +39,19 @@ class CreateStep2Controller extends AbstractController
     #[Route('/bookings/create/participants', name: 'app_booking_create_step_2')]
     public function participants(Request $request): Response
     {
-        try {
-            $bookingCreateDto = $this
-                ->bookingService
-                ->getOrCreateBookingCreateDto($request);
-        } catch (NoRoomsAvailableException $e) {
-            $this->addFlash('error', 'Leider sind für diese Reise aktuell keine Zimmer verfügbar.');
-            // TODO: Redirect to travel listing or hotel details page
-            throw $this->createNotFoundException('No rooms available for this travel.');
+        $result = $this->getOrCreateBookingCreateDto($this->bookingService, $request);
+        if ($result instanceof Response) {
+            return $result;
         }
+        $bookingCreateDto = $result;
 
         // Enrich with fresh availability data
         $this->enrichWithFreshAvailabilities($bookingCreateDto);
 
         // Validate step access
-        $this->validateStepAccess($bookingCreateDto, 2);
+        if ($redirect = $this->validateStepAccess($bookingCreateDto, 2)) {
+            return $redirect;
+        }
 
         // Ensure correct number of participants
         $this->ensureCorrectNumberOfParticipants($bookingCreateDto);
@@ -100,12 +98,11 @@ class CreateStep2Controller extends AbstractController
     #[Route('/bookings/create/participants/refresh', name: 'app_booking_create_step_2_refresh', methods: ['POST'])]
     public function refreshParticipantForm(Request $request): Response
     {
-        try {
-            $bookingCreateDto = $this->bookingService->getOrCreateBookingCreateDto($request);
-        } catch (NoRoomsAvailableException $e) {
-            // For HTMX requests, return a simple error message
-            return new Response('<div class="text-red-700 p-4">Keine Zimmer verfügbar</div>', 400);
+        $result = $this->getOrCreateBookingCreateDtoForHtmx($this->bookingService, $request);
+        if ($result instanceof Response) {
+            return $result;
         }
+        $bookingCreateDto = $result;
 
         // Enrich with fresh availability data
         $this->enrichWithFreshAvailabilities($bookingCreateDto);
@@ -152,6 +149,13 @@ class CreateStep2Controller extends AbstractController
         );
     }
 
+    /**
+     * Calculates the total number of participants based on room selections.
+     *
+     * @param BookingCreateDto $bookingCreateDto The booking DTO containing room selections
+     *
+     * @return int Total number of participants required
+     */
     private function getParticipantsCount(BookingCreateDto $bookingCreateDto): int
     {
         return $this
@@ -159,6 +163,15 @@ class CreateStep2Controller extends AbstractController
             ->getParticipantsCount($bookingCreateDto->roomSelections, $bookingCreateDto->travel);
     }
 
+    /**
+     * Ensures the booking DTO has the correct number of participant objects.
+     *
+     * Creates or reuses participant DTOs to match the required participant count
+     * based on room selections. Preserves existing participant data when possible
+     * and assigns proper index values.
+     *
+     * @param BookingCreateDto $bookingCreateDto The booking DTO to update
+     */
     private function ensureCorrectNumberOfParticipants(BookingCreateDto $bookingCreateDto): void
     {
         $participantsCount = $this->getParticipantsCount($bookingCreateDto);
@@ -177,6 +190,9 @@ class CreateStep2Controller extends AbstractController
      *
      * Fetches availability data with short-term caching and patches the travel object
      * to ensure service availability is reasonably up-to-date while reducing API calls.
+     * This is essential for accurate pricing and service selection during the booking process.
+     *
+     * @param BookingCreateDto $bookingCreateDto The booking DTO containing travel data to enrich
      */
     private function enrichWithFreshAvailabilities(BookingCreateDto $bookingCreateDto): void
     {